商城改进与注释

addons/shopro/controller/Pay.php

@@ -33,7 +33,7 @@ class Pay extends Common
         $openid = $this->request->post('openid', '');
         $money = $this->request->post('money', 0);
         $money = $money > 0 ? $money : 0;
-        $platform = $this->request->header('platform');
+        $platform = $this->request->post('platform');
 
         list($order, $order_type) = $this->getOrderInstance($order_sn);
         $order = $order->where('user_id', $user->id)->where('order_sn', $order_sn)->find();
@@ -152,7 +152,7 @@ class Pay extends Common
             $order_data['subject'] = '商城订单支付';
         }
 
-        $payService = new PayService($payment);
+        $payService = new PayService($payment,$platform);
 
         try {
             $result = $payService->pay($order_data);

addons/shopro/controller/order/Order.php

@@ -16,6 +16,7 @@ class Order extends Common
     protected $noNeedLogin = [];
     protected $noNeedRight = ['*'];
 
+    //订单列表
     public function index()
     {
         $user = auth_user();
@@ -39,17 +40,18 @@ class Order extends Common
                 break;
         }
 
-        $orders = $orders->order('id', 'desc')->paginate(request()->param('list_rows', 10))->toArray();
+//        $orders = $orders->order('id', 'desc')->paginate(request()->param('list_rows', 10))->toArray();
+        $orders = $orders->order('id', 'desc')->autopage()->select();
 
         $orderModel = new OrderModel();
-        foreach ($orders['data'] as &$order) {
+        foreach ($orders as &$order) {
             $order = $orderModel->setOrderItemStatusByOrder($order);
         }
 
         $this->success('获取成功', $orders);
     }
 
-
+    //订单详情
     public function detail()
     {
         $user = auth_user();
@@ -181,7 +183,8 @@ class Order extends Common
         // 订单未支付，处理 item 状态
         $order = $order->setOrderItemStatusByOrder($order);     // 这里订单转 数组了
 
-        $this->success('取消成功', $order);
+//        $this->success('取消成功', $order);
+        $this->success('取消成功');
     }
 
 

addons/shopro/service/order/OrderCreate.php

@@ -152,7 +152,7 @@ class OrderCreate
         $this->address_id = $params['address_id'] ?? 0;
         $this->invoice_id = $params['invoice_id'] ?? 0;//发票
 
-        $this->coupon_id = $params['coupon_id'] ?? 0;
+        $this->coupon_id = $params['coupon_id'] ?? 0;//单张优惠券，优惠券只能与活动叠加
         $this->remark = $params['remark'] ?? '';
 
         $this->money = (isset($params['money']) && $params['money'] > 0) ? $params['money'] : 0;

application/extra/upload.php

@@ -21,7 +21,7 @@ return [
     /**
      * 可上传的文件类型
      */
-    'mimetype'  => 'jpg,png,bmp,jpeg,gif,webp,zip,rar,wav,mp4,mp3,webm',
+    'mimetype'  => 'jpg,png,bmp,jpeg,gif,webp,zip,rar,wav,mp4,mp3,webm,crt',
     /**
      * 是否支持批量上传
      */