From 5d9cf179ba9691a3564e0d96a9110973d2ef401e Mon Sep 17 00:00:00 2001
From: zhaojs <349234519@qq.com>
Date: 星期四, 29 六月 2023 14:28:00 +0800
Subject: [PATCH] Merge branch 'feature/1.1.3api开发' into develop
---
application/api/logic/commission/Jd.php | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/application/api/logic/commission/Jd.php b/application/api/logic/commission/Jd.php
index fada63c..ba3d13b 100644
--- a/application/api/logic/commission/Jd.php
+++ b/application/api/logic/commission/Jd.php
@@ -27,7 +27,7 @@
*/
public function getEstimateCommission($user_id,$time_type,$is_own)
{
- $info = Db::name('jingdong_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('jingdong_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',[16,17,18])->find();
return $info;
}
@@ -108,6 +108,8 @@
'pay_month' => $order['pay_month'],
'create_time' => time()
];
+
+ // dump(2222);exit;
$save_data[] = $tmp_1;
// $push_data[] = [
// 'user' => $user,
--
Gitblit v1.9.3