Просмотр исходного кода

完善平台流水日账单月账单

sunxbiao 1 год назад
Родитель
Сommit
53dd95e3b3
1 измененных файлов с 2 добавлено и 0 удалено
  1. 2 0
      app/controller/api/cron/CommissionCron.php

+ 2 - 0
app/controller/api/cron/CommissionCron.php

@@ -1734,6 +1734,7 @@ where o.paid=1 and o.is_settlement=1 and settlement_time between '$this->startMo
1734
         $jingdou_list_by_online = Db::name("user_sign_jingdou")
1734
         $jingdou_list_by_online = Db::name("user_sign_jingdou")
1735
             ->where('order_type', '=','0')
1735
             ->where('order_type', '=','0')
1736
             ->where('status', '=',1)
1736
             ->where('status', '=',1)
1737
+            ->whereNotNull('settlement_time')
1737
             ->whereIn('order_id', array_column($store_order_list,'order_id'))
1738
             ->whereIn('order_id', array_column($store_order_list,'order_id'))
1738
             ->select()
1739
             ->select()
1739
             ->toArray();
1740
             ->toArray();
@@ -1763,6 +1764,7 @@ where o.paid=1 and o.is_settlement=1 and settlement_time between '$this->startMo
1763
         $jingdou_list_by_offline = Db::name("user_sign_jingdou")
1764
         $jingdou_list_by_offline = Db::name("user_sign_jingdou")
1764
             ->where('order_type', '=','10')
1765
             ->where('order_type', '=','10')
1765
             ->where('status', '=',1)
1766
             ->where('status', '=',1)
1767
+            ->whereNotNull('settlement_time')
1766
             ->whereIn('order_id', array_column($order_merchant_list,'id'))
1768
             ->whereIn('order_id', array_column($order_merchant_list,'id'))
1767
             ->select()
1769
             ->select()
1768
             ->toArray();
1770
             ->toArray();