Merge remote-tracking branch 'origin/master'

db/model/user_public_platoon_income_records.go

@@ -17,4 +17,5 @@ type UserPublicPlatoonIncomeRecords struct {
 	Oid          string    `json:"oid" xorm:"comment('订单号') VARCHAR(100)"`
 	Type         int       `json:"type" xorm:"not null default 0 comment('0收入 1支出') INT(11)"`
 	BeforeAmount string    `json:"before_amount" xorm:"comment('变更前金额') VARCHAR(100)"`
+	Source       string    `json:"source" xorm:"comment('变更前金额') VARCHAR(100)"`
 }

svc/reward_commission.go

@@ -151,14 +151,17 @@ 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 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 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)
+			}
 		}
+
 		//自购
 		ulink = getRewardLink(reward.Uid, 0, reward.SelfRateList, ulink, "own", cfg)
 		if zhios_order_relate_utils.StrToFloat64(commArr["integralRewardMultiple"]) > 0 {