feat：大会员微信免费订阅

src/jfw/modules/publicapply/src/attachmentdow/service/service.go

@@ -5,7 +5,6 @@ import (
 	"config"
 	"db"
 	"fmt"
-	"jfw/public"
 	"log"
 	qu "qfw/util"
 	"qfw/util/jy"
@@ -33,7 +32,7 @@ func (u *Dow) Subdow() {
 		}
 
 		BaseMsg := jy.GetBigVipUserBaseMsg(userid, db.Mysql, db.Mgo)
-		vipStatus := jy.GetVipState(public.Mysql, public.MQFW, userid)
+		vipStatus := jy.GetVipState(db.Mysql, db.Mgo, userid)
 
 		var (
 			mon string

src/jfw/modules/publicapply/src/me/me.go

@@ -2,7 +2,6 @@ package me
 
 import (
 	"db"
-	"jfw/public"
 	"qfw/util"
 	"qfw/util/jy"
 	"qfw/util/redis"
@@ -61,9 +60,9 @@ func (m *Me) MyInfo() {
 		isEnt := false
 		if phone != "" {
 			//已购买企业未过期
-			if entInfo := public.Mysql.SelectBySql(`SELECT status,isNew FROM entniche_info WHERE id  IN (SELECT ent_id FROM entniche_user where phone = ? and power =1)`, phone); len((*entInfo)) > 0 {
-				for _, v := range (*entInfo) {
-					if util.IntAll(v["status"]) == 1 && util.IntAll(v["isNew"]) == 1{
+			if entInfo := db.Mysql.SelectBySql(`SELECT status,isNew FROM entniche_info WHERE id  IN (SELECT ent_id FROM entniche_user where phone = ? and power =1)`, phone); len((*entInfo)) > 0 {
+				for _, v := range *entInfo {
+					if util.IntAll(v["status"]) == 1 && util.IntAll(v["isNew"]) == 1 {
 						isEnt = true
 						break
 					}

src/jfw/modules/publicapply/src/subscribePush/entity/keyWords.go

@@ -40,7 +40,7 @@ func (this *KeyWordsSet) UpdateKeyWords() map[string]interface{} {
 		types = "o_vipjy"
 	}
 	//付费用户
-	if power.Status > 0 || power.VipStatus > 0  {
+	if this.Type != "f" && (power.Status > 0 || power.VipStatus > 0) {
 		switch this.ActionType {
 		case "SK": //保存/修改关键词
 			return AddKeyWords(types, this.UserId, this.ClassifyIndex, this.ClassifyName, this.KeyWordIndex, this.KeyWordName, this.KeyWordsCount, this.NotKeyWord, this.AppendKeyWord, this.MatchWay)