预约，订单状态调整

app/admin/controller/order/WholeController.php

@@ -399,6 +399,8 @@ class WholeController extends Curd
                 $payDetail->pay_category = $categoryArray[1];
             } else if (in_array($categoryArray[0], ['WXPAY', 'ALIPAY'])) {
                 $payDetail->pay_category = $categoryArray[0];
+            }else if($categoryArray[0] == 'OFFLINE'){
+                $payDetail->pay_category = $categoryArray[0];
             } else {
                 if (MemberAccount::where('member_account_nbr', $categoryArray[0])->where('member_account_classify', 'CARD')->exists()) {
                     $payDetail->pay_category = 'CARD';
@@ -589,8 +591,10 @@ class WholeController extends Curd
         try{
             // 组合支付时，付款码应收金额
             $qrcodePayAmount = 0;
-            // 余额支付
-            if ($params['pay_category'] == 'CASH') {
+            if ($params['pay_category'] == 'OFFLINE'){
+                $order->order_status_system = $systemStatus;
+                $order->order_status_payment = 'SUCCESS';
+            }else if ($params['pay_category'] == 'CASH') {    // 余额支付
                 $account = MemberAccount::where('join_account_member_id', $params['join_order_member_id'])
                     ->where('member_account_classify', 'CASH')
                     ->where('member_account_status', 'ACTIVED')
@@ -780,9 +784,11 @@ class WholeController extends Curd
                 $payData['pay_prepayid'] = $params['join_order_member_id'].'-WELFARE';
             }else if ($params['pay_category'] == 'CARD'){
                 $payData['pay_prepayid'] = $params['card_nbr'];
+            }else if ($params['pay_category'] == 'OFFLINE'){
+                $payData['pay_prepayid'] = 'OFFLINE';
             }
             // 更新非微信支付宝的支付记录
-            PayDetail::where('join_pay_order_id',$order->order_groupby)->whereNotIn('pay_prepayid',['WXPAY','ALIPAY'])->update($payData);
+            PayDetail::where('join_pay_order_id',$order->order_groupby)->where('pay_status','WAITING')->update($payData);
             $writeOffDate = [];
             $applyData = [];
             // 服务已完成，生成核销数据
@@ -1001,8 +1007,11 @@ class WholeController extends Curd
                     $systemStatus = 'DONE';
                 }
             }
-            // 余额支付
-            if ($params['settlement_now'] == 'Y' && $params['pay_category'] == 'CASH') {
+            
+            if ($params['settlement_now'] == 'Y'){
+                $params['order_status_system'] = $systemStatus;
+                $params['order_status_payment'] = 'SUCCESS';
+            }else if ($params['settlement_now'] == 'Y' && $params['pay_category'] == 'CASH') {    // 余额支付
                 $account = MemberAccount::where('join_account_member_id', $params['join_order_member_id'])
                     ->where('member_account_classify', 'CASH')
                     ->where('member_account_status', 'ACTIVED')
@@ -1408,13 +1417,15 @@ class WholeController extends Curd
         try {
             if (in_array($params['pay_category'], ['WXPAY', 'ALIPAY'])) {
                 $payPrepayid = $params['pay_category'];
+            }else if ($params['pay_category'] == 'OFFLINE'){
+                $payPrepayid = 'OFFLINE';
             } else {
                 $payPrepayid = $params['join_order_member_id'] . '-' . $params['pay_category'];
             }
             $data = [
                 'join_pay_member_id' => $params['join_order_member_id'],
                 'join_pay_order_id' => $params['orderGroupId'],
-                'pay_status' => 'SUCCESS',
+                'pay_status' => $params['settlement_now'] == 'Y' ? 'SUCCESS' : 'WAITING',
                 'pay_category' => $params['goods_classify'],
                 'pay_amount' => $params['order_amount_pay'],
                 'pay_prepayid' => $payPrepayid,