完善功能

app/admin/controller/order/WholeController.php

@@ -221,7 +221,7 @@ class WholeController extends Curd
             }
             if ($item['goods']['goods_classify'] == 'SERVICE') {
                 $benifit = MemberBenefit::where('join_benefit_member_id', $item['join_sheet_member_id'])
-                    ->where('join_benefit_goods_id', $item['goods']['goods_id'])
+                    ->where('join_benefit_order_id', $orderId)
                     ->first();
                 $item['benefit'] = [
                     'total' => intval($benifit->member_benefit_limit_count),
@@ -436,14 +436,14 @@ class WholeController extends Curd
 
             // 配送方式
             if ($params['delivery'] == 'PICKUP') { // 自提
-                $params['order_express_json'] = json_encode([
-                    'express' => 'S',
+                $params['order_config_json'] = json_encode([
+                    // 'express' => 'S',
                     'premises' => $params['dept_premises_id']
                 ]);
             } else if ($params['delivery'] == 'LOGISTICS') {
-                $params['order_express_json'] = json_encode([
-                    'express' => 'Y',
-                ]);
+                // $params['order_express_json'] = json_encode([
+                //     'express' => 'Y',
+                // ]);
             }
 
             // 写入主订单
@@ -549,7 +549,8 @@ class WholeController extends Curd
                 'order_status_payment' => $params['order_status_payment'],
                 'order_status_storage' => $params['order_status_storage'],
                 'order_remark' => $params['order_remark'] ?? '',
-                'order_express_json' => $params['order_express_json'],
+                'order_config_json' =>$params['order_config_json'] ?? '[]',
+                'order_express_json' => $params['order_express_json'] ?? '[]',
                 'order_addtimes' => time()
             ];
 
@@ -698,21 +699,21 @@ class WholeController extends Curd
     {
         $params['order_express_goods'] = json_encode(['sheet' => [$params['sheet_id']]]);
         if ($params['delivery'] == 'PICKUP') { // 自提
-            $params['order_express_json'] = json_encode([
-                'express' => 'S',
+            $params['order_config_json'] = json_encode([
+                // 'express' => 'S',
                 'premises' => $params['dept_premises_id']
             ]);
         } else if ($params['delivery'] == 'LOGISTICS') {
-            $params['order_express_json'] = json_encode([
-                'express' => 'Y',
-            ]);
+            // $params['order_express_json'] = json_encode([
+            //     'express' => 'Y',
+            // ]);
             $params['orderId'] = $params['order_id'];
 
             $this->saveExpress($params);
         }
 
         try {
-            Order::where('order_id', $params['order_id'])->update(['order_express_json' => $params['order_express_json']]);
+            Order::where('order_id', $params['order_id'])->update(['order_config_json' => $params['order_config_json'] ?? '[]']);
         } catch (\Exception $e) {
             throw new BusinessException('修改订单失败');
         }