Merge branch 'dev2.8.5' of http://192.168.3.207:10080/qmx/jy into dev2.8.5

src/jfw/front/vipsubscribe.go

@@ -6,7 +6,6 @@ import (
 	"jfw/jyutil"
 	"jfw/public"
 	"jfw/wx"
-	"log"
 	"net/url"
 	"qfw/util"
 	"time"
@@ -309,20 +308,11 @@ func (s *Subscribepay) OpenInvoice(order_code string) {
 //预热活动链接跳转
 func (s *Subscribepay) PreheatPoster() {
 	myopenid := util.ObjToString(s.GetSession("s_m_openid"))
-	mynickname, _ := s.Session().Get("s_nickname").(string)
-	myavatar, _ := s.Session().Get("s_avatar").(string)
-	s.T["nickname"] = mynickname
-	s.T["avatar"] = myavatar
-	s.T["signature"] = wx.SignJSSDK(s.Site() + s.Url())
-	s.T["openid"] = se.EncodeString(myopenid)
 	u, ok := public.MQFW.FindOne("user", `{"s_m_openid":"`+myopenid+`"}`)
-	log.Println(myopenid, "---", u, "--", ok)
 	if len(*u) > 0 && ok {
 		if util.Int64All((*u)["i_vip_status"]) == 1 || util.Int64All((*u)["i_vip_status"]) == 2 {
-			log.Println("VIP")
 			s.Redirect("/front/vipsubscribe/toSetPage")
 		} else {
-			log.Println("NO VIP")
 			s.Redirect("/front/vipsubscribe/introducePage")
 		}
 	}

src/jfw/modules/subscribepay/src/service/index_p1.go

@@ -310,8 +310,6 @@ func getPushHistory(userId string) (result []map[string]interface{}) {
 func getJyPushs(datas []map[string]interface{}) (pushCas []*jy.PushCa) {
 	pushCas = []*jy.PushCa{}
 	for _, v := range datas {
-		keys := v["matchkeys"].(string)
-		//		for id_k, id_v := range strings.Split(util.ObjToString(v["pushinfo"]), ",") {
 		pushCas = append(pushCas, &jy.PushCa{
 			Date:       qutil.Int64All(v["date"]),
 			InfoId:     qutil.ObjToString(v["infoid"]),
@@ -320,7 +318,7 @@ func getJyPushs(datas []map[string]interface{}) (pushCas []*jy.PushCa) {
 			Area:       qutil.ObjToString(v["area"]),
 			City:       qutil.ObjToString(v["city"]),
 			Buyerclass: qutil.ObjToString(v["buyerclass"]),
-			Keys:       strings.Split(keys, " "),
+			Keys:       strings.Split(qutil.ObjToString(v["matchkeys"]), " "),
 			Type:       qutil.IntAll(v["type"]),
 		})
 	}

src/jfw/modules/weixin/src/wx/wx.go

@@ -789,24 +789,6 @@ func Subscribe(w ResponseWriter, r *Request) {
 			PicUrl:      subscribeReply["picUrl"].(string),
 			Description: subscribeReply["description"].(string),
 		}})
-		//vip消息
-		/*
-			preheatingState := config.Sysconfig["preheatingState"].(bool)
-			if preheatingState {
-				preheatingReply := config.Sysconfig["preheatingReply"].(map[string]interface{})
-				u, ok := tools.MQFW.FindOne("user", `{"s_m_openid":"`+openid+`"}`)
-				if len(*u) > 0 && ok {
-					if util.Int64All((*u)["i_vip_status"]) == 1 || util.Int64All((*u)["i_vip_status"]) == 2 {
-						preheatingReply["href"] = preheatingReply["href_vip"]
-					} else {
-						preheatingReply["href"] = preheatingReply["href_notvip"]
-					}
-				}
-				time.AfterFunc(time.Second/2, func() {
-					w.PostText(fmt.Sprintf(fmt.Sprint(preheatingReply["content"]), config.Sysconfig["webdomain"].(string)+preheatingReply["href"].(string)))
-				})
-			}
-		*/
 	}
 	if source != "" && len(source) > 5 {
 		go saveUserLog(source, openid, activeName, shareflag)