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

entniche_new/src/service/subscribe/subscribe.go

@@ -1582,11 +1582,22 @@ func (ac *Action) Update_pushset_new() {
 	entInfo := VarCurrentUser.EntInfo(entId, entUserId)
 	// model := entInfo.Ent.Model //1-统一订阅 2-个人订阅
 	status := 0
-	matchway, _ := ac.GetInteger("matchway")
+	//matchway, _ := ac.GetInteger("matchway")
+	matchmode := ac.GetString("matchmode")
+	amount := ac.GetString("amount")
+	Iswitch := ac.GetString("switch")
 	identity := ac.GetString("identity")
 	update := map[string]interface{}{
-		"l_updatetime":          time.Now().Unix(),
-		`o_entniche.i_matchway`: matchway,
+		"l_updatetime": time.Now().Unix(),
+	}
+	if matchmode != "" {
+		update[`o_entniche.i_matchmode`] = strings.Split(matchmode, ",")
+	}
+	if amount != "" {
+		update[`o_entniche.amount`] = amount
+	}
+	if Iswitch != "" {
+		update[`o_entniche.i_switch`] = Iswitch
 	}
 	vSwitch := ac.GetString("vSwitch")
 	i_type := 0