From d6b09fc9d32d5256bdc4e2f7f7a525d79bbe77c2 Mon Sep 17 00:00:00 2001
From: huangjiajun <582604932@qq.com>
Date: Wed, 24 Apr 2024 18:04:52 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 svc/reward_commission.go | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/svc/reward_commission.go b/svc/reward_commission.go
index 64f4cc4..e449894 100644
--- a/svc/reward_commission.go
+++ b/svc/reward_commission.go
@@ -151,15 +151,13 @@ func GetRewardCommission(engine *xorm.Engine, rmd *md.CommissionParam, isShare b
 		}
 		profit := zhios_order_relate_utils.StrToFloat64(reward.SelfRateList["0"])
 		var ulink = &comm_plan.LvUser{}
-		if returnAllLevel {
-			if zhios_order_relate_utils.StrToInt(reward.CommonWealthBenefitUid) != zhios_order_relate_utils.StrToInt(reward.DirectPushBenefitUid) {
-				//共富收益处理
-				ulink = getRewardLink(reward.CommonWealthBenefitUid, 2, reward.CommonWealthSystem, ulink, "public_platoon", cfg)
-				//直推收益处理
-				ulink = getRewardLink(reward.DirectPushBenefitUid, 1, reward.DirectPush, ulink, "extend", cfg)
-			} else { //共富 直推都是同一个用户的处理
-				ulink = getRewardLinkCommWithExtend(reward.CommonWealthBenefitUid, 3, reward.CommonWealthSystem, reward.DirectPush, ulink, cfg)
-			}
+		if zhios_order_relate_utils.StrToInt(reward.CommonWealthBenefitUid) != zhios_order_relate_utils.StrToInt(reward.DirectPushBenefitUid) {
+			//共富收益处理
+			ulink = getRewardLink(reward.CommonWealthBenefitUid, 2, reward.CommonWealthSystem, ulink, "public_platoon", cfg)
+			//直推收益处理
+			ulink = getRewardLink(reward.DirectPushBenefitUid, 1, reward.DirectPush, ulink, "extend", cfg)
+		} else { //共富 直推都是同一个用户的处理
+			ulink = getRewardLinkCommWithExtend(reward.CommonWealthBenefitUid, 3, reward.CommonWealthSystem, reward.DirectPush, ulink, cfg)
 		}
 
 		//自购

From cfd0740f086280f29bffb9cf14ab457ef2c96acd Mon Sep 17 00:00:00 2001
From: huangjiajun <582604932@qq.com>
Date: Wed, 24 Apr 2024 19:04:01 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 svc/small_public_platoon_relate_commission.go | 1 +
 1 file changed, 1 insertion(+)

diff --git a/svc/small_public_platoon_relate_commission.go b/svc/small_public_platoon_relate_commission.go
index 1d2a549..5d59376 100644
--- a/svc/small_public_platoon_relate_commission.go
+++ b/svc/small_public_platoon_relate_commission.go
@@ -346,6 +346,7 @@ func BatchSmallGetPublicPlatoonRelateByGoods(engine *xorm.Engine, masterId strin
 			}
 		}
 		resp[param.Oid] = &md.SmallPublicPlatoonRelateCommissionResp{
+			Uid:                param.Uid,
 			PendingAmount:      param.PendingAmount,
 			Oid:                param.Oid,
 			SelfRateList:       selfRateList,