Merge remote-tracking branch 'origin/master'

svc/get_plan_cfg.go

@@ -99,10 +99,9 @@ func GetPlanCfg(eg *xorm.Engine, pvd, masterId string, rewardOpts map[string]*mo
 	// 根据供应商
 	rewardOpt := rewardOpts[pvd]
 	if strings.Contains(pvd, "seFree") == false && strings.Contains(pvd, "moreFree") == false {
-		if pvd == "tikTok" && rmd.IsTikTokTeamOrder == "1" && rewardOpts["tikTokTeam"] != nil && rewardOpts["tikTokTeam"].PlanCommissionId > 0 {
+		if (pvd == "tikTok" || pvd == "csjp") && rmd.IsTikTokTeamOrder == "1" && rewardOpts["tikTokTeam"] != nil && rewardOpts["tikTokTeam"].PlanCommissionId > 0 {
 			rewardOpt = rewardOpts["tikTokTeam"]
 		}
-
 		if pvd == "kuaishou" && rmd.IsTikTokTeamOrder == "1" && rewardOpts["kuaishouTeam"] != nil && rewardOpts["kuaishouTeam"].PlanCommissionId > 0 {
 			rewardOpt = rewardOpts["kuaishouTeam"]
 		}