Browse Source

手机下单,后台付款,优惠券

gorden 3 months ago
parent
commit
a0eaf13391
1 changed files with 97 additions and 97 deletions
  1. 97 97
      app/admin/controller/order/WholeController.php

+ 97 - 97
app/admin/controller/order/WholeController.php

@@ -579,7 +579,7 @@ class WholeController extends Curd
                     $order->awaiting_times = date('Y-m-d H:i:s', strtotime($order->order_addtimes));
                 }
             }
-            $discount = ['coupon_name' => '', 'classify' => '', 'value' => 0];
+            $discount = ['coupon_id' => '', 'coupon_name' => '', 'classify' => '', 'value' => 0];
             if (!empty($order->order_discount_json)) {
                 $orderDiscountJson = json_decode($order->order_discount_json, true);
                 foreach ($orderDiscountJson as $discountItem) {
@@ -598,7 +598,6 @@ class WholeController extends Curd
                     }
                     if (empty($discountItem['coupon_id']) && !empty($discountItem['coupon_classify'])) {
                         if (!empty($discountItem['coupon_detail_id'])) {
-
                             $discount['classify'] .= $discountItem['coupon_detail_id'][0] . '(优惠¥' . sprintf("%.2f", $discountItem['coupon_value']) . '), ';
                         } else {
                             $discount['classify'] .= $discountItem['coupon_classify'] . '(优惠¥' . sprintf("%.2f", $discountItem['coupon_value']) . '), ';
@@ -607,6 +606,7 @@ class WholeController extends Curd
                     if (!empty($discountItem['coupon_value'])) {
                         $discount['value'] += $discountItem['coupon_value'];
                     }
+                    $discount['coupon_id'] = $discountItem['coupon_id'];
                 }
                 if (!empty($discount['coupon_name'])) {
                     $discount['coupon_name'] = rtrim($discount['coupon_name'], ', ');
@@ -987,7 +987,7 @@ class WholeController extends Curd
                 if (in_array($params['goods_classify'], ['SERVICE', 'CHNMED', 'CHNNCD', 'MEALS'])) {
                     $payDetails = PayDetail::where('join_pay_member_id', $params['join_order_member_id'])
                         ->where('pay_status', 'SUCCESS')
-                        ->where('pay_prepayid', $params['join_order_member_id'] . '-WELFARE')
+                        ->where('pay_prepayid', $params['join_order_member_id'] . ' - WELFARE')
                         ->whereIn('pay_category', ['SERVICE', 'CHNMED', 'CHNNCD', 'MEALS', 'DESHES'])
                         ->get()
                         ->toArray();
@@ -996,7 +996,7 @@ class WholeController extends Curd
 
                     $refundPayDetails = PayDetail::where('join_pay_member_id', $params['join_order_member_id'])
                         ->where('pay_status', 'SUCCESS')
-                        ->where('pay_prepayid', $params['join_order_member_id'] . '-WELFARE')
+                        ->where('pay_prepayid', $params['join_order_member_id'] . ' - WELFARE')
                         ->where('pay_category', 'REFUND')
                         ->get()
                         ->toArray();
@@ -1020,7 +1020,7 @@ class WholeController extends Curd
                 } else {
                     $payDetails = PayDetail::where('join_pay_member_id', $params['join_order_member_id'])
                         ->where('pay_status', 'SUCCESS')
-                        ->where('pay_prepayid', $params['join_order_member_id'] . '-WELFARE')
+                        ->where('pay_prepayid', $params['join_order_member_id'] . ' - WELFARE')
                         ->whereNotIn('pay_category', ['SERVICE', 'CHNMED', 'CHNNCD', 'MEALS', 'DESHES', 'REFUND', 'RECHARGE'])
                         ->get()
                         ->toArray();
@@ -1029,7 +1029,7 @@ class WholeController extends Curd
 
                     $refundPayDetails = PayDetail::where('join_pay_member_id', $params['join_order_member_id'])
                         ->where('pay_status', 'SUCCESS')
-                        ->where('pay_prepayid', $params['join_order_member_id'] . '-WELFARE')
+                        ->where('pay_prepayid', $params['join_order_member_id'] . ' - WELFARE')
                         ->where('pay_category', 'REFUND')
                         ->get()
                         ->toArray();
@@ -1190,11 +1190,11 @@ class WholeController extends Curd
                 $payData['pay_prepayid'] = $params['pay_category'];
                 $payData['pay_json_response'] = $params['pay_json_response'];
             } else if ($params['pay_category'] == 'CASH') {
-                $payData['pay_prepayid'] = $params['join_order_member_id'] . '-CASH';
+                $payData['pay_prepayid'] = $params['join_order_member_id'] . ' - CASH';
             } else if ($params['pay_category'] == 'WELFARE') {
-                $payData['pay_prepayid'] = $params['join_order_member_id'] . '-WELFARE';
+                $payData['pay_prepayid'] = $params['join_order_member_id'] . ' - WELFARE';
             } else if ($params['pay_category'] == 'VIP') {
-                $payData['pay_prepayid'] = $params['join_order_member_id'] . '-VIP';
+                $payData['pay_prepayid'] = $params['join_order_member_id'] . ' - VIP';
             } else if ($params['pay_category'] == 'CARD') {
                 $payData['pay_prepayid'] = $params['card_id'];
             } else if ($params['pay_category'] == 'OFFLINE') {
@@ -1207,7 +1207,7 @@ class WholeController extends Curd
                 $payData['pay_prepayid'] = 'MONEY';
             }
             // 如果 是APP 过来的菜订单,可能没有paydetail
-            if (!PayDetail::where('join_pay_order_id', $order->order_groupby)->where('pay_category', '<>', 'WXPAY')->where('pay_category', '<>', 'ALIPAY')->exists()) {
+            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'] = !empty($payData['pay_status']) && $payData['pay_status'] == 'SUCCESS' ? $payData['pay_status'] : 'WAITING';
@@ -1215,7 +1215,7 @@ class WholeController extends Curd
                 $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' ? json_encode([
-                    'pay-result' => '支付成功', 'result-datetime' => date('Y-m-d H:i:s')
+                    '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();
@@ -1223,7 +1223,7 @@ class WholeController extends Curd
                 PayDetail::insert($payData);
             } else {
                 // 更新非微信支付宝的支付记录
-                PayDetail::where('join_pay_order_id', $order->order_groupby)->where('pay_category', '<>', 'WXPAY')->where('pay_category', '<>', 'ALIPAY')->update($payData);
+                PayDetail::where('join_pay_order_id', $order->order_groupby)->where('pay_category', ' <> ', 'WXPAY')->where('pay_category', ' <> ', 'ALIPAY')->update($payData);
             }
             $writeOffDate = [];
             $applyData = [];
@@ -1300,7 +1300,7 @@ class WholeController extends Curd
             // 2.4W 康养城
             if ($params['goods_classify'] == 'VIP' && $order->order_status_payment == 'SUCCESS') {
                 $params['member_id'] = $params['join_order_member_id'];
-                Event::dispatch('order.kangyangCityVIP.grant', $params);
+                Event::dispatch('order . kangyangCityVIP . grant', $params);
             }
 
             Db::commit();
@@ -1310,12 +1310,12 @@ class WholeController extends Curd
                 // 加销售量
                 OrderSheetService::addGoodsSales($params['orderId']);
                 // 完成订单
-                Event::dispatch('order.complete', $params);
+                Event::dispatch('order . complete', $params);
                 // 上级提成
-                Event::dispatch('commission.order', $params);
+                Event::dispatch('commission . order', $params);
                 // 入收支明细表
                 $params['inout_category'] = $oldOrderPaymentStatus == 'AWAITING' ? '挂账订单结算' : '餐饮订单';
-                Event::dispatch('statistics.inout.in', $params);
+                Event::dispatch('statistics . inout . in', $params);
             }
 
             // 打小票
@@ -1519,7 +1519,7 @@ class WholeController extends Curd
             $wxAndAliPayStatus = 'Y';
             $waitToPayAccount = [];
             // 清除paydetail 中的未支付记录
-            PayDetail::where('join_pay_order_id', $params['orderGroupId'])->where('pay_status', '<>', 'SUCCESS')->delete();
+            PayDetail::where('join_pay_order_id', $params['orderGroupId'])->where('pay_status', ' <> ', 'SUCCESS')->delete();
             if (!empty($params['pay_category_constitute']) && in_array('OFFLINE', $params['pay_category_constitute'])) {  //线下付款
                 $order->order_status_system = $systemStatus;
                 $order->order_status_payment = 'SUCCESS';
@@ -1559,7 +1559,7 @@ class WholeController extends Curd
                 }
                 if (isset($constituteList['CASH'])) {
                     $params['order_amount_pay'] = $constituteList['CASH'];
-                    $params['pay_category'] = $params['join_order_member_id'] . '-CASH';
+                    $params['pay_category'] = $params['join_order_member_id'] . ' - CASH';
                 }
                 $amount = $account->member_account_surplus + $account->member_account_added;
                 if ($params['order_amount_pay'] > $amount) {
@@ -1570,7 +1570,7 @@ class WholeController extends Curd
                     'group_id' => $params['orderGroupId'],
                     'member_id' => $params['join_order_member_id'],
                     'amount' => $constituteList['CASH'],
-                    'nbr' => $params['join_order_member_id'] . '-CASH'
+                    'nbr' => $params['join_order_member_id'] . ' - CASH'
                 ];
                 // 生成支付记录
                 $params['order_status_payment'] = 'PENDING';
@@ -1780,7 +1780,7 @@ class WholeController extends Curd
             // 2.4W 康养城
             if ($params['goods_classify'] == 'VIP' && $order->order_status_payment == 'SUCCESS') {
                 $params['member_id'] = $params['join_order_member_id'];
-                Event::dispatch('order.kangyangCityVIP.grant', $params);
+                Event::dispatch('order . kangyangCityVIP . grant', $params);
             }
 
             Db::commit();
@@ -1789,12 +1789,12 @@ class WholeController extends Curd
                 // 加销售量
                 OrderSheetService::addGoodsSales($params['orderId']);
                 // 完成订单
-                Event::dispatch('order.complete', $params);
+                Event::dispatch('order . complete', $params);
                 // 上级提成
-                Event::dispatch('commission.order', $params);
+                Event::dispatch('commission . order', $params);
                 // 入收支明细表
                 $params['inout_category'] = $oldOrderPaymentStatus == 'AWAITING' ? '挂账订单结算' : '餐饮订单';
-                Event::dispatch('statistics.inout.in', $params);
+                Event::dispatch('statistics . inout . in', $params);
             }
 
             // 打小票
@@ -1866,7 +1866,7 @@ class WholeController extends Curd
 
             $payDetail = PayDetail::where('join_pay_order_id', $order->order_groupby)->first();
             if ($payDetail) {
-                $payType = explode('-', $payDetail->pay_prepayid);
+                $payType = explode(' - ', $payDetail->pay_prepayid);
                 // 余额支付
                 if (isset($payType[1]) && $payType[1] == 'CASH') {
                     $memberAccount = MemberAccount::where('join_account_member_id', $payDetail->join_pay_member_id)
@@ -2172,7 +2172,7 @@ class WholeController extends Curd
                 if (in_array($params['goods_classify'], ['SERVICE', 'CHNMED', 'CHNNCD', 'MEALS'])) {
                     $payDetails = PayDetail::where('join_pay_member_id', $params['join_order_member_id'])
                         ->where('pay_status', 'SUCCESS')
-                        ->where('pay_prepayid', $params['join_order_member_id'] . '-WELFARE')
+                        ->where('pay_prepayid', $params['join_order_member_id'] . ' - WELFARE')
                         ->whereIn('pay_category', ['SERVICE', 'CHNMED', 'CHNNCD', 'MEALS', 'DESHES'])
                         ->get()
                         ->toArray();
@@ -2181,7 +2181,7 @@ class WholeController extends Curd
 
                     $refundPayDetails = PayDetail::where('join_pay_member_id', $params['join_order_member_id'])
                         ->where('pay_status', 'SUCCESS')
-                        ->where('pay_prepayid', $params['join_order_member_id'] . '-WELFARE')
+                        ->where('pay_prepayid', $params['join_order_member_id'] . ' - WELFARE')
                         ->where('pay_category', 'REFUND')
                         ->get()
                         ->toArray();
@@ -2206,7 +2206,7 @@ class WholeController extends Curd
                 } else {
                     $payDetails = PayDetail::where('join_pay_member_id', $params['join_order_member_id'])
                         ->where('pay_status', 'SUCCESS')
-                        ->where('pay_prepayid', $params['join_order_member_id'] . '-WELFARE')
+                        ->where('pay_prepayid', $params['join_order_member_id'] . ' - WELFARE')
                         ->whereNotIn('pay_category', ['SERVICE', 'CHNMED', 'CHNNCD', 'MEALS', 'DESHES', 'REFUND', 'RECHARGE'])
                         ->get()
                         ->toArray();
@@ -2215,7 +2215,7 @@ class WholeController extends Curd
 
                     $refundPayDetails = PayDetail::where('join_pay_member_id', $params['join_order_member_id'])
                         ->where('pay_status', 'SUCCESS')
-                        ->where('pay_prepayid', $params['join_order_member_id'] . '-WELFARE')
+                        ->where('pay_prepayid', $params['join_order_member_id'] . ' - WELFARE')
                         ->where('pay_category', 'REFUND')
                         ->get()
                         ->toArray();
@@ -2494,7 +2494,7 @@ class WholeController extends Curd
             // 2.4W 康养城
             if ($params['goods_classify'] == 'VIP' && $params['order_status_payment'] == 'SUCCESS') {
                 $params['member_id'] = $params['join_order_member_id'];
-                Event::dispatch('order.kangyangCityVIP.grant', $params);
+                Event::dispatch('order . kangyangCityVIP . grant', $params);
             }
 
             Db::commit();
@@ -2502,12 +2502,12 @@ class WholeController extends Curd
             // 触发事件
             if (!empty($params['order_is_complete']) && $params['order_is_complete'] == 'Y' && $params['order_status_payment'] == 'SUCCESS') {
                 // 订单完成
-                Event::dispatch('order.complete', $params);
+                Event::dispatch('order . complete', $params);
                 // 上级提成
-                Event::dispatch('commission.order', $params);
+                Event::dispatch('commission . order', $params);
                 // 入收支明细表
                 $params['inout_category'] = '餐饮订单';
-                Event::dispatch('statistics.inout.in', $params);
+                Event::dispatch('statistics . inout . in', $params);
             }
 
             // 打小票
@@ -2797,7 +2797,7 @@ class WholeController extends Curd
 
                 if (isset($constituteList['CASH'])) {
                     $params['order_amount_pay'] = $constituteList['CASH'];
-                    $params['pay_category'] = $params['join_order_member_id'] . '-CASH';
+                    $params['pay_category'] = $params['join_order_member_id'] . ' - CASH';
                 }
                 if ($params['order_amount_pay'] > $amount) {
                     throw new BusinessException("账户余额不足");
@@ -2807,7 +2807,7 @@ class WholeController extends Curd
                     'group_id' => $params['orderGroupId'],
                     'member_id' => $params['join_order_member_id'],
                     'amount' => $constituteList['CASH'],
-                    'nbr' => $params['join_order_member_id'] . '-CASH'
+                    'nbr' => $params['join_order_member_id'] . ' - CASH'
                 ];
 
                 $params['order_status_system'] = $systemStatus;
@@ -3037,7 +3037,7 @@ class WholeController extends Curd
             // 2.4W 康养城
             if ($params['goods_classify'] == 'VIP' && intval($params['order_amount_pay']) == 24000 && $params['order_status_payment'] == 'SUCCESS') {
                 $params['member_id'] = $params['join_order_member_id'];
-                Event::dispatch('order.kangyangCityVIP.grant', $params);
+                Event::dispatch('order . kangyangCityVIP . grant', $params);
             }
 
             Db::commit();
@@ -3045,12 +3045,12 @@ class WholeController extends Curd
             // 触发事件
             if (!empty($params['order_is_complete']) && $params['order_is_complete'] == 'Y' && $params['order_status_payment'] == 'SUCCESS') {
                 // 完成订单
-                Event::dispatch('order.complete', $params);
+                Event::dispatch('order . complete', $params);
                 // 上级提成
-                Event::dispatch('commission.order', $params);
+                Event::dispatch('commission . order', $params);
                 // 入收支明细表
                 $params['inout_category'] = '餐饮订单';
-                Event::dispatch('statistics.inout.in', $params);
+                Event::dispatch('statistics . inout . in', $params);
             }
 
             // 打小票
@@ -3170,7 +3170,7 @@ class WholeController extends Curd
                 'order_id' => $params['orderId'],
                 'order_groupby' => $params['orderGroupId'],
                 'join_order_member_id' => $params['join_order_member_id'],
-                'order_name' => date('Y-m-d H:i:s') . '-订单',
+                'order_name' => date('Y-m-d H:i:s') . ' - 订单',
                 'order_amount_total' => $params['order_amount_total'],
                 'order_amount_pay' => $params['order_amount_pay'],
                 'order_category' => $orderCategory,
@@ -3288,10 +3288,10 @@ class WholeController extends Curd
             }
             return $orderSheetIds;
         } catch (\support\exception\BusinessException $e) {
-            dump($e->getMessage() . '||' . $e->getLine());
+            dump($e->getMessage() . ' || ' . $e->getLine());
             throw new BusinessException($e->getMessage());
         } catch (\Exception $e) {
-            dump($e->getMessage() . '||' . $e->getLine());
+            dump($e->getMessage() . ' || ' . $e->getLine());
             throw new BusinessException('订单创建失败');
         }
     }
@@ -3321,7 +3321,7 @@ class WholeController extends Curd
             } else if ($params['pay_category'] == 'CARD') {
                 $payPrepayid = $params['card_id'];
             } else {
-                $payPrepayid = $params['join_order_member_id'] . '-' . $params['pay_category'];
+                $payPrepayid = $params['join_order_member_id'] . ' - ' . $params['pay_category'];
             }
             $data = [
                 'join_pay_member_id' => $params['join_order_member_id'],
@@ -3465,11 +3465,11 @@ class WholeController extends Curd
             if (!empty($order->order_discount_json)) {
                 $orderDiscountJson = json_decode($order->order_discount_json, true);
                 $couponId = '';
-                foreach ($orderDiscountJson as $coupon){
+                foreach ($orderDiscountJson as $coupon) {
                     $couponId = $coupon['coupon_id'];
                 }
-                $coupon = Coupon::where('coupon_id',$couponId)->select('coupon_classify')->first();
-                if (!empty($coupon) && $coupon->coupon_classify == '折扣券'){
+                $coupon = Coupon::where('coupon_id', $couponId)->select('coupon_classify')->first();
+                if (!empty($coupon) && $coupon->coupon_classify == '折扣券') {
                     $zhekou = 'Y';
                 }
             }
@@ -3484,9 +3484,9 @@ class WholeController extends Curd
             foreach ($params['goodsContentList'] as $goods) {
                 //{"unit": "份", "table": null, "premises": "15"}
                 $price = floatval($goods['goods_sales_price']);
-                if ($zhekou == 'Y'){
+                if ($zhekou == 'Y') {
                     $orderSheetPricePay = round(($order->order_amount_pay / $order->order_amount_total) * $price, 2);
-                }else{
+                } else {
                     $orderSheetPricePay = $price;
                 }
 
@@ -3776,11 +3776,11 @@ class WholeController extends Curd
             $model->save();
 
             // 事件通知
-            Event::dispatch('client_message.delivery', $params);
+            Event::dispatch('client_message . delivery', $params);
             if ($params['express_type'] == '自提') {
                 $order = Order::where('order_id', $request->post('order_id'))->select('join_order_member_id')->first();
                 if (!empty($order)) {
-//                    Event::dispatch('order_pay.member_level.up', $order->join_order_member_id);
+//                    Event::dispatch('order_pay . member_level . up', $order->join_order_member_id);
                 }
             }
 
@@ -3893,7 +3893,7 @@ class WholeController extends Curd
                 $params['dept'] = $dept;
                 $params['write_off_data'] = OrderService::generateWriteOffDataByOrderProcess($params);
                 // 触发事件
-                Event::dispatch('order.write_off', $params);
+                Event::dispatch('order . write_off', $params);
             }
 
             Db::commit();
@@ -4134,7 +4134,7 @@ class WholeController extends Curd
                         'orderId' => $key,
                         'submit_premises_id' => $dept['dept_id'] ?? 0,
                     ];
-                    Event::dispatch('order.complete', $processParams);
+                    Event::dispatch('order . complete', $processParams);
                 }
             }
 
@@ -4151,7 +4151,7 @@ class WholeController extends Curd
                         $params['dept'] = $dept;
                         $params['write_off_data'] = OrderService::generateWriteOffDataByOrderProcess($params);
                         // 触发事件
-                        Event::dispatch('order.write_off', $params);
+                        Event::dispatch('order . write_off', $params);
                     }
                 }
 
@@ -4196,7 +4196,7 @@ class WholeController extends Curd
         }
         $sheetOrderIds = [];
         if (!empty($goodsName)) {
-            $goodsIds = Goods::where('goods_name', 'like', '%' . $goodsName . '%')->pluck('goods_id')->toArray();
+            $goodsIds = Goods::where('goods_name', 'like', ' % ' . $goodsName . ' % ')->pluck('goods_id')->toArray();
             $sheetOrderIds = OrderSheet::whereIn('join_sheet_goods_id', $goodsIds)
                 ->where('join_sheet_member_id', $memberId)
                 ->pluck('join_sheet_order_id')
@@ -4204,7 +4204,7 @@ class WholeController extends Curd
         }
 
         $order = Order::with([
-            'return' => function ($query) {
+            'return ' => function ($query) {
                 $query->select('join_return_order_id', 'orders_return_id', 'order_return_status');
             },
             'sheets',
@@ -4213,7 +4213,7 @@ class WholeController extends Curd
             }
         ])
             ->where('join_order_member_id', $memberId)
-            ->where('order_classify', '<>', 'RECHARGE')
+            ->where('order_classify', ' <> ', 'RECHARGE')
             ->when(!empty($datetime), function ($query) use ($datetime) {
                 $datetime[0] = strtotime($datetime[0]);
                 $datetime[1] = strtotime($datetime[1]);
@@ -4347,7 +4347,7 @@ class WholeController extends Curd
             $return->order_return_status = 'DONE';
             $return->order_return_refund_json = json_encode(['amount' => $amount, 'datetime' => date('Y-m-d H:i:s'), 'user_id' => JwtToken::getCurrentId()]);
             $return->save();
-            $payType = explode('-', $payDetail->pay_prepayid);
+            $payType = explode(' - ', $payDetail->pay_prepayid);
             // 区分账户余额支付和在线支付
             if ($payDetail->pay_prepayid == 'WXPAY') {
                 // 退款
@@ -4359,7 +4359,7 @@ class WholeController extends Curd
                     'refund_fee' => $amount * 100,
                     'refund_desc' => '退款',
                 ];
-                $res = Pay::wechat(config('payment.wxpay'))->refund($data);
+                $res = Pay::wechat(config('payment . wxpay'))->refund($data);
                 $resArray = json_decode($res, true);
                 if (!$resArray['result_code'] == 'SUCCESS' || !$resArray['return_code'] == 'SUCCESS') {
                     throw new PayException("退款失败");
@@ -4370,7 +4370,7 @@ class WholeController extends Curd
                     'out_trade_no' => $order->order_groupby,
                     'refund_amount' => $amount,
                 ];
-                $res = Pay::alipay(config('payment.alipay'))->refund($data);
+                $res = Pay::alipay(config('payment . alipay'))->refund($data);
                 $resArray = json_decode($res, true);
                 if ($resArray['fund_change'] != 'Y' || $resArray['msg'] != 'Success') {
                     throw new PayException("退款失败");
@@ -4445,7 +4445,7 @@ class WholeController extends Curd
                 'pay_paytimes' => date('Y-m-d H:i:s'),
                 'pay_json_request' => json_encode($data),
                 'pay_json_response' => $res,
-                'pay_prepayid' => $payType[0] . (!empty($payType[1]) ? '-' . $payType[1] : ''),
+                'pay_prepayid' => $payType[0] . (!empty($payType[1]) ? ' - ' . $payType[1] : ''),
                 'pay_addtimes' => time()
             ];
             PayDetail::insert($payDetailData);
@@ -4453,7 +4453,7 @@ class WholeController extends Curd
             Db::commit();
 
             // 事件通知
-            Event::dispatch('client_message.refund', $order->join_order_member_id);
+            Event::dispatch('client_message . refund', $order->join_order_member_id);
 
             _syslog("退款", "发起退款", json_decode($res), $data);
             return json_success("退款成功");
@@ -4510,11 +4510,11 @@ class WholeController extends Curd
         } else if ($type == 'todayOrderAmount') {
             $todayTimeUnix = strtotime(date('Y-m-d') . ' 00:00:00');
             $groupIds = PayDetail::whereRaw('CAST(UNIX_TIMESTAMP(pay_paytimes) as SIGNED) > ? ', [$todayTimeUnix])
-                ->where('join_pay_order_id', '<>', '')
-                ->where('pay_prepayid', '<>', '')
-                ->where('pay_category', '<>', 'RETURN')
-                ->where('pay_category', '<>', 'RECHARGE')
-                ->where('pay_category', '<>', 'CLEAR')
+                ->where('join_pay_order_id', ' <> ', '')
+                ->where('pay_prepayid', ' <> ', '')
+                ->where('pay_category', ' <> ', 'return ')
+                ->where('pay_category', ' <> ', 'RECHARGE')
+                ->where('pay_category', ' <> ', 'CLEAR')
                 ->pluck('join_pay_order_id')
                 ->toArray();
             $where['order_groupby'] = ['in', $groupIds];
@@ -4522,13 +4522,13 @@ class WholeController extends Curd
         $orderId = trim($request->get('order_id'));
         $orderIds = [];
         if (!empty($orderId)) {
-            $orderIds = Order::where('order_id', 'like', '%' . $orderId . '%')
+            $orderIds = Order::where('order_id', 'like', ' % ' . $orderId . ' % ')
                 ->pluck('order_id')
                 ->toArray();
         }
         $goodsName = trim($request->get('goods_name', ''));
         if (!empty($goodsName)) {
-            $goodsIds = Goods::where('goods_name', 'like', '%' . $goodsName . '%')
+            $goodsIds = Goods::where('goods_name', 'like', ' % ' . $goodsName . ' % ')
                 ->pluck('goods_id')
                 ->toArray();
             $goodsOrderIds = OrderSheet::whereIn('join_sheet_goods_id', $goodsIds)->pluck('join_sheet_order_id')->toArray();
@@ -4561,17 +4561,17 @@ class WholeController extends Curd
             $where['order_is_complete'] = 'N';
         }
 
-        if (!empty($where['order_status_system']) && $where['order_status_system'] == 'RETURN') {
+        if (!empty($where['order_status_system']) && $where['order_status_system'] == 'return ') {
             unset($where['order_status_system']);
             unset($where['order_is_complete']);
-            $where['order_category'] = 'RETURN';
+            $where['order_category'] = 'return ';
         }
 
         // 自提订单
         if (!empty($where['order_status_system']) && $where['order_status_system'] == 'PICKUP') {
             $where['order_is_complete'] = 'N';
             $where['order_status_system'] = 'SENDING';
-            $where['order_express.order_express_type'] = '自提';
+            $where['order_express . order_express_type'] = '自提';
         }
 
         $query = $this->doSelect($where, $field, $order);
@@ -4644,8 +4644,8 @@ class WholeController extends Curd
                 ->where(function ($query) use ($item) {
                     $query->whereJsonContains('join_pay_object_json->order_id', $item['order_id'])->orWhere('join_pay_object_json', '')->orWhereNull('join_pay_object_json');
                 })->where('pay_status', 'SUCCESS')
-                ->where('pay_prepayid', '<>', '')
-                ->where('pay_category', '<>', 'REFUND')
+                ->where('pay_prepayid', ' <> ', '')
+                ->where('pay_category', ' <> ', 'REFUND')
                 ->get()
                 ->toArray();
             if (count($payDetails) > 1) {
@@ -4664,7 +4664,7 @@ class WholeController extends Curd
             if (!empty($item['member']) && $item['member']['member_mobile'] == '0000') {
                 $memberName = '散客';
             } else {
-                $memberName = !empty($item['cert']) ? $item['cert']['member_cert_name'] : (!empty($item['member']) ? (substr($item['member']['member_mobile'], -4) . '会员' . '-') : '');
+                $memberName = !empty($item['cert']) ? $item['cert']['member_cert_name'] : (!empty($item['member']) ? (substr($item['member']['member_mobile'], -4) . '会员' . ' - ') : '');
                 if (!empty($item['member'])) {
                     $memberName .= $item['member']['member_mobile'];
                 }
@@ -4861,7 +4861,7 @@ class WholeController extends Curd
     public function doPrinterWriterOff($id)
     {
         $payOff = OrderProcess::where('order_process_key', 'PAYOFF')
-            ->where('order_process_json', 'like', '%' . $id . '%')
+            ->where('order_process_json', 'like', ' % ' . $id . ' % ')
             ->first();
         if (!$payOff) {
             return json_fail('暂无数据');
@@ -4934,9 +4934,9 @@ class WholeController extends Curd
             $full = '';
             $payStatus = 'N';
             if (in_array('WXPAY', $payDetailType)) {
-                $result = Pay::wechat(config('payment.wxpay'))->find($order->order_groupby, 'pos');
+                $result = Pay::wechat(config('payment . wxpay'))->find($order->order_groupby, 'pos');
                 $result = json_decode(json_encode($result), true);
-//               $result = '{"return_code":"SUCCESS","return_msg":"OK","result_code":"SUCCESS","mch_id":"1680393367","appid":"wxc6274da7198e3eb4","openid":"o3JAn6Ii_bAlxS-jbNEC4WnPhdwM","is_subscribe":"N","trade_type":"MICROPAY","trade_state":"SUCCESS","bank_type":"OTHERS","total_fee":"3","fee_type":"CNY","cash_fee":"1000","cash_fee_type":"CNY","transaction_id":"4200067718202409250802875650","out_trade_no":"OD24092518408RV7","attach":[],"time_end":"20240925184009","trade_state_desc":"支付成功","nonce_str":"OeGOkjch4eaV5qIt","sign":"6DCB3BFC594EBC018A2BEE2C3DFEA4E3"}';
+//               $result = '{ "return_code":"SUCCESS","return_msg":"OK","result_code":"SUCCESS","mch_id":"1680393367","appid":"wxc6274da7198e3eb4","openid":"o3JAn6Ii_bAlxS-jbNEC4WnPhdwM","is_subscribe":"N","trade_type":"MICROPAY","trade_state":"SUCCESS","bank_type":"OTHERS","total_fee":"3","fee_type":"CNY","cash_fee":"1000","cash_fee_type":"CNY","transaction_id":"4200067718202409250802875650","out_trade_no":"OD24092518408RV7","attach":[],"time_end":"20240925184009","trade_state_desc":"支付成功","nonce_str":"OeGOkjch4eaV5qIt","sign":"6DCB3BFC594EBC018A2BEE2C3DFEA4E3"}';
 //               $result = json_decode($result, true);
                 if (!empty($result['return_code']) && $result['return_code'] == 'SUCCESS' && !empty($result['result_code']) && $result['result_code'] == 'SUCCESS' && !empty($result['trade_state']) && $result['trade_state'] == 'SUCCESS') {
                     $payStatus = 'Y';
@@ -4952,7 +4952,7 @@ class WholeController extends Curd
                         $order->order_amount_paid = $order->order_amount_paid + $totalFee;
                         $order->order_amount_pay = $order->order_amount_paid;
                         if ($order->order_amount_paid >= $order->order_amount_total) {
-                            $full = '-满额';
+                            $full = ' - 满额';
                             $order->order_status_payment = 'SUCCESS';
                             $order->order_status_system = 'DONE';
                             $order->order_is_complete = 'Y';
@@ -4972,10 +4972,10 @@ class WholeController extends Curd
                         'pay_json_response' => json_encode($result)
                     ]);
                     // 除微信外的支付记录
-                    PayDetail::where('join_pay_order_id', $order->order_groupby)->where('pay_prepayid', '<>', 'WXPAY')->update([
+                    PayDetail::where('join_pay_order_id', $order->order_groupby)->where('pay_prepayid', ' <> ', 'WXPAY')->update([
                         'pay_status' => 'SUCCESS',
                         'pay_paytimes' => date('Y-m-d H:i:s'),
-                        'pay_json_response' => json_encode(['pay-result' => '支付成功', 'result-datetime' => date('Y-m-d H:i:s')])
+                        'pay_json_response' => json_encode(['pay - result' => '支付成功', 'result - datetime' => date('Y-m-d H:i:s')])
                     ]);
                     // 加销售量
                     OrderSheetService::addGoodsSales($params['orderId']);
@@ -4985,7 +4985,7 @@ class WholeController extends Curd
 
                 }
             } else if (in_array('ALIPAY', $payDetailType)) {
-                $result = Pay::alipay(config('payment.alipay'))->find($order->order_groupby);
+                $result = Pay::alipay(config('payment . alipay'))->find($order->order_groupby);
                 $result = json_decode(json_encode($result), true);
 //                $result = '{"code":"10000","msg":"Success","buyer_logon_id":"138******93","buyer_pay_amount":"5.87","fund_bill_list":[{"amount":"5.69","fund_channel":"ALIPAYACCOUNT"},{"amount":"0.18","fund_channel":"COUPON"},{"amount":"0.13","fund_channel":"DISCOUNT"}],"invoice_amount":"5.69","out_trade_no":"OD2409251550Q07A","point_amount":"0.00","receipt_amount":"6.00","send_pay_date":"2024-09-25 15:50:22","total_amount":"6.00","trade_no":"2024092523001439431419750998","trade_status":"TRADE_SUCCESS","buyer_open_id":"04309N2aVhSZz4cKwN_DN2DQa7ekM3z5n8kscQHsmIZOJsf"}';
 //                $result = json_decode($result, true);
@@ -5002,7 +5002,7 @@ class WholeController extends Curd
                         $order->order_amount_paid = $order->order_amount_paid + $result['total_amount'];
                         $order->order_amount_pay = $order->order_amount_paid;
                         if ($order->order_amount_paid >= $order->order_amount_total) {
-                            $full = '-满额';
+                            $full = ' - 满额';
                             $order->order_status_system = 'DONE';
                             $order->order_status_payment = 'SUCCESS';
                             $order->order_is_complete = 'Y';
@@ -5029,12 +5029,12 @@ class WholeController extends Curd
 
                     // if (in_array($order->order_category, ['SERVICE', 'CHNMED', 'CHNNCD', 'PACKAGE', 'GOODS', 'DISHES', 'MEALS'])) {
                     //     // 给上级提成
-                    //     Event::dispatch('commission.order', $params);
+                    //     Event::dispatch('commission . order', $params);
                     // }
 
                     // // 收支明细
                     // $params['inout_category'] = $oldOrderPaymentStatus == 'AWAITING' ? '挂账订单结算' : ($order->order_classify == 'VIP' ? ('购买康养城VIP套餐包' . $full) : '餐饮订单');
-                    // Event::dispatch('statistics.inout.in', $params);
+                    // Event::dispatch('statistics . inout . in', $params);
 
                     // return json_success('success');
                 }
@@ -5054,11 +5054,11 @@ class WholeController extends Curd
 
                 if (in_array($order->order_category, ['SERVICE', 'CHNMED', 'CHNNCD', 'PACKAGE', 'GOODS', 'DISHES', 'MEALS'])) {
                     // 给上级提成
-                    Event::dispatch('commission.order', $params);
+                    Event::dispatch('commission . order', $params);
                 }
                 // 收支明细
                 $params['inout_category'] = $oldOrderPaymentStatus == 'AWAITING' ? '挂账订单结算' : ($order->order_classify == 'VIP' ? ('购买康养城VIP套餐包' . $full) : '餐饮订单');
-                Event::dispatch('statistics.inout.in', $params);
+                Event::dispatch('statistics . inout . in', $params);
 
                 return json_success('success');
             }
@@ -5097,7 +5097,7 @@ class WholeController extends Curd
             Db::beginTransaction();
             $payStatus = 'N';
             if (in_array('WXPAY', $payDetailType)) {
-                $result = Pay::wechat(config('payment.wxpay'))->find($groupId, 'pos');
+                $result = Pay::wechat(config('payment . wxpay'))->find($groupId, 'pos');
                 $result = json_decode(json_encode($result), true);
 //                 $result = '{"return_code":"SUCCESS","return_msg":"OK","result_code":"SUCCESS","mch_id":"1680393367","appid":"wxc6274da7198e3eb4","openid":"o3JAn6Ii_bAlxS-jbNEC4WnPhdwM","is_subscribe":"N","trade_type":"MICROPAY","trade_state":"SUCCESS","bank_type":"OTHERS","total_fee":"1000","fee_type":"CNY","cash_fee":"1000","cash_fee_type":"CNY","transaction_id":"4200067718202409250802875650","out_trade_no":"OD24092518408RV7","attach":[],"time_end":"20240925184009","trade_state_desc":"支付成功","nonce_str":"OeGOkjch4eaV5qIt","sign":"6DCB3BFC594EBC018A2BEE2C3DFEA4E3"}';
 //                 $result = json_decode($result, true);
@@ -5133,7 +5133,7 @@ class WholeController extends Curd
                     }
                 }
             } else if (in_array('ALIPAY', $payDetailType)) {
-                $result = Pay::alipay(config('payment.alipay'))->find($groupId);
+                $result = Pay::alipay(config('payment . alipay'))->find($groupId);
                 $result = json_decode(json_encode($result), true);
 //                $result = '{"code":"10000","msg":"Success","buyer_logon_id":"138******93","buyer_pay_amount":"5.87","fund_bill_list":[{"amount":"5.69","fund_channel":"ALIPAYACCOUNT"},{"amount":"0.18","fund_channel":"COUPON"},{"amount":"0.13","fund_channel":"DISCOUNT"}],"invoice_amount":"5.69","out_trade_no":"OD2409251550Q07A","point_amount":"0.00","receipt_amount":"6.00","send_pay_date":"2024-09-25 15:50:22","total_amount":"6.00","trade_no":"2024092523001439431419750998","trade_status":"TRADE_SUCCESS","buyer_open_id":"04309N2aVhSZz4cKwN_DN2DQa7ekM3z5n8kscQHsmIZOJsf"}';
 //                $result = json_decode($result, true);
@@ -5178,21 +5178,21 @@ class WholeController extends Curd
                     $this->deductAccountOne($groupId, $item, $amount);
                 }
                 // 如果有余额、VIP、福利账户支付
-                // if (in_array($orders[0]['join_order_member_id'] . '-CASH', $payDetailType)) {
+                // if (in_array($orders[0]['join_order_member_id'] . ' - CASH', $payDetailType)) {
                 //     $cashAmount = PayDetail::where('join_pay_order_id', $groupId)
-                //         ->where('pay_prepayid', $orders[0]['join_order_member_id'] . '-CASH')
+                //         ->where('pay_prepayid', $orders[0]['join_order_member_id'] . ' - CASH')
                 //         ->sum('pay_amount');
-                //     $this->deductAccountOne($groupId, $orders[0]['join_order_member_id'] . '-CASH', $cashAmount);
+                //     $this->deductAccountOne($groupId, $orders[0]['join_order_member_id'] . ' - CASH', $cashAmount);
                 // }
-                // if (in_array($orders[0]['join_order_member_id'] . '-VIP', $payDetailType)) {
+                // if (in_array($orders[0]['join_order_member_id'] . ' - VIP', $payDetailType)) {
                 //     $cashAmount = PayDetail::where('join_pay_order_id', $groupId)
-                //         ->where('pay_prepayid', $orders[0]['join_order_member_id'] . '-VIP')
+                //         ->where('pay_prepayid', $orders[0]['join_order_member_id'] . ' - VIP')
                 //         ->sum('pay_amount');
-                //     $this->deductAccountOne($groupId, $orders[0]['join_order_member_id'] . '-VIP', $cashAmount);
+                //     $this->deductAccountOne($groupId, $orders[0]['join_order_member_id'] . ' - VIP', $cashAmount);
                 // }
-                // if (in_array($orders[0]['join_order_member_id'] . '-WELFARE', $payDetailType)) {
+                // if (in_array($orders[0]['join_order_member_id'] . ' - WELFARE', $payDetailType)) {
                 //     $cashAmount = PayDetail::where('join_pay_order_id', $groupId)
-                //         ->where('pay_prepayid', $orders[0]['join_order_member_id'] . '-WELFARE')
+                //         ->where('pay_prepayid', $orders[0]['join_order_member_id'] . ' - WELFARE')
                 //         ->sum('pay_amount');
                 //     $this->deductAccountOne($groupId, $orders[0]['join_order_member_id'] . 'WELFARE', $cashAmount);
                 // }
@@ -5396,7 +5396,7 @@ class WholeController extends Curd
     public function deductAccount($orderId, $orderGroup, $payWay)
     {
         $payDetails = PayDetail::where('join_pay_order_id', $orderGroup)
-            ->where('pay_prepayid', '<>', $payWay)
+            ->where('pay_prepayid', ' <> ', $payWay)
             ->whereJsonContains('join_pay_object_json->order_id', $orderId)
             ->get()
             ->toArray();
@@ -5420,7 +5420,7 @@ class WholeController extends Curd
             }
         }
         PayDetail::where('join_pay_order_id', $orderGroup)
-            ->where('pay_prepayid', '<>', $payWay)
+            ->where('pay_prepayid', ' <> ', $payWay)
             ->whereJsonContains('join_pay_object_json->order_id', $orderId)
             ->update(['pay_status' => 'SUCCESS']);
     }