From 4fa2a021dcc80ae0ec294e183a90c30e77bd565c Mon Sep 17 00:00:00 2001
From: zhaojs <349234519@qq.com>
Date: 星期二, 18 七月 2023 16:22:22 +0800
Subject: [PATCH] no message

---
 application/api/logic/commission/Jtk.php |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/application/api/logic/commission/Jtk.php b/application/api/logic/commission/Jtk.php
index 5e2b0ac..77ac1ed 100644
--- a/application/api/logic/commission/Jtk.php
+++ b/application/api/logic/commission/Jtk.php
@@ -27,7 +27,7 @@
      */
     public function getEstimateCommission($user_id,$time_type,$is_own)
     {
-        $info = Db::name('jtk_union_order_commission')->field("COUNT(id) as order_num,COALESCE(SUM(pub_share_pre_fee),0) as money,COALESCE(SUM(alipay_total_price),0) as sales_volume,'鍏朵粬' as name")->where(['member_id'=>$user_id,'is_own'=>$is_own])->whereTime('tb_paid_time', $time_type)->find();
+        $info = Db::name('jtk_union_order_commission')->field("COUNT(id) as order_num,COALESCE(SUM(pub_share_pre_fee),0) as money,COALESCE(SUM(alipay_total_price),0) as sales_volume,'鍏朵粬' as name")->where(['member_id'=>$user_id,'is_own'=>$is_own])->whereTime('tb_paid_time', $time_type)->whereIn('tk_status',[1,2,3])->find();
         return $info;
     }
 
@@ -212,9 +212,9 @@
                     return ['status'=>false,'info'=>'璁㈠崟鐘舵�佷慨鏀瑰け璐�'];
                 }
             }
-            if(!empty($push_data)){
-                $this->userPush($push_data);
-            }
+            // if(!empty($push_data)){
+            //     $this->userPush($push_data);
+            // }
         }else{ //宸茬粡鎷嗗垎璁㈠崟锛岃繘琛屾洿鏂�
             foreach($find_commission as $item){
                 $item_data = [

--
Gitblit v1.9.3