From 8a087c51cacc5adb285973c06672bdd5a8a25929 Mon Sep 17 00:00:00 2001
From: huangjiajun <582604932@qq.com>
Date: Sat, 21 Oct 2023 10:50:16 +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 | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/app/svc/platform/svc_withdrawal.go b/app/svc/platform/svc_withdrawal.go
index 250cfe5..8c406a9 100644
--- a/app/svc/platform/svc_withdrawal.go
+++ b/app/svc/platform/svc_withdrawal.go
@@ -418,6 +418,21 @@ func masterMonthAmount(mid string) map[string]string {
 	lastMonthSum := playletSaleOrder.PlayletVideoOrderSum(mid, "", "last_month")
 	monthSum := playletSaleOrder.PlayletVideoOrderSum(mid, "", "current_month")
 	monthSettleSum := playletSaleOrder.PlayletVideoOrderSum(mid, "订单结算", "current_month")
+	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")
+	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")
+	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")
+	monthSettleSum += hwMonthSettleSum + guideMonthSettleSum
+
 	res := map[string]string{
 		"last_month_amount":   utils.Float64ToStr(lastMonthSum),
 		"month_amount":        utils.Float64ToStr(monthSum),