feat:增加字段

pushsubscribe/match/job/matchjob.go

@@ -271,8 +271,9 @@ func (m *MatchJob) ToMatch(batchIndex int, freeUser *FreeUser, datas *[]map[stri
 						"key":  wxtplmsg_keyword,
 						"area": wxtplmsg_area,
 					},
-					"maxpushsize": user.SubSet.MaxPushSize,
-					"maxmailsize": user.SubSet.MaxMailSize,
+					"maxpushsize":     user.SubSet.MaxPushSize,
+					"maxmailsize":     user.SubSet.MaxMailSize,
+					"subpushinactive": user.SubPushInactive,
 				})
 				if len(saveBatch) == Mgo_BulkSize {
 					Mgo_Log.SaveBulk(Pushspace_temp, saveBatch...)

pushsubscribe/push/util/util.go

@@ -29,12 +29,13 @@ func NewUserInfoByPushSpaceColl(user map[string]interface{}) *UserInfo {
 				RateMode: util.IntAll(user["ratemode"]),
 			},
 		},
-		S_m_openid:   util.ObjToString(user["s_m_openid"]),
-		Phone:        util.ObjToString(user["phone"]),
-		Jpushid:      util.ObjToString(user["jpushid"]),
-		Opushid:      util.ObjToString(user["opushid"]),
-		AppPhoneType: util.ObjToString(user["appphonetype"]),
-		WxTplMsg:     wxTplMsg,
+		S_m_openid:      util.ObjToString(user["s_m_openid"]),
+		Phone:           util.ObjToString(user["phone"]),
+		Jpushid:         util.ObjToString(user["jpushid"]),
+		Opushid:         util.ObjToString(user["opushid"]),
+		AppPhoneType:    util.ObjToString(user["appphonetype"]),
+		SubPushInactive: util.IntAll(user["subpushinactive"]),
+		WxTplMsg:        wxTplMsg,
 	}
 	if ui.SubSet.MaxPushSize <= 0 {
 		ui.SubSet.MaxPushSize = Config.MaxPushSize

pushsupersub/match/job/matchjob.go

@@ -241,9 +241,10 @@ func (m *MatchJob) ToMatch(batchIndex int, matcher Matcher, datas *[]map[string]
 						"key":  wxtplmsg_keyword,
 						"area": wxtplmsg_area,
 					},
-					"maxpushsize": user.SubSet.MaxPushSize,
-					"maxmailsize": user.SubSet.MaxMailSize,
-					"times":       user.PushSet.SubSet.Times,
+					"maxpushsize":     user.SubSet.MaxPushSize,
+					"maxmailsize":     user.SubSet.MaxMailSize,
+					"times":           user.PushSet.SubSet.Times,
+					"subpushinactive": user.SubPushInactive,
 				})
 				if len(saveBatch) == Mgo_BulkSize {
 					Mgo_Log.SaveBulk(Pushspace_temp, saveBatch...)

pushsupersub/push/util/util.go

@@ -29,13 +29,14 @@ func NewUserInfoByPushSpaceColl(user map[string]interface{}) *UserInfo {
 				RateMode: util.IntAll(user["ratemode"]),
 			},
 		},
-		S_m_openid:   util.ObjToString(user["s_m_openid"]),
-		Phone:        util.ObjToString(user["phone"]),
-		Jpushid:      util.ObjToString(user["jpushid"]),
-		Opushid:      util.ObjToString(user["opushid"]),
-		AppPhoneType: util.ObjToString(user["appphonetype"]),
-		Subscribe:    util.IntAll(user["subscribe"]),
-		WxTplMsg:     wxTplMsg,
+		S_m_openid:      util.ObjToString(user["s_m_openid"]),
+		Phone:           util.ObjToString(user["phone"]),
+		Jpushid:         util.ObjToString(user["jpushid"]),
+		Opushid:         util.ObjToString(user["opushid"]),
+		AppPhoneType:    util.ObjToString(user["appphonetype"]),
+		Subscribe:       util.IntAll(user["subscribe"]),
+		SubPushInactive: util.IntAll(user["subpushinactive"]),
+		WxTplMsg:        wxTplMsg,
 	}
 	if ui.SubSet.MaxPushSize <= 0 {
 		ui.SubSet.MaxPushSize = Config.MaxPushSize