订单筛选调整

app/admin/controller/order/DishesController.php

@@ -78,7 +78,7 @@ class DishesController extends Curd
             $payTimeStart = strtotime($where['order_addtimes'][0]);
             $payTimeEnd = strtotime($where['order_addtimes'][1]);
             unset($where['order_addtimes']);
-            $payOrderIds = PayDetailService::getPayOrderId($payTimeStart, $payTimeEnd);
+            $payOrderIds = PayDetailService::getPayOrderId($payTimeStart, $payTimeEnd, ['MEALS']);
         }
         if (!empty($orderId) && $timeType == 'pay') {
             $orderIds = array_intersect($orderIds, $payOrderIds);

app/admin/controller/order/GoodsController.php

@@ -93,7 +93,7 @@ class GoodsController extends Curd
             $payTimeStart = strtotime($where['order_addtimes'][0]);
             $payTimeEnd = strtotime($where['order_addtimes'][1]);
             unset($where['order_addtimes']);
-            $payOrderIds = PayDetailService::getPayOrderId($payTimeStart, $payTimeEnd);
+            $payOrderIds = PayDetailService::getPayOrderId($payTimeStart, $payTimeEnd, ['GOODS']);
         }
         if (!empty($orderId) && $timeType == 'pay') {
             $orderIds = array_intersect($orderIds, $payOrderIds);

app/admin/controller/order/KangyangCityController.php

@@ -91,7 +91,7 @@ class KangyangCityController extends Curd
             $payTimeStart = strtotime($where['order_addtimes'][0]);
             $payTimeEnd = strtotime($where['order_addtimes'][1]);
             unset($where['order_addtimes']);
-            $payOrderIds = PayDetailService::getPayOrderId($payTimeStart, $payTimeEnd);
+            $payOrderIds = PayDetailService::getPayOrderId($payTimeStart, $payTimeEnd, ['VIP']);
         }
         if (!empty($orderId) && $timeType == 'pay') {
             $orderIds = array_intersect($orderIds, $payOrderIds);

app/admin/controller/order/NewCustomerController.php

@@ -93,7 +93,7 @@ class NewCustomerController extends Curd
             $payTimeStart = strtotime($where['order_addtimes'][0]);
             $payTimeEnd = strtotime($where['order_addtimes'][1]);
             unset($where['order_addtimes']);
-            $payOrderIds = PayDetailService::getPayOrderId($payTimeStart, $payTimeEnd);
+            $payOrderIds = PayDetailService::getPayOrderId($payTimeStart, $payTimeEnd, ['COMBINE']);
         }
         if (!empty($orderId) && $timeType == 'pay') {
             $orderIds = array_intersect($orderIds, $payOrderIds);
@@ -190,7 +190,7 @@ class NewCustomerController extends Curd
                 unset($item['join_express_order_id'], $item['order_express_type']);
             }
 
-            $item['payDetail'] = PayDetailService::getPayWay($item['order_groupby'],$item['order_id']);
+            $item['payDetail'] = PayDetailService::getPayWay($item['order_groupby'], $item['order_id']);
         }
 
         return $items;
@@ -879,7 +879,7 @@ class NewCustomerController extends Curd
                                 $coupon['invalid'] = CouponDetail::where('join_detail_coupon_id', $coupon['coupon_id'])
                                     ->where('join_coupon_detail_member_id', $order->join_order_member_id)
 //                                    ->whereJsonContains('coupon_detail_extend_json->order_id', $order->order_id)
-                                    ->whereIn('coupon_detail_status', ['DISABLED','CANCEL','EXPIRED'])
+                                    ->whereIn('coupon_detail_status', ['DISABLED', 'CANCEL', 'EXPIRED'])
                                     ->count();
                                 $coupon['unused'] = $coupon['num'] - $coupon['used'] - $coupon['invalid'];
                             }

app/admin/controller/order/PackagesController.php

@@ -96,7 +96,7 @@ class PackagesController extends Curd
             $payTimeStart = strtotime($where['order_addtimes'][0]);
             $payTimeEnd = strtotime($where['order_addtimes'][1]);
             unset($where['order_addtimes']);
-            $payOrderIds = PayDetailService::getPayOrderId($payTimeStart, $payTimeEnd);
+            $payOrderIds = PayDetailService::getPayOrderId($payTimeStart, $payTimeEnd, ['PACKAGE']);
         }
         if (!empty($orderId) && $timeType == 'pay') {
             $orderIds = array_intersect($orderIds, $payOrderIds);
@@ -233,7 +233,7 @@ class PackagesController extends Curd
                 ->exists()) {
                 $item['have_success_paydetail'] = 'Y';
             }
-            $item['payDetail'] = PayDetailService::getPayWay($item['order_groupby'],$item['order_id']);
+            $item['payDetail'] = PayDetailService::getPayWay($item['order_groupby'], $item['order_id']);
         }
 
         return $items;

app/admin/controller/order/PartnerController.php

@@ -92,7 +92,7 @@ class PartnerController extends Curd
             $payTimeStart = strtotime($where['order_addtimes'][0]);
             $payTimeEnd = strtotime($where['order_addtimes'][1]);
             unset($where['order_addtimes']);
-            $payOrderIds = PayDetailService::getPayOrderId($payTimeStart, $payTimeEnd);
+            $payOrderIds = PayDetailService::getPayOrderId($payTimeStart, $payTimeEnd, ['PARTNER']);
         }
         if (!empty($orderId) && $timeType == 'pay') {
             $orderIds = array_intersect($orderIds, $payOrderIds);
@@ -114,7 +114,7 @@ class PartnerController extends Curd
                 $query->select('join_sheet_order_id', 'order_sheet_id', 'join_sheet_goods_id', 'order_sheet_num', 'order_sheet_price');
             },
             'member' => function ($query) {
-                $query->select('member_id', 'member_mobile','join_invite_member_id');
+                $query->select('member_id', 'member_mobile', 'join_invite_member_id');
             },
             'cert' => function ($query) {
                 $query->select('join_cert_member_id', 'member_cert_name');
@@ -196,7 +196,7 @@ class PartnerController extends Curd
                 $inviteCertName = !empty($inviteMember['cert']) && !empty($inviteMember['cert']['member_cert_name']) ? $inviteMember['cert']['member_cert_name'] : '';
                 $item['invite_name'] = MemberService::getMemberCertName($inviteMobile, $inviteCertName, '');
             }
-            $item['payDetail'] = PayDetailService::getPayWay($item['order_groupby'],$item['order_id']);
+            $item['payDetail'] = PayDetailService::getPayWay($item['order_groupby'], $item['order_id']);
         }
 
         return $items;
@@ -802,7 +802,7 @@ class PartnerController extends Curd
             $orderId = $request->get('order_id');
             $orderSheet = OrderSheet::with([
                 'member' => function ($query) {
-                    $query->select('member_id', 'member_mobile', 'member_is_owner', 'join_member_role_id', 'member_is_vip', 'member_is_partner', 'member_is_referrer','join_invite_member_id');
+                    $query->select('member_id', 'member_mobile', 'member_is_owner', 'join_member_role_id', 'member_is_vip', 'member_is_partner', 'member_is_referrer', 'join_invite_member_id');
                 },
                 'goods' => function ($query) {
                     $query->select('goods_id', 'goods_name', 'goods_cover', 'goods_market_price', 'goods_sales_price', 'goods_classify', 'goods_if_express');

app/admin/controller/order/RechargeController.php

@@ -94,7 +94,7 @@ class RechargeController extends Curd
             $payTimeStart = strtotime($where['order_addtimes'][0]);
             $payTimeEnd = strtotime($where['order_addtimes'][1]);
             unset($where['order_addtimes']);
-            $payOrderIds = PayDetailService::getPayOrderId($payTimeStart, $payTimeEnd);
+            $payOrderIds = PayDetailService::getPayOrderId($payTimeStart, $payTimeEnd, ['RECHARGE']);
         }
         if (!empty($orderId) && $timeType == 'pay') {
             $orderIds = array_intersect($orderIds, $payOrderIds);
@@ -200,7 +200,7 @@ class RechargeController extends Curd
                 unset($item['join_express_order_id'], $item['order_express_type']);
             }
 
-            $item['payDetail'] = PayDetailService::getPayWay($item['order_groupby'],$item['order_id']);
+            $item['payDetail'] = PayDetailService::getPayWay($item['order_groupby'], $item['order_id']);
         }
 
         return $items;
@@ -830,7 +830,7 @@ class RechargeController extends Curd
                                 $coupon['invalid'] = CouponDetail::where('join_detail_coupon_id', $coupon['coupon_id'])
                                     ->where('join_coupon_detail_member_id', $order->join_order_member_id)
                                     ->whereJsonContains('coupon_detail_extend_json->order_id', $order->order_id)
-                                    ->whereIn('coupon_detail_status', ['DISABLED','CANCEL','EXPIRED'])
+                                    ->whereIn('coupon_detail_status', ['DISABLED', 'CANCEL', 'EXPIRED'])
                                     ->count();
                                 $coupon['unused'] = $coupon['num'] - $coupon['used'] - $coupon['invalid'];
                             }

app/admin/controller/order/ReferrerController.php

@@ -92,7 +92,7 @@ class ReferrerController extends Curd
             $payTimeStart = strtotime($where['order_addtimes'][0]);
             $payTimeEnd = strtotime($where['order_addtimes'][1]);
             unset($where['order_addtimes']);
-            $payOrderIds = PayDetailService::getPayOrderId($payTimeStart, $payTimeEnd);
+            $payOrderIds = PayDetailService::getPayOrderId($payTimeStart, $payTimeEnd, ['REFERRER']);
         }
         if (!empty($orderId) && $timeType == 'pay') {
             $orderIds = array_intersect($orderIds, $payOrderIds);
@@ -189,7 +189,7 @@ class ReferrerController extends Curd
                 ];
                 unset($item['join_express_order_id'], $item['order_express_type']);
             }
-            $item['payDetail'] = PayDetailService::getPayWay($item['order_groupby'],$item['order_id']);
+            $item['payDetail'] = PayDetailService::getPayWay($item['order_groupby'], $item['order_id']);
         }
 
         return $items;

app/admin/controller/order/ServicesController.php

@@ -90,7 +90,7 @@ class ServicesController extends Curd
             $payTimeStart = strtotime($where['order_addtimes'][0]);
             $payTimeEnd = strtotime($where['order_addtimes'][1]);
             unset($where['order_addtimes']);
-            $payOrderIds = PayDetailService::getPayOrderId($payTimeStart, $payTimeEnd);
+            $payOrderIds = PayDetailService::getPayOrderId($payTimeStart, $payTimeEnd, ['SERVICE', 'CHNMED', 'CHNNCD']);
         }
         if (!empty($orderId) && $timeType == 'pay') {
             $orderIds = array_intersect($orderIds, $payOrderIds);
@@ -203,7 +203,7 @@ class ServicesController extends Curd
                 ->exists()) {
                 $item['have_success_paydetail'] = 'Y';
             }
-            $item['payDetail'] = PayDetailService::getPayWay($item['order_groupby'],$item['order_id']);
+            $item['payDetail'] = PayDetailService::getPayWay($item['order_groupby'], $item['order_id']);
         }
 
         return $items;

app/admin/service/order/PayDetailService.php

@@ -4,7 +4,6 @@ namespace app\admin\service\order;
 
 use app\model\PayDetail;
 use support\Db;
-use support\Log;
 
 class PayDetailService
 {
@@ -38,11 +37,14 @@ class PayDetailService
      * @param $timeEnd
      * @return array
      */
-    public static function getPayOrderId($timeStart, $timeEnd)
+    public static function getPayOrderId($timeStart, $timeEnd, $category = [])
     {
         $payDetails = PayDetail::whereRaw('CAST(UNIX_TIMESTAMP(pay_paytimes) as SIGNED) >= ? ', [$timeStart])
             ->whereRaw('CAST(UNIX_TIMESTAMP(pay_paytimes) as SIGNED) <= ? ', [$timeEnd])
             ->where('pay_status', 'SUCCESS')
+            ->when(!empty($category), function ($query) use ($category) {
+                $query->whereIn('pay_category', $category);
+            })
             ->select('join_pay_object_json')
             ->get()
             ->toArray();
@@ -57,8 +59,6 @@ class PayDetailService
             }
         }
 
-        Log::info("订单ID", $orderIds);
-
         return $orderIds;
     }