Merge branch 'dev_v2.9.41_wh' of jianyu/ent_new into feature/v2.9.41

entniche_new/src/service/subscribe/subscribe.go

@@ -1584,19 +1584,19 @@ func (ac *Action) Update_pushset_new() {
 	status := 0
 	//matchway, _ := ac.GetInteger("matchway")
 	matchmode := ac.GetString("matchmode")
+	updateType := ac.GetString("updateType")
 	amount := ac.GetString("amount")
 	Iswitch := ac.GetString("switch")
 	identity := ac.GetString("identity")
 	update := map[string]interface{}{
 		"l_updatetime": time.Now().Unix(),
 	}
-	if matchmode != "" {
+	switch updateType {
+	case "matchmode":
 		update[`o_entniche.i_matchmode`] = strings.Split(matchmode, ",")
-	}
-	if amount != "" {
+	case "amount":
 		update[`o_entniche.amount`] = amount
-	}
-	if Iswitch != "" {
+	case "switch":
 		update[`o_entniche.i_switch`] = Iswitch
 	}
 	vSwitch := ac.GetString("vSwitch")