完善功能

app/admin/controller/order/WholeController.php

@@ -460,6 +460,9 @@ class WholeController extends Curd
             if(isset($orderConfigJson['premises'])){
                 $order->premises = $orderConfigJson['premises'];
             }
+            if(isset($orderConfigJson['tableid'])){
+                $order->dept_table_id = $orderConfigJson['tableid'];
+            }
         }
 
         $order->premises = $premises;
@@ -514,6 +517,25 @@ class WholeController extends Curd
             if (!empty($params['preferential'])){
                 $orderConfigJson['preferential'] = $params['preferential'];
             }
+            if(!empty($params['dept_premises_id'])){
+                $premise = SysDept::where('dept_name',$params['dept_premises_id'])->where('dept_category','营业场所')->first();
+                $orderConfigJson['dept']=$premise->dept_id ?? 0;
+                $orderConfigJson['premises']=$params['dept_premises_id'];
+            }
+            if (!empty($params['dept_table_id'])){
+                if(isset($orderConfigJson['tableid']) && $params['dept_table_id'] != $orderConfigJson['tableid']){
+                    // 原桌释放
+                    SysDept::where('dept_id',$orderConfigJson['tableid'])->update(['dept_status'=>'ACTIVED']);
+                    // 新桌使用
+                    SysDept::where('dept_id',$params['dept_table_id'])->update(['dept_status'=>'USING']);
+
+                }
+                $table = SysDept::where('dept_id',$params['dept_table_id'])->where('dept_category','桌台')->first();
+                $orderConfigJson['table']=$table->dept_name ?? 0;
+                $orderConfigJson['tableid']=$params['dept_table_id'];
+            }
+
+
             $data = [
                 'order_amount_pay'=>$params['order_amount_pay'],
                 'order_amount_total'=>$params['order_amount_total'],
@@ -933,8 +955,23 @@ class WholeController extends Curd
             }else if ($params['pay_category'] == 'OFFLINE'){
                 $payData['pay_prepayid'] = 'OFFLINE';
             }
-            // 更新非微信支付宝的支付记录
-            PayDetail::where('join_pay_order_id',$order->order_groupby)->where('pay_status','WAITING')->update($payData);
+            // 如果 是APP 过来的菜订单，可能没有paydetail
+            if (!PayDetail::where('join_pay_order_id',$order->order_groupby)->where('pay_category','<>','WXPAY')->where('pay_category','<>','ALIPAY')->exists()){
+                $payData['join_pay_member_id'] = $params['join_order_member_id'];
+                $payData['join_pay_order_id'] = $order->order_groupby;
+                $payData['pay_status'] = $payData['pay_status'] == 'SUCCESS' ? $payData['pay_status'] : 'WAITING';
+                $payData['pay_category'] = $params['goods_classify'] ?? '';
+                $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' ? json_encode([
+                    'pay-result'=>'支付成功','result-datetime'=>date('Y-m-d H:i:s')
+                ]) : '[]';
+                $payData['pay_addtimes'] = time();
+
+                PayDetail::insert($payData);
+            }else{
+                // 更新非微信支付宝的支付记录
+                PayDetail::where('join_pay_order_id',$order->order_groupby)->where('pay_category','<>','WXPAY')->where('pay_category','<>','ALIPAY')->update($payData);
+            }
             $writeOffDate = [];
             $applyData = [];
             // 服务已完成，生成核销数据
@@ -1016,7 +1053,6 @@ class WholeController extends Curd
                                         ]
                                     ]
                                 ];
-                                dump('打印',$voteData);
                                 http_post_json(getenv('VOTE_MENU_URL'),$voteData);
                             }
                         }

app/admin/service/order/OrderService.php

@@ -184,7 +184,6 @@ class OrderService
     public static function qrcodePay($params)
     {
         $params['order_amount_pay'] = floatval($params['order_amount_pay']);
-        dump("支付参数",$params);
         $qrcodeNbr = $params['qrcode_nbr'];
         $prefix = substr($qrcodeNbr,0,2);
         // 微信支付