拆单

app/admin/controller/order/GoodsController.php

@@ -1295,7 +1295,7 @@ class GoodsController extends Curd
             $payData['pay_category'] = $params['goods_classify'] ?? '';
             $payData['pay_paytimes'] = date('Y-m-d H:i:s');
             $payData['pay_json_request'] = json_encode($params);   // {"pay-result": "支付成功", "result-datetime": "2024-07-29 18:38:21"}
-            $payData['pay_json_response'] = $payData['pay_status'] == 'SUCCESS' ? (!empty($params['pay_json_response']) ? $params['pay_json_response'] : json_encode(['pay-result' => '支付成功', 'result-datetime' => date('Y-m-d H:i:s')])) : '[]';
+            $payData['pay_json_response'] = !empty($payData['pay_status']) && $payData['pay_status'] == 'SUCCESS' ? (!empty($params['pay_json_response']) ? $params['pay_json_response'] : json_encode(['pay-result' => '支付成功', 'result-datetime' => date('Y-m-d H:i:s')])) : '[]';
             $payData['join_pay_object_json'] = !empty($params['orderId']) ? json_encode(['order_id' => $params['orderId']]) : '[]';
             $payData['pay_addtimes'] = time();
             PayDetail::insert($payData);

app/admin/controller/order/PackagesController.php

@@ -1430,7 +1430,7 @@ class PackagesController extends Curd
             $payData['pay_category'] = $params['goods_classify'] ?? '';
             $payData['pay_paytimes'] = date('Y-m-d H:i:s');
             $payData['pay_json_request'] = json_encode($params);   // {"pay-result": "支付成功", "result-datetime": "2024-07-29 18:38:21"}
-            $payData['pay_json_response'] = $payData['pay_status'] == 'SUCCESS' ? (!empty($params['pay_json_response']) ? $params['pay_json_response'] : json_encode(['pay-result' => '支付成功', 'result-datetime' => date('Y-m-d H:i:s')])) : '[]';
+            $payData['pay_json_response'] = !empty($payData['pay_status']) && $payData['pay_status'] == 'SUCCESS' ? (!empty($params['pay_json_response']) ? $params['pay_json_response'] : json_encode(['pay-result' => '支付成功', 'result-datetime' => date('Y-m-d H:i:s')])) : '[]';
             $payData['join_pay_object_json'] = !empty($params['orderId']) ? json_encode(['order_id' => $params['orderId']]) : '[]';
             $payData['pay_addtimes'] = time();
             PayDetail::insert($payData);

app/admin/controller/order/ServicesController.php

@@ -844,58 +844,7 @@ class ServicesController extends Curd
             $params['order_config_json'] = json_encode($orderConfigJson);
             // 写入订单
             $this->insertMain($params, $premises);
-
-            // 买的单个服务
-            $writeOffDate = [];
-            $applyData = [];
-            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['delivery'] == 'ARRIVAL') {
-                        $params['benefitId'] = 'BF' . date('ymdHi') . random_string(4, '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('ymdHi') . random_string(4, '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['delivery'] == 'ARRIVAL') {  // 一个套餐买多个
-                        $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('ymdHi') . random_string(4, 'up');
-                            $params['order_sheet_num'] = $goods['nbr'] * $componentJson['nbr'];
-                            for ($i = 0; $i < intval($params['order_sheet_num']); $i++) {
-                                $params['appointmentId'] = 'AP' . date('ymdHi') . random_string(4, '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);
-                        }
-                    }
-                }
-            }
+            
             Db::commit();
 
             // 会员升级
@@ -1031,7 +980,7 @@ class ServicesController extends Curd
             $couponUseJson = [];
             $discountJson = [];
             if (!empty($order->order_discount_json)) {
-                $discountJson = json_decode($order->order_discount_json, true);;
+                $discountJson = json_decode($order->order_discount_json, true);
                 foreach ($discountJson as $item) {
                     if (isset($item['coupon_value']) && sprintf('%.2f', (floatval($order->order_amount_total) - floatval($params['order_amount_pay']))) != sprintf('%.2f', $item['coupon_value'])) {
                         throw new BusinessException("计算优惠后，实付金额错误！");