一些接口注释和修改

addons/shopro/controller/order/Express.php

@@ -5,7 +5,7 @@ namespace addons\shopro\controller\order;
 use addons\shopro\controller\Common;
 use app\admin\model\shopro\order\Express as OrderExpressModel;
 use addons\shopro\library\express\Express as ExpressLib;
-
+//物流
 class Express extends Common
 {
 

addons/shopro/controller/order/Invoice.php

@@ -4,7 +4,7 @@ namespace addons\shopro\controller\order;
 
 use addons\shopro\controller\Common;
 use app\admin\model\shopro\order\Invoice as OrderInvoiceModel;
-
+//发票
 class Invoice extends Common
 {
     protected $noNeedLogin = [];

addons/shopro/controller/order/Order.php

@@ -9,7 +9,7 @@ use addons\shopro\service\order\OrderOper;
 use app\admin\model\shopro\order\Order as OrderModel;
 use app\admin\model\shopro\Pay as PayModel;
 use addons\shopro\library\express\Express as ExpressLib;
-
+//订单
 class Order extends Common
 {
 
@@ -110,7 +110,7 @@ class Order extends Common
         $this->success('获取成功', $item);
     }
 
-
+    //计算订单
     public function calc()
     {
         $params = $this->request->param();
@@ -126,7 +126,7 @@ class Order extends Common
         }
     }
 
-
+    //创建订单
     public function create()
     {
         $params = $this->request->param();

addons/shopro/controller/trade/Order.php

@@ -5,7 +5,7 @@ namespace addons\shopro\controller\trade;
 use addons\shopro\controller\Common;
 use app\admin\model\shopro\trade\Order as TradeOrderModel;
 use app\admin\model\shopro\Config;
-
+//充值
 class Order extends Common
 {
 

addons/shopro/controller/user/Coupon.php

@@ -23,7 +23,9 @@ class Coupon extends Common
             $userCoupons = $userCoupons->{Str::camel($type)}();
         }
 
-        $userCoupons = $userCoupons->order('id', 'desc')->paginate($this->request->param('list_rows', 10));
+        $userCoupons = $userCoupons->order('id', 'desc')
+//            ->paginate($this->request->param('list_rows', 10));
+            ->autopage()->select();
 
         $this->success('获取成功', $userCoupons);
     }

addons/shopro/service/order/OrderCreate.php

@@ -145,10 +145,12 @@ class OrderCreate
         // $groupon_id = $groupon_id ?? 0;        // 拼团的 团 id
         // $buy_type = $buy_type ?? 'alone';        // 拼团的 购买方式: alone=单独购买,groupon=开团
         
-        $this->goodsList = $params['goods_list'] ?? [];
+//        $this->goodsList = $params['goods_list'] ?? [];
+        $this->goodsList = $params['goods_list'] ? json_decode(htmlspecialchars_decode($params['goods_list']),true) : [];
+
         
         $this->address_id = $params['address_id'] ?? 0;
-        $this->invoice_id = $params['invoice_id'] ?? 0;
+        $this->invoice_id = $params['invoice_id'] ?? 0;//发票
 
         $this->coupon_id = $params['coupon_id'] ?? 0;
         $this->remark = $params['remark'] ?? '';

addons/shopro/validate/order/Order.php

@@ -7,8 +7,9 @@ use think\Validate;
 class Order extends Validate
 {
     protected $rule = [
-        'goods_list' => 'require|array',
-        
+//        'goods_list' => 'require|array',
+        'goods_list' => 'require',
+
         // 评价
         'comments' => 'require|array',
         'item_id' => 'require',

application/admin/model/shopro/order/Aftersale.php

@@ -5,7 +5,7 @@ namespace app\admin\model\shopro\order;
 use traits\model\SoftDelete;
 use app\admin\model\shopro\Common;
 use app\admin\model\shopro\user\User;
-
+//售后
 class Aftersale extends Common
 {
     use SoftDelete;

application/api/controller/Demo.php

@@ -53,7 +53,17 @@ class Demo extends Api
      */
     public function test1()
     {
-        $this->success('返回成功', ['action' => 'test1']);
+        $a = [
+            [
+                'goods_sku_price_id' => 93,
+                'goods_id' => 33,
+            ],
+            [
+                'goods_sku_price_id' => 96,
+                'goods_id' => 34,
+            ],
+        ];
+        dump(json_encode($a));
     }
 
     /**