同步组合支付

app/admin/controller/order/WholeController.php

@@ -796,6 +796,9 @@ class WholeController extends Curd
             $order->order_is_complete = 'Y';
             $systemStatus = 'DONE';
         }
+        if ($params['goods_classify'] == 'PACKAGE' && $params['delivery'] == 'ARRIVAL'){
+            $systemStatus = "WAITING";
+        }
         Db::beginTransaction();
         try {
             // 使用优惠券
@@ -1362,6 +1365,9 @@ class WholeController extends Curd
             $order->order_is_complete = 'Y';
             $systemStatus = 'DONE';
         }
+        if ($params['goods_classify'] == 'PACKAGE' && $params['delivery'] == 'ARRIVAL'){
+            $systemStatus = "WAITING";
+        }
         $payDetail = PayDetail::where('join_pay_order_id', $order->order_groupby)->first();
         Db::beginTransaction();
         try {// 使用优惠券
@@ -1925,6 +1931,9 @@ class WholeController extends Curd
                     $params['order_is_complete'] = 'Y';
                     $systemStatus = 'DONE';
                 }
+                if ($params['goods_classify'] == 'PACKAGE' && $params['delivery'] == 'ARRIVAL'){
+                    $systemStatus = "WAITING";
+                }
             }
 
             if ($params['settlement_now'] == 'Y' && ($params['pay_category'] == 'OFFLINE' || $params['pay_category'] == 'MONEY')) {
@@ -2496,6 +2505,9 @@ class WholeController extends Curd
                     $params['order_is_complete'] = 'Y';
                     $systemStatus = 'DONE';
                 }
+                if ($params['goods_classify'] == 'PACKAGE' && $params['delivery'] == 'ARRIVAL'){
+                    $systemStatus = "WAITING";
+                }
             }
             if (!empty($params['pay_category_constitute']) && in_array('OFFLINE', $params['pay_category_constitute'])) {      // 线下支付
                 $params['order_status_system'] = $systemStatus;
@@ -2562,62 +2574,6 @@ class WholeController extends Curd
                 $params['order_amount_pay'] = $orderAmountPay;
 
             }
-            // 买的单个服务
-            $writeOffDate = [];
-            $applyData = [];
-            // 服务已完成，生成核销数据
-//             if ($params['order_status_payment'] == 'SUCCESS' && in_array($goods['goods_classify'], ['SERVICE','CHNMED','CHNNCD', 'PACKAGE'])) {
-//                 $writeOffDate = OrderService::generateWriteOffData($params);
-//                 $applyData = OrderService::generateAppointmentApplyData($params);
-//             }
-            if ($params['order_status_payment'] == 'SUCCESS') {
-                foreach ($params['goodsContentList'] as $goods) {
-                    $params['join_sheet_goods_id'] = $goods['goods_id'];
-                    if (isset($goods['goods_classify']) && in_array($goods['goods_classify'], ['SERVICE', 'CHNMED', 'CHNNCD'])) {
-                        $params['benefitId'] = 'BF' . date('YmdHis') . random_string(6, 'up');
-                        $params['join_sheet_goods_sku_id'] = $goods['sku_id'];
-                        $params['goods_id'] = $goods['goods_id'];
-                        $params['order_sheet_num'] = $goods['nbr'];
-                        // 预约表
-                        for ($i = 0; $i < intval($params['order_sheet_num']); $i++) {
-                            $params['appointmentId'] = 'AP' . date('YmdHis') . random_string(6, 'up');
-                            // 入预约记录
-                            $this->insertAppointment($params, $writeOffDate, $applyData);
-                        }
-                        $goods['skuId'] = $goods['sku_id'];
-                        $goods['category'] = $goods['goods_classify'];
-                        // 权益表
-                        $this->insertMemberBenefit($params, $goods);
-                    } elseif (isset($goods['goods_classify']) && $goods['goods_classify'] == 'PACKAGE') {  // 一个套餐买多个
-                        $params['packageId'] = $goods['goods_id'];
-                        $components = GoodsComponent::with([
-                            'goods' => function ($query) {
-                                $query->select('goods_id', 'goods_name', 'goods_classify');
-                            }
-                        ])->where('join_component_master_goods_id', $params['packageId'])
-                            ->get()
-                            ->toArray();
-                        foreach ($components as $component) {
-                            $componentJson = json_decode($component['goods_component_json'], true);
-                            $params['join_sheet_goods_sku_id'] = $componentJson['sku_id'];
-                            $params['benefitId'] = 'BF' . date('YmdHis') . random_string(6, 'up');
-                            $params['order_sheet_num'] = $goods['nbr'] * $componentJson['nbr'];
-                            for ($i = 0; $i < intval($params['order_sheet_num']); $i++) {
-                                $params['appointmentId'] = 'AP' . date('YmdHis') . random_string(8, 'up');
-                                // 入预约记录
-                                $this->insertAppointment($params, $writeOffDate);
-                            }
-                            $goods['goods_id'] = $component['join_component_goods_id'];
-                            $goods['goods_name'] = $component['goods']['goods_name'];
-                            $goods['goods_classify'] = $component['goods']['goods_classify'];
-                            $goods['skuId'] = $goods['sku_id'];
-                            $goods['category'] = 'SERVICE';
-                            // 权益表
-                            $this->insertMemberBenefit($params, $goods);
-                        }
-                    }
-                }
-            }
             if (!empty($params['pay_category_constitute']) && in_array('CARD', $params['pay_category_constitute'])) {    // 储值卡账户
                 $cardNbr = $params['card_nbr'];
                 if (!$cardNbr) {