Merge remote-tracking branch 'origin/master'

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)
 		}
 
 		//自购

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,