From ea61d4b1655f87798322a135bc3fee3c2efd0a45 Mon Sep 17 00:00:00 2001
From: huangjiajun <582604932@qq.com>
Date: Sat, 21 Oct 2023 11:59:25 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/svc/platform/svc_withdrawal.go | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/app/svc/platform/svc_withdrawal.go b/app/svc/platform/svc_withdrawal.go
index 8c406a9..fd96c8d 100644
--- a/app/svc/platform/svc_withdrawal.go
+++ b/app/svc/platform/svc_withdrawal.go
@@ -421,16 +421,16 @@ func masterMonthAmount(mid string) map[string]string {
 	lastMonthTimeRange := utils.GetTimeRange("last_month")
 	currentMonthTimeRange := utils.GetTimeRange("current_month")
 
-	hwSum, _ := db.ZhimengDb.NotIn("status", []string{"订单退款"}).Where("uid=? and create_time>=? and create_time<?", mid, lastMonthTimeRange["start"], lastMonthTimeRange["end"]).Sum(&model.HwOrder{}, "commission")
-	guideSum, _ := db.ZhimengDb.NotIn("status", []string{"订单退款"}).Where("uid=? and create_time>=? and create_time<?", mid, lastMonthTimeRange["start"], lastMonthTimeRange["end"]).Sum(&model.GuideOrder{}, "commission")
+	hwSum, _ := db.ZhimengDb.NotIn("status", []string{"订单退款", "订单失效"}).Where("uid=? and create_time>=? and create_time<?", mid, lastMonthTimeRange["start"], lastMonthTimeRange["end"]).Sum(&model.HwOrder{}, "commission")
+	guideSum, _ := db.ZhimengDb.NotIn("status", []string{"订单退款", "订单失效"}).Where("uid=? and create_time>=? and create_time<?", mid, lastMonthTimeRange["start"], lastMonthTimeRange["end"]).Sum(&model.GuideOrder{}, "commission")
 	lastMonthSum += hwSum + guideSum
 
-	hwMonthSum, _ := db.ZhimengDb.NotIn("status", []string{"订单退款"}).Where("uid=? and create_time>=? and create_time<?", mid, currentMonthTimeRange["start"], currentMonthTimeRange["end"]).Sum(&model.HwOrder{}, "commission")
-	guideMonthSum, _ := db.ZhimengDb.NotIn("status", []string{"订单退款"}).Where("uid=? and create_time>=? and create_time<?", mid, currentMonthTimeRange["start"], currentMonthTimeRange["end"]).Sum(&model.GuideOrder{}, "commission")
+	hwMonthSum, _ := db.ZhimengDb.NotIn("status", []string{"订单退款", "订单失效"}).Where("uid=? and create_time>=? and create_time<?", mid, currentMonthTimeRange["start"], currentMonthTimeRange["end"]).Sum(&model.HwOrder{}, "commission")
+	guideMonthSum, _ := db.ZhimengDb.NotIn("status", []string{"订单退款", "订单失效"}).Where("uid=? and create_time>=? and create_time<?", mid, currentMonthTimeRange["start"], currentMonthTimeRange["end"]).Sum(&model.GuideOrder{}, "commission")
 	monthSum += hwMonthSum + guideMonthSum
 
-	hwMonthSettleSum, _ := db.ZhimengDb.NotIn("status", []string{"订单退款"}).Where("uid=? and create_time>=? and create_time<?", mid, currentMonthTimeRange["start"], currentMonthTimeRange["end"]).Sum(&model.HwOrder{}, "commission")
-	guideMonthSettleSum, _ := db.ZhimengDb.NotIn("status", []string{"订单退款"}).Where("uid=? and create_time>=? and create_time<?", mid, currentMonthTimeRange["start"], currentMonthTimeRange["end"]).Sum(&model.GuideOrder{}, "real_commission")
+	hwMonthSettleSum, _ := db.ZhimengDb.NotIn("status", []string{"订单退款", "订单失效"}).Where("uid=? and create_time>=? and create_time<?", mid, currentMonthTimeRange["start"], currentMonthTimeRange["end"]).Sum(&model.HwOrder{}, "commission")
+	guideMonthSettleSum, _ := db.ZhimengDb.NotIn("status", []string{"订单退款", "订单失效"}).Where("uid=? and create_time>=? and create_time<?", mid, currentMonthTimeRange["start"], currentMonthTimeRange["end"]).Sum(&model.GuideOrder{}, "real_commission")
 	monthSettleSum += hwMonthSettleSum + guideMonthSettleSum
 
 	res := map[string]string{