Browse Source

订单导出

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

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

@@ -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';
@@ -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 = [];
@@ -1518,7 +1518,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';
@@ -4211,7 +4211,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]);
@@ -4508,11 +4508,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];
@@ -4640,8 +4640,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) {
@@ -4983,7 +4983,7 @@ 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')])
@@ -5407,7 +5407,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();
@@ -5431,7 +5431,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']);
     }