From a62ebe0d1b9ea896cdba7bd4ec6e1d0d142b3b84 Mon Sep 17 00:00:00 2001
From: heyuntao <heyuntao@LAPTOP-MP4HD5NS>
Date: 星期二, 18 七月 2023 09:48:40 +0800
Subject: [PATCH] no message
---
application/api/logic/commission/Pdd.php | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/application/api/logic/commission/Pdd.php b/application/api/logic/commission/Pdd.php
index 9a2108a..389a5a5 100644
--- a/application/api/logic/commission/Pdd.php
+++ b/application/api/logic/commission/Pdd.php
@@ -27,7 +27,7 @@
*/
public function getEstimateCommission($user_id,$time_type,$is_own)
{
- $info = Db::name('pdd_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('pdd_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',[0,1,2,5])->find();
return $info;
}
@@ -219,9 +219,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