xiugai

src/jfw/modules/pushsubscribe/src/match/job/matchjob.go

@@ -202,6 +202,9 @@ func (m *MatchJob) LoadBidding(lastId, newId string, lastTime int64) bool {
 	if len(idQuery) > 0 {
 		c_query["_id"] = idQuery
 	}
+	//c_query = map[string]interface{}{
+	//"_id": bson.ObjectIdHex("5da706f7a5cb26b9b778d08a"),
+	//}
 	logger.Info("mongodb query：", c_query)
 	count := mongodb.Count("bidding", c_query)
 	logger.Info("本次数据共", count, "条")

src/jfw/modules/pushsubscribe/src/match/matcher/vipmatch.go

@@ -72,7 +72,7 @@ func (v *VipUser) Match(info *map[string]interface{}) *map[*UserInfo]*MatchUser
 	users := map[*UserInfo]*MatchUser{}
 	for k, _ := range v.Users {
 		if (!v.BuyerclassUsers[""][k] && !v.BuyerclassUsers[buyerclass][k]) ||
-			(!v.AreaUsers[""][k] && !v.AreaUsers[area][k] && !v.AreaUsers[city][k]) ||
+			(!v.AreaUsers[""][k] && !v.AreaUsers[area][k] && !v.CityUsers[city][k]) ||
 			(!v.InfoTypeUsers[""][k] && !v.InfoTypeUsers[toptype][k]) {
 			continue
 		}

src/jfw/modules/pushsubscribe/src/push/job/pushjob.go

@@ -279,7 +279,6 @@ func (p *PushJob) doPush(pusher Pusher, taskType int, pushWay *putil.PushWay, u
 			according = fmt.Sprintf(Config.Mail_according, strings.Replace(strings.Join(u.Keys, ";"), "+", " ", -1))
 		}
 		html := fmt.Sprintf(Config.Mail_html, according, pushParam.MailContent)
-		logger.Info(html)
 		isPushOk := p.sendMail(u.Email, Config.Mail_title, html, nil)
 		if isPushOk {
 			pushResult.MailStatus = 1