Merge branch 'feature/v4.8.74' into dev/4.8.74_zsy

src/go.mod

@@ -4,9 +4,9 @@ go 1.19
 
 require (
 	app.yhyue.com/moapp/jyMarketing v0.0.2-0.20230308011651-df591d32df88
-	app.yhyue.com/moapp/jybase v0.0.0-20230901064756-2fc66b18db40
+	app.yhyue.com/moapp/jybase v0.0.0-20231026082242-8eb41c7bdda6
 	app.yhyue.com/moapp/jylog v0.0.0-20230522075550-05d7230ca545
-	app.yhyue.com/moapp/jypkg v0.0.0-20231017032120-01da044f6c92
+	app.yhyue.com/moapp/jypkg v1.0.4-0.20231108013952-a37ecebda2ed
 	bp.jydev.jianyu360.cn/BaseService/userCenter v1.2.14
 	github.com/SKatiyar/qr v0.0.0-20151201054752-25b6bdf44e67
 	github.com/bwmarrin/snowflake v0.3.0

src/go.sum

@@ -5,12 +5,12 @@ app.yhyue.com/moapp/jyMarketing v0.0.2-0.20230308011651-df591d32df88/go.mod h1:J
 app.yhyue.com/moapp/jyPoints v1.1.1/go.mod h1:SvP8p5L3jGrejHiH2LXfgCg/NPlFiKBC5Yd0gsI12FU=
 app.yhyue.com/moapp/jybase v0.0.0-20220427020729-974c1a148186/go.mod h1:qNRA0sHuYqcLoYoP8irpaWnW9YsXixe6obBIkwaXpD0=
 app.yhyue.com/moapp/jybase v0.0.0-20230117032034-ad7c00ffe11a/go.mod h1:zB47XTeJvpcbtBRYgkQuxOICWNexiZfbUO+7aUf6mNs=
-app.yhyue.com/moapp/jybase v0.0.0-20230901064756-2fc66b18db40 h1:/FcBvpf/KW8g6GBfTkypVW1pGbNs+iNhDrUGUi+KNjc=
-app.yhyue.com/moapp/jybase v0.0.0-20230901064756-2fc66b18db40/go.mod h1:Hv9U/7oHRucqH315Tr1+d03NCvS9mOKPfk8pwwlOIwQ=
+app.yhyue.com/moapp/jybase v0.0.0-20231026082242-8eb41c7bdda6 h1:uyaBp5Iuc/Il4+O2n92CyU9LPvHetFzQVC8iS9iLFOc=
+app.yhyue.com/moapp/jybase v0.0.0-20231026082242-8eb41c7bdda6/go.mod h1:Hv9U/7oHRucqH315Tr1+d03NCvS9mOKPfk8pwwlOIwQ=
 app.yhyue.com/moapp/jylog v0.0.0-20230522075550-05d7230ca545 h1:+Lak4m1zgsigQloOsvp8AJ+0XeX/+PGp9QP550xlbBQ=
 app.yhyue.com/moapp/jylog v0.0.0-20230522075550-05d7230ca545/go.mod h1:uFrsdUBFbETiJlEmr4PtJWPsZlUpPj2bHQRhryu6ggk=
-app.yhyue.com/moapp/jypkg v0.0.0-20231017032120-01da044f6c92 h1:ZEe+lUFbCk+MWUnNxTx4L+lsJmiAEIdFsgFyMT4ua+E=
-app.yhyue.com/moapp/jypkg v0.0.0-20231017032120-01da044f6c92/go.mod h1:76Kz6+MuxcRJRyFad9W8R4AByiQlVGzuGFzklY+2m38=
+app.yhyue.com/moapp/jypkg v1.0.4-0.20231108013952-a37ecebda2ed h1:rd5FDHAWiM1MLbgi79KBpRTMQfH5e2Y+knkk2JMsFP4=
+app.yhyue.com/moapp/jypkg v1.0.4-0.20231108013952-a37ecebda2ed/go.mod h1:76Kz6+MuxcRJRyFad9W8R4AByiQlVGzuGFzklY+2m38=
 app.yhyue.com/moapp/message v0.0.0-20221223100203-6402e389d9ae h1:6rDDaz6yxvE8viTSzEBwKYOFWq14TMfuBivSazUZMz4=
 app.yhyue.com/moapp/message v0.0.0-20221223100203-6402e389d9ae/go.mod h1:b0zZHev3gmJao1Fo+2Z2KPVjsuLOJVvVxf+kCnu9WkA=
 bp.jydev.jianyu360.cn/BaseService/entManageApplication v0.0.0-20230214091519-89a98c01ab0e h1:h+VEI3o1qC0jeCzkFGTrLI4f27cfa/W/y+0sXokWMgE=

src/jfw/front/classificationTag.go

@@ -3,14 +3,17 @@ package front
 import (
 	qu "app.yhyue.com/moapp/jybase/common"
 	"app.yhyue.com/moapp/jybase/encrypt"
+	elastic "app.yhyue.com/moapp/jybase/es"
 	"app.yhyue.com/moapp/jybase/redis"
 	"app.yhyue.com/moapp/jypkg/common/src/qfw/util/bidsearch"
 	"app.yhyue.com/moapp/jypkg/public"
 	"encoding/json"
 	"fmt"
+	"github.com/gogf/gf/v2/util/gconv"
 	"jy/src/jfw/config"
 	"log"
 	"strconv"
+	"strings"
 	"sync"
 	"time"
 
@@ -60,17 +63,16 @@ func GetWinnerInfo() (data []*BuyerList) {
 		return cache
 	}
 	// 没取到缓存查数据
-	rs := getEntBaseInfo(IdentityTypeWinner, config.HotWinnerConfig.Limit)
+	rs := GetHotWinnerBuyer(IdentityTypeWinner, config.HotWinnerConfig.Limit)
 	//关联中标企业
-	if rs == nil || len(*rs) == 0 {
+	if rs == nil || len(rs) == 0 {
 		return
 	}
 
-	for _, v := range *rs {
+	for _, v := range rs {
 		var vs BuyerList
-		id := encrypt.EncodeArticleId2ByCheck(qu.InterfaceToStr(v["id"]))
 		vs.Name = qu.InterfaceToStr(v["name"])
-		vs.Url = fmt.Sprintf("/swordfish/page_big_pc/ent_portrait/%s", id)
+		vs.Url = qu.InterfaceToStr(v["url"])
 		data = append(data, &vs)
 	}
 	// 存缓存
@@ -114,6 +116,105 @@ func getEntBaseInfo(identityType, limit int) *[]map[string]interface{} {
 
 }
 
+func GetHotWinnerBuyer(identityType, limit int) []map[string]interface{} {
+	isWinner := identityType == 1
+	queryTotal := gconv.Int(gconv.Float64(limit) * 1.5)
+	var querySql string
+	if isWinner {
+		querySql = fmt.Sprintf(`{"query": {"bool": {"must": [{"exists": {"field": "s_winner"}},{"exists": {"field": "entidlist"}}],"must_not":[{"term":{"entidlist":"-"}}]}},"_source":["buyer","s_winner","entidlist"],"size": %d}`, queryTotal)
+	} else {
+		querySql = fmt.Sprintf(`{"query": {"bool": {"must": [{"exists": {"field": "buyer"}}]}},"_source":["buyer","s_winner","entidlist"],"size": %d}`, queryTotal)
+	}
+	getData := elastic.GetNoLimit("projectset", "projectset", querySql)
+	var finalList []map[string]interface{}
+	if getData != nil && len(*getData) > 0 {
+		queryMap := make(map[string]bool)
+		if isWinner { //采购关联企业 校验正确性
+			var queryArr []string
+			for _, v := range *getData {
+				if len(queryArr) < queryTotal {
+					for _, name := range gconv.Strings(v["entidlist"]) {
+						if name == "" || name == "-" {
+							continue
+						}
+						if queryMap[name] {
+							continue
+						}
+						queryArr = append(queryArr, name)
+						queryMap[name] = true
+
+						if len(queryArr) == queryTotal {
+							break
+						}
+					}
+				}
+			}
+			finalList = getWinnerSeoIdByName(queryArr...)
+		} else {
+			var queryArr []string
+			for _, v := range *getData {
+				buyerName := gconv.String(v["buyer"])
+				if queryMap[buyerName] {
+					continue
+				}
+				queryArr = append(queryArr, buyerName)
+				queryMap[buyerName] = true
+			}
+			finalList = getBuyerSeoIdByName(queryArr...)
+		}
+	}
+	if len(finalList) > limit {
+		finalList = finalList[:limit]
+	}
+	return finalList
+}
+
+// 根据企业名称获取seoid
+// query： company_name 根据名字匹配
+// query： _id 根据entid匹配
+func getWinnerSeoIdByName(winners ...string) (res []map[string]interface{}) {
+	if len(winners) == 0 {
+		return
+	}
+	winnerRes := elastic.Get("qyxy", "qyxy", fmt.Sprintf(`{"query":{"terms":{"_id":["%s"]}},"_source":[%s],"size":%d}`, strings.Join(winners, `","`), `"nseo_id","company_name"`, len(winners)))
+	if winnerRes != nil && len(*winnerRes) > 0 {
+		for _, m := range *winnerRes {
+			name := gconv.String(m["company_name"])
+			sid := gconv.String(m["nseo_id"])
+			if name != "" && sid != "" {
+				res = append(res, map[string]interface{}{
+					"name":  name,
+					"seoId": sid,
+					"url":   fmt.Sprintf("/qy/%s.html", sid),
+				})
+			}
+		}
+	}
+	return
+}
+
+// 根据采购单位名字获取seoid
+func getBuyerSeoIdByName(buyer ...string) (res []map[string]interface{}) {
+	if len(buyer) == 0 {
+		return
+	}
+	buyerRes := elastic.GetNoLimit("buyer", "buyer", fmt.Sprintf(`{"query":{"terms":{"buyer_name":["%s"]}},"_source":[%s],"size":%d}`, strings.Join(buyer, `","`), `"seo_id","name"`, len(buyer)))
+	if buyerRes != nil && len(*buyerRes) > 0 {
+		for _, m := range *buyerRes {
+			name := gconv.String(m["name"])
+			sid := gconv.String(m["seo_id"])
+			if name != "" && sid != "" {
+				res = append(res, map[string]interface{}{
+					"name":  name,
+					"seoId": sid,
+					"url":   fmt.Sprintf("/dw/%s.html", sid),
+				})
+			}
+		}
+	}
+	return
+}
+
 // ContentRecommendation 实用内容推荐
 func ContentRecommendation() []KeyType {
 	if bytes, err := redis.GetBytes(RedisNameNew, "contentRecommendation"); err == nil && bytes != nil {
@@ -251,26 +352,27 @@ type BuyerList struct {
 }
 
 // 热门采购单位
-func HotBuyerList(entIsNew bool) []*BuyerList {
+func HotBuyerList() []*BuyerList {
 	// 取缓存
 	cache, err := GetHotCache(config.HotBuyerConfig.CacheKey)
 	if err == nil && cache != nil && len(cache) > 0 {
 		return cache
 	}
 	// 查数据
-	data := getEntBaseInfo(IdentityTypeBuyer, config.HotBuyerConfig.Limit)
-	if data == nil || len(*data) == 0 {
+	//data := getEntBaseInfo(IdentityTypeBuyer, config.HotBuyerConfig.Limit)
+	data := GetHotWinnerBuyer(IdentityTypeBuyer, config.HotBuyerConfig.Limit)
+	if data == nil || len(data) == 0 {
 		return nil
 	}
 	var buyerList []*BuyerList
-	for _, b := range *data {
+	for _, b := range data {
 		name := qu.ObjToString(b["name"])
-		buyerId := qu.ObjToString(b["name_id"])
-		if name != "" && buyerId != "" {
-			idEncode := encrypt.EncodeArticleId2ByCheck(buyerId)
+		url := qu.InterfaceToStr(b["url"])
+		if name != "" && url != "" {
+			//idEncode := encrypt.EncodeArticleId2ByCheck(buyerId)
 			buyerList = append(buyerList, &BuyerList{
 				Name: name,
-				Url:  qu.If(entIsNew, fmt.Sprintf("/entpc/unit_portrayal_id/%s", idEncode), fmt.Sprintf("/swordfish/page_big_pc/unit_portrayal_id/%s", idEncode)).(string),
+				Url:  url,
 			})
 		}
 	}

src/jfw/front/front.go

@@ -882,35 +882,39 @@ func (m *Front) Sess(ostr string) error {
 	if len(str) == 4 {
 		userFlag := str[0]
 		ok := false
-		var identity *pb.Identity
-		if str[1] == "userId" || str[1] == "entUserId" || str[1] == "positionId" {
-			if str[1] == "userId" {
-				identity = config.Middleground.UserCenter.IdentityByUserId(util.Int64All(userFlag))
-			} else if str[1] == "entUserId" {
-				identity = config.Middleground.UserCenter.IdentityByEntUserId(util.Int64All(userFlag))
-			} else if str[1] == "positionId" {
-				identity = config.Middleground.UserCenter.IdentityByPositionId(util.Int64All(userFlag))
-			}
-			if identity != nil {
-				ok, _, _ = FindUserAndCreateSessByBaseUserId(identity.UserId, m.Session(), false, false)
-			}
+		if str[2] == "identityKeep" && m.GetSession("positionId") != nil {
+			ok = true
 		} else {
-			hasIdentity := false
-			if str[1] == "_id" {
-				ok, _, _ = FindUserAndCreateSessById(mgdb.StringTOBsonId(userFlag), m.Session(), false, !hasIdentity)
+			var identity *pb.Identity
+			if str[1] == "userId" || str[1] == "entUserId" || str[1] == "positionId" {
+				if str[1] == "userId" {
+					identity = config.Middleground.UserCenter.IdentityByUserId(util.Int64All(userFlag))
+				} else if str[1] == "entUserId" {
+					identity = config.Middleground.UserCenter.IdentityByEntUserId(util.Int64All(userFlag))
+				} else if str[1] == "positionId" {
+					identity = config.Middleground.UserCenter.IdentityByPositionId(util.Int64All(userFlag))
+				}
+				if identity != nil {
+					ok, _, _ = FindUserAndCreateSessByBaseUserId(identity.UserId, m.Session(), false, false)
+				}
 			} else {
-				if m.GetSession("positionId") != nil {
-					hasIdentity = true
+				hasIdentity := false
+				if str[1] == "_id" {
+					ok, _, _ = FindUserAndCreateSessById(mgdb.StringTOBsonId(userFlag), m.Session(), false, !hasIdentity)
+				} else {
+					if m.GetSession("positionId") != nil {
+						hasIdentity = true
+					}
+					ok, _, _ = FindUserAndCreateSess(userFlag, m.Session(), "wx", false, !hasIdentity)
+				}
+				if !hasIdentity {
+					identity = config.Middleground.UserCenter.IdentityByUserId(util.Int64All(m.GetSession("base_user_id")))
 				}
-				ok, _, _ = FindUserAndCreateSess(userFlag, m.Session(), "wx", false, !hasIdentity)
 			}
-			if !hasIdentity {
-				identity = config.Middleground.UserCenter.IdentityByUserId(util.Int64All(m.GetSession("base_user_id")))
+			if identity != nil {
+				ok = ok && NewIdentityInfo(identity).Switch(m.Session(), &public.MQFW)
 			}
 		}
-		if identity != nil {
-			ok = ok && NewIdentityInfo(identity).Switch(m.Session(), &public.MQFW)
-		}
 		if ok {
 			actionurl := ""
 			if str[3] == "" {
@@ -1138,6 +1142,15 @@ func (f *Front) TSGuide() error {
 					"i_ts_guide":        2,
 					"o_jy.i_newfree":    1,
 				}
+				nsqPath, _ := config.Sysconfig["nsq"].(string)
+				nsq_topic, _ := config.Sysconfig["nsq_topic"].(string)
+				jy.Publish(public.Mgo_Log, nsqPath, nsq_topic, "task", util.ObjToString(f.GetSession("mgoUserId")), jy.Jywx_node1, map[string]interface{}{
+					"code":       1015, //首次订阅
+					"types":      "subscribeKeyWords",
+					"num":        50,
+					"baseUserId": f.GetSession("base_user_id"),
+					"positionId": f.GetSession("positionId"),
+				})
 				result["flag"] = jyutil.Compatible.Update(userid, bson.M{"$set": saveData})
 			}
 		} else if reqType == "over" {

src/jfw/front/frontRouter.go

@@ -1,6 +1,10 @@
 package front
 
 import (
+	"app.yhyue.com/moapp/jybase/common"
+	"app.yhyue.com/moapp/jybase/encrypt"
+	elastic "app.yhyue.com/moapp/jybase/es"
+	"app.yhyue.com/moapp/jybase/redis"
 	"app.yhyue.com/moapp/jypkg/public"
 	"fmt"
 	"jy/src/jfw/config"
@@ -217,9 +221,56 @@ func (this *CommonRouter) doPcBigPage(pageSign, types string) error {
 	if !strings.Contains(pageSign, "unit_portrayal") && !strings.Contains(pageSign, "ent_portrait") && !strings.Contains(pageSign, "ent_ser_portrait") && userid == "" {
 		return this.Redirect("/notin/page")
 	}
+	if userid == "" {
+		if strings.Contains(pageSign, "ent_ser_portrait") || strings.Contains(pageSign, "ent_portrait") {
+			urlArr := strings.Split(pageSign, "_portrait/")
+			entId := encrypt.DecodeArticleId2ByCheck(urlArr[len(urlArr)-1])[0]
+			if seoId := esSeoId(true, entId); seoId != "" {
+				return this.Redirect(fmt.Sprintf("/qy/%s.html", seoId))
+			}
+		} else if strings.Contains(pageSign, "unit_portrayal") {
+			urlArr := strings.Split(pageSign, "unit_portrayal/")
+			//buyerName := urlArr[len(urlArr)-1]
+			// 解码 URL 编码的字符串
+			buyer, _ := url.QueryUnescape(urlArr[len(urlArr)-1])
+			//buyer := this.GetString("buyer")
+			if seoId := esSeoId(false, buyer); seoId != "" {
+				return this.Redirect(fmt.Sprintf("/dw/%s.html", seoId))
+			}
+		}
+	}
 	return this.Render(fmt.Sprintf("/frontRouter/pc/page_big_pc/sess/index.html"))
 }
 
+func esSeoId(isWinner bool, idName string) string {
+	if idName == "" {
+		return idName
+	}
+	var seoId string
+	redisKey := fmt.Sprintf("getSeoId_%v_%s", isWinner, idName)
+	seoId = redis.GetStr("newother", redisKey)
+	if seoId != "" {
+		return seoId
+	}
+
+	if isWinner {
+		winnerSeo := elastic.GetById("qyxy", "qyxy", idName)
+		if winnerSeo != nil && len(*winnerSeo) > 0 {
+			seoId = common.InterfaceToStr((*winnerSeo)[0]["nseo_id"])
+		}
+	} else {
+		q := fmt.Sprintf(`{"query": {"bool": {"must": [{"match": {"buyer_name": "%s"}}]}},"from": 0,"size": 1,"_source":["seo_id"]}`, idName)
+		winnerSeo := elastic.Get("buyer", "buyer", q)
+		if winnerSeo != nil && len(*winnerSeo) > 0 {
+			seoId = common.InterfaceToStr((*winnerSeo)[0]["seo_id"])
+		}
+	}
+	if seoId != "" {
+		redis.Put("newother", redisKey, seoId, -1)
+	}
+	return seoId
+}
+
 // 卡卷
 func (this *CommonRouter) CouponIndex() error {
 	return this.doCouponPage()

src/jfw/front/login.go

@@ -1,8 +1,18 @@
 package front
 
 import (
+	"app.yhyue.com/moapp/jybase/date"
+	"fmt"
+	"jy/src/jfw/config"
+	jutil "jy/src/jfw/jyutil"
+	"log"
+	"regexp"
+	"strings"
+	"time"
+
 	qutil "app.yhyue.com/moapp/jybase/common"
 	"app.yhyue.com/moapp/jybase/dchest/captcha"
+	"app.yhyue.com/moapp/jybase/encrypt"
 	"app.yhyue.com/moapp/jybase/go-xweb/httpsession"
 	"app.yhyue.com/moapp/jybase/go-xweb/xweb"
 	. "app.yhyue.com/moapp/jybase/mongodb"
@@ -10,14 +20,7 @@ import (
 	"app.yhyue.com/moapp/jypkg/common/src/qfw/util/jy"
 	"app.yhyue.com/moapp/jypkg/public"
 	"bp.jydev.jianyu360.cn/BaseService/userCenter/rpc/pb"
-	"fmt"
 	"go.mongodb.org/mongo-driver/bson/primitive"
-	"jy/src/jfw/config"
-	jutil "jy/src/jfw/jyutil"
-	"log"
-	"regexp"
-	"strings"
-	"time"
 )
 
 type Login struct {
@@ -177,10 +180,11 @@ func (l *Login) Login() error {
 						data["s_tracksource"] = source
 					}
 					//获取base_user_id
-					if resp := config.Middleground.UserCenter.UserAdd(pb.UserAddReq{
+					resp := config.Middleground.UserCenter.UserAdd(pb.UserAddReq{
 						Appid: "10000",
 						Phone: phone,
-					}); resp != nil && resp.Data.Id > 0 {
+					})
+					if resp != nil && resp.Data.Id > 0 {
 						data["base_user_id"] = resp.Data.Id
 					} else {
 						log.Println(phone, "调用usercenter失败")
@@ -200,7 +204,14 @@ func (l *Login) Login() error {
 						if ok {
 							result["userInfo"] = userInfo
 							go anonymousLogin(l.Session(), l.Cookie("JYTrustedId"))
-							return 1, true
+							jy.Publish(public.Mgo_Log, nsqPath, nsq_topic, "task", _id, jy.Jyweb_node2, map[string]interface{}{
+								"code":       1007, //绑定手机号任务
+								"types":      "bindPhone",
+								"num":        50,
+								"baseUserId": resp.Data.Id,
+								"positionId": l.GetSession("positionId"),
+							})
+							return 2, true
 						}
 					}
 				} else {
@@ -229,14 +240,35 @@ func (l *Login) Login() error {
 					if ok {
 						result["userInfo"] = userInfo
 						go anonymousLogin(l.Session(), l.Cookie("JYTrustedId"))
-						return 1, true
+						return 3, true
 					}
 				}
 			}
 		}
 		return 0, false
 	}()
-	if status == 1 && isLogin {
+	if status >= 1 && isLogin {
+		status = 1
+		//登录source 更新 p414
+		channelCode := "jy_pc"
+		cc, ckErr := l.Request.Cookie(jy.ChannelCookieName)
+		if ckErr == nil {
+			channelCode = cc.Value
+		}
+		us := jy.UserSource{
+			UserId:           qutil.ObjToString(l.GetSession("userId")),
+			Phone:            qutil.ObjToString(l.GetSession("phone")),
+			State:            qutil.If(status == 2, status, 1).(int), //注册/登录标志 1：登录；2：注册
+			ChannelCode:      channelCode,
+			EncryptionUserId: encrypt.SE.Encode2Hex(qutil.ObjToString(l.GetSession("userId"))),
+			CreateTime:       time.Now().Format(date.Date_Full_Layout),
+			LoginWay:         qutil.If(status == 1, status, 2).(int), //登录方式;1:手机号密码；2：手机号验证码；3：微信；4：手机号一键登录
+			Platform:         1,
+			Ip:               qutil.GetIp(l.Request),
+		}
+		go func(us jy.UserSource) {
+			jy.SaveUserSource(public.BaseMysql, jy.ChannelTableName, qutil.StructToMapMore(us))
+		}(us)
 		//当前用户登录选择 下次自动登录
 		if isAutoLogin && err == nil {
 			baseUserId := qutil.Int64All(l.GetSession("base_user_id"))

src/jfw/front/org_structure.go

@@ -21,6 +21,7 @@ import (
 	"app.yhyue.com/moapp/jypkg/public"
 
 	util "app.yhyue.com/moapp/jybase/common"
+	"app.yhyue.com/moapp/jypkg/common/src/qfw/util/jy"
 	"bp.jydev.jianyu360.cn/BaseService/userCenter/rpc/pb"
 
 	"app.yhyue.com/moapp/jybase/go-xweb/xweb"
@@ -194,6 +195,25 @@ func (this *OrgStructure) AutoLogon() error {
 			}); resp != nil && resp.Data.Id > 0 {
 				data["base_user_id"] = resp.Data.Id
 				if id := mongodb.Save("user", data); id != "" {
+
+					nsqPath, _ := config.Sysconfig["nsq"].(string)
+					nsq_topic, _ := config.Sysconfig["nsq_topic"].(string)
+					jy.Publish(public.Mgo_Log, nsqPath, nsq_topic, "task", id, jy.Jyweb_node2, map[string]interface{}{
+						"code":       1007,
+						"types":      "bindPhone",
+						"num":        50,
+						"baseUserId": resp.Data.Id,
+						"positionId": this.GetSession("positionId"),
+					})
+					if mail != "" {
+						jy.Publish(public.Mgo_Log, nsqPath, nsq_topic, "task", id, jy.Jyweb_node2, map[string]interface{}{
+							"code":       1009,
+							"types":      "bindMail",
+							"num":        50,
+							"baseUserId": resp.Data.Id,
+							"positionId": this.GetSession("positionId"),
+						})
+					}
 					rb = true
 				}
 			} else {

src/jfw/front/pcIndex.go

@@ -159,11 +159,11 @@ func (m *PcIndex) NewSordfish(flag string) error {
 		} else if flag == "tmp" {
 			return m.Render("/pc/index_tmp.html", &m.T)
 		} else {
-			var entIsNew bool
-			if userId != "" {
-				bigBaseMsg := jy.GetBigVipUserBaseMsg(m.Session(), *config.Middleground)
-				entIsNew = bigBaseMsg.EntIsNew
-			}
+			//var entIsNew bool
+			//if userId != "" {
+			//	bigBaseMsg := jy.GetBigVipUserBaseMsg(m.Session(), *config.Middleground)
+			//	entIsNew = bigBaseMsg.EntIsNew
+			//}
 			//按地区、信息类型、热门招标
 			for k, v := range RegionAndInformationAndTender() {
 				m.T[k] = v
@@ -201,8 +201,6 @@ func (m *PcIndex) NewSordfish(flag string) error {
 			m.T["jycmsLink"] = GetJycmsAreaLink()
 			//推荐标讯专区
 			m.T["recommendBeacon"] = RecommendationBeacon()
-			//热门采购单位
-			m.T["hotBuyers"] = HotBuyerList(entIsNew)
 			//招投标攻略
 			var strategyList []map[string]interface{}
 			for _, item := range jySchool.GuidelineColumn().SeedData {
@@ -217,6 +215,8 @@ func (m *PcIndex) NewSordfish(flag string) error {
 			m.T["strategyList"] = strategyList
 			m.T["hasLogin"] = userId != ""
 			m.T["includedInfo"] = GetIncludedInfo()
+			//热门采购单位
+			m.T["hotBuyers"] = HotBuyerList()
 			m.T["hotWinner"] = GetWinnerInfo()
 			m.T["newbids"] = NewIndexbids(m.Session(), m.Request)
 			m.T["hotkey"] = hotKeyArrLoginEd

src/jfw/front/supsearch.go

@@ -571,10 +571,16 @@ func (p *Pcsearch) PcSearchIndex(module string) error {
 	p.T["isEntService"] = userInfo.EntService
 	p.T["vipBefore202209"] = userInfo.VipState > 0 && userInfo.VipStartData < util.Int64All(config.Sysconfig["contextOldVipLimit"]) //超级订阅 超强项目
 	//
+	cooperateCode := ""
 	if userId != "" {
 		//企业画像 权限
 		p.T["portraitpower"] = jylabutil.IsAuthorized(userId, "i_portraitpower")
+	} else {
+		if cc, err := p.GetCookie(jy.ChannelCookieName); err == nil {
+			cooperateCode = cc.Value
+		}
 	}
+	p.T["cooperateCode"] = cooperateCode
 	p.T["isLimit"] = isLimit
 	if module == "supsearch" {
 		p.T["simpleTemplateData"] = map[string]interface{}{

src/jfw/front/websocket.go

@@ -20,7 +20,7 @@ import (
 	"time"
 )
 
-//socket对象放在内存中，待rpc回调使用
+// socket对象放在内存中，待rpc回调使用
 type Wss struct {
 	Conn    *websocket.Conn
 	session *httpsession.Session
@@ -47,7 +47,7 @@ func (m *MapSocket) GC() {
 var MSPOOL = 20
 var MapSocketArr = make([]*MapSocket, MSPOOL)
 
-//初始化
+// 初始化
 func init() {
 	for i := 0; i < MSPOOL; i++ {
 		ms := &MapSocket{Map: map[string]*Wss{}}
@@ -57,7 +57,6 @@ func init() {
 	redis.InitRedisLogin(public.DbConf.Redis.Login.Address)
 }
 
-//
 func GetRedisPoolVal() {
 	redis.GetLoginVal("loginCode", GetWsByCode)
 	//	var res string
@@ -71,7 +70,7 @@ func GetRedisPoolVal() {
 	//	}
 }
 
-//根据代码和ws做映射
+// 根据代码和ws做映射
 func PutWsByCode(src string, ws *websocket.Conn, session *httpsession.Session) {
 	defer qutil.Catch()
 	n := HashVal(src) % MSPOOL
@@ -92,7 +91,7 @@ func PutWsByCode(src string, ws *websocket.Conn, session *httpsession.Session) {
 	ms.Lock.Unlock()
 }
 
-//计算代码的hash值
+// 计算代码的hash值
 func HashVal(src string) int {
 	check := 0
 	for i := len(src) / 2; i < len(src); i++ {
@@ -101,7 +100,7 @@ func HashVal(src string) int {
 	return check
 }
 
-//rpc回调,写到前台
+// rpc回调,写到前台
 func GetWsByCode(param []string) bool {
 	if len(param) < 2 {
 		return false
@@ -145,7 +144,7 @@ func GetWsByCode(param []string) bool {
 				if ok := redis.Del("newother", fmt.Sprintf(jyutil.KeepLoginTimeKey, src)) && redis.Del("newother", fmt.Sprintf(jyutil.KeepLoginTimeKey, erStr)); !ok {
 					log.Println(fmt.Sprintf("%d 清除用户登录延期标识 异常", baseUserId))
 				}
-				//
+				//登录source 更新
 				//收到webSocket消息后,您无法设置cookie.一旦建立了webSocket连接,它就是一个开放的TCP套接字,协议不再是http,因此没有内置的方式来交换cookie.
 				//jyutil.SetCookieValueForAutoLogin(wss.Conn.W, baseUserId)  不可用
 				//您可以将自己的webSocket消息发送回客户端,告知它设置cookie,然后在客户端中侦听该消息,当它收到该消息时,它可以在浏览器中设置cookie.
@@ -167,7 +166,7 @@ func GetWsByCode(param []string) bool {
 	}
 }
 
-//用户登录信息
+// 用户登录信息
 func LoginInfo(shareid, openid string, Sess interface{}) map[string]interface{} {
 	if Sess == nil {
 		return nil
@@ -216,7 +215,7 @@ func ServeWss(conn *websocket.Conn) {
 
 }
 
-//实验室
+// 实验室
 func QrToLabWss(conn *websocket.Conn) {
 	defer qutil.Catch()
 	var receive, userId string
@@ -286,7 +285,7 @@ func QrToLabWss(conn *websocket.Conn) {
 	}
 }
 
-//电脑端强制分享，扫码分享到朋友圈
+// 电脑端强制分享，扫码分享到朋友圈
 func QrToShareTimeline(conn *websocket.Conn) {
 	defer qutil.Catch()
 	var receive string
@@ -341,7 +340,7 @@ func QrToShareTimeline(conn *websocket.Conn) {
 	}
 }
 
-//pc弹框 最新一条消息
+// pc弹框 最新一条消息
 func GetBuoyMsg(conn *websocket.Conn) {
 	defer qutil.Catch()
 	sess := xweb.RootApp().SessionManager.Session(conn.R, conn.W)

src/jfw/modules/app/src/app/front/bigMember.go

@@ -2,12 +2,17 @@ package front
 
 import (
 	qutil "app.yhyue.com/moapp/jybase/common"
+	"app.yhyue.com/moapp/jybase/encrypt"
+	elastic "app.yhyue.com/moapp/jybase/es"
 	"app.yhyue.com/moapp/jybase/go-xweb/xweb"
+	"app.yhyue.com/moapp/jybase/redis"
 	"app.yhyue.com/moapp/jypkg/common/src/qfw/util/jy"
 	"app.yhyue.com/moapp/jypkg/public"
 	"bp.jydev.jianyu360.cn/BaseService/userCenter/rpc/pb"
+	"fmt"
 	"jy/src/jfw/modules/app/src/jfw/config"
 	"regexp"
+	"strings"
 )
 
 type NewBigMemberAction struct {
@@ -37,6 +42,7 @@ func (s *NewBigMemberAction) PowerClear() {
 }
 
 func (s *NewBigMemberAction) VipPageManager(htmlName string) error {
+	userid, _ := s.GetSession("userId").(string)
 	if !freePageReg.MatchString(htmlName) {
 		bigBaseMsg := jy.GetBigVipUserBaseMsg(s.Session(), *config.Middleground)
 		//大会员页面权限判断
@@ -51,5 +57,51 @@ func (s *NewBigMemberAction) VipPageManager(htmlName string) error {
 		//	return s.Redirect("/jyapp/big/page/init") //跳转至首次初始化页面
 		//}
 	}
+	if userid == "" {
+		if strings.Contains(htmlName, "ent_ser_portrait") || strings.Contains(htmlName, "ent_portrait") {
+			//urlArr := strings.Split(htmlName, "/")
+			entId := encrypt.DecodeArticleId2ByCheck(s.GetString("eId"))[0]
+			if seoId := esSeoId(true, entId); seoId != "" {
+				return s.Redirect(fmt.Sprintf("/qy/%s.html", seoId))
+			}
+		} else if strings.Contains(htmlName, "unit_portrayal") {
+			//urlArr := strings.Split(htmlName, "/")
+			//buyerName := urlArr[len(urlArr)-1]
+			// 解码 URL 编码的字符串
+			buyer := s.GetString("entName")
+			//buyer := this.GetString("buyer")
+			if seoId := esSeoId(false, buyer); seoId != "" {
+				return s.Redirect(fmt.Sprintf("/dw/%s.html", seoId))
+			}
+		}
+	}
 	return s.Render("/big-member/page_" + htmlName + ".html")
 }
+
+func esSeoId(isWinner bool, idName string) string {
+	if idName == "" {
+		return idName
+	}
+	var seoId string
+	redisKey := fmt.Sprintf("getSeoId_%v_%s", isWinner, idName)
+	seoId = redis.GetStr("newother", redisKey)
+	if seoId != "" {
+		return seoId
+	}
+	if isWinner {
+		winnerSeo := elastic.GetById("qyxy", "qyxy", idName)
+		if winnerSeo != nil && len(*winnerSeo) > 0 {
+			seoId = qutil.InterfaceToStr((*winnerSeo)[0]["nseo_id"])
+		}
+	} else {
+		q := fmt.Sprintf(`{"query": {"bool": {"must": [{"match": {"buyer_name": "%s"}}]}},"from": 0,"size": 1,"_source":["seo_id"]}`, idName)
+		winnerSeo := elastic.Get("buyer", "buyer", q)
+		if winnerSeo != nil && len(*winnerSeo) > 0 {
+			seoId = qutil.InterfaceToStr((*winnerSeo)[0]["seo_id"])
+		}
+	}
+	if seoId != "" {
+		redis.Put("newother", redisKey, seoId, -1)
+	}
+	return seoId
+}

src/jfw/modules/app/src/app/front/front.go

@@ -340,6 +340,15 @@ func (f *Front) TSGuide() error {
 					"i_ts_guide":        2,
 					"o_jy.i_newfree":    1,
 				}
+				nsqPath, _ := config.Sysconfig["nsq"].(string)
+				nsq_topic, _ := config.Sysconfig["nsq_topic"].(string)
+				jy.Publish(public.Mgo_Log, nsqPath, nsq_topic, "task", util.ObjToString(f.GetSession("mgoUserId")), jy.Jywx_node1, map[string]interface{}{
+					"code":       1015, //首次订阅
+					"types":      "subscribeKeyWords",
+					"num":        50,
+					"baseUserId": f.GetSession("base_user_id"),
+					"positionId": f.GetSession("positionId"),
+				})
 				result["flag"] = utils.Compatible.Update(userid, map[string]interface{}{"$set": saveData})
 			}
 		} else if reqType == "over" {

src/jfw/modules/app/src/app/front/login.go

@@ -1,6 +1,8 @@
 package front
 
 import (
+	"app.yhyue.com/moapp/jybase/date"
+	"app.yhyue.com/moapp/jybase/encrypt"
 	"encoding/json"
 	"fmt"
 	"jy/src/jfw/modules/app/src/jfw/config"
@@ -105,13 +107,15 @@ func (l *Login) Login() error {
 	}
 	returnSign := ""
 	userInfo := map[string]interface{}{}
-	status := func() int {
+	status, state := func() (int, int) {
+		nsqPath, _ := config.Sysconfig["nsq"].(string)
+		nsq_topic, _ := config.Sysconfig["nsq_topic"].(string)
 		reqType := l.GetString("reqType")
 		if reqType == "phoneLogin" {
 			phone := l.GetString("phone")
 			password := l.GetString("password")
 			if strings.TrimSpace(phone) == "" || strings.TrimSpace(password) == "" {
-				return -1
+				return -1, -1
 			}
 			query := map[string]interface{}{
 				"i_appid": 2,
@@ -131,9 +135,16 @@ func (l *Login) Login() error {
 				deviceId := l.GetString("deviceId")
 				phoneType := l.GetString("phoneType")
 				returnSign = afterLogin((*user)[0], l.Session(), rid, oid, phoneType, channel, deviceId, false, l.ResponseWriter)
-				return 1
+				jy.Publish(public.Mgo_Log, nsqPath, nsq_topic, "task", BsonIdToSId((*user)[0]["_id"]), jy.Jyapp_node1, map[string]interface{}{
+					"code":       1014, //下载app任务
+					"types":      "downloadApp",
+					"num":        50,
+					"baseUserId": l.GetSession("base_user_id"),
+					"positionId": l.GetSession("positionId"),
+				})
+				return 1, 1
 			}
-			return -1 //用户名或密码不正确
+			return -1, -1 //用户名或密码不正确
 		} else if reqType == "signLogin" {
 			returnStatus := 0
 			if l.GetSession("mgoUserId") != nil {
@@ -146,7 +157,7 @@ func (l *Login) Login() error {
 			(userInfo)["s_phone"] = l.GetSession("s_phone")
 			(userInfo)["userid"] = l.GetSession("mgoUserId")
 			(userInfo)["app_name"] = l.GetSession("app_name")
-			return returnStatus
+			return returnStatus, 2
 		} else if reqType == "sendIdentCode" {
 			phone := jy.CheckSendMsg(l.GetString("token"))
 			if phone == "" {
@@ -154,18 +165,18 @@ func (l *Login) Login() error {
 			}
 			//手机号验证不通过
 			if phone == "" {
-				return -2
+				return -2, -1
 			} else if !phoneReg.MatchString(phone) {
-				return -1
+				return -1, -1
 			} else if jy.SendPhoneIdentCode(qutil.ObjToString(config.Sysconfig["smsServiceRpc"]), phone, l.Session()) {
-				return 1
+				return 1, -1
 			}
-			return 0
+			return 0, -1
 		} else if reqType == "identCodeLogin" {
 			disWord := l.GetString("disWord")
 			phone, _ := l.GetSession("identCodeKey").(string)
 			if phone == "" || l.GetSession("identCodeValue") == nil || l.GetString("identCode") != l.GetSession("identCodeValue") { //验证码不正确
-				return -1
+				return -1, -1
 			} else {
 				RegLock.Lock()
 				reg := RegMap[phone]
@@ -182,7 +193,7 @@ func (l *Login) Login() error {
 				ok, user := getPhoneUser(phone)
 				//登录成功
 				if !ok {
-					return 0
+					return 0, -1
 				}
 				//用户不存在
 				rid := l.GetString("rid")
@@ -230,7 +241,7 @@ func (l *Login) Login() error {
 						data["base_user_id"] = resp.Data.Id
 					} else {
 						log.Println(phone, "调用usercenter失败")
-						return -4
+						return -4, -1
 					}
 					_id := mongodb.Save("user", data)
 					if _id != "" {
@@ -238,29 +249,34 @@ func (l *Login) Login() error {
 
 						jy.ClearPhoneIdentSession(l.Session())
 						returnSign = afterLogin(data, l.Session(), rid, oid, phoneType, channel, deviceId, true, l.ResponseWriter)
-						addr, _ := config.Sysconfig["nsq"].(string)
-						nsq_topic, _ := config.Sysconfig["nsq_topic"].(string)
 						if disWord != "" {
 							redisDis := redis.GetStr("other", "DIS_"+disWord[1:])
 							//邀请新用户 调用队列
 							if redisDisArr := strings.Split(redisDis, "##"); len(redisDisArr) > 1 {
 								fromUserId := redisDisArr[1]
-								err := jy.Publish(public.Mgo_Log, addr, nsq_topic, jy.Jywx_subscribe_invite, fromUserId, jy.Jyapp_node1, nil)
+								err := jy.Publish(public.Mgo_Log, nsqPath, nsq_topic, jy.Jywx_subscribe_invite, fromUserId, jy.Jyapp_node1, nil)
 								if err != nil {
 									log.Println("nsq队列写入失败-->", err, jy.Jywx_subscribe_invite, fromUserId)
 								}
-								err = jy.Publish(public.Mgo_Log, addr, nsq_topic, jy.Jywx_subscribe_invited, _id, jy.Jyapp_node1, nil)
+								err = jy.Publish(public.Mgo_Log, nsqPath, nsq_topic, jy.Jywx_subscribe_invited, _id, jy.Jyapp_node1, nil)
 								if err != nil {
 									log.Println("nsq队列写入失败-->", err, jy.Jywx_subscribe_invited, _id)
 								}
 							}
 						} else {
-							err := jy.Publish(public.Mgo_Log, addr, nsq_topic, jy.Jyapp_phone_register, _id, jy.Jyapp_node1, nil)
+							err := jy.Publish(public.Mgo_Log, nsqPath, nsq_topic, jy.Jyapp_phone_register, _id, jy.Jyapp_node1, nil)
 							if err != nil {
 								log.Println("nsq队列写入失败-->", err, jy.Jyapp_phone_register, _id)
 							}
 						}
-						return 1
+						jy.Publish(public.Mgo_Log, nsqPath, nsq_topic, "task", _id, jy.Jyapp_node1, map[string]interface{}{
+							"code":       1014, //下载app任务
+							"types":      "downloadApp",
+							"num":        50,
+							"baseUserId": l.GetSession("base_user_id"),
+							"positionId": l.GetSession("positionId"),
+						})
+						return 1, 3
 					}
 				} else {
 					//以s_m_phone登录的 需要把s_m_phone转化为s_phone
@@ -281,12 +297,39 @@ func (l *Login) Login() error {
 					}
 					jy.ClearPhoneIdentSession(l.Session())
 					returnSign = afterLogin(user, l.Session(), rid, oid, phoneType, channel, deviceId, false, l.ResponseWriter)
-					return 1
+					jy.Publish(public.Mgo_Log, nsqPath, nsq_topic, "task", BsonIdToSId(user["_id"]), jy.Jyapp_node1, map[string]interface{}{
+						"code":       1014, //下载app任务
+						"types":      "downloadApp",
+						"num":        50,
+						"baseUserId": l.GetSession("base_user_id"),
+						"positionId": l.GetSession("positionId"),
+					})
+					return 1, 4
 				}
 			}
 		}
-		return 0
+		return 0, -1
 	}()
+	//登录source 更新 p414
+	channelCode := "jy_app"
+	cc, ckErr := l.Request.Cookie(jy.ChannelCookieName)
+	if ckErr == nil {
+		channelCode = cc.Value
+	}
+	us := jy.UserSource{
+		UserId:           qutil.ObjToString(l.GetSession("userId")),
+		Phone:            qutil.ObjToString(l.GetSession("phone")),
+		State:            qutil.If(state == 3, 2, 1).(int), //注册/登录标志 1：登录；2：注册
+		ChannelCode:      channelCode,
+		EncryptionUserId: encrypt.SE.Encode2Hex(qutil.ObjToString(l.GetSession("userId"))),
+		CreateTime:       time.Now().Format(date.Date_Full_Layout),
+		LoginWay:         qutil.If(state == 1, state, 2).(int),                         //登录方式;1:手机号密码；2：手机号验证码；3：微信；4：手机号一键登录
+		Platform:         qutil.If(strings.Contains(l.Request.Host, "h5"), 4, 3).(int), //登录端；1：PC；2：WX；3：APP；4：H5
+		Ip:               qutil.GetIp(l.Request),
+	}
+	go func(us jy.UserSource) {
+		jy.SaveUserSource(public.BaseMysql, jy.ChannelTableName, qutil.StructToMapMore(us))
+	}(us)
 	result := map[string]interface{}{
 		"status": status,
 		"userId": l.GetSession("mgoUserId"),
@@ -463,6 +506,8 @@ func (l *Login) Register() error {
 		return l.Render("/me/register.html", &l.T)
 	}
 	var returnSign string
+	nsqPath, _ := config.Sysconfig["nsq"].(string)
+	nsq_topic, _ := config.Sysconfig["nsq_topic"].(string)
 	status := func() string {
 		reqType := l.GetString("reqType")
 		if reqType == "sendIdentCode" { //发短信
@@ -519,25 +564,23 @@ func (l *Login) Register() error {
 				registerclient := jy.NewRegister(jyutil.Compatible.Mgo, jyutil.Compatible.BaseService, jyutil.Compatible.MainMysql, jyutil.Compatible.Middleground)
 				_, errStr = registerclient.PublicRegister(phone, email, isAndroidOrIOS(l.Header("User-Agent")), data, func(saveid string) {
 
-					addr := config.Sysconfig["nsq"].(string)
-					topic := config.Sysconfig["nsq_topic"].(string)
 					go func() {
 						if disWord != "" {
 							redisDis := redis.GetStr("other", "DIS_"+disWord[1:])
 							//邀请新用户 调用队列
 							if redisDisArr := strings.Split(redisDis, "##"); len(redisDisArr) > 1 {
 								fromUserId := redisDisArr[1]
-								err := jy.Publish(public.Mgo_Log, addr, topic, jy.Jywx_subscribe_invite, fromUserId, jy.Jyapp_node1, nil)
+								err := jy.Publish(public.Mgo_Log, nsqPath, nsq_topic, jy.Jywx_subscribe_invite, fromUserId, jy.Jyapp_node1, nil)
 								if err != nil {
 									log.Println("nsq队列写入失败-->", err, jy.Jywx_subscribe_invite, fromUserId)
 								}
-								err = jy.Publish(public.Mgo_Log, addr, topic, jy.Jywx_subscribe_invited, saveid, jy.Jyapp_node1, nil)
+								err = jy.Publish(public.Mgo_Log, nsqPath, nsq_topic, jy.Jywx_subscribe_invited, saveid, jy.Jyapp_node1, nil)
 								if err != nil {
 									log.Println("nsq队列写入失败-->", err, jy.Jywx_subscribe_invited, saveid)
 								}
 							}
 						} else {
-							err := jy.Publish(public.Mgo_Log, addr, topic, jy.Jyapp_phone_register, saveid, jy.Jyapp_node1, nil)
+							err := jy.Publish(public.Mgo_Log, nsqPath, nsq_topic, jy.Jyapp_phone_register, saveid, jy.Jyapp_node1, nil)
 							if err != nil {
 								log.Println("nsq队列写入失败-->", err, jy.Jyapp_phone_register, saveid)
 							}
@@ -545,9 +588,45 @@ func (l *Login) Register() error {
 					}()
 					l.DelSession("registerStep")
 					jy.ClearPhoneIdentSession(l.Session())
+					//剑鱼币
+					jy.Publish(public.Mgo_Log, nsqPath, nsq_topic, "task", qutil.ObjToString(l.GetSession("mgoUserId")), jy.Jyapp_node1, map[string]interface{}{
+						"code":       1014, //下载app任务
+						"types":      "downloadApp",
+						"num":        50,
+						"baseUserId": l.GetSession("base_user_id"),
+						"positionId": l.GetSession("positionId"),
+					})
 				})
 				if errStr == "y" {
 					returnSign = afterLogin(data, l.Session(), rid, oid, phoneType, channel, deviceId, true, l.ResponseWriter)
+					//剑鱼币
+					jy.Publish(public.Mgo_Log, nsqPath, nsq_topic, "task", qutil.ObjToString(l.GetSession("mgoUserId")), jy.Jyapp_node1, map[string]interface{}{
+						"code":       1014, //下载app任务
+						"types":      "downloadApp",
+						"num":        50,
+						"baseUserId": l.GetSession("base_user_id"),
+						"positionId": l.GetSession("positionId"),
+					})
+					//登录source 更新 p414
+					channelCode := "jy_app"
+					cc, ckErr := l.Request.Cookie(jy.ChannelCookieName)
+					if ckErr == nil {
+						channelCode = cc.Value
+					}
+					us := jy.UserSource{
+						UserId:           qutil.ObjToString(l.GetSession("userId")),
+						Phone:            qutil.ObjToString(l.GetSession("phone")),
+						State:            2, //注册/登录标志 1：登录；2：注册
+						ChannelCode:      channelCode,
+						EncryptionUserId: encrypt.SE.Encode2Hex(qutil.ObjToString(l.GetSession("userId"))),
+						CreateTime:       time.Now().Format(date.Date_Full_Layout),
+						LoginWay:         1,                                                            //登录方式;1:手机号密码；2：手机号验证码；3：微信；4：手机号一键登录
+						Platform:         qutil.If(strings.Contains(l.Request.Host, "h5"), 4, 3).(int), //登录端；1：PC；2：WX；3：APP；4：H5
+						Ip:               qutil.GetIp(l.Request),
+					}
+					go func(us jy.UserSource) {
+						jy.SaveUserSource(public.BaseMysql, jy.ChannelTableName, qutil.StructToMapMore(us))
+					}(us)
 				}
 				return errStr
 			}()
@@ -718,14 +797,46 @@ func (l *Login) WxLogin() {
 						log.Println("nsq队列写入失败-->", jy.Jyapp_wx_register, _id)
 					}
 				}
-				return 1
+				return 2
 			}
 		}
 		return 0
 	}()
+
+	nsqPath, _ := config.Sysconfig["nsq"].(string)
+	nsq_topic, _ := config.Sysconfig["nsq_topic"].(string)
+	jy.Publish(public.Mgo_Log, nsqPath, nsq_topic, "task", qutil.ObjToString(l.GetSession("mgoUserId")), jy.Jyapp_node1, map[string]interface{}{
+		"code":       1014, //下载app任务
+		"types":      "downloadApp",
+		"num":        50,
+		"baseUserId": l.GetSession("base_user_id"),
+		"positionId": l.GetSession("positionId"),
+	})
+	if status > 0 {
+		//登录source 更新 p414
+		channelCode := "jy_app"
+		cc, ckErr := l.Request.Cookie(jy.ChannelCookieName)
+		if ckErr == nil {
+			channelCode = cc.Value
+		}
+		us := jy.UserSource{
+			UserId:           qutil.ObjToString(l.GetSession("userId")),
+			Phone:            qutil.ObjToString(l.GetSession("phone")),
+			State:            status, //注册/登录标志 1：登录；2：注册
+			ChannelCode:      channelCode,
+			EncryptionUserId: encrypt.SE.Encode2Hex(qutil.ObjToString(l.GetSession("userId"))),
+			CreateTime:       time.Now().Format(date.Date_Full_Layout),
+			LoginWay:         3,                                                            //登录方式;1:手机号密码；2：手机号验证码；3：微信；4：手机号一键登录
+			Platform:         qutil.If(strings.Contains(l.Request.Host, "h5"), 4, 3).(int), //登录端；1：PC；2：WX；3：APP；4：H5
+			Ip:               qutil.GetIp(l.Request),
+		}
+		go func(us jy.UserSource) {
+			jy.SaveUserSource(public.BaseMysql, jy.ChannelTableName, qutil.StructToMapMore(us))
+		}(us)
+	}
 	//返回
 	result := map[string]interface{}{
-		"status": status,
+		"status": qutil.If(status > 0, 1, status).(int),
 		"userId": l.GetSession("mgoUserId"),
 	}
 	if returnSign != "" {

src/jfw/modules/app/src/app/front/shorturl.go

@@ -39,6 +39,9 @@ type Short struct {
 
 func init() {
 	xweb.AddAction(&Short{})
+	if config.Seoconfig["hotArea"] != nil {
+		utils.HotArea = config.Seoconfig["hotArea"].(string)
+	}
 }
 
 var DateFullLayout = "2006-01-02 15:04:05"
@@ -194,6 +197,11 @@ func (s *Short) Article(contentType, stype, id string) error {
 					}
 				}
 			}
+		} else {
+			//未登录顶部导航
+			s.T["hotArea"] = utils.HotAreas
+			s.T["areaList"] = utils.AreaInfo
+			s.T["infoTypeList"], _ = utils.GetInfoType()
 		}
 		//超前项目推送处理
 		s.T["canRead"] = canRead
@@ -329,6 +337,21 @@ func (s *Short) Article(contentType, stype, id string) error {
 		obj["industry"] = industry
 		obj["keywords"] = KeyWordHandle(obj)
 		obj["description"] = DescriptionHandle(stype, obj)
+
+		if userId == "" {
+			var currentLocation []Navigation
+			if typeVal := util.ObjToString(obj["toptype"]); typeVal != "" {
+				if val := getSeoLocation(typeVal); val != nil {
+					currentLocation = append(currentLocation, *val)
+				}
+			}
+			if title := util.ObjToString(obj["title"]); title != "" {
+				currentLocation = append(currentLocation, Navigation{
+					Name: title,
+				})
+			}
+			s.T["currentLocation"] = currentLocation
+		}
 		s.T["obj"] = obj
 		s.T["isIosExam"], s.T["isIosExamPhone"], _, _ = IosExamInfo(s.Action, false, false)
 		content, err := s.Render4Cache("/weixin/wxinfocontent.html", &s.T)
@@ -343,6 +366,30 @@ func (s *Short) Article(contentType, stype, id string) error {
 	return s.Redirect("/jyapp/free/mob/err")
 }
 
+var typeUrlMap = map[string]string{
+	"预告": "/list/stype/ZBYG.html",
+	"招标": "/list/stype/ZBGG.html",
+	"结果": "/list/stype/ZBJG.html",
+	"其它": "/list/stype/ZBXYXX.html",
+}
+
+func getSeoLocation(name string) *Navigation {
+	var url string
+
+	if url = typeUrlMap[name]; url != "" {
+		return &Navigation{
+			Name: name,
+			Url:  url,
+		}
+	}
+
+	switch name {
+
+	}
+
+	return nil
+}
+
 // 未登录用户进行数据过滤
 func Filter(obj map[string]interface{}) map[string]interface{} {
 	detail := fmt.Sprint(obj["detail"])

src/jfw/modules/app/src/go.mod

@@ -5,7 +5,7 @@ go 1.18
 require (
 	app.yhyue.com/moapp/jybase v0.0.0-20230901064756-2fc66b18db40
 	app.yhyue.com/moapp/jylog v0.0.0-20230522075550-05d7230ca545
-	app.yhyue.com/moapp/jypkg v0.0.0-20230925120741-9e02619bfe25
+	app.yhyue.com/moapp/jypkg v1.0.4-0.20231108013952-a37ecebda2ed
 	bp.jydev.jianyu360.cn/BaseService/userCenter v1.2.14
 	github.com/SKatiyar/qr v0.0.0-20151201054752-25b6bdf44e67
 	github.com/gogf/gf/v2 v2.3.1
@@ -139,7 +139,7 @@ require (
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 	gorm.io/driver/mysql v1.0.5 // indirect
 	gorm.io/gorm v1.21.3 // indirect
-	jygit.jydev.jianyu360.cn/ApplicationCenter/publicService v0.0.0-20230710093759-d9d6c68de8b1 // indirect
+	jygit.jydev.jianyu360.cn/ApplicationCenter/publicService v0.0.0-20231017031425-45003ca9f35a // indirect
 	k8s.io/api v0.26.3 // indirect
 	k8s.io/apimachinery v0.27.0-alpha.3 // indirect
 	k8s.io/client-go v0.26.3 // indirect

src/jfw/modules/app/src/go.sum

@@ -9,8 +9,8 @@ app.yhyue.com/moapp/jybase v0.0.0-20230901064756-2fc66b18db40 h1:/FcBvpf/KW8g6GB
 app.yhyue.com/moapp/jybase v0.0.0-20230901064756-2fc66b18db40/go.mod h1:Hv9U/7oHRucqH315Tr1+d03NCvS9mOKPfk8pwwlOIwQ=
 app.yhyue.com/moapp/jylog v0.0.0-20230522075550-05d7230ca545 h1:+Lak4m1zgsigQloOsvp8AJ+0XeX/+PGp9QP550xlbBQ=
 app.yhyue.com/moapp/jylog v0.0.0-20230522075550-05d7230ca545/go.mod h1:uFrsdUBFbETiJlEmr4PtJWPsZlUpPj2bHQRhryu6ggk=
-app.yhyue.com/moapp/jypkg v0.0.0-20230925120741-9e02619bfe25 h1:2q7b1auPihIJD3Ewsd7Zi8ESeLkxuP57avWL8UoBr9U=
-app.yhyue.com/moapp/jypkg v0.0.0-20230925120741-9e02619bfe25/go.mod h1:gPCOY8bVXdY5bD7nry7th+YNkKC/viG8Dc9+z4fUaRo=
+app.yhyue.com/moapp/jypkg v1.0.4-0.20231108013952-a37ecebda2ed h1:rd5FDHAWiM1MLbgi79KBpRTMQfH5e2Y+knkk2JMsFP4=
+app.yhyue.com/moapp/jypkg v1.0.4-0.20231108013952-a37ecebda2ed/go.mod h1:76Kz6+MuxcRJRyFad9W8R4AByiQlVGzuGFzklY+2m38=
 app.yhyue.com/moapp/message v0.0.0-20221223100203-6402e389d9ae h1:6rDDaz6yxvE8viTSzEBwKYOFWq14TMfuBivSazUZMz4=
 app.yhyue.com/moapp/message v0.0.0-20221223100203-6402e389d9ae/go.mod h1:b0zZHev3gmJao1Fo+2Z2KPVjsuLOJVvVxf+kCnu9WkA=
 bp.jydev.jianyu360.cn/BaseService/entManageApplication v0.0.0-20230214091519-89a98c01ab0e h1:h+VEI3o1qC0jeCzkFGTrLI4f27cfa/W/y+0sXokWMgE=
@@ -1429,8 +1429,8 @@ honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWh
 honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg=
 honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
 honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
-jygit.jydev.jianyu360.cn/ApplicationCenter/publicService v0.0.0-20230710093759-d9d6c68de8b1 h1:BItxi1gkQUs3sjxaBk6tc34fZWSO4hUSXcTM3PcnY4I=
-jygit.jydev.jianyu360.cn/ApplicationCenter/publicService v0.0.0-20230710093759-d9d6c68de8b1/go.mod h1:p/595fgbj4r6GhSJhHDpx3Ru1NkD5UASFL8OuIQw09E=
+jygit.jydev.jianyu360.cn/ApplicationCenter/publicService v0.0.0-20231017031425-45003ca9f35a h1:kwjO4pqB3gnNGrQ9aXyz6f8s9qXAUenPUDWip8gYR/Q=
+jygit.jydev.jianyu360.cn/ApplicationCenter/publicService v0.0.0-20231017031425-45003ca9f35a/go.mod h1:p/595fgbj4r6GhSJhHDpx3Ru1NkD5UASFL8OuIQw09E=
 k8s.io/api v0.22.9/go.mod h1:rcjO/FPOuvc3x7nQWx29UcDrFJMx82RxDob71ntNH4A=
 k8s.io/api v0.26.3 h1:emf74GIQMTik01Aum9dPP0gAypL8JTLl/lHa4V9RFSU=
 k8s.io/api v0.26.3/go.mod h1:PXsqwPMXBSBcL1lJ9CYDKy7kIReUydukS5JiRlxC3qE=

src/jfw/modules/app/src/web/staticres/jyapp/big-member/css/ent_portrait.css

@@ -640,3 +640,19 @@
     font-size: .26rem;
     color: #2abed1;
 }
+.dt-text-tips{
+  padding: .24rem .32rem .48rem;
+  font-size: .24rem;
+  line-height: .36rem;
+  color: rgba(29, 29, 29, 1);
+  text-align: center;
+}
+.dt-text-tips > .highlight-text{
+  text-decoration: underline;
+  font-size: inherit;
+}
+.dt-text-tips.light-bg{
+  margin: .24rem .32rem;
+  background: linear-gradient(rgba(234, 248, 250, 1), rgba(234, 248, 250, 0));
+  border-radius: 8px;
+}

src/jfw/modules/app/src/web/staticres/jyapp/big-member/css/unit_portrayal.css

@@ -695,3 +695,19 @@
 .zb-analysis-module {
     margin-bottom: .08rem;
 }
+.dt-text-tips{
+  padding: .24rem .32rem .48rem;
+  font-size: .24rem;
+  line-height: .36rem;
+  color: rgba(29, 29, 29, 1);
+  text-align: center;
+}
+.dt-text-tips > .highlight-text{
+  text-decoration: underline;
+  font-size: inherit;
+}
+.dt-text-tips.light-bg{
+  margin: .24rem .32rem;
+  background: linear-gradient(rgba(234, 248, 250, 1), rgba(234, 248, 250, 0));
+  border-radius: 8px;
+}

src/jfw/modules/app/src/web/staticres/jyapp/big-member/js/ent_portrait.js

@@ -94,7 +94,9 @@ var vNode = {
         count: 1, // 总共多少条数据
         pageSize: 5,
         loaded: false,
-        showGetNextButton: true
+        showGetNextButton: true,
+        total: 0,
+        updateTime: 0
       },
       entPortraitInfo: {
         project_count: 0
@@ -305,6 +307,27 @@ var vNode = {
     },
     isFreeOrNotLogin () {
       return !this.isLogin || this.isFree
+    },
+    // 升级超级订阅文案：老版超级订阅用户、新版超级订阅（购买非全国）用户余额为0
+    updateVipStatus () {
+      var info = this.powerInfo
+      var isNoMember = info.memberStatus <= 0
+      var isOldVip = info.vipStatus > 0 && !info.viper
+      var isNewVip = info.vipStatus > 0 && info.viper && !this.surplus
+      var isNotAll = this.entvisit.provin !== -1
+      return (isOldVip || (isNewVip && isNotAll)) && isNoMember
+    },
+    // 联系客服文案：新版超级订阅（购买全国）用户余额为0、大会员自定义用户、商机管理用户
+    customerServiceStatus: function () {
+      var info = this.powerInfo
+      var memberCustom = this.conf.arr.indexOf(13) === -1 && info.memberStatus > 0
+      var isNewVip = info.vipStatus > 0 && info.viper && !this.surplus && this.entvisit.provin === -1
+      // 纯商机管理用户
+      var entniche = info.vipStatus <= 0 && info.memberStatus <= 0 && info.entniche
+      return memberCustom || isNewVip || entniche
+    },
+    noShowTip: function () {
+      return (!this.isFree && !this.updateVipStatus && !this.customerServiceStatus) || (this.isFree && this.canFreeTrial)
     }
   },
   methods: {
@@ -353,7 +376,7 @@ var vNode = {
         }
         // 获取企业中标动态-13
         if (_this.conf._13) {
-          _this.getProjectNews()
+          // _this.getProjectNews()
           _this.gotTab2 = true
           console.log('获取企业中标动态...')
         }
@@ -365,6 +388,8 @@ var vNode = {
           // }
         }
         _this.gotTab2 = true
+        // P396:所有用户均可获取企业中标动态
+        _this.getProjectNews()
 
       });
     },
@@ -641,6 +666,8 @@ var vNode = {
           if (res.error_code == 0) {
             _this.loading.clear()
             _this.topProject.count = res.data.count
+            _this.topProject.total = res.data.count
+            _this.topProject.updateTime = new Date(Number(res.data.updateTime + '000')).pattern('yyyy-MM-dd')
             if (!res.data.list || res.data.list.length == 0) {
               // 新加变量 判断中标动态有无数据 用于展示缺省页组件
               _this.show.dt = false
@@ -933,6 +960,9 @@ var vNode = {
             if (res.data && res.data == 'success') {
               _this.entInfo.follow = !_this.entInfo.follow
             }
+            if(_this.entInfo.follow) {
+              _this.pointsTaskSuccessTip()
+            }
 
             if (!_this.entInfo.follow) {
               history.back()
@@ -947,6 +977,19 @@ var vNode = {
         }
       })
     },
+    // 赚剑鱼币任务完成提示
+    pointsTaskSuccessTip: function() {
+      // 获取剑鱼币任务信息
+      const from =  utils.getParam('from')
+      var point = utils.getParam('point') || 0
+      if(from && from === 'task'){
+        this.$toast({
+          message: `关注企业成功，获得${point}剑鱼币。`,
+          duration: 1500
+        })
+        utils.delUrlParam('from')
+      }
+    },
     // 初始化图标数据
     initChartsData: function () {
       var dataSet = this.entPortraitInfo
@@ -1534,6 +1577,17 @@ var vNode = {
     goLogin: function () {
       window.location.href = "/jyapp/free/login?to=back";
     },
+    onDtTextClick: function(type) {
+      if (type === 'customer') {
+        location.href = '/jyapp/free/customer'
+      } else if (type === 'update') {
+        //跳转清除旧套餐缓存，防止计算价格出错
+        sessionStorage.removeItem('vipSub_oldBuySet')
+        location.href = '/jy_mobile/common/order/create/svip?type=upgrade'
+      } else if (type === 'buy') {
+        location.href = '/jy_mobile/common/order/create/svip?type=buy'
+      }
+    }
   }
 }
 var vueComponent = new Vue(vNode)

src/jfw/modules/app/src/web/staticres/jyapp/big-member/js/unit_portrayal.js

@@ -83,7 +83,9 @@ var vNode = {
         list: [],
         isMore: '',
         pageCount: '',
-        isNext: true
+        isNext: true,
+        total: 0,
+        updateTime: 0
       },
       regCapSettings: {
         showLine: ['累计采购规模'],
@@ -253,6 +255,24 @@ var vNode = {
     // 留完资的用户（保含已体验和未体验的）
     getfreeBuyerOpen: function () {
       return this.userInfo.isFree && this.userInfo.freeBuyerPort != 0;
+    },
+    // 联系客服文案：新版超级订阅（购买全国）用户余额为0、大会员自定义用户、商机管理用户
+    customerServiceStatus: function () {
+      var info = this.userInfo
+      var memberCustom = this.power.indexOf(5) === -1 && info.memberStatus > 0
+      var isNewVip = info.vipStatus > 0 && info.viper && this.usageInfo.surplus <= 0 && this.usageInfo.provin === -1
+      // 纯商机管理用户
+      var entniche = info.vipStatus <= 0 && info.memberStatus <= 0 && info.entniche
+      return memberCustom || isNewVip || entniche
+    },
+    // 升级超级订阅文案：老版超级订阅用户、新版超级订阅（购买非全国）用户余额为0
+    updateVipStatus: function () {
+      var info = this.userInfo
+      var isNoMember = info.memberStatus <= 0
+      var isOldVip = info.vipStatus > 0 && !info.viper
+      var isNewVip = info.vipStatus > 0 && info.viper && this.usageInfo.surplus <= 0
+      var isNotAll = this.usageInfo.provin !== -1
+      return (isOldVip || (isNewVip && isNotAll)) && isNoMember
     }
   },
   watch: {
@@ -684,8 +704,10 @@ var vNode = {
         timeout: 8000,
         success: function (res) {
           if (res.error_code == 0) {
+            that.dt.updateTime = new Date(Number(res.data.updateTime + '000')).pattern('yyyy-MM-dd')
             if (res.data.list && res.data.list.length && res.data.list.length > 0) {
               that.dt.pageCount = res.data.count
+              that.dt.total = res.data.count
               if (res.data.list && $.isArray(res.data.list)) {
                 that.isShow.showDynamic = true;
                 res.data.list.forEach(function (v, i) {
@@ -707,9 +729,9 @@ var vNode = {
                   })
                 } catch (error) { }
                 res.data.list.forEach((item) => {
-                  if (that.dt.list.length < 5) {
+                  // if (that.dt.list.length < 5) {
                     that.dt.list.push(item)
-                  }
+                  // }
                 })
                 // that.dt.list = res.data.list
                 that.colList = res.data.list
@@ -774,7 +796,7 @@ var vNode = {
         timeout: 10000,
         success: function (res) {
           if (res.error_code == 0) {
-            that.reqCount++
+            that.reqCount++;
             if (res.data && Object.keys(res.data).length > 0) {
               that.chartLoading = false;
               // 免费用户是否浏览过当前画像 true：浏览过 不返该字段：没浏览过
@@ -1016,7 +1038,13 @@ var vNode = {
         } else {
           that.isShow.showScaleFb = true;
           that.$nextTick(function () {
-            that.getHotChartData(res);
+            var timer = setInterval(function () {
+              // 判断页面所有资源已加载完毕
+              if (document.readyState === "complete") {
+                that.getHotChartData(res);//执行方法
+                window.clearInterval(timer);
+              }
+            }, 800)
           })
         }
       }
@@ -1106,7 +1134,13 @@ var vNode = {
       if (data && data.length > 0) {
         that.isShow.showScaleRate = true
         that.$nextTick(function () {
-          that.getPieCharData(data)
+          var timer = setInterval(function () {
+            // 判断页面所有资源已加载完毕
+            if (document.readyState === "complete") {
+              that.getPieCharData(data);//执行方法
+              window.clearInterval(timer);
+            }
+          }, 800)
         })
       }
     },
@@ -1889,6 +1923,17 @@ var vNode = {
           }
         })
       }
+    },
+    onDtTextClick: function(type) {
+      if (type === 'customer') {
+        location.href = '/jyapp/free/customer'
+      } else if (type === 'update') {
+        //跳转清除旧套餐缓存，防止计算价格出错
+        sessionStorage.removeItem('vipSub_oldBuySet')
+        location.href = '/jy_mobile/common/order/create/svip?type=upgrade'
+      } else if (type === 'buy') {
+        location.href = '/jy_mobile/common/order/create/svip?type=buy'
+      }
     }
   }
 }

src/jfw/modules/app/src/web/staticres/jyapp/big-member/js/utils.js

@@ -115,6 +115,13 @@ var utils = {
         r = null;
         return context == null || context == '' || context == 'undefined' ? '' : context;
     },
+    // 移除url参数，但是不刷新页面
+    delUrlParam: function (name){
+      var href = window.location.href;
+      const e = eval(`/&?${name}=[^&#]*/g`);
+      href = href.replace(e, '');
+      history.replaceState('','',href);// replaceState方法不会触发页面刷新，只是导致history对象发生变化，地址栏
+    },
     // 取[m, n]随机数
     getRandomNumber: function (min, max) {
         return Math.floor(Math.random() * (max - min + 1) + min);

src/jfw/modules/app/src/web/staticres/jyapp/js/historypush.js

@@ -628,19 +628,6 @@ var vm = new Vue({
           // 从页面移植来的
           if(!res.data.entniche && !res.data.member && res.data.vip <= 0) {
             sessionStorage.removeItem('switch-product')
-            setTimeout(function() {
-                (window.slotbydup = window.slotbydup || []).push({
-                    id: "u6603902",
-                    container: "_36y1d8lbx9n",
-                    async: true
-                });
-                (window.slotbydup = window.slotbydup || []).push({
-                    id: "u6603902",
-                    container: "_061vbh43quq3",
-                    async: true
-                });
-            },1000)
-            _this.getAjaxAdv()
           }
         }
       })
@@ -923,20 +910,6 @@ var vm = new Vue({
       this.$refs.industryItem.toggle(false)
       this.$refs.moreDropdownItems.toggle(false)
     },
-    getAjaxAdv: function () {
-      $.ajax({
-        type: 'POST',
-        url: '/publicapply/adLeague/exposure',
-        data: {
-            client: 'APP',
-            id: 'ad6',
-            position: '订阅推送列表页'
-        },
-        success: function(res) {
-            // console.log(res)
-        }
-      })
-    },
     // 选择附件
     selectFileFn: function(item) {
       if (!this.screenShow) return

src/jfw/modules/app/src/web/staticres/jyapp/me/js/mail_bind.js

@@ -48,9 +48,25 @@ var vm = new Vue({
         }
     },
     created: function () {
-        this.getType()
+      this.getType()
+      this.getUserInfo()
     },
     methods: {
+        getUserInfo: function () {
+          var _this = this
+          this.getUserInfoLoaded = false
+          $.ajax({
+            type: 'GET',
+            url: '/jypay/user/getAccountInfo?t=' + Date.now(),
+            success: function (res) {
+              if (res.error_code == 0 && res.data) {
+                if(res.data.otherMail) {
+                  _this.info.mail = res.data.otherMail
+                }
+              }
+            }
+          })
+        },
         getType: function () {
             if (location.pathname.indexOf('bind') !== -1) {
                 this.type = 'bind'
@@ -137,19 +153,37 @@ var vm = new Vue({
                 success: function (res) {
                     loading.clear()
                     if (res.error_code == 0 && res.data.state == 1) {
-                        _this.$toast({
-                            message: _this.someText.text + '成功',
-                            duration: 1500,
-                            forbidClick: true,
-                            onClose: function () {
-                                history.back()
-                            }
-                        })
+                      _this.pointsTaskSuccessTip()
                     } else {
                         _this.showToast(res.error_msg)
                     }
                 }
             })
         },
+        // 赚剑鱼币任务完成提示
+        pointsTaskSuccessTip: function() {
+          // 获取剑鱼币任务信息
+          const from =  utils.getParam('from')
+          var point = utils.getParam('point') || 0
+          if(from && from === 'task'){
+            this.$toast({
+              message: `绑定邮箱成功，获得${point}剑鱼币。`,
+              duration: 1500,
+              forbidClick: true,
+              onClose: function () {
+                history.back()
+              }
+            })
+          } else {
+            this.$toast({
+              message: this.someText.text + '成功',
+              duration: 1500,
+              forbidClick: true,
+              onClose: function () {
+                history.back()
+              }
+            })
+          }
+        }
     }
-})
+})

src/jfw/modules/app/src/web/staticres/jyapp/me/js/phone_bind.js

@@ -5,7 +5,7 @@ var vm = new Vue({
         type: 'bind',
         act: '',  // 是否要做某些操作
         mode: '',  // 是否跳转强制绑定
-        from: '',  // 是否通过iframe进入
+        from: '',  // 是否通过iframe进入(form=task则是来自剑鱼币做任务)
         token: '',  // 账号合并需要的token
         fastButton: false, // 一键绑定按钮是否展示
         userInfo: {
@@ -418,6 +418,7 @@ var vm = new Vue({
         bindPhoneSuccess: function (state) {
             var _this = this
             if (state == 1) {
+                this.pointsTaskSuccessTip()
                 // 绑定手机号完成后，如果已经填写过公司。则不发送提交公司的请求
                 // 可以直接判断计算属性showEntItem，来判断需不需要填写公司
                 if (_this.showEntItem) {
@@ -467,6 +468,14 @@ var vm = new Vue({
                 // location.replace('/jyapp/free/login?back=index&flag=quit')
                 // location.replace('/jyapp/jylab/mainSearch')
             })
+        },
+        // 赚剑鱼币任务完成提示
+        pointsTaskSuccessTip: function() {
+          // 获取剑鱼币任务信息
+          if(this.from === 'task' && this.type === 'bind'){
+            var point = utils.getParam('point') || 0
+            this.showToast(`绑定手机号成功，获得${point}剑鱼币。`)
+          }
         }
     }
 })

src/jfw/modules/app/src/web/staticres/jyapp/tags/js/index.js

@@ -14,6 +14,15 @@ var page = {
   initEvents: function () {
     this.initFooterPhoneCall()
     // this.showAppFooterNavs()
+    this.initBack()
+    this.topSearchEvent()
+  },
+  topSearchEvent: function () {
+    $('.search-container').on('click', function (e) {
+      e.preventDefault()
+      localStorage.removeItem('JY-MOBILE-home-top-search')
+      location.href = '/jy_mobile/search/middle/bidding'
+    })
   },
   showAppFooterNavs: function () {
     var isInHomePage = location.pathname === '/jyapp/jylab/mainSearch'
@@ -49,6 +58,11 @@ var page = {
     if (f) {
       $('.tag-info-type-nav-list, .tag-area-nav-container').addClass('dark-mode')
     }
+  },
+  initBack: function () {
+    $('.j-icon.base-icon.icon-back-white').on('click', function() {
+      window.history.back()
+    })
   }
 }
 

src/jfw/modules/app/src/web/staticres/jyapp/wxtsguide/main.js

@@ -188,6 +188,7 @@ var Guide = {
 			$("body").removeClass("step-3-body");
 		}else if(index == 4){
 			this.saveLSkeywords(true);
+      Guide.pointsTaskSuccessTip()
 			$(".step-3").hide();
 			$(".com-top-two-b").show();
 			$("body").removeClass("step-3-body");
@@ -214,6 +215,15 @@ var Guide = {
 			localStorage.tsGuide_step = index-1;
 		}
 	},
+  // 赚剑鱼币任务完成提示
+  pointsTaskSuccessTip: function () {
+    // 获取剑鱼币任务信息
+    var from = getUrlParam('from')
+    var point = getUrlParam('point') || 0
+    if(from && from === 'task'){
+      JYAlert("关注企业成功，获得" + point + "剑鱼币。")
+    }
+  },
 	appendHaskeywords: function(text){
 		text = $.trim(text);
 		if(this.checkIsMax(true) || text == ""){
@@ -468,9 +478,23 @@ var wantToUrl = getParam('url')
 if (wantToUrl) {
   Guide.params.url = decodeURIComponent(wantToUrl)
 }
-
+// 传入你要获取的参数的名字
+function getUrlParam (name) {
+  var reg = new RegExp('(^|&)' + name + '=([^&]*)(&|$)', 'i');
+  if(Guide.params.url && Guide.params.url.split('?').length > 0) {
+    var par = Guide.params.url.split('?')[1]
+    var r = par.match(reg); //获取url中'?'符后的字符串并正则匹配
+    var context = '';
+    if (r != null) context = r[2];
+    // 释放变量
+    reg = null;
+    r = null;
+    return context == null || context == '' || context == 'undefined' ? '' : context;
+  } else {
+    return ''
+  }
+}
 Guide.clearHistoryPushDataCache()
-
 //
 var RecomKWs = function() {
 	this.count = 20;
@@ -854,6 +878,7 @@ var JYAlert = function(T,comStartFlag){
 		$("#jydialog").css({"left":"50%","margin-top":"-50px","margin-left":"-140px"});
 		$("#myModal").modal("show");
 	}
+  	$(".jyhead_mask").html(T)
 }
 // 获取已经设置过的关键词
 function getHadKeywords(step, callback){

src/jfw/modules/app/src/web/templates/big-member/page_client_buyer_project_news.html

@@ -267,7 +267,7 @@
                     <div class="empty-container" v-show="listState.list.length === 0 && listState.loaded && !listState.loading">
                         <div class="empty-content-position">
                             <div class="image">
-                                <img src="/jyapp/big-member/image/img-empty.png">
+                                <img src="/common-module/public/image/jy-back.png">
                             </div>
                             <div class="empty-main tip-text">暂无数据</div>
                         </div>

src/jfw/modules/app/src/web/templates/big-member/page_client_portrayal.html

@@ -174,7 +174,7 @@
               <div class="module-title-container bg-white project-news-module">
                 <div class="module-title project-news-title">
                   <span>招标动态</span>
-                  <!-- <span class="module-title-num">10</span> -->
+                  <span class="module-title-num">${dt.total}</span>
                 </div>
                 <div class="action-group">
                   <div class="action-button export" @click="onExport" v-if="dt.list.length">
@@ -204,11 +204,16 @@
                           <p class="i_time">${item.publishtime}</p>
                       </div>
                   </div>
-                  <div v-show="dt.isNext">
+                  <div v-show="dt.isNext && !noAuth">
                       <div class="more">
                           <span @click.stop="goProjectPage">查看更多</span>
                       </div>
                   </div>
+                  <div v-if="noAuth" class="dt-text-tips light-bg">
+                    免费用户支持查看最近30条招标动态，数据更新频率为每周1次，最近更新时间为${dt.updateTime}，您可
+                    <!-- 新版超级订阅（购买全国）用户余额为0、大会员自定义用户、商机管理用户 -->
+                    <span class="highlight-text" @click="onDtTextClick('customer')">联系客服升级套餐实时查看更多数据</span>。
+                  </div>
                 </div>
                 <div class="empty-container bg-white" v-show="dt.list.length === 0 && dt.loaded">
                   <div class="empty-content-position">
@@ -223,6 +228,11 @@
                         <template v-else>暂无数据</template>
                       </div>
                   </div>
+                  <div v-if="noAuth" class="dt-text-tips">
+                    免费用户支持查看最近30条招标动态，数据更新频率为每周1次，最近更新时间为${dt.updateTime}，您可
+                    <!-- 新版超级订阅（购买全国）用户余额为0、大会员自定义用户、商机管理用户 -->
+                    <span class="highlight-text"  @click="onDtTextClick('customer')">联系客服升级套餐实时查看更多数据</span>。
+                  </div>
                 </div>
               </div>
             </div>

src/jfw/modules/app/src/web/templates/big-member/page_ent_portrait.html

@@ -290,21 +290,21 @@
             <div class="module-title-container bg-white project-news-module">
               <div class="module-title project-news-title">
                 <span>中标动态</span>
-                <!-- <span class="module-title-num">10</span> -->
+                <span class="module-title-num">${topProject.total}</span>
               </div>
-              <div class="action-group" v-if="conf._13" key="action-group">
+              <div class="action-group" key="action-group">
                 <div class="action-button export" @click="onExport" v-if="topProject.list.length">
                     <i class="j-icon base-icon icon-download"></i>
                     <em class="action-button-text">数据导出</em>
                 </div>
-                <div class="action-button filters-button" @click="goHighSet" v-if="!hideDt">
+                <div class="action-button filters-button" @click="goHighSet" v-if="conf._13 && !hideDt">
                   <i class="j-icon base-icon icon-3hengxian"></i>
                   <em class="action-button-text">筛选条件</em>
                 </div>
               </div>
             </div>
             <div class="module-notice-tip">注：1个项目如同时发布了中标、成交、合同等结果类公告，则有多条数据</div>
-            <div class="tab-card-content vip_component" v-if="hideDt"
+            <div class="tab-card-content vip_component" v-if="!isLogin"
               style="height:9.16rem;background:url('/common-module/collection/image/bg/vip_bg_1.png?v={{Msg "seo" "version"}}') no-repeat;background-size:100% 100%"
               key="dt">
               <vip-component @tabactive="tabActive" :power="conf" type="item_1" :can-free-exp="canFreeExp"
@@ -313,7 +313,7 @@
               </vip-component>
             </div>
             <div class="tab-card-content" key="dt" v-else>
-              <ul class="project-info-list" v-show="topProject.list.length !== 0">
+              <ul class="project-info-list" v-if="topProject.list.length !== 0">
                 <li class="project-info-item border-line-b clickable" :class="{ visited: item.visited }" v-for="(item,index) in topProject.list"
                     @click="toProjectDetail(item)">
                   <div class="head-group">
@@ -332,11 +332,20 @@
                   </div>
                 </li>
                 <li class="show-more clickable"
-                    v-if="topProject.showGetNextButton && (isMemberAndSvip || canFreeTrial) && topProject.count > 3"
+                    v-if="topProject.showGetNextButton && (isMemberAndSvip || canFreeTrial) && topProject.count > 3 && noShowTip"
                     @click="goToFilterProjectNews">查看更多
                 </li>
+                <li v-if="(isFree && !canFreeTrial) || updateVipStatus || customerServiceStatus" class="dt-text-tips light-bg">
+                  免费用户支持查看最近30条招标动态，数据更新频率为每周1次，最近更新时间为${topProject.updateTime}，您可
+                  <!-- 免费用户 -->
+                  <span class="highlight-text" v-if="(isFree && !canFreeTrial)" @click="onDtTextClick('buy')">开通超级订阅实时查看更多数据</span>
+                  <!-- 老版超级订阅用户、新版超级订阅（购买非全国）用户余额为0 -->
+                  <span class="highlight-text" v-if="updateVipStatus" @click="onDtTextClick('update')">升级超级订阅实时查看更多数据</span>
+                  <!-- 新版超级订阅（购买全国）用户余额为0、大会员自定义用户、商机管理用户 -->
+                  <span class="highlight-text" v-if="customerServiceStatus" @click="onDtTextClick('customer')">联系客服升级套餐实时查看更多数据</span>。
+                </li>
               </ul>
-              <div class="empty-container bg-white" v-show="topProject.list.length === 0 && topProject.loaded">
+              <div class="empty-container bg-white" v-else>
                 <div class="empty-content-position">
                     <div class="image">
                         <img src="/common-module/public/image/jy-back.png">
@@ -349,6 +358,15 @@
                       <template v-else>暂无数据</template>
                     </div>
                 </div>
+                <div v-if="(isFree && !canFreeTrial) || updateVipStatus || customerServiceStatus" class="dt-text-tips">
+                  免费用户支持查看最近30条招标动态，数据更新频率为每周1次，最近更新时间为${topProject.updateTime}，您可
+                  <!-- 免费用户 -->
+                  <span class="highlight-text" v-if="(isFree && !canFreeTrial)" @click="onDtTextClick('buy')">开通超级订阅实时查看更多数据</span>
+                  <!-- 老版超级订阅用户、新版超级订阅（购买非全国）用户余额为0 -->
+                  <span class="highlight-text" v-if="updateVipStatus" @click="onDtTextClick('update')">升级超级订阅实时查看更多数据</span>
+                  <!-- 新版超级订阅（购买全国）用户余额为0、大会员自定义用户、商机管理用户 -->
+                  <span class="highlight-text" v-if="customerServiceStatus" @click="onDtTextClick('customer')">联系客服升级套餐实时查看更多数据</span>。
+                </div>
               </div>
             </div>
           </div>

src/jfw/modules/app/src/web/templates/big-member/page_free_buyer_loading.html

@@ -0,0 +1,99 @@
+<!DOCTYPE html>
+<html lang="zh-CN" style="font-size: 50px;">
+
+<head>
+  <title>采购单位画像</title>
+
+  <!--引入公共资源头部-->
+  {{include "/big-member/meta.html"}}
+
+  <!--S-当前页必定需要预加载的资源-->
+  <link rel="preload" as="style" href=//cdn-common.jianyu360.com/cdn/lib/reset-css/5.0.1/reset.min.css />
+
+  <!--E-当前页必定需要预加载的资源-->
+
+  <!--S-当前页面的css资源-->
+  <link rel="stylesheet" href=//cdn-common.jianyu360.com/cdn/lib/vant/2.12.24/lib/index.css />
+  <link rel="stylesheet" href=//cdn-common.jianyu360.com/cdn/lib/reset-css/5.0.1/reset.min.css />
+  <link rel="stylesheet"
+    href='{{Cdns .Host "seo" "cdn"|SafeUrl}}/common-module/mainSearch/css/j-icons.css?v={{Msg "seo" "version"}}' />
+  <!--E-当前页面的css资源-->
+  <style>
+    .skeleton {
+      height: 100%;
+      display: flex;
+      flex-direction: column;
+      justify-content: center;
+      align-content: center;
+      background-color: #fff;
+    }
+
+    .working {
+      width: 4rem;
+      height: 4rem;
+      margin: -0.4rem auto 0;
+    }
+    
+  </style>
+</head>
+
+<body>
+  <div class="j-container">
+    {{include "/big-member/header.html"}}
+    <div id="portrayal_loading" ref="container" class="j-main" v-cloak>
+      <div class="skeleton">
+        <img class="working" src="/jyapp/big-member/image/working.gif" alt="">
+      </div>
+    </div>
+  </div>
+
+  <!--S-必定需要预加载的资源-->
+  <link rel="preload" as="script" href=//cdn-common.jianyu360.com/cdn/lib/vue/2.6.11/vue.min.js />
+  <link rel="preload" as="script" href=//cdn-common.jianyu360.com/cdn/lib/zepto/1.2.0/zepto.min.js />
+  <!--E-必定需要预加载的资源-->
+
+  <!--S-当前页面的资源-->
+  <script src=//cdn-common.jianyu360.com/cdn/lib/vue/2.6.11/vue.min.js> </script>
+  <script src=//cdn-common.jianyu360.com/cdn/lib/vant/2.12.24/lib/vant.min.js></script>
+  <script src=//cdn-common.jianyu360.com/cdn/lib/zepto/1.2.0/zepto.min.js></script>
+  {{include "/big-member/commonjs.html"}}
+  <script src='{{Cdns .Host "seo" "cdn"|SafeUrl}}/common-module/public/js/setTdk.js?v={{Msg "seo" "version"}}'></script>
+  <script src='{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/js/common.js?v={{Msg "seo" "version"}}'></script>
+  <script>
+    var vNode = {
+      delimiters: ['${', '}'],
+      el: '#portrayal_loading',
+      data: {},
+      created() {
+        this.getPowerInfo()
+      },
+      mounted() {},
+      methods: {
+        getPowerInfo: function () {
+          var _this = this
+          $.ajax({
+            type: 'GET',
+            url: '/bigmember/use/isAdd',
+            success: function (res) {
+              if (res.error_code == 0) {
+                if (res.data.entIsNew) {
+                  location.replace("/jyapp/big/page/client_portrayal?entName=" + utils.getParam('entName') + '&from=client')
+                } else {
+                  location.replace("/jyapp/big/page/unit_portrayal?entName=" + utils.getParam('entName'))
+                }
+              } else {
+                _this.$toast(res.error_msg)
+              }
+            },
+            error: function (error) {
+                console.log(error)
+            }
+          })
+        }
+      }
+    }
+    new Vue(vNode)
+  </script>
+</body>
+
+</html>

src/jfw/modules/app/src/web/templates/big-member/page_free_buyer_project_news.html

@@ -268,7 +268,7 @@
                     <div class="empty-container" v-show="listState.list.length === 0 && listState.loaded && !listState.loading">
                         <div class="empty-content-position">
                             <div class="image">
-                                <img src="/jyapp/big-member/image/img-empty.png">
+                                <img src="/common-module/public/image/jy-back.png">
                             </div>
                             <div class="empty-main tip-text">暂无数据</div>
                         </div>
@@ -348,6 +348,15 @@
                     <span @click.stop="onExport">查看更多</span>
                   </div>
                 </div>
+                <div class="dt-text-tips">
+                  免费用户支持查看最近30条招标动态，数据更新频率为每周1次，最近更新时间为${dt.updateTime}，您可
+                   <!-- 免费用户 -->
+                   <!-- <span class="highlight-text" v-if="userInfo.isFree" @click="onDtTextClick('buy')">开通超级订阅实时查看更多数据</span> -->
+                   <!-- 老版超级订阅用户、新版超级订阅（购买非全国）用户余额为0 -->
+                   <!-- <span class="highlight-text" v-if="updateVipStatus" @click="onDtTextClick('update')">升级超级订阅实时查看更多数据</span> -->
+                   <!-- 新版超级订阅（购买全国）用户余额为0、大会员自定义用户、商机管理用户 -->
+                   <span class="highlight-text" >联系客服升级套餐实时查看更多数据</span>。
+                </div>
             </div>
         </div>
     </div>

src/jfw/modules/app/src/web/templates/big-member/page_free_ent_project_news.html

@@ -137,7 +137,7 @@
                     <div class="empty-container" v-show="listState.list.length === 0 && listState.loaded && !listState.loading">
                         <div class="empty-content-position">
                             <div class="image">
-                                <img src="/jyapp/big-member/image/img-empty.png">
+                                <img src="/common-module/public/image/jy-back.png">
                             </div>
                             <div class="empty-main tip-text">暂无数据</div>
                         </div>

src/jfw/modules/app/src/web/templates/big-member/page_unit_portrayal.html

@@ -216,24 +216,24 @@
                 <div class="module-title-container bg-white project-news-module">
                   <div class="module-title project-news-title">
                     <span>招标动态</span>
-                    <!-- <span class="module-title-num">10</span> -->
+                    <span class="module-title-num">${dt.total}</span>
                   </div>
-                  <div class="action-group" v-if="!getStatus">
+                  <div class="action-group">
                     <div class="action-button export" @click="onExport" v-if="dt.list.length">
                         <i class="j-icon base-icon icon-download"></i>
                         <em id="mainSearch-selLable-dataExport" class="action-button-text">数据导出</em>
                     </div>
-                    <div class="action-button filters-button" @click="goHighSet">
+                    <div class="action-button filters-button" @click="goHighSet" v-if="!getStatus">
                       <i class="j-icon base-icon icon-3hengxian"></i>
                       <em class="action-button-text">筛选条件</em>
                     </div>
                   </div>
                 </div>
                 <div class="module-notice-tip">注：1个项目如同时发布了预告、招标、中标等多条公告，则有多条数据</div>
-                <div v-if="getStatus" class="tab-card-content vip_component" style="height:8.8rem;background:#fff url('/common-module/collection/image/buyer/cg-zbdt-bg.jpg?v={{Msg "seo" "version"}}') no-repeat center 50px;background-size:100% 100%;position:relative;">
+                <!-- <div v-if="getStatus" class="tab-card-content vip_component" style="height:8.8rem;background:#fff url('/common-module/collection/image/buyer/cg-zbdt-bg.jpg?v={{Msg "seo" "version"}}') no-repeat center 50px;background-size:100% 100%;position:relative;">
                   <buyer-example :useage="usageInfo" :userinfo="userInfo" :status="bigStatus" @open-page="onExampleOpenPage" :power="power" type="item_14" imgurl='{{Cdns .Host "seo" "cdn"|SafeUrl}}/common-module/collection/image/buyer/cg-zbdt.png?v={{Msg "seo" "version"}}'></buyer-example>
-                </div>
-                <div class="tab-card-content" v-else>
+                </div> -->
+                <div class="tab-card-content">
                   <div class=" d_content" v-if="dt.list.length">
                     <div class="d_list" :class="{ visited: item.visited }" v-for="(item,index) in dt.list"
                       @click="goDetail(item)">
@@ -251,11 +251,20 @@
                         <p class="i_time">${item.publishtime}</p>
                       </div>
                     </div>
-                    <div v-show="dt.isNext">
+                    <div v-show="dt.isNext && !getStatus">
                       <div class="more">
                         <span @click.stop="goProjectPage">查看更多</span>
                       </div>
                     </div>
+                    <div v-if="getStatus" class="dt-text-tips light-bg">
+                      免费用户支持查看最近30条招标动态，数据更新频率为每周1次，最近更新时间为${dt.updateTime}，您可
+                      <!-- 免费用户 -->
+                      <span class="highlight-text" v-if="userInfo.isFree" @click="onDtTextClick('buy')">开通超级订阅实时查看更多数据</span>
+                      <!-- 老版超级订阅用户、新版超级订阅（购买非全国）用户余额为0 -->
+                      <span class="highlight-text" v-if="updateVipStatus" @click="onDtTextClick('update')">升级超级订阅实时查看更多数据</span>
+                      <!-- 新版超级订阅（购买全国）用户余额为0、大会员自定义用户、商机管理用户 -->
+                      <span class="highlight-text" v-if="customerServiceStatus" @click="onDtTextClick('customer')">联系客服升级套餐实时查看更多数据</span>。
+                    </div>
                   </div>
                   <div class="empty-container bg-white" v-show="dt.list.length === 0 && dt.loaded">
                     <div class="empty-content-position">
@@ -270,6 +279,15 @@
                           <template v-else>暂无数据</template>
                         </div>
                     </div>
+                    <div v-if="getStatus" class="dt-text-tips">
+                      免费用户支持查看最近30条招标动态，数据更新频率为每周1次，最近更新时间为${dt.updateTime}，您可
+                       <!-- 免费用户 -->
+                       <span class="highlight-text" v-if="userInfo.isFree" @click="onDtTextClick('buy')">开通超级订阅实时查看更多数据</span>
+                       <!-- 老版超级订阅用户、新版超级订阅（购买非全国）用户余额为0 -->
+                       <span class="highlight-text" v-if="updateVipStatus" @click="onDtTextClick('update')">升级超级订阅实时查看更多数据</span>
+                       <!-- 新版超级订阅（购买全国）用户余额为0、大会员自定义用户、商机管理用户 -->
+                       <span class="highlight-text" v-if="customerServiceStatus" @click="onDtTextClick('customer')">联系客服升级套餐实时查看更多数据</span>。
+                    </div>
                   </div>
                 </div>
                 <!--                <div v-if="isActive ==1" class="d_content">-->

src/jfw/modules/app/src/web/templates/followent/list.html

@@ -37,56 +37,6 @@
 				return;
 			}
 			var data = res.list;
-			// $.ajax({
-			// 		type: 'POST',
-			// 		url: '/publicapply/bidcoll/power',
-			// 		success: function(res) {
-			// 				console.log(res)
-			// 				if(res.error_code == 0) {
-			// 					if(!res.data.entniche && !res.data.member && res.data.vip <= 0){
-			// 							(window.slotbydup = window.slotbydup || []).push({
-			// 									id: "u6603901",
-			// 									container: "_yzpxro2x1n",
-			// 									async: true
-			// 							});
-			// 							getAjaxAdv()
-			// 					}
-			// 				}
-			// 		},
-			// 		error: function(err) {
-			// 				console.log(err)
-			// 		}
-			// })
-			// function getAjaxAdv () {
-			// 		$.ajax({
-			// 			type: 'POST',
-			// 			url: '/publicapply/adLeague/exposure',
-			// 			data: {
-			// 					client: 'APP',
-			// 					id: 'ad8',
-			// 					position: '关注的企业列表页底部'
-			// 			},
-			// 			success: function(res) {
-			// 					console.log(res)
-			// 			}
-			// 		})
-			// }
-			// addEventListener('focus', function() {
-			// 		if(document.activeElement = document.getElementById('iframeu6603901_0')) {
-			// 				$.ajax({
-			// 						type: 'POST',
-			// 						url: '/publicapply/adLeague/click',
-			// 						data: {
-			// 							client: 'APP',
-			// 							id: 'ad8',
-			// 							position: '关注的企业列表页底部'
-			// 						},
-			// 						success: function(res) {
-			// 								console.log(res)
-			// 						}
-			// 				})
-			// 		}
-			// });
 			var allHtml = "";
 			var jyno = 0;
 			var fronthtml = "";
@@ -268,7 +218,6 @@ function receivePushMessageHandle(type,url){
             </div>
             <div class="jylistbottom" style="display: none;">
 								<img src="{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/followent/images/wx/jydustbin.png?v={{Msg "seo" "version"}}"/>批量移除30天无更新企业
-								<div class="_j07axdxi26i"></div>
 						</div>
 						<!-- <div class="_yzpxro2x1n" id="pro_footer"></div> -->
             <div class="easypopup" id="easypopup">

src/jfw/modules/app/src/web/templates/frontRouter/userMerge/free/confirm.html

@@ -98,6 +98,7 @@
                 checkedColor: '#2CB7CA',
                 // from默认为'', 值为bindPhone时表示从手机号绑定页面/jyapp/account/phone/bind?mode=mergeBind过来的
                 from: '',
+                direct: '',
                 token: '',
                 userName:{
                     wx:'',
@@ -120,10 +121,14 @@
             },
             created () {
                 this.token = utils.getParam('token')
-                var from = utils.getParam('from')
-                if (from) {
-                    this.from = from
-                }
+              var from = utils.getParam('from')
+              if (from) {
+                this.from = from
+              }
+              var direct = utils.getParam('toDirect')
+              if (direct) {
+                this.direct = direct
+              }
                 this.getInfo()
             },
             methods: {
@@ -252,6 +257,8 @@
                         JyObj.refreshAppointTab('subscribe', 1)
                         JyObj.refreshAppointTab('box', 1)
                         JyObj.refreshAppointTab('me', 1)
+                    }else if (this.direct !==""){
+                        window.location.replace(this.direct)
                     } else {
                         history.go(-2)
                     }

src/jfw/modules/app/src/web/templates/me/account.html

@@ -50,16 +50,16 @@
                         </div>
                         <i class="van-icon van-icon-arrow van-cell__right-icon phone-icon"></i>
                     </div>
-                    <div role="button" class="van-cell van-cell--clickable van-cell--center companyClick" >
-                        <div class="van-cell__title">
-                            <span>公司</span>
-                        </div>
-                        <div class="van-cell__value">
-                            <span class="company-value" style="display:none"></span>
-                            <span class="bind-company"></span>
-                        </div>
-                        <i class="van-icon van-icon-arrow van-cell__right-icon phone-icon"></i>
-                    </div>
+<!--                    <div role="button" class="van-cell van-cell&#45;&#45;clickable van-cell&#45;&#45;center companyClick" >-->
+<!--                        <div class="van-cell__title">-->
+<!--                            <span>公司</span>-->
+<!--                        </div>-->
+<!--                        <div class="van-cell__value">-->
+<!--                            <span class="company-value" style="display:none"></span>-->
+<!--                            <span class="bind-company"></span>-->
+<!--                        </div>-->
+<!--                        <i class="van-icon van-icon-arrow van-cell__right-icon phone-icon"></i>-->
+<!--                    </div>-->
                 </div>
                 <div class="bindinfo">
                     <div class="van-cell-group__title">绑定信息</div>

src/jfw/modules/app/src/web/templates/tags/class.html

@@ -29,6 +29,7 @@
     <div class="loading-icon"></div>
   </div>
   {{include "/tags/template/tag-footer-common-assets.html"}}
+  {{include "/tags/template/tag-footer-concat.html"}}
   <script>
     var templateData = {
       homeLink: {{.T.HomeOrigin}},

src/jfw/modules/app/src/web/templates/tags/details.html

@@ -38,6 +38,7 @@
             {{include "/tags/template/tag-breadcrumb-navigation.html"}}
         {{end}}
         {{include "/tags/template/tag-footer.html"}}
+        {{include "/tags/template/tag-footer-concat.html"}}
       </div>
     </main>
   </section>

src/jfw/modules/app/src/web/templates/tags/strategy.html

@@ -27,6 +27,7 @@
             {{include "/tags/template/tag-breadcrumb-navigation.html"}}
         {{end}}
         {{include "/tags/template/tag-footer.html"}}
+        {{include "/tags/template/tag-footer-concat.html"}}
       </div>
     </main>
   </section>

src/jfw/modules/app/src/web/templates/tags/template/tag-area-nav.html

@@ -1,6 +1,6 @@
 <section class="tag-area-nav-container">
   <div class="tag-area-nav-list-container simple-area">
-    <p class="tag-area-nav-list-title">分站</p>
+    <div class="tag-area-nav-list-title">分站</div>
     <ul class="tag-area-nav-list">
       {{range $val:=.T.hotArea}}
       <li class="tag-area-nav-item">

src/jfw/modules/app/src/web/templates/tags/template/tag-breadcrumb-navigation.html

@@ -1,6 +1,6 @@
 <section class="tag-breadcrumb-navigation ellipsis">
   <span>当前位置：</span>
-  <a href="{{.T.Home}}">剑鱼标讯首页</a>
+  <a href="/">剑鱼标讯首页</a>
   {{range $l:=.T.currentLocation}}
   {{if $l.Url}}
   &gt; <a href="{{$l.Url}}">{{$l.Name}}</a>

src/jfw/modules/app/src/web/templates/tags/template/tag-footer-concat.html

@@ -0,0 +1,13 @@
+<section class="tag-footer-container fixed">
+  <div class="footer-button-group">
+    <a class="seo-button theme-main radius phone-concat-customer" data-tel="400-108-6670" href="tel:400-108-6670">
+      <span class="j-icon base-icon icon-phone-white-solid"></span>
+      <p>电话咨询</p>
+    </a>
+    <a class="seo-button theme-main radius" href="/jyapp/free/login?url=/jyapp/jylab/mainSearch">
+      <span class="j-icon base-icon icon-person-white-solid"></span>
+      <p>登录/注册</p>
+    </a>
+  </div>
+</section>
+

src/jfw/modules/app/src/web/templates/tags/template/tag-footer.html

@@ -5,7 +5,7 @@
       <a class="tel-link" data-tel="400-108-6670" href="tel:400-108-6670">400-108-6670</a>
     </div>
     <div class="footer-card-line bottom-navs">
-      <a class="bottom-nav-link" href="{{.T.Home}}">首页</a>
+      <a class="bottom-nav-link" href="/">首页</a>
       <a class="bottom-nav-link" href="/jyapp/free/swordfish/about">关于剑鱼标讯</a>
     </div>
     <div class="footer-divider"></div>

src/jfw/modules/app/src/web/templates/tags/template/tag-header.html

@@ -1,4 +1,5 @@
 <div class="tag-header-container j-header jy-app-header">
+    <i class="j-icon base-icon icon-back-white" style="display: block;flex-shrink: 0;margin-right: 0.16rem;"></i>
     <a class="search-container bg-white" href="/jy_mobile/search/middle/bidding">
         <i class="search-icon j-icon base-icon icon-search"></i>
         <div class="search-input">请输入您要搜索的内容</div>

src/jfw/modules/app/src/web/templates/weixin/search/mainSearch.html

@@ -841,51 +841,7 @@
     }
   })
 
-  function advHtml() {
-    (window.slotbydup = window.slotbydup || []).push({
-      id: "u6603898",
-      container: "_ouq34ajmfig",
-      async: true
-    });
-    (window.slotbydup = window.slotbydup || []).push({
-      id: "u6603898",
-      container: "_nxko9k32d8d",
-      async: true
-    });
-    getAjaxAdv()
-  }
 
-  function getAjaxAdv() {
-    $.ajax({
-      type: 'POST',
-      url: '/publicapply/adLeague/exposure',
-      data: {
-        client: 'APP',
-        id: 'ad5',
-        position: '搜索列表页'
-      },
-      success: function (res) {
-        console.log(res)
-      }
-    })
-  }
-
-  addEventListener('focus', function () {
-    if (document.activeElement = document.getElementById('iframeu6603898_0')) {
-      $.ajax({
-        type: 'POST',
-        url: '/publicapply/adLeague/click',
-        data: {
-          client: 'APP',
-          id: 'ad5',
-          position: '搜索列表页'
-        },
-        success: function (res) {
-          console.log(res)
-        }
-      })
-    }
-  });
 </script>
 <script type="text/javascript">
   var adv_url = "/datareport/page/introduce";

src/jfw/modules/app/src/web/templates/weixin/wxinfocontent.html

@@ -28,9 +28,12 @@
     <script src="{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/local/bootstrap.min.js"></script>
     <script src="{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/js/share.js?v={{Msg "seo" "version"}}"></script>
     <script src="//cdn-common.jianyu360.com/cdn/lib/html2canvas/1.3.3/dist/html2canvas.min.js"></script>
+    <link href='{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/tags/css/tags-module-common.css?v={{Msg "seo" "version"}}' rel="stylesheet" />
+
 
     {{include "/common/js.html"}}
     <style>
+      p{margin: 0;}
       html > body {
         background: #fff;
       }
@@ -344,6 +347,7 @@
             </ul>
         </div>
     </div>
+    {{if .T.obj.hasSession}}
     <div class="app-layout-header jy-app-header">
         <span class="app-back jyapp-icon jyapp-icon-zuojiantou share-back"></span>
         <span class="header-title">公告信息</span>
@@ -399,61 +403,18 @@
             <!-- 分享 end -->
 	    </span>
     </div>
+    {{else}}
+    {{include "tags/template/tag-header.html" .}}
+    {{end}}
+
     <div class="app-layout-content-b">
+        {{if not .T.obj.hasSession}}
+        {{include "tags/template/tag-register-login-group.html" .}}
+        {{include "tags/template/tag-info-type-nav.html" .}}
+        {{include "tags/template/tag-area-nav.html" .}}
+        {{end}}
         <div class="mask"></div>
         <div class="info">
-            <!-- <div class="_c2l0w7g3cjf"></div> -->
-            <script type="text/javascript">
-            $.ajax({
-                type: 'POST',
-                url: '/publicapply/bidcoll/power',
-                success: function(res) {
-                    if(res.error_code == 0) {
-                        if(!res.data.entniche && !res.data.member && res.data.vip <= 0) {
-                            (window.slotbydup = window.slotbydup || []).push({
-                                id: "u6603899",
-                                container: "_c2l0w7g3cjf",
-                                async: true
-                            });
-                            getAjaxAdv()
-                        }
-                    }
-                },
-                error: function(err) {
-                        console.log(err)
-                }
-			})
-                function getAjaxAdv () {
-                    $.ajax({
-                    type: 'POST',
-                    url: '/publicapply/adLeague/exposure',
-                    data: {
-                        client: 'APP',
-                        id: 'ad7',
-                        position: '公告详情页顶部'
-                    },
-                    success: function(res) {
-                        // console.log(res)
-                    }
-                    })
-                }
-                addEventListener('focus', function() {
-                    if(document.activeElement = document.getElementById('iframeu6603899_0')) {
-                        $.ajax({
-                            type: 'POST',
-                            url: '/publicapply/adLeague/click',
-                            data: {
-                                client: 'APP',
-                                id: 'ad7',
-                                position: '公告详情页顶部'
-                            },
-                            success: function(res) {
-                                // console.log(res)
-                            }
-                        })
-                    }
-                });
-            </script>
 <!--            <div v-if="item.site === '剑鱼信息发布平台' || item.spidercode === 'a_jyxxfbpt_gg'" class="yhfb">用户发布</div>-->
             {{if .T.obj.site}}
             {{if eq .T.obj.site "剑鱼信息发布平台"}}
@@ -967,7 +928,8 @@
                             <span class="concat-kf">联系客服</span>
 							<span class="go-buy-file-pack" style="display: none">立即充值</span>
                             <span class="free-open-tip" style="display: none;">
-                              <span class="down-more-text">下载更多附件</span>
+                              <span class="free-has-num down-more-text" style="display:none;">本月剩余：<em class="file-count"></em>个</span>
+                              <span class="free-no-num down-more-text" style="display: none;">下载更多附件</span>
                               <span class="open-vip-btn">开通超级订阅</span>
                             </span>
                         </div>
@@ -1132,6 +1094,10 @@
         {{end}}
         {{end}}
         {{end}}
+        {{if not .T.obj.hasSession}}
+        {{include "tags/template/tag-breadcrumb-navigation.html" .}}
+        {{include "tags/template/tag-footer.html" .}}
+        {{end}}
     </div>
 </div>
 <!-- 三方认证弹窗 -->
@@ -1146,6 +1112,7 @@
 <script src='/common-module/nps-common/js/nps.js?v={{Msg "seo" "version"}}'></script>
 <script src='/common-module/forward-share/js/forward.js?v={{Msg "seo" "version"}}'></script>
 <script src='/common-module/bidstatus-update/js/bid-status-update.js?v={{Msg "seo" "version"}}'></script>
+
 <!-- <script src="https://cdn.bootcss.com/vConsole/3.3.4/vconsole.min.js"></script>
 <script> new VConsole(); </script> -->
 <script>
@@ -1155,7 +1122,6 @@
       $(this).wrap('<div class="scroll-tab-container" style="max-width: 100%;overflow-x: scroll;"></div>')
     })
   });
-
     var canRead = {{.T.canRead}} //免费用户当天查看是否查看三次公告
     var	shareimgflag = true;
     var area = {{.T.obj.area}}
@@ -1419,7 +1385,8 @@
                 window.vipStatus = res.data.vipStatus // 是否是超级订阅用户
                 window.viper = res.data.viper // 是否是超级订阅老用户 false:老用户 true: 新用户
                 window.entniche = res.data.entniche // 商机管理用户
-                window.fileNum = res.data.fileNum // 超级订阅用户可下载附件次数
+                // window.fileNum = res.data.fileNum // 超级订阅用户可下载附件次数
+                window.memberStatus = res.data.memberStatus // 大会员
                 window.isEntService = res.data.isEntService
                 bigstatus = res.data.memberStatus
                 hasServiceArr = res.data.power ? res.data.power : []
@@ -1470,13 +1437,13 @@
                     })
                   }
                 }
-                //非大会员或大会员无此功能 且是新超级订阅用户
-                if (res.data && res.data.vipStatus > 0 && res.data.viper&&!window.isMemberAndPower) {
-                  $('.file-count-tip').css('display', 'inline-block')
-                  $('.go-buy-file-pack').css('display', 'inline-block')
-                  $('.icon-help').css('display', 'inline-block')
-                  $('.file-count').html(res.data.fileNum)
-                }
+                // //非大会员或大会员无此功能 且是新超级订阅用户
+                // if (res.data && res.data.vipStatus > 0 && res.data.viper&&!window.isMemberAndPower) {
+                //   $('.file-count-tip').css('display', 'inline-block')
+                //   $('.go-buy-file-pack').css('display', 'inline-block')
+                //   $('.icon-help').css('display', 'inline-block')
+                //   // $('.file-count').html(res.data.fileNum)
+                // }
                 setEntServiceInfo(res)
             },
             error:function(err) {
@@ -2034,7 +2001,7 @@
       e.preventDefault()
       location.href = '/jyapp/big/page/client_portrayal?entName=' + encodeURIComponent({{.T.obj.buyer}}) + '&from=client'
     }
-    function downFileOfVIP (fileName, callback) {
+    function downloadFileAjax (fileName, callback) {
         // 有下载次数
         $.ajax({
             type: 'post',
@@ -2047,27 +2014,44 @@
                 title: title
             },
             success: function (r) {
-                if (r&&r.r&&r.r.code&&r.r.code<0&&window.vipStatus>0){
-                    // 次数用完提醒联系客服
-                    vant.Dialog.confirm({
-                        message: '您本月附件下载机会已消耗完毕，如需下载更多附件，请前往充值。',
-                        showCancelButton: true,
-                        confirmButtonText: '立即充值',
-                        confirmButtonColor: '#2ABDD1',
-                        className: 'custom-dialog',
-                        width: 303
-
-                    }).then(() => {
-                        location.href = '/jy_mobile/common/order/create/filepack?type=0'
-                    })
-                        .catch(() => {})
+                  // 重新获取下载次数
+                  subPoint()
+                if (r&&r.r&&r.r.code&&r.r.code<0){
+                    // 次数用完提醒
+                      if(window.vipStatus>0) {
+                        vant.Dialog.confirm({
+                          message: '您本月附件下载机会已消耗完毕，如需下载更多附件，请前往充值。',
+                          showCancelButton: true,
+                          confirmButtonText: '立即充值',
+                          confirmButtonColor: '#2ABDD1',
+                          className: 'custom-dialog',
+                          width: 303
+
+                        }).then(() => {
+                          location.href = '/jy_mobile/common/order/create/filepack?type=0'
+                        }).catch(() => {})
+                      } else if(window.isFree) {
+                        vant.Dialog.confirm({
+                          title: '开通超级订阅',
+                          message: '您的免费【附件下载】次数已使用完，暂无免费查看权限。如需查看更多，请开通超级订阅获取更多权限。',
+                          showCancelButton: true,
+                          confirmButtonText: '去开通',
+                          confirmButtonColor: '#2ABDD1',
+                          className: 'custom-dialog',
+                          width: 303,
+                          messageAlign: 'left',
+                        }).then(() => {
+                          // location.href = '/jyapp/vipsubscribe/vipsubscribe_new'
+                          location.href = '/jy_mobile/common/order/create/svip?type=buy'
+                        }).catch(() => {})
+                      }
                     return
                 }else if (r && r.m === '' && r.r) {
                     var url = r.r.downUrl
                     if (url){
                         if (!r.r.isExists){
-                            window.fileNum = window.fileNum - 1;
-                            $('.file-count').html($('.file-count').text()-1)
+                            // window.fileNum = Number(window.fileNum) - 1;
+                            // $('.file-count').text(Number($('.file-count').text())-1)
                         }
                         if(mySysIsIos()){
                             typeof callback === 'function' ? callback(url) : null
@@ -2084,6 +2068,57 @@
         })
     }
 
+    // 获取当前用户附件下载数量（用户下载次数判断需要）
+    window.downloadNum = 0
+    function subPoint() {
+      $.ajax({
+        url: '/jypay/resourcePack/account',
+        type: 'POST',
+        contentType: 'application/x-www-form-urlencoded',
+        data: {
+          product: 'attachmentDownPack'
+        },
+        dataType: 'json'
+      }).done(res => {
+        if (res.error_msg === '' && res.data && res.data.data) {
+          try {
+            var downloadNum =  res.data.data[0].number || 0
+            window.downloadNum = downloadNum // 免费用户可下载附件次数
+            window.fileNum = downloadNum // 超级订阅用户可下载附件次数
+            // 免费用户处理
+            if(window.isFree) {
+              // 免费用户且未留资过也未体验过，展示文案（引导留资）
+              if (window.freeFile == 0) {
+                if(downloadNum > 0) {
+                  $('.free-down-text').text('免费用户享有' + downloadNum + '次附件下载权益')
+                } else {
+                  $('.free-down-text').text('免费用户享有1次附件下载权益')
+                }
+              } else {
+                // 免费用户体验过
+               if(downloadNum > 0){
+                  $('.free-has-num').show() // 展示下载次数
+                  $('.free-no-num').hide()
+                } else{
+                 $('.free-has-num').hide() // 隐藏下载次数
+                 $('.free-no-num').show() // 展示下载更多附件
+               }
+              }
+            }
+            //非大会员或大会员无此功能 且是新超级订阅用户
+            if ( window.vipStatus > 0 && window.viper&&!window.isMemberAndPower) {
+              $('.file-count-tip').css('display', 'inline-block')
+              $('.go-buy-file-pack').css('display', 'inline-block')
+              $('.icon-help').css('display', 'inline-block')
+            }
+            // 下载次数
+            $('.file-count').html(downloadNum)
+          } catch (e) {
+            console.warn(e)
+          }
+        }
+      })
+    }
     // 附件下载展示
     function andownload() {
         $.ajax({
@@ -2106,26 +2141,31 @@
                             html += "<li class='downs'>"+"<a class='menu_list' data-href="+data.data.attachment[i].downurl+">"+data.data.attachment[i].filename+"</a></li>"
                         }
                     }
-
                     $('.download-list>ul').append(html)
-                     // 下载附件
+                  // 下载附件
                     $('.downs').on('click', function() {
                       var url = $(this).find('a').attr('data-href')
                       var size = $(this).find('a').attr('date-size')
                       var fileName = $(this).find('a').text()
-                      console.log(window.isNoMember, window.isFree,window.freeFile, window.vipStatus, window.viper)
+                      console.log(window.isNoMember, window.isFree,window.freeFile, window.downloadNum,window.vipStatus, window.viper)
                       // 免费用户
                       if (window.isFree) {
                         // 判断有无体验过 0：未体验过
                         if (window.freeFile == 0) {
+                          // h5页跳转走数据不刷新处理
+                          if (utils.$envs.inH5) {
+                            subPoint()
+                          }
                           // 判断有无留过资 且未体验过 - 去留资
                           location.href = '/jyapp/frontPage/bigmember/free/perfect_info?source=article_attach_freeuser'
                           return
-                        } else if (window.freeFile < 0 ) {
-                          // 免费用户 体验过 下载次数为-1 弹框提醒跳至超级订阅购买页
+                        } else if (window.freeFile < 0 && window.downloadNum <= 0) {
+                          // 免费体验用户，无下载此处提示开通超级订阅
+                          // 免费用户 体验过（freeFile=-1） 剩余下载次数 弹框提醒跳至超级订阅购买页
+                          // message: '您已经免费解锁过【附件下载】权益1次，暂无免费查看权限。如需查看更多，请开通超级订阅获取更多权限。',
                           vant.Dialog.confirm({
                             title: '开通超级订阅',
-                            message: '您已经免费解锁过【附件下载】权益1次，暂无免费查看权限。如需查看更多，请开通超级订阅获取更多权限。',
+                            message: '您的免费【附件下载】次数已使用完，暂无免费查看权限。如需查看更多，请开通超级订阅获取更多权限。',
                             showCancelButton: true,
                             confirmButtonText: '去开通',
                             confirmButtonColor: '#2ABDD1',
@@ -2138,19 +2178,25 @@
                           })
                           .catch(() => {})
                           return
-                        }else if(window.freeFile>0){
+                        }else{
+                          // P317版本改为免费用户只要有下载次数，均可正常下载
                           window.freeFile=-1
-                          //
-                          gotoFilePage($(this).find('a').text())
+                          // IOS APP端特殊流程处理，先提示填写邮箱后扣次数
+                          if(mySysIsIos()) {
+                            return iosShow(url, fileName,size)
+                          }
+                          downloadFileAjax(fileName)
+                          // gotoFilePage($(this).find('a').text())
                         }
                       } else {
                         // 付费用户
-                        // 大会员用户 有下载权限
-                        if (window.isMemberAndPower) {
+                        // 大会员用户 且有附件下载个数
+                        if (window.memberStatus > 0) {
                           if(mySysIsIos()){
                             iosShow(url,fileName,size,false)
                           } else {
-                            location.href = url
+                            downloadFileAjax(fileName)
+                            // location.href = url
                           }
                           return
                         }
@@ -2162,13 +2208,13 @@
                             if(mySysIsIos()) {
                               return iosShow(url, fileName,size,false)
                             }
-                            downFileOfVIP(fileName)
+                            downloadFileAjax(fileName)
                             return
                             //if (window.fileNum <= 0) {
                             //}else{
-                              //window.fileNum = window.fileNum - 1;
-                              //gotoFilePageOfVip($(this).find('a').text())
-                              //return
+                            //window.fileNum = window.fileNum - 1;
+                            //gotoFilePageOfVip($(this).find('a').text())
+                            //return
                             //}
                           } else {
                             // 老超级订阅用户 提醒升级
@@ -2189,6 +2235,16 @@
                             return
                           }
                         }
+                        // 商机管理用户只要有个数就有下载权限
+                        if(window.entniche && window.downloadNum > 0){
+                          if(mySysIsIos()){
+                            iosShow(url,fileName,size,false)
+                          } else {
+                            downloadFileAjax(fileName)
+                          }
+                          return
+                        }
+
                         // 是大会员自定义版本没有下载权限 或 非超级订阅的商机管理用户 (弹框提醒联系客服)
                         var memberNoVip = window.isNoMember == true && !(window.vipStatus >0 && window.viper)
                         if (memberNoVip || (window.vipStatus <=0 && window.entniche)) {
@@ -2198,7 +2254,8 @@
                             confirmButtonText: '我知道了',
                             confirmButtonColor: '#2ABDD1',
                             width: 303,
-                          }).then(() => {})
+                          }).then(() => {
+                          })
                           return
                         }
                       }
@@ -2254,19 +2311,15 @@
     //ios更改为下载
     //老版本还走邮件模式  新版本走下载 需要判断版本号
     //isfree 是否是免费
-    function iosShow(url,fileName,size,isfree){
+    function iosShow(url,fileName,size){
       var version = JyObj.getVersion()
       if(version && compareVersion('3.0.4',version)){
         //切割名称获取格式
           var name = fileName ? fileName.substring(0, fileName.lastIndexOf('.')) : ''
           var types = fileName ? fileName.substring(fileName.lastIndexOf('.') + 1) : ''
-          if (isfree){
-              JyObj.downLoadFile(name,types,url,size);
-          }else{
-            downFileOfVIP(fileName, function (url) {
-              JyObj.downLoadFile(name,types,url,size);
-            })
-          }
+          downloadFileAjax(fileName, function (url) {
+            JyObj.downLoadFile(name,types,url,size);
+          })
         }else{
           iosShow_email(url,fileName,isfree)
         }
@@ -2306,7 +2359,7 @@
                     //按下确定按钮执行的操作
                     //todo ....
                     if (!isfree) {
-                        downFileOfVIP(fileName, function (url) {
+                        downloadFileAjax(fileName, function (url) {
                             sendAlert(url,getinputemail)
                         })
                     } else {
@@ -2762,6 +2815,7 @@
         $('.caigouunit .textcontent').css('color', '#171826')
         $('.zhongbiaounit').addClass('notextcontent')
       }
+      // 获取isAdd的信息
       isOpening()
       $(document).on('click',".border-tel",function(){
           if(!isEntniche&&!isVIP&&bigstatus<=0){
@@ -3201,7 +3255,8 @@
                               sessionStorage.followSetReload = "1";
                           }
                           followId = r.data;
-                          EasyAlert.show("已关注，可从“我的-<br>项目关注”查看<br>或设置提醒日期",{"text-align":"left","width":"195px"});
+                          // EasyAlert.show("已关注，可从“我的-<br>项目关注”查看<br>或设置提醒日期",{"text-align":"left","width":"195px"});
+                          pointsTaskSuccessTip()
                           followFlag = true;
                           jumpFlag = true;
                           $(".follow").html('<i class="glyphicon yiguanzhu"></i>已关注');
@@ -3231,7 +3286,19 @@
               location.href = '/jyapp/big/page/landingPage'
           })
       });
-
+      // 赚剑鱼币任务完成提示
+      function pointsTaskSuccessTip() {
+        // 获取剑鱼币任务信息
+        const from =  utils.getParam('from')
+        var point = utils.getParam('point') || 0
+        if(from && from === 'task'){
+          EasyAlert.show("关注项目成功，获得" + point + "剑鱼币。<br>可从“我的-<br>项目关注”查看<br>或设置提醒日期",{"text-align":"left","width":"195px"}, 2000);
+          utils.delUrlParam('from')
+        } else {
+          // 普通提示
+          EasyAlert.show("已关注，可从“我的-<br>项目关注”查看<br>或设置提醒日期",{"text-align":"left","width":"195px"});
+        }
+      }
       //
       $(".myfollowent").click(function(){
           var entname = $(this).text()
@@ -3455,9 +3522,13 @@
       window.addEventListener('pagehide', function () {
           isPageHide = true;
       });
+      subPoint()
       if (canRead) {
         // 有权限查看的才会下载附件
-        andownload()
+        setTimeout(function(){
+          andownload()
+        }, 500)
+
       }
       // 收藏
       $('.collec_star').on('click', function () {
@@ -3520,7 +3591,76 @@
         return key
       }
     }
+
 </script>
+{{if not .T.obj.hasSession }}
+  <script>
+      var areaNavModule = {
+      $el: null,
+      init: function () {
+        this.getTargetDOM()
+        this.addListener()
+      },
+      getTargetDOM: function () {
+        this.$el = $('.tag-area-nav-container')
+      },
+      addListener: function () {
+        var _this = this
+        if (!this.$el) return
+        this.$el.find('.action-show-more').on('click', function () {
+          _this.$el.find('.tag-area-nav-list-group').toggle()
+        })
+      }
+    }
+    var backToTop = {
+      $scrollDOM: $('.app-layout-content-b'),
+      $backToTop: $('.back-to-top'),
+      init: function () {
+        this.checkBackToTopButtonShow()
+        this.bindEvents()
+      },
+      bindEvents: function () {
+        var _this = this
+        this.$backToTop.on('click', function () {
+          $('.app-layout-content-b').animate({
+            scrollTop: 0
+          })
+        })
+        this.$scrollDOM.on('scroll', function (e) {
+          _this.checkBackToTopButtonShow()
+        })
+      },
+      checkBackToTopButtonShow: function () {
+        var scrollTop = this.$scrollDOM.scrollTop()
+        if (scrollTop < 5) {
+          this.$backToTop.hide()
+        } else {
+          this.$backToTop.show()
+        }
+      }
+    }
+    $(function(){
+      areaNavModule.init()
+      backToTop.init()
+      // 未登录状态下距顶部距离为顶部搜索框高度
+      var headerTop = document.querySelector('.jy-app-header ').clientHeight
+      $('.app-layout-content-b').css('top', headerTop)
+      $('.h5-tabfix').css('top', headerTop)
+      $('.wx-tabfix').css('top', headerTop)
+      $('.childNav').css('top', headerTop)
+      $('.tag-breadcrumb-navigation').css('background', '#EDEFF2')
+      $('.search-container').on('click', function (e) {
+        e.preventDefault()
+        localStorage.removeItem('JY-MOBILE-home-top-search')
+        sessionStorage.removeItem('JY-MOBILE-/search/result/bidding')
+        location.href = '/jy_mobile/search/middle/bidding'
+      })
+      $('.j-icon.base-icon.icon-back-white').on('click', function() {
+        window.history.back()
+      })
+    })
+  </script>
+{{end}}
 {{include "/common/baiducc.html"}}
 </body>
 </html>

src/jfw/modules/bigmember/src/config.json

@@ -180,5 +180,9 @@
   "potentialCount": 1000,
   "newDataTime": 1685606275,
   "projectCount": 5000,
-  "portraitStartTime": 2018
+  "portraitStartTime": 2018,
+  "portraitDynamicTime": 7,
+  "portraitCount": 30,
+  "nsq": "192.168.3.240:4260",
+  "nsq_topic": "jy_event"
 }

src/jfw/modules/bigmember/src/config/config.go

@@ -65,11 +65,15 @@ type config struct {
 		Details  string `json:"details"`
 		ListPage string `json:"listPage"`
 	} `json:"claim"`
-	ContextOldVipLimit int64 `json:"contextOldVipLimit"` //超级订阅部分用户：--- 超前项目权限
-	PotentialCount     int   `json:"potentialCount"`     //潜在客户 潜在竞争对手数据量
-	NewDataTime        int64 `json:"newDataTime"`        // 用于周边月报区分是否为新数据 、配置为p350发版的时间
-	ProjectCount       int   `json:"projectCount"`       //画像和报告项目明细最大数量
-	PortraitStartTime  int   `json:"portraitStartTime"`
+	ContextOldVipLimit  int64  `json:"contextOldVipLimit"` //超级订阅部分用户：--- 超前项目权限
+	PotentialCount      int    `json:"potentialCount"`     //潜在客户 潜在竞争对手数据量
+	NewDataTime         int64  `json:"newDataTime"`        // 用于周边月报区分是否为新数据 、配置为p350发版的时间
+	ProjectCount        int    `json:"projectCount"`       //画像和报告项目明细最大数量
+	PortraitStartTime   int    `json:"portraitStartTime"`
+	PortraitDynamicTime int    `json:"portraitDynamicTime"`
+	PortraitCount       int    `json:"portraitCount"`
+	Nsq                 string `json:"nsq"`
+	Nsq_topic           string `json:"nsq_topic"`
 }
 
 type CustomerInfo struct {

src/jfw/modules/bigmember/src/entity/followProject.go

@@ -1,7 +1,6 @@
 package entity
 
 import (
-	"app.yhyue.com/moapp/jybase/go-xweb/httpsession"
 	"encoding/json"
 	"errors"
 	"fmt"
@@ -15,6 +14,8 @@ import (
 	"sync"
 	"time"
 
+	"app.yhyue.com/moapp/jybase/go-xweb/httpsession"
+
 	qutil "app.yhyue.com/moapp/jybase/common"
 	elastic "app.yhyue.com/moapp/jybase/es"
 	"app.yhyue.com/moapp/jybase/redis"
@@ -145,7 +146,6 @@ func (this *ProjectFollow) SaveProject(sid string) (string, error) {
 	if followId == "" {
 		return "", errors.New("关注项目出错")
 	}
-
 	return followId, nil
 }
 

src/jfw/modules/bigmember/src/entity/portrait.go

@@ -310,14 +310,14 @@ func (this *Portrait) GetWinnerContactsMsg(entId string) ([]map[string]interface
 //		  matchType 搜索范围
 //	   area 项目地区
 //	   pushTime 发布时间
-func (this *Portrait) GetWinnerNewMsg(pwp *PortraitProjectScreen) ([]map[string]interface{}, int64, error) {
+func (this *Portrait) GetWinnerNewMsg(pwp *PortraitProjectScreen) ([]map[string]interface{}, int64, int64, error) {
 	return pwp.GetWinnerList()
 }
 func (this *Portrait) GetWinnerNewExport(pwp *PortraitProjectScreen) ([]string, error) {
 	return pwp.GetWinnerListIds()
 }
 
-func (this *Portrait) GetBuyerNewMsg(pwp *PortraitProjectScreen) ([]map[string]interface{}, int64, error) {
+func (this *Portrait) GetBuyerNewMsg(pwp *PortraitProjectScreen) ([]map[string]interface{}, int64, int64, error) {
 	return pwp.GetBuyerList()
 }
 func (this *Portrait) GetBuyerNewMsgExport(pwp *PortraitProjectScreen) ([]string, error) {

src/jfw/modules/bigmember/src/entity/portrait_screen.go

@@ -1,6 +1,7 @@
 package entity
 
 import (
+	"app.yhyue.com/moapp/jybase/redis"
 	"encoding/json"
 	"fmt"
 	"jy/src/jfw/modules/bigmember/src/config"
@@ -219,6 +220,7 @@ func (pwp *PortraitProjectScreen) CommonPare(isWinner bool) (mustQueryArr []stri
 	}
 
 	//按照当前年份，往前推4年，共5个年份可选
+	//无权已用户
 	sTime, eTime := pwp.Screen.PareTimeSelect(isWinner) //采购单位不校验权限
 	if isWinner {
 		mustQueryArr = append(mustQueryArr, fmt.Sprintf(`{"term":{"entidlist":"%s"}}`, pwp.Screen.Ent))
@@ -232,7 +234,7 @@ func (pwp *PortraitProjectScreen) CommonPare(isWinner bool) (mustQueryArr []stri
 
 // GetWinnerListSearch 获取企业画像中标信息数据
 // 会员展示1-4页表格数据，免费用户前三条
-func (pwp *PortraitProjectScreen) GetWinnerListSearch() (list *[]map[string]interface{}, total int64, err error) {
+func (pwp *PortraitProjectScreen) GetWinnerListSearch() (list *[]map[string]interface{}, total int64, updateTime int64, err error) {
 	if pwp.Screen.Ent == "" {
 		err = fmt.Errorf("企业名称异常")
 		return
@@ -240,6 +242,11 @@ func (pwp *PortraitProjectScreen) GetWinnerListSearch() (list *[]map[string]inte
 	mustQueryArr := pwp.CommonPare(true)
 	pwp.PageNum = qutil.If(pwp.PageNum == 0, 1, pwp.PageNum).(int)     //默认第一页
 	pwp.PageSize = qutil.If(pwp.PageSize == 0, 10, pwp.PageSize).(int) //默认每页10条
+
+	if !pwp.Screen.HasPower || pwp.Free {
+		return pwp.FreePortraitNews(mustQueryArr, true)
+	}
+
 	//仅第一页查询总量
 	if pwp.PageNum == 1 || pwp.IsExport {
 		total = elastic.Count(biddingIndex, biddingType, fmt.Sprintf(NewMustSearch, strings.Join(mustQueryArr, ","), ""))
@@ -272,9 +279,9 @@ func (pwp *PortraitProjectScreen) GetWinnerListSearch() (list *[]map[string]inte
 }
 
 // GetWinnerList 获取企业画像中标信息数据
-func (pwp *PortraitProjectScreen) GetWinnerList() (list []map[string]interface{}, total int64, err error) {
+func (pwp *PortraitProjectScreen) GetWinnerList() (list []map[string]interface{}, total int64, updateTime int64, err error) {
 	var newData *[]map[string]interface{}
-	newData, total, err = pwp.GetWinnerListSearch()
+	newData, total, updateTime, err = pwp.GetWinnerListSearch()
 	if newData == nil || len(*newData) == 0 {
 		return
 	}
@@ -314,7 +321,7 @@ func (pwp *PortraitProjectScreen) GetWinnerList() (list []map[string]interface{}
 // GetWinnerListIds 画像中标单位动态数据导出
 func (pwp *PortraitProjectScreen) GetWinnerListIds() (ids []string, err error) {
 	var newData *[]map[string]interface{}
-	newData, _, err = pwp.GetWinnerListSearch()
+	newData, _, _, err = pwp.GetWinnerListSearch()
 	if newData == nil || len(*newData) == 0 {
 		err = fmt.Errorf("未找到相关数据")
 		return
@@ -349,7 +356,7 @@ func GetNewBiddingCount(winnerId, buyer string) int64 {
 }
 
 // GetBuyerListSearch 采购单位中标动态查询
-func (pwp *PortraitProjectScreen) GetBuyerListSearch() (list *[]map[string]interface{}, total int64, err error) {
+func (pwp *PortraitProjectScreen) GetBuyerListSearch() (list *[]map[string]interface{}, total int64, updateTime int64, err error) {
 	if pwp.Screen.Ent == "" {
 		err = fmt.Errorf("企业名称异常")
 		return
@@ -358,9 +365,12 @@ func (pwp *PortraitProjectScreen) GetBuyerListSearch() (list *[]map[string]inter
 	if pwp.Screen.HasPower {
 		pwp.PageNum = qutil.If(pwp.PageNum == 0, 1, pwp.PageNum).(int)    //默认第一页
 		pwp.PageSize = qutil.If(pwp.PageSize == 0, 5, pwp.PageSize).(int) //默认每页10条
-	} else { //免费用户可以查看三条
-		pwp.PageNum = 1
-		pwp.PageSize = 5
+		//} else { //免费用户可以查看三条
+		//	pwp.PageNum = 1
+		//	pwp.PageSize = 5
+	}
+	if !pwp.Screen.HasPower || pwp.Free {
+		return pwp.FreePortraitNews(mustQueryArr, false)
 	}
 
 	//仅第一页查询总量(非数据导出)
@@ -384,27 +394,73 @@ func (pwp *PortraitProjectScreen) GetBuyerListSearch() (list *[]map[string]inter
 		//log.Printf("PortraitWinnerProject GetList Sql %s\n", listQuery)
 		list = elastic.Get(biddingIndex, biddingIndex, listQuery)
 	} else { // 数据导出分批查询
-		if total > 5 {
-			if pwp.Screen.HasPower {
-				if pwp.Free {
-					total = 5
-				}
-			} else { //免费用户可以查看三条
-				total = 5
-			}
-		}
+		//if total > 5 {
+		//	if pwp.Screen.HasPower {
+		//		if pwp.Free {
+		//			total = 5
+		//		}
+		//	} else { //免费用户可以查看三条
+		//		total = 5
+		//	}
+		//}
 		listQuery := fmt.Sprintf(NewMustSearch, strings.Join(mustQueryArr, ","), `,"_source":["_id"],"sort":{"publishtime":"desc"}`)
 		list = getBatchSearchRes(biddingIndex, biddingIndex, listQuery, total)
 	}
 	return
 }
 
+func (pwp *PortraitProjectScreen) FreePortraitNews(mustQueryArr []string, isWinner bool) (data *[]map[string]interface{}, total int64, updateTime int64, err error) {
+	redisKey := fmt.Sprintf("free_portrait_list_%s", pwp.Screen.Ent)
+	redisData := make(map[string]interface{})
+	var dataArr []map[string]interface{}
+	if rBytes, err := redis.GetBytes("other", redisKey); err == nil && len(*rBytes) != 0 {
+		_ = json.Unmarshal(*rBytes, &redisData)
+		rData, _ := redisData["list"].([]interface{})
+		dataArr = qutil.ObjArrToMapArr(rData)
+		total = qutil.Int64All(redisData["total"])
+		updateTime = qutil.Int64All(redisData["updateTime"])
+	} else {
+		var fields string
+		updateTime = time.Now().Unix()
+		if isWinner {
+			fields = `"_id","projectname","bidamount","budget","title","publishtime","subtype","toptype","area","bidopentime","buyer"`
+		} else {
+			fields = `"bidstatus","_id","title","subtype","projectname","publishtime","area","bidamount","budget","bidopentime","s_winner","entidlist"`
+		}
+		mustQueryArrStr := strings.Join(mustQueryArr, ",")
+		total = elastic.Count(biddingIndex, biddingIndex, fmt.Sprintf(NewMustSearch, mustQueryArrStr, ""))
+		isTrue := true
+		if total > 0 {
+			listQuery := fmt.Sprintf(NewMustSearch, mustQueryArrStr, fmt.Sprintf(`,"_source":[%s],"sort":{%s},"from":0,"size":%d`, fields, `"publishtime":"desc","id":"desc"`, config.Config.PortraitCount))
+			list := elastic.Get(biddingIndex, biddingIndex, listQuery)
+			if list != nil && len(*list) > 0 {
+				dataArr = *list
+			} else {
+				log.Printf("画像动态数据获取异常,ent:%s,total:%d,sql:%s", pwp.Screen.Ent, total, listQuery)
+				isTrue = false
+				total = 0
+			}
+		}
+		if isTrue {
+			go func() {
+				redis.Put("other", redisKey, map[string]interface{}{
+					"list":       dataArr,
+					"total":      total,
+					"updateTime": updateTime,
+				}, 24*3600*config.Config.PortraitDynamicTime)
+			}()
+		}
+	}
+	data = &dataArr
+	return
+}
+
 // GetBuyerList 获取采购单位采购信息数据
-// 会员展示1-4页表格数据，免费用户前三条
-func (pwp *PortraitProjectScreen) GetBuyerList() (list []map[string]interface{}, total int64, err error) {
+// 会员展示1-4页表格数据，免费用户前三十条
+func (pwp *PortraitProjectScreen) GetBuyerList() (list []map[string]interface{}, total int64, updateTime int64, err error) {
 	var newData *[]map[string]interface{}
 	//查询
-	newData, total, err = pwp.GetBuyerListSearch()
+	newData, total, updateTime, err = pwp.GetBuyerListSearch()
 	if newData == nil || len(*newData) == 0 {
 		return
 	}
@@ -444,7 +500,7 @@ func (pwp *PortraitProjectScreen) GetBuyerList() (list []map[string]interface{},
 func (pwp *PortraitProjectScreen) GetBuyerListIds() (ids []string, err error) {
 	var newData *[]map[string]interface{}
 	//查询
-	newData, _, err = pwp.GetBuyerListSearch()
+	newData, _, _, err = pwp.GetBuyerListSearch()
 	if newData == nil || len(*newData) == 0 {
 		err = fmt.Errorf("未查询到相关数据")
 		return

src/jfw/modules/bigmember/src/go.mod

@@ -5,8 +5,8 @@ go 1.19
 require (
 	app.yhyue.com/moapp/jybase v0.0.0-20230727083622-4dfc804ea6cf
 	app.yhyue.com/moapp/jylog v0.0.0-20230522075550-05d7230ca545
-	app.yhyue.com/moapp/jypkg v0.0.0-20230710012638-0d2f7219700e
-	bp.jydev.jianyu360.cn/BaseService/userCenter v1.2.13
+	app.yhyue.com/moapp/jypkg v0.0.0-20231024062045-5c364be1561d
+	bp.jydev.jianyu360.cn/BaseService/userCenter v1.2.14
 	github.com/donnie4w/go-logger v0.0.0-20230316073421-36a48f87a69a
 	github.com/gogf/gf/v2 v2.4.2
 	github.com/olivere/elastic/v7 v7.0.32
@@ -18,7 +18,7 @@ require (
 	app.yhyue.com/moapp/jyMarketing v0.0.2-0.20230304035551-21bb1eedf547 // indirect
 	app.yhyue.com/moapp/message v0.0.0-20221223100203-6402e389d9ae // indirect
 	bp.jydev.jianyu360.cn/BaseService/entManageApplication v0.0.0-20230214091519-89a98c01ab0e // indirect
-	bp.jydev.jianyu360.cn/BaseService/powerCheckCenter v0.0.0-20230222052351-9d6fad062447 // indirect
+	bp.jydev.jianyu360.cn/BaseService/powerCheckCenter v0.0.0-20230225125145-431a4f70093a // indirect
 	bp.jydev.jianyu360.cn/BaseService/resourceCenter v0.0.7 // indirect
 	github.com/BurntSushi/toml v1.1.0 // indirect
 	github.com/beorn7/perks v1.0.1 // indirect
@@ -134,7 +134,7 @@ require (
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 	gorm.io/driver/mysql v1.0.5 // indirect
 	gorm.io/gorm v1.21.3 // indirect
-	jygit.jydev.jianyu360.cn/ApplicationCenter/publicService v0.0.0-20230630032508-eefb06a4588e // indirect
+	jygit.jydev.jianyu360.cn/ApplicationCenter/publicService v0.0.0-20231017031425-45003ca9f35a // indirect
 	k8s.io/api v0.26.3 // indirect
 	k8s.io/apimachinery v0.27.0-alpha.3 // indirect
 	k8s.io/client-go v0.26.3 // indirect

src/jfw/modules/bigmember/src/go.sum

@@ -9,18 +9,18 @@ app.yhyue.com/moapp/jybase v0.0.0-20230727083622-4dfc804ea6cf h1:/Tk5haITmGc5c3/
 app.yhyue.com/moapp/jybase v0.0.0-20230727083622-4dfc804ea6cf/go.mod h1:D40Ae0rQilH8Hc5o2Vtt04Tjh/DNEFpcS3/WkJMPJb8=
 app.yhyue.com/moapp/jylog v0.0.0-20230522075550-05d7230ca545 h1:+Lak4m1zgsigQloOsvp8AJ+0XeX/+PGp9QP550xlbBQ=
 app.yhyue.com/moapp/jylog v0.0.0-20230522075550-05d7230ca545/go.mod h1:uFrsdUBFbETiJlEmr4PtJWPsZlUpPj2bHQRhryu6ggk=
-app.yhyue.com/moapp/jypkg v0.0.0-20230710012638-0d2f7219700e h1:phO8+opFgz3p1XebtdLepM1u8q/TE/EgLYjP4Ebt/jU=
-app.yhyue.com/moapp/jypkg v0.0.0-20230710012638-0d2f7219700e/go.mod h1:wbDWBpLODtGhkQw4dCShvmRr6G8CazuW8kWq42paQOM=
+app.yhyue.com/moapp/jypkg v0.0.0-20231024062045-5c364be1561d h1:h8SnO8ONZlmtx8ZSYtpw36TdBhYPy8WgLeWHyMGZj0Q=
+app.yhyue.com/moapp/jypkg v0.0.0-20231024062045-5c364be1561d/go.mod h1:76Kz6+MuxcRJRyFad9W8R4AByiQlVGzuGFzklY+2m38=
 app.yhyue.com/moapp/message v0.0.0-20221223100203-6402e389d9ae h1:6rDDaz6yxvE8viTSzEBwKYOFWq14TMfuBivSazUZMz4=
 app.yhyue.com/moapp/message v0.0.0-20221223100203-6402e389d9ae/go.mod h1:b0zZHev3gmJao1Fo+2Z2KPVjsuLOJVvVxf+kCnu9WkA=
 bp.jydev.jianyu360.cn/BaseService/entManageApplication v0.0.0-20230214091519-89a98c01ab0e h1:h+VEI3o1qC0jeCzkFGTrLI4f27cfa/W/y+0sXokWMgE=
 bp.jydev.jianyu360.cn/BaseService/entManageApplication v0.0.0-20230214091519-89a98c01ab0e/go.mod h1:7Xhygw0KBuL4h0G76FnFg4otQcA9bmOO0c8M0FCjAyQ=
-bp.jydev.jianyu360.cn/BaseService/powerCheckCenter v0.0.0-20230222052351-9d6fad062447 h1:hrBqrsf2QHTrnoR9VTV4w7g2akDfbpQ+umNQvkkNs+Y=
-bp.jydev.jianyu360.cn/BaseService/powerCheckCenter v0.0.0-20230222052351-9d6fad062447/go.mod h1:5nimT8GJh46AyfeeDeyRlDQygMlO7TRM8Pwm41Gxemc=
+bp.jydev.jianyu360.cn/BaseService/powerCheckCenter v0.0.0-20230225125145-431a4f70093a h1:JX2jEMrbdLzXfVC/nTUvdFOkqNj5DUxkJFjl3XE1gyg=
+bp.jydev.jianyu360.cn/BaseService/powerCheckCenter v0.0.0-20230225125145-431a4f70093a/go.mod h1:5nimT8GJh46AyfeeDeyRlDQygMlO7TRM8Pwm41Gxemc=
 bp.jydev.jianyu360.cn/BaseService/resourceCenter v0.0.7 h1:G6PHMWAHfYEuY6kbl7OM/KnCQf1Xa54mdhuP7JzK8/I=
 bp.jydev.jianyu360.cn/BaseService/resourceCenter v0.0.7/go.mod h1:rRiGzKG4F/fmkNxXQCxrkxNWc8yf1SmW8qWCKfGIQSM=
-bp.jydev.jianyu360.cn/BaseService/userCenter v1.2.13 h1:aK3ya7aznINdAuEl7sKq9U2MvJidUfk6nxPGjjX+t3Y=
-bp.jydev.jianyu360.cn/BaseService/userCenter v1.2.13/go.mod h1:vDEKni2rnCraKgKnnCEIwsFmO92GxnpfKmNQ+83wKP0=
+bp.jydev.jianyu360.cn/BaseService/userCenter v1.2.14 h1:L/0RrgU+l8nMS7YO2JizszaX3lAo0gqzg2Bqmu0So0s=
+bp.jydev.jianyu360.cn/BaseService/userCenter v1.2.14/go.mod h1:03M9BWIGHy7BbGxLvjt8V9zZzEZDWhN6BuHVfVcDFbQ=
 cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
 cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
 cloud.google.com/go v0.37.4/go.mod h1:NHPJ89PdicEuT9hdPXMROBD91xc5uRDxsMtSB16k7hw=
@@ -1420,8 +1420,8 @@ honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWh
 honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg=
 honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
 honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
-jygit.jydev.jianyu360.cn/ApplicationCenter/publicService v0.0.0-20230630032508-eefb06a4588e h1:1O11hFuKvLD3Ls+9wxssUpMV3fG9qD4EfeeAy92dsWY=
-jygit.jydev.jianyu360.cn/ApplicationCenter/publicService v0.0.0-20230630032508-eefb06a4588e/go.mod h1:wBxeFODhYtGenkxXJGThN/VrFaxPvvHMxzpS09pxApM=
+jygit.jydev.jianyu360.cn/ApplicationCenter/publicService v0.0.0-20231017031425-45003ca9f35a h1:kwjO4pqB3gnNGrQ9aXyz6f8s9qXAUenPUDWip8gYR/Q=
+jygit.jydev.jianyu360.cn/ApplicationCenter/publicService v0.0.0-20231017031425-45003ca9f35a/go.mod h1:p/595fgbj4r6GhSJhHDpx3Ru1NkD5UASFL8OuIQw09E=
 k8s.io/api v0.22.9/go.mod h1:rcjO/FPOuvc3x7nQWx29UcDrFJMx82RxDob71ntNH4A=
 k8s.io/api v0.26.3 h1:emf74GIQMTik01Aum9dPP0gAypL8JTLl/lHa4V9RFSU=
 k8s.io/api v0.26.3/go.mod h1:PXsqwPMXBSBcL1lJ9CYDKy7kIReUydukS5JiRlxC3qE=

src/jfw/modules/bigmember/src/service/follow/enterprise.go

@@ -1,15 +1,18 @@
 package follow
 
 import (
-	. "app.yhyue.com/moapp/jybase/api"
-	qutil "app.yhyue.com/moapp/jybase/common"
 	"errors"
 	"fmt"
+	"jy/src/jfw/modules/bigmember/src/config"
+	"jy/src/jfw/modules/bigmember/src/db"
 	"jy/src/jfw/modules/bigmember/src/entity"
 	"jy/src/jfw/modules/bigmember/src/util"
 	"log"
 
+	. "app.yhyue.com/moapp/jybase/api"
+	qutil "app.yhyue.com/moapp/jybase/common"
 	"app.yhyue.com/moapp/jybase/go-xweb/xweb"
+	"app.yhyue.com/moapp/jypkg/common/src/qfw/util/jy"
 )
 
 // FollowEnt 大会员关注企业接口（企业情报）
@@ -146,6 +149,14 @@ func (this *FollowEnt) AddFollow() {
 		if err != nil {
 			return nil, err
 		}
+		//	首次完成关注企业可获得积分
+		jy.Publish(db.Mgo_Log, config.Config.Nsq, config.Config.Nsq_topic, "task", qutil.ObjToString(this.GetSession("mgoUserId")), jy.Jywx_node1, map[string]interface{}{
+			"code":       1012, //关注企业
+			"types":      "followEnt",
+			"num":        50,
+			"baseUserId": this.GetSession("base_user_id"),
+			"positionId": this.GetSession("positionId"),
+		})
 		return "success", nil
 	}()
 	if errMsg != nil {

src/jfw/modules/bigmember/src/service/follow/project.go

@@ -1,17 +1,21 @@
 package follow
 
 import (
-	. "app.yhyue.com/moapp/jybase/api"
-	qutil "app.yhyue.com/moapp/jybase/common"
-	elastic "app.yhyue.com/moapp/jybase/es"
 	"errors"
 	"fmt"
+	"jy/src/jfw/modules/bigmember/src/config"
+	"jy/src/jfw/modules/bigmember/src/db"
 	"jy/src/jfw/modules/bigmember/src/entity"
 	"jy/src/jfw/modules/bigmember/src/util"
+
 	"log"
 	"strings"
 
+	. "app.yhyue.com/moapp/jybase/api"
+	qutil "app.yhyue.com/moapp/jybase/common"
+	elastic "app.yhyue.com/moapp/jybase/es"
 	"app.yhyue.com/moapp/jybase/go-xweb/xweb"
+	"app.yhyue.com/moapp/jypkg/common/src/qfw/util/jy"
 )
 
 // FollowProject 大会员关注项目接口
@@ -48,6 +52,16 @@ func (this *FollowProject) AddProject() {
 		if err != nil {
 			return nil, err
 		}
+
+		//	首次完成项目关注可获得积分
+		jy.Publish(db.Mgo_Log, config.Config.Nsq, config.Config.Nsq_topic, "task", qutil.ObjToString(this.GetSession("mgoUserId")), jy.Jywx_node1, map[string]interface{}{
+			"code":       1013, //关注项目
+			"types":      "followProject",
+			"num":        50,
+			"baseUserId": this.GetSession("base_user_id"),
+			"positionId": this.GetSession("positionId"),
+		})
+
 		return util.EncodeId(followId), nil
 	}()
 	if errMsg != nil {

src/jfw/modules/bigmember/src/service/portrait/memberPortraitAction.go

@@ -116,17 +116,14 @@ func (this *EntPortrait) WinnerNewMsg() {
 		if entId == "" {
 			return nil, fmt.Errorf("企业参数异常")
 		}
-		cepm, hasPower, err, _ := entity.CreatePortraitManager(this.Session(), "entNewMsg")
-		if err != nil {
-			return nil, err
-		}
-		if !hasPower {
-			return nil, fmt.Errorf("非法请求")
-		}
+		cepm, hasPower, _, _ := entity.CreatePortraitManager(this.Session(), "entNewMsg")
+		//if err != nil {
+		//	return nil, err
+		//}
 		pageNum, _ := this.GetInteger("pageNum")
 		pageSize, _ := this.GetInteger("pageSize")
 
-		rData, total, err := cepm.GetWinnerNewMsg(&entity.PortraitProjectScreen{
+		rData, total, updateTime, err := cepm.GetWinnerNewMsg(&entity.PortraitProjectScreen{
 			Screen: &entity.PortraitScreen{
 				Ent:        entId,
 				Match:      this.GetString("match"),
@@ -145,8 +142,9 @@ func (this *EntPortrait) WinnerNewMsg() {
 			return nil, err
 		}
 		return map[string]interface{}{
-			"list":  rData,
-			"count": total,
+			"list":       rData,
+			"count":      total,
+			"updateTime": updateTime,
 		}, nil
 	}()
 	if errMsg != nil {
@@ -167,9 +165,7 @@ func (this *EntPortrait) WinnerNewMsgExport() {
 		if err != nil {
 			return nil, err
 		}
-		if !hasPower {
-			return nil, fmt.Errorf("非法请求")
-		}
+
 		//查询数据导出数据id列
 		pps := &entity.PortraitProjectScreen{
 			Screen: &entity.PortraitScreen{
@@ -298,16 +294,16 @@ func (this *EntPortrait) BuyerNewMsg() {
 	userId := qutil.ObjToString(this.GetSession("userId"))
 	rData, errMsg := func() (interface{}, error) {
 		cepm, hasPower, err, _ := entity.CreatePortraitManager(this.Session(), "buyerPortrait")
-		if err != nil {
-			return nil, err
-		}
+		//if err != nil {
+		//	return nil, err
+		//}
 
 		buyer := this.GetString("buyer")
 		pageNum, _ := this.GetInteger("pageNum")
 		pageSize, _ := this.GetInteger("pageSize")
 
 		//免费用户仅可查看三条记录
-		rData, total, err := cepm.GetBuyerNewMsg(&entity.PortraitProjectScreen{
+		rData, total, updateTime, err := cepm.GetBuyerNewMsg(&entity.PortraitProjectScreen{
 			Screen: &entity.PortraitScreen{
 				Ent:        buyer,
 				Match:      this.GetString("match"),
@@ -325,8 +321,9 @@ func (this *EntPortrait) BuyerNewMsg() {
 			return nil, err
 		}
 		return map[string]interface{}{
-			"list":  rData,
-			"count": total,
+			"list":       rData,
+			"count":      total,
+			"updateTime": updateTime,
 		}, nil
 	}()
 	if errMsg != nil {
@@ -339,11 +336,11 @@ func (this *EntPortrait) BuyerNewMsgExport() {
 	userId := qutil.ObjToString(this.GetSession("userId"))
 	rData, errMsg := func() (interface{}, error) {
 		cepm, hasPower, err, free := entity.CreatePortraitManager(this.Session(), "buyerPortrait")
-		if err != nil {
-			return nil, err
-		}
+		//if err != nil {
+		//	return nil, err
+		//}
 		buyer := this.GetString("buyer")
-		//免费用户仅可查看三条记录
+		//免费用户仅可查看三十条记录
 		pps := &entity.PortraitProjectScreen{
 			Screen: &entity.PortraitScreen{
 				Ent:        buyer,
@@ -525,7 +522,7 @@ func (this *EntPortrait) NoLoginAssociatedInfo() {
 		// 未登录用户关联中标企业
 		data := entity.NoLoginAssociatedInfo(entId)
 		var cepm *entity.Portrait
-		rData, _, _ := cepm.GetWinnerNewMsg(&entity.PortraitProjectScreen{
+		rData, _, _, _ := cepm.GetWinnerNewMsg(&entity.PortraitProjectScreen{
 			Screen: &entity.PortraitScreen{
 				Ent:        entId,
 				Match:      this.GetString("match"),

src/jfw/modules/bigmember/src/service/portrait/subvipPortraitAction.go

@@ -68,26 +68,17 @@ func (this *SubVipPortrait) SubVipEntDetail() {
 // SubVipWinnerNewMsg 超级订阅升级版查看最新中标动态
 func (this *SubVipPortrait) SubVipWinnerNewMsg() {
 	userId := qutil.ObjToString(this.GetSession("userId"))
-	log.Println(this.Session().GetMultiple(), "---SubVipWinnerNewMsg  userId :", userId)
 	rData, errMsg := func() (interface{}, error) {
-		log.Println(qutil.ObjToString(this.GetSession("userId")), "------SubVipWinnerNewMsg -------------  userId :", userId)
 		entId := util.DecodeId(this.GetString("entId"))
 		if entId == "" {
 			return nil, fmt.Errorf("参数异常")
 		}
-		cepm, power, err, _ := entity.CreateSubVipPortraitManager(userId, "entNewMsg", entId, true, this.Session())
-		if err != nil {
-			return nil, err
-		}
-
-		if power <= 1 {
-			return nil, errors.New("非法请求")
-		}
+		cepm, power, _, _ := entity.CreateSubVipPortraitManager(userId, "entNewMsg", entId, true, this.Session())
 
 		pageNum, _ := this.GetInteger("pageNum")
 		pageSize, _ := this.GetInteger("pageSize")
 
-		rData, total, err := cepm.GetWinnerNewMsg(&entity.PortraitProjectScreen{
+		rData, total, updateTime, err := cepm.GetWinnerNewMsg(&entity.PortraitProjectScreen{
 			Screen: &entity.PortraitScreen{
 				Ent:        entId,
 				Match:      this.GetString("match"),
@@ -96,7 +87,7 @@ func (this *SubVipPortrait) SubVipWinnerNewMsg() {
 				Area:       this.GetString("area"),
 				ScopeClass: this.GetString("scopeClass"),
 				TimeRange:  this.GetString("timeRange"),
-				HasPower:   true,
+				HasPower:   power > 1,
 			},
 			PageNum:  pageNum,
 			PageSize: pageSize,
@@ -105,8 +96,9 @@ func (this *SubVipPortrait) SubVipWinnerNewMsg() {
 			return nil, err
 		}
 		return map[string]interface{}{
-			"list":  rData,
-			"count": total,
+			"list":       rData,
+			"count":      total,
+			"updateTime": updateTime,
 		}, nil
 	}()
 	if errMsg != nil {
@@ -127,9 +119,9 @@ func (this *SubVipPortrait) WinnerNewMsgExport() {
 		if err != nil {
 			return nil, err
 		}
-		if power <= 1 {
-			return nil, errors.New("非法请求")
-		}
+		//if power <= 1 {
+		//	return nil, errors.New("非法请求")
+		//}
 		//查询数据导出数据id列
 		pps := &entity.PortraitProjectScreen{
 			Screen: &entity.PortraitScreen{
@@ -140,7 +132,7 @@ func (this *SubVipPortrait) WinnerNewMsgExport() {
 				Area:       this.GetString("area"),
 				ScopeClass: this.GetString("scopeClass"),
 				TimeRange:  this.GetString("timeRange"),
-				HasPower:   true,
+				HasPower:   power > 1,
 			},
 			IsExport: true,
 			Free:     free,
@@ -341,20 +333,15 @@ func (this *SubVipPortrait) BuyerNewMsg() {
 		if buyer == "" {
 			return nil, fmt.Errorf("参数异常")
 		}
-		if userId == "" {
-			return nil, fmt.Errorf("未登录")
-		}
 		pageNum, _ := this.GetInteger("pageNum")
 		pageSize, _ := this.GetInteger("pageSize")
 		cepm, power, err, _ := entity.CreateSubVipPortraitManagerForOpen(userId, "buyerPortrait", buyer, false, this.Session())
-		if err != nil {
-			return nil, err
-		}
-		if power <= 1 {
-			return nil, fmt.Errorf("无查看权益")
-		}
+		//if err != nil {
+		//	return nil, err
+		//}
+
 		//免费用户仅可查看三条记录
-		rData, total, err := cepm.GetBuyerNewMsg(&entity.PortraitProjectScreen{
+		rData, total, updateTime, err := cepm.GetBuyerNewMsg(&entity.PortraitProjectScreen{
 			Screen: &entity.PortraitScreen{
 				Ent:        buyer,
 				Match:      this.GetString("match"),
@@ -372,8 +359,9 @@ func (this *SubVipPortrait) BuyerNewMsg() {
 			return nil, err
 		}
 		return map[string]interface{}{
-			"list":  rData,
-			"count": total,
+			"list":       rData,
+			"count":      total,
+			"updateTime": updateTime,
 		}, nil
 	}()
 	if errMsg != nil {

src/jfw/modules/followent/src/web/templates/weixin/list.html

@@ -28,7 +28,7 @@ if(sessionStorage){
 		right: 0;
 		bottom: 0;
 	}
-  
+
   .listpage .redspot{
       position: absolute;
       width: 8px;
@@ -50,97 +50,7 @@ if(sessionStorage){
 	</div>
 	<div class="jylistbottom" style="display: none;">
         <img src="/jylab/followent/images/wx/jydustbin.png"/>批量移除30天无更新企业
-    </div>
-    <div class="_fhts92t44f" id="pro_footer"></div>
-    <script type="text/javascript">
-        $.ajax({
-            type: 'POST',
-            url: '/publicapply/bidcoll/power?t=' + new Date().getTime(),
-            success: function(res) {
-                console.log(res)
-                // res.data.entniche = false
-                // res.data.member = false
-                // res.data.vip = 0
-                if(res.error_code == 0) {
-                    if(!res.data.entniche && !res.data.member && res.data.vip <= 0){
-                        (window.slotbydup = window.slotbydup || []).push({
-                            id: "u6603901",
-                            container: "_fhts92t44f",
-                            async: true
-                        });
-                        getAjaxAdv()
-                        var frames = document.getElementById("iframeu6603901_0");
-                        console.log(frames, 'frames')
-                        IframeOnClick.track(frames, function() {
-                            jQuery(document).click();
-                        });
-                    }
-                }
-            },
-            error: function(err) {
-                console.log(err)
-            }
-        })
-        function getAjaxAdv () {
-            $.ajax({
-                type: 'POST',
-                url: '/publicapply/adLeague/exposure',
-                data: {
-                        client: 'WX',
-                        id: 'ad8',
-                        position: '关注的企业列表页底部'
-                },
-                success: function(res) {
-                        console.log(res)
-                }
-            })
-        }
-        var IframeOnClick = {
-            resolution: 200,
-            iframes: [],
-            interval: null,
-            Iframe: function() {
-                    this.element = arguments[0];
-                    this.cb = arguments[1];
-                    this.hasTracked = false;
-            },
-            track: function(element, cb) {
-                    this.iframes.push(new this.Iframe(element, cb));
-                    var _this = this;
-                            this.interval = setInterval(function() { _this.checkClick(); }, this.resolution);
-            },
-            checkClick: function() {
-                if (document.activeElement) {
-                    var activeElement = document.activeElement;
-                    for (var i in this.iframes) {
-                        if (activeElement === this.iframes[i].element) { // user is in this Iframe
-                                if (this.iframes[i].hasTracked == false) {
-                                        this.iframes[i].cb.apply(window, []);
-                                        this.iframes[i].hasTracked = true;
-                                        $.ajax({
-                                                type: 'POST',
-                                                url: '/publicapply/adLeague/click',
-                                                data: {
-                                                    client: 'WX',
-                                                    id: 'ad8',
-                                                    position: '关注的企业列表页底部'
-                                                },
-                                                success: function(res) {
-                                                        console.log(res)
-                                                }
-                                        })
-                                }
-                        } else {
-                                this.iframes[i].hasTracked = false;
-                        }
-                    }
-                }
-            }
-			};
-    </script>
-    <!-- 多条广告如下脚本只需引入一次 -->
-    <script type="text/javascript" src="//cpro.baidustatic.com/cpro/ui/cm.js" async="async" defer="defer" >
-    </script>
+  </div>
 	<div class="easypopup" id="easypopup">
 		<div class="easypopup-main">
 			<div class="easypopup-header">提示信息</div>

src/jfw/modules/publicapply/src/channel/entity/entity.go

@@ -0,0 +1 @@
+package entity

src/jfw/modules/publicapply/src/channel/init.go

@@ -0,0 +1,10 @@
+package channel
+
+import (
+	"app.yhyue.com/moapp/jybase/go-xweb/xweb"
+	"jy/src/jfw/modules/publicapply/src/channel/service"
+)
+
+func init() {
+	xweb.AddAction(&service.ChannelStruct{})
+}

src/jfw/modules/publicapply/src/channel/service/action.go

@@ -0,0 +1,8 @@
+package service
+
+import "app.yhyue.com/moapp/jybase/go-xweb/xweb"
+
+type ChannelStruct struct {
+	*xweb.Action
+	cooperation xweb.Mapper `xweb:"/channel/cooperation"` //招标信息收藏
+}

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

@@ -0,0 +1,42 @@
+package service
+
+import (
+	. "app.yhyue.com/moapp/jybase/api"
+	qu "app.yhyue.com/moapp/jybase/common"
+	"app.yhyue.com/moapp/jypkg/common/src/qfw/util/jy"
+	"jy/src/jfw/modules/publicapply/src/db"
+	"log"
+)
+
+// P414
+func (c *ChannelStruct) Cooperation() {
+	defer qu.Catch()
+	r := func() Result {
+		//已登录 不做任何操作
+		if userId, _ := c.GetSession("userId").(string); userId != "" {
+			return Result{Data: nil}
+		}
+		if c.Method() != "POST" {
+			return Result{Data: nil, Error_msg: Error_msg_1005}
+		}
+		var (
+			res = Result{}
+		)
+		channelCode, err := c.Request.Cookie(jy.ChannelCookieName)
+		log.Println(err, "---channelCode.Value:--", channelCode)
+		if err == nil {
+			selectSql := `SELECT * FROM thirdparty.ent_channel_info WHERE channel_code = ?`
+			data := db.BaseMysql.SelectBySql(selectSql, channelCode.Value)
+			if data != nil && len(*data) > 0 {
+				customInfo := (*data)[0]["custom_info"]
+				res.Data = qu.If(customInfo != nil, qu.ObjToMap(customInfo), "").(interface{})
+			} else {
+				log.Println("未查到相关数据")
+			}
+		} else {
+			log.Println("不是 渠道合作商")
+		}
+		return res
+	}()
+	c.ServeJson(r)
+}

src/jfw/modules/publicapply/src/config.json

@@ -57,5 +57,6 @@
   "nsq":"192.168.3.240:4260",
   "nsq_topic": "jy_event",
   "accountMergeOnline": "2015-03-30 00:00:00",
-  "criticality":2
+  "criticality":2,
+  "taskStartTime":1698020000
 }

src/jfw/modules/publicapply/src/config/config.go

@@ -41,6 +41,7 @@ type config struct {
 	NsqTopic           string `json:"nsq_topic"`
 	AccountMergeOnline string `json:"accountMergeOnline"`
 	Criticality        int    `json:"criticality"`
+	TaskStartTime      int64
 }
 type BidColl struct {
 	PayUserCollLimit      int    //付费用户收藏数量最大限制

src/jfw/modules/publicapply/src/filter/cookie.go

@@ -0,0 +1,30 @@
+package filter
+
+import (
+	"app.yhyue.com/moapp/jybase/go-xweb/xweb"
+	"app.yhyue.com/moapp/jypkg/common/src/qfw/util/jy"
+	"jy/src/jfw/modules/publicapply/src/util"
+	"log"
+	"net/http"
+	"regexp"
+)
+
+var cc = regexp.MustCompile("^/channel/cooperate/(.*)")
+
+// CookieInfo 信息
+type CookieInfo struct {
+	App *xweb.App
+}
+
+// Do 继承过滤器方法
+func (ci *CookieInfo) Do(w http.ResponseWriter, req *http.Request) bool {
+	log.Println(req.Referer())
+	if cc.MatchString(req.Referer()) {
+		match := cc.FindStringSubmatch(req.Referer())
+		if len(match) > 1 {
+			util.SetCookieValue(w, jy.ChannelCookieName, match[1], -1)
+		}
+		log.Println("----------------------------", match)
+	}
+	return true
+}

src/jfw/modules/publicapply/src/filter/filter.go

@@ -7,4 +7,5 @@ import (
 func init() {
 	xweb.AddFilter(&logfilter{App: xweb.RootApp()})
 	xweb.AddFilter(&sessionfilter{App: xweb.RootApp()})
+	xweb.AddFilter(&CookieInfo{App: xweb.RootApp()})
 }

src/jfw/modules/publicapply/src/filter/sessionfilter.go

@@ -22,7 +22,7 @@ var reg_share = regexp.MustCompile("^/publicapply/shareFission/.*")
 var reg_nps = regexp.MustCompile("^/publicapply/nps/.*")
 var regWhiteList = regexp.MustCompile("^/publicapply/userbase/whitelist$")
 var regEntSearch = regexp.MustCompile("^/publicapply/enterpriseSearch/doQuery") //企业搜索接口
-var regOneClick = regexp.MustCompile("^/publicapply/oneClick/.*")
+var regOneClick = regexp.MustCompile("^/publicapply/(oneClick|channel)/.*")
 
 func (l *sessionfilter) Do(w http.ResponseWriter, req *http.Request) bool {
 	session := l.App.SessionManager.Session(req, w)

src/jfw/modules/publicapply/src/go.mod

@@ -5,7 +5,7 @@ go 1.18
 require (
 	app.yhyue.com/moapp/jybase v0.0.0-20230727083622-4dfc804ea6cf
 	app.yhyue.com/moapp/jylog v0.0.0-20230522075550-05d7230ca545
-	app.yhyue.com/moapp/jypkg v0.0.0-20230925120741-9e02619bfe25
+	app.yhyue.com/moapp/jypkg v1.0.4-0.20231108013952-a37ecebda2ed
 	bp.jydev.jianyu360.cn/BaseService/userCenter v1.2.14
 	github.com/SKatiyar/qr v0.0.0-20151201054752-25b6bdf44e67
 	github.com/alibabacloud-go/darabonba-openapi/v2 v2.0.4
@@ -148,7 +148,7 @@ require (
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 	gorm.io/driver/mysql v1.0.5 // indirect
 	gorm.io/gorm v1.21.3 // indirect
-	jygit.jydev.jianyu360.cn/ApplicationCenter/publicService v0.0.0-20230710093759-d9d6c68de8b1 // indirect
+	jygit.jydev.jianyu360.cn/ApplicationCenter/publicService v0.0.0-20231017031425-45003ca9f35a // indirect
 	k8s.io/api v0.26.3 // indirect
 	k8s.io/apimachinery v0.27.0-alpha.3 // indirect
 	k8s.io/client-go v0.26.3 // indirect

src/jfw/modules/publicapply/src/go.sum

@@ -9,8 +9,8 @@ app.yhyue.com/moapp/jybase v0.0.0-20230727083622-4dfc804ea6cf h1:/Tk5haITmGc5c3/
 app.yhyue.com/moapp/jybase v0.0.0-20230727083622-4dfc804ea6cf/go.mod h1:D40Ae0rQilH8Hc5o2Vtt04Tjh/DNEFpcS3/WkJMPJb8=
 app.yhyue.com/moapp/jylog v0.0.0-20230522075550-05d7230ca545 h1:+Lak4m1zgsigQloOsvp8AJ+0XeX/+PGp9QP550xlbBQ=
 app.yhyue.com/moapp/jylog v0.0.0-20230522075550-05d7230ca545/go.mod h1:uFrsdUBFbETiJlEmr4PtJWPsZlUpPj2bHQRhryu6ggk=
-app.yhyue.com/moapp/jypkg v0.0.0-20230925120741-9e02619bfe25 h1:2q7b1auPihIJD3Ewsd7Zi8ESeLkxuP57avWL8UoBr9U=
-app.yhyue.com/moapp/jypkg v0.0.0-20230925120741-9e02619bfe25/go.mod h1:gPCOY8bVXdY5bD7nry7th+YNkKC/viG8Dc9+z4fUaRo=
+app.yhyue.com/moapp/jypkg v1.0.4-0.20231108013952-a37ecebda2ed h1:rd5FDHAWiM1MLbgi79KBpRTMQfH5e2Y+knkk2JMsFP4=
+app.yhyue.com/moapp/jypkg v1.0.4-0.20231108013952-a37ecebda2ed/go.mod h1:76Kz6+MuxcRJRyFad9W8R4AByiQlVGzuGFzklY+2m38=
 app.yhyue.com/moapp/message v0.0.0-20221223100203-6402e389d9ae h1:6rDDaz6yxvE8viTSzEBwKYOFWq14TMfuBivSazUZMz4=
 app.yhyue.com/moapp/message v0.0.0-20221223100203-6402e389d9ae/go.mod h1:b0zZHev3gmJao1Fo+2Z2KPVjsuLOJVvVxf+kCnu9WkA=
 bp.jydev.jianyu360.cn/BaseService/entManageApplication v0.0.0-20230214091519-89a98c01ab0e h1:h+VEI3o1qC0jeCzkFGTrLI4f27cfa/W/y+0sXokWMgE=
@@ -1481,8 +1481,8 @@ honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWh
 honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg=
 honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
 honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
-jygit.jydev.jianyu360.cn/ApplicationCenter/publicService v0.0.0-20230710093759-d9d6c68de8b1 h1:BItxi1gkQUs3sjxaBk6tc34fZWSO4hUSXcTM3PcnY4I=
-jygit.jydev.jianyu360.cn/ApplicationCenter/publicService v0.0.0-20230710093759-d9d6c68de8b1/go.mod h1:p/595fgbj4r6GhSJhHDpx3Ru1NkD5UASFL8OuIQw09E=
+jygit.jydev.jianyu360.cn/ApplicationCenter/publicService v0.0.0-20231017031425-45003ca9f35a h1:kwjO4pqB3gnNGrQ9aXyz6f8s9qXAUenPUDWip8gYR/Q=
+jygit.jydev.jianyu360.cn/ApplicationCenter/publicService v0.0.0-20231017031425-45003ca9f35a/go.mod h1:p/595fgbj4r6GhSJhHDpx3Ru1NkD5UASFL8OuIQw09E=
 k8s.io/api v0.22.9/go.mod h1:rcjO/FPOuvc3x7nQWx29UcDrFJMx82RxDob71ntNH4A=
 k8s.io/api v0.26.3 h1:emf74GIQMTik01Aum9dPP0gAypL8JTLl/lHa4V9RFSU=
 k8s.io/api v0.26.3/go.mod h1:PXsqwPMXBSBcL1lJ9CYDKy7kIReUydukS5JiRlxC3qE=

src/jfw/modules/publicapply/src/identity/service/action.go

@@ -10,4 +10,8 @@ type Identity struct {
 	list xweb.Mapper `xweb:"/identity/list"`
 	//身份切换
 	switchIdentity xweb.Mapper `xweb:"/identity/switch"`
+	//编辑身份信息维护
+	edit xweb.Mapper `xweb:"/identity/maintenance/edit"`
+	//获取身份信息维护
+	detail xweb.Mapper `xweb:"/identity/maintenance/detail"`
 }

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

@@ -6,10 +6,12 @@ import (
 	. "jy/src/jfw/modules/publicapply/src/config"
 	. "jy/src/jfw/modules/publicapply/src/db"
 	"log"
+	"strings"
 
 	. "app.yhyue.com/moapp/jybase/api"
 	util "app.yhyue.com/moapp/jybase/common"
 	"app.yhyue.com/moapp/jybase/encrypt"
+	"app.yhyue.com/moapp/jypkg/common/src/qfw/util/jy"
 	. "app.yhyue.com/moapp/jypkg/identity"
 )
 
@@ -98,3 +100,104 @@ func (f *Identity) SwitchIdentity() {
 		Data: status,
 	})
 }
+
+func (f *Identity) Edit() {
+	userId, _ := f.GetSession("mgoUserId").(string)
+	set := map[string]interface{}{}
+	entName := strings.TrimSpace(f.GetString("entName"))
+	if entName != "" {
+		set["s_company"] = entName
+	}
+	if entType := strings.TrimSpace(f.GetString("entType")); entType != "" {
+		set["identity_info.ent_type"] = entType
+	}
+	if position := strings.TrimSpace(f.GetString("position")); position != "" {
+		set["identity_info.position"] = position
+	}
+	if deptName := strings.TrimSpace(f.GetString("deptName")); deptName != "" {
+		set["identity_info.dept_name"] = deptName
+	}
+	entBusinessType := strings.TrimSpace(f.GetString("entBusinessType"))
+	if entBusinessType != "" {
+		set["identity_info.ent_businessType"] = entBusinessType
+	}
+	status := 0
+	if len(set) > 0 {
+		if Mgo.UpdateById("user", userId, map[string]interface{}{"$set": set}) {
+			userMsg, _ := Mgo.FindById("user", userId, `{"l_registedate":1}`)
+			isNew := false
+			if userMsg != nil && len(*userMsg) > 0 {
+				l_registedate := util.Int64All((*userMsg)["l_registedate"])
+				isNew = l_registedate > Config.TaskStartTime //是否注册时间处于新手任务开始时间
+			}
+			status = 1
+			if entName != "" {
+				err := jy.Publish(Mgo_Log, Config.Nsq, Config.NsqTopic, "task", userId, "", map[string]interface{}{
+					"code":       util.If(isNew, "1010", "1017"),
+					"types":      "improveEntInfo",
+					"baseUserId": util.Int64All(f.GetSession("base_user_id")),
+				})
+				if err != nil {
+					log.Println(userId, "完善身份信息-公司信息，发送nsq消息错误-->", err)
+				}
+			}
+			if entBusinessType != "" {
+				err := jy.Publish(Mgo_Log, Config.Nsq, Config.NsqTopic, "task", userId, "", map[string]interface{}{
+					"code":       util.If(isNew, "1011", "1018"),
+					"types":      "improveBusiness",
+					"baseUserId": util.Int64All(f.GetSession("base_user_id")),
+				})
+				if err != nil {
+					log.Println(userId, "完善身份信息-公司信息，发送nsq消息错误-->", err)
+				}
+			}
+		}
+	}
+	f.ServeJson(Result{Data: status})
+}
+
+func (f *Identity) Detail() {
+	userId, _ := f.GetSession("userId").(string)
+	mgoUserId, _ := f.GetSession("mgoUserId").(string)
+	u, ok := Mgo.FindById("user", mgoUserId, `{"s_company":1,"identity_info":1}`)
+	data := M{}
+	if ok && u != nil && len(*u) > 0 {
+		entType, position, deptName, entBusinessType := "", "", "", ""
+		entName, _ := (*u)["s_company"].(string)
+		identityInfo, _ := (*u)["identity_info"].(map[string]interface{})
+		if identityInfo != nil {
+			entType, _ = identityInfo["ent_type"].(string)
+			position, _ = identityInfo["position"].(string)
+			deptName, _ = identityInfo["dept_name"].(string)
+			entBusinessType, _ = identityInfo["ent_businessType"].(string)
+		}
+		if entName == "" || position == "" || deptName == "" || entType == "" {
+			saleLeads, ok := Mgo.Find("saleLeads", map[string]interface{}{
+				"userid": userId,
+			}, `{"createtime":-1}`, `{"company":1,"position":1,"department":1,"companyType":1,"branch":1}`, false, 0, 1)
+			if ok && saleLeads != nil && len(*saleLeads) == 1 {
+				if entName == "" {
+					entName, _ = (*saleLeads)[0]["company"].(string)
+				}
+				if position == "" {
+					position, _ = (*saleLeads)[0]["position"].(string)
+				}
+				if deptName == "" {
+					deptName, _ = (*saleLeads)[0]["department"].(string)
+				}
+				if deptName == "" {
+					deptName, _ = (*saleLeads)[0]["branch"].(string)
+				}
+				if entType == "" {
+					entType, _ = (*saleLeads)[0]["companyType"].(string)
+				}
+			}
+		}
+		data["entName"] = entName
+		data["entType"] = entType
+		data["position"] = position
+		data["deptName"] = deptName
+		data["entBusinessType"] = entBusinessType
+	}
+	f.ServeJson(Result{Data: data})
+}

src/jfw/modules/publicapply/src/main.go

@@ -26,6 +26,7 @@ import (
 	_ "jy/src/jfw/modules/publicapply/src/transfer"
 	"net/http"
 
+	_ "jy/src/jfw/modules/publicapply/src/channel"
 	_ "jy/src/jfw/modules/publicapply/src/shareFission"
 	_ "jy/src/jfw/modules/publicapply/src/subscribe"
 	_ "jy/src/jfw/modules/publicapply/src/subscribePush"

src/jfw/modules/publicapply/src/oneclick/entity/entity.go

@@ -1,7 +1,21 @@
 package entity
 
 import (
+	"encoding/json"
+	"errors"
+	"fmt"
+	"jy/src/jfw/modules/publicapply/src/config"
+	"jy/src/jfw/modules/publicapply/src/db"
+	"jy/src/jfw/modules/publicapply/src/jyutil"
+	"jy/src/jfw/modules/publicapply/src/oneclick/initjson"
+	"log"
+	"net/http"
+	"strings"
+	"sync"
+	"time"
+
 	"app.yhyue.com/moapp/jybase/common"
+	qutil "app.yhyue.com/moapp/jybase/common"
 	"app.yhyue.com/moapp/jybase/date"
 	"app.yhyue.com/moapp/jybase/encrypt"
 	"app.yhyue.com/moapp/jybase/go-xweb/httpsession"
@@ -10,23 +24,12 @@ import (
 	qrpc "app.yhyue.com/moapp/jybase/rpc"
 	"app.yhyue.com/moapp/jybase/usercenter"
 	"app.yhyue.com/moapp/jypkg/common/src/qfw/util/jy"
+	"app.yhyue.com/moapp/jypkg/public"
 	"bp.jydev.jianyu360.cn/BaseService/userCenter/rpc/pb"
-	"encoding/json"
-	"errors"
-	"fmt"
 	openapi "github.com/alibabacloud-go/darabonba-openapi/v2/client"
 	dypnsapi20170525 "github.com/alibabacloud-go/dypnsapi-20170525/v2/client"
 	util "github.com/alibabacloud-go/tea-utils/v2/service"
 	"github.com/alibabacloud-go/tea/tea"
-	"jy/src/jfw/modules/publicapply/src/config"
-	"jy/src/jfw/modules/publicapply/src/db"
-	"jy/src/jfw/modules/publicapply/src/jyutil"
-	"jy/src/jfw/modules/publicapply/src/oneclick/initjson"
-	"log"
-	"net/http"
-	"strings"
-	"sync"
-	"time"
 )
 
 type OneClickInfo struct {
@@ -48,6 +51,7 @@ type OneClickInfo struct {
 	Session        *httpsession.Session
 	ResponseWriter *http.ResponseWriter
 	Host           string
+	R              *http.Request
 }
 
 var (
@@ -299,7 +303,6 @@ func (o *OneClickInfo) ProcessPhone(phone string) (map[string]interface{}, error
 		}
 		returnData = rs
 	}
-
 	return returnData, nil
 }
 
@@ -392,7 +395,7 @@ func (o *OneClickInfo) phoneLogin(phone string) (map[string]interface{}, error)
 				}
 				mgoUserId, _ := o.Session.Get("mgoUserId").(string)
 				go o.saveLog(mgoUserId, "o_register")
-				return 1
+				return 2
 			}
 		} else {
 			//以s_m_phone登录的 需要把s_m_phone转化为s_phone
@@ -413,6 +416,44 @@ func (o *OneClickInfo) phoneLogin(phone string) (map[string]interface{}, error)
 		}
 		return 0
 	}()
+	if status == 1 {
+		mgoUserId := qutil.ObjToString(o.Session.Get("mgoUserId"))
+		err := jy.Publish(db.Mgo_Log, config.Config.Nsq, config.Config.NsqTopic, "task", mgoUserId, "", map[string]interface{}{
+			"code":       1014, //下载app任务
+			"types":      "downloadApp",
+			"num":        50,
+			"baseUserId": o.Session.Get("base_user_id"),
+			"positionId": o.Session.Get("positionId"),
+		})
+		if err != nil {
+			log.Println(mgoUserId, "下载app任务，发送nsq消息错误-->", err)
+		}
+	}
+	if status > 0 {
+		//登录source 更新 p414
+		mgoUserId, _ := o.Session.Get("mgoUserId").(string)
+		phone, _ := o.Session.Get("phone").(string)
+		channelCode := "jy_app"
+		cc, ckErr := o.R.Cookie(jy.ChannelCookieName)
+		if ckErr == nil {
+			channelCode = cc.Value
+		}
+		us := jy.UserSource{
+			UserId:           mgoUserId,
+			Phone:            phone,
+			State:            status, //注册/登录标志 1：登录；2：注册
+			ChannelCode:      channelCode,
+			EncryptionUserId: encrypt.SE.Encode2Hex(mgoUserId),
+			CreateTime:       time.Now().Format(date.Date_Full_Layout),
+			LoginWay:         4,                                                                  //登录方式;1:手机号密码；2：手机号验证码；3：微信；4：手机号一键登录
+			Platform:         common.If(strings.Contains(o.Host, "h5.jianyu360.cn"), 4, 3).(int), //登录端；1：PC；2：WX；3：APP；4：H5
+			Ip:               common.GetIp(o.R),
+		}
+		go func(us jy.UserSource) {
+			jy.SaveUserSource(public.BaseMysql, jy.ChannelTableName, common.StructToMapMore(us))
+		}(us)
+		status = 1
+	}
 	result := map[string]interface{}{
 		"status": status,
 		"userId": o.Session.Get("mgoUserId"),

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

@@ -1,11 +1,11 @@
 package service
 
 import (
-	. "app.yhyue.com/moapp/jybase/api"
-	qu "app.yhyue.com/moapp/jybase/common"
-	"errors"
-	"jy/src/jfw/modules/publicapply/src/oneclick/entity"
-	"log"
+    . "app.yhyue.com/moapp/jybase/api"
+    qu "app.yhyue.com/moapp/jybase/common"
+    "errors"
+    "jy/src/jfw/modules/publicapply/src/oneclick/entity"
+    "log"
 )
 
 func (o *OneClick) GetPhoneByToken() {

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

@@ -1,7 +1,6 @@
 package entity
 
 import (
-	"bp.jydev.jianyu360.cn/BaseService/userCenter/rpc/pb"
 	"fmt"
 	"jy/src/jfw/modules/publicapply/src/config"
 	"jy/src/jfw/modules/publicapply/src/db"
@@ -10,6 +9,8 @@ import (
 	"strings"
 	"time"
 
+	"bp.jydev.jianyu360.cn/BaseService/userCenter/rpc/pb"
+
 	qutil "app.yhyue.com/moapp/jybase/common"
 	"app.yhyue.com/moapp/jybase/go-xweb/httpsession"
 	"app.yhyue.com/moapp/jypkg/common/src/qfw/util/jy"
@@ -268,6 +269,17 @@ func AddKeyWordsFree(types, userId, classIndex, className, keywordsIndex, keywor
 				AppId:      "10000",
 			})
 			config.Middleground.PowerCheckCenter.DelCheckRedis("10000", qutil.Int64All(positionId))
+			//判断是新增
+			if (keywordCount == "" || keywordCount == "0") || (keywordCount == keywordsIndex || qutil.Int64All(keywordCount) == qutil.Int64All(keywordsIndex)+1) {
+				//设置关键词送积分
+				jy.Publish(db.Mgo_Log, config.Config.Nsq, config.Config.NsqTopic, "task", qutil.ObjToString(session.Get("mgoUserId")), jy.Jywx_node1, map[string]interface{}{
+					"code":       1015, //首次订阅
+					"types":      "subscribeKeyWords",
+					"num":        50,
+					"baseUserId": session.Get("base_user_id"),
+					"positionId": positionId,
+				})
+			}
 		}
 		SetLog(userId, types, 0, session)
 	}
@@ -342,6 +354,18 @@ func AddKeyWords(types, userId, classIndex, className, keywordsIndex, keywordNam
 			"$set": saveData,
 		})
 		SetLog(userId, types, positionType, session)
+		//判断是新增
+
+		if (keywordCount == "" || keywordCount == "0") || (keywordCount == keywordsIndex || qutil.Int64All(keywordCount) == qutil.Int64All(keywordsIndex)+1) {
+			//设置关键词送积分
+			jy.Publish(db.Mgo_Log, config.Config.Nsq, config.Config.NsqTopic, "task", qutil.ObjToString(session.Get("mgoUserId")), jy.Jywx_node1, map[string]interface{}{
+				"code":       1015, //首次订阅
+				"types":      "subscribeKeyWords",
+				"num":        50,
+				"baseUserId": session.Get("base_user_id"),
+				"positionId": session.Get("positionId"),
+			})
+		}
 	}
 	return map[string]interface{}{"flag": flag, "msg": ""}
 }

src/jfw/modules/publicapply/src/util/util.go

@@ -1,37 +1,39 @@
 package util
 
 import (
-    "encoding/json"
-    "fmt"
-    "jy/src/jfw/modules/publicapply/src/config"
-    "jy/src/jfw/modules/publicapply/src/db"
-    "regexp"
-    "strconv"
-    "strings"
-    "time"
+	"app.yhyue.com/moapp/jybase/go-xweb/httpsession"
+	"encoding/json"
+	"fmt"
+	"jy/src/jfw/modules/publicapply/src/config"
+	"jy/src/jfw/modules/publicapply/src/db"
+	"net/http"
+	"regexp"
+	"strconv"
+	"strings"
+	"time"
 
-    qutil "app.yhyue.com/moapp/jybase/common"
-    . "app.yhyue.com/moapp/jybase/date"
-    "app.yhyue.com/moapp/jybase/encrypt"
-    "app.yhyue.com/moapp/jypkg/common/src/qfw/util/jy"
+	qutil "app.yhyue.com/moapp/jybase/common"
+	. "app.yhyue.com/moapp/jybase/date"
+	"app.yhyue.com/moapp/jybase/encrypt"
+	"app.yhyue.com/moapp/jypkg/common/src/qfw/util/jy"
 )
 
 var ClearHtml = regexp.MustCompile("<[^>]*>")
 
-//加密
+// 加密
 func EncodeId(sid string) string {
-    if sid == "" {
-        return ""
-    }
-    return encrypt.EncodeArticleId2ByCheck(sid)
+	if sid == "" {
+		return ""
+	}
+	return encrypt.EncodeArticleId2ByCheck(sid)
 }
 
-//解密
+// 解密
 func DecodeId(eid string) string {
-    if eid == "" {
-        return ""
-    }
-    return encrypt.CommonDecodeArticle("content", eid)[0]
+	if eid == "" {
+		return ""
+	}
+	return encrypt.CommonDecodeArticle("content", eid)[0]
 }
 
 //收藏列表
@@ -43,231 +45,249 @@ func DecodeId(eid string) string {
 	   开始时间-结束时间：1622476800-1623859200
 */
 type CollList struct {
-    Pagenum     int    `json:"pagenum"`     //页数
-    Label       string `json:"label"`       //标签 用,分隔开
-    SelectTime  string `json:"selectTime"`  //收藏时间
-    Buyerclass  string `json:"buyerclass"`  //采购单位 用,分隔开
-    BuyerPhone  int    `json:"buyerPhone"`  //是否需要采购单位联系方式 1:需要 -1:不需要 0:未选中
-    WinnerPhone int    `json:"winnerPhone"` //是否需要中标单位联系方式 1:需要 -1:不需要 0:未选中
-    Pagesize    int    `json:"pagesize"`    //每页展示数量
+	Pagenum     int    `json:"pagenum"`     //页数
+	Label       string `json:"label"`       //标签 用,分隔开
+	SelectTime  string `json:"selectTime"`  //收藏时间
+	Buyerclass  string `json:"buyerclass"`  //采购单位 用,分隔开
+	BuyerPhone  int    `json:"buyerPhone"`  //是否需要采购单位联系方式 1:需要 -1:不需要 0:未选中
+	WinnerPhone int    `json:"winnerPhone"` //是否需要中标单位联系方式 1:需要 -1:不需要 0:未选中
+	Pagesize    int    `json:"pagesize"`    //每页展示数量
 }
 
-//搜藏列表
+// 搜藏列表
 func CollListSql(c *CollList, isPay bool, userid string) string {
-    sql := fmt.Sprintf(`select bid from %s where userid ='%s'`, db.DbConf.Bdcollection, userid)
-    limit := config.BidCollConfig.FreeUserCollLimit
-    //个人标签
-    if c.Label != "" {
-        i := 0
-        sql += ` and `
-        if labelArr := strings.Split(c.Label, ","); len(labelArr) > 0 {
-            sql += `(`
-            for _, v := range labelArr {
-                i++
-                labid := encrypt.SE.DecodeString(v)
-                if i == len(labelArr) {
-                    sql += fmt.Sprintf(`FIND_IN_SET(%s,labelid)`, labid)
-                } else {
-                    sql += fmt.Sprintf(`FIND_IN_SET(%s,labelid) or `, labid)
-                }
-            }
-            sql += `)`
-        }
-    }
-    now := time.Now()
-    start, end := "", ""
-    //收藏时间
-    if c.SelectTime == "lately-7" { //最近7天
-        start = fmt.Sprint(time.Date(now.Year(), now.Month(), now.Day()-7, 0, 0, 0, 0, time.Local).Format(Date_Full_Layout))
-    } else if c.SelectTime == "lately-30" { //最近30天
-        start = fmt.Sprint(time.Date(now.Year(), now.Month(), now.Day()-30, 0, 0, 0, 0, time.Local).Format(Date_Full_Layout))
-    } else if c.SelectTime == "thisyear" { //去年
-        start = fmt.Sprint(time.Date(now.Year()-1, 1, 1, 0, 0, 0, 0, time.Local).Format(Date_Full_Layout))
-        end = fmt.Sprint(time.Date(now.Year()-1, 12, 31, 23, 59, 59, 0, time.Local).Format(Date_Full_Layout))
-    } else if len(strings.Split(c.SelectTime, "_")) == 2 {
-        if c.SelectTime != "0_0" {
-            starttime := strings.Split(c.SelectTime, "_")[0]
-            startstamp, _ := strconv.Atoi(starttime)
-            start = time.Unix(int64(startstamp), 0).Format(Date_Full_Layout)
-            endtime := strings.Split(c.SelectTime, "_")[1]
-            et, _ := strconv.ParseInt(endtime, 0, 64)
-            etTime := time.Unix(et, 0)
-            end = fmt.Sprint(time.Date(etTime.Year(), etTime.Month(), etTime.Day()+1, 0, 0, 0, 0, time.Local).Format(Date_Full_Layout))
-        }
-    }
-    if start != "" && end != "" {
-        sql += ` and createdate >= '` + start + `' and createdate < '` + end + `'`
-    } else if start != "" && end == "" {
-        sql += ` and createdate >= '` + start + `'`
-    } else if start == "" && end != "" {
-        sql += ` and createdate < '` + end + `'`
-    }
-    if isPay {
+	sql := fmt.Sprintf(`select bid from %s where userid ='%s'`, db.DbConf.Bdcollection, userid)
+	limit := config.BidCollConfig.FreeUserCollLimit
+	//个人标签
+	if c.Label != "" {
+		i := 0
+		sql += ` and `
+		if labelArr := strings.Split(c.Label, ","); len(labelArr) > 0 {
+			sql += `(`
+			for _, v := range labelArr {
+				i++
+				labid := encrypt.SE.DecodeString(v)
+				if i == len(labelArr) {
+					sql += fmt.Sprintf(`FIND_IN_SET(%s,labelid)`, labid)
+				} else {
+					sql += fmt.Sprintf(`FIND_IN_SET(%s,labelid) or `, labid)
+				}
+			}
+			sql += `)`
+		}
+	}
+	now := time.Now()
+	start, end := "", ""
+	//收藏时间
+	if c.SelectTime == "lately-7" { //最近7天
+		start = fmt.Sprint(time.Date(now.Year(), now.Month(), now.Day()-7, 0, 0, 0, 0, time.Local).Format(Date_Full_Layout))
+	} else if c.SelectTime == "lately-30" { //最近30天
+		start = fmt.Sprint(time.Date(now.Year(), now.Month(), now.Day()-30, 0, 0, 0, 0, time.Local).Format(Date_Full_Layout))
+	} else if c.SelectTime == "thisyear" { //去年
+		start = fmt.Sprint(time.Date(now.Year()-1, 1, 1, 0, 0, 0, 0, time.Local).Format(Date_Full_Layout))
+		end = fmt.Sprint(time.Date(now.Year()-1, 12, 31, 23, 59, 59, 0, time.Local).Format(Date_Full_Layout))
+	} else if len(strings.Split(c.SelectTime, "_")) == 2 {
+		if c.SelectTime != "0_0" {
+			starttime := strings.Split(c.SelectTime, "_")[0]
+			startstamp, _ := strconv.Atoi(starttime)
+			start = time.Unix(int64(startstamp), 0).Format(Date_Full_Layout)
+			endtime := strings.Split(c.SelectTime, "_")[1]
+			et, _ := strconv.ParseInt(endtime, 0, 64)
+			etTime := time.Unix(et, 0)
+			end = fmt.Sprint(time.Date(etTime.Year(), etTime.Month(), etTime.Day()+1, 0, 0, 0, 0, time.Local).Format(Date_Full_Layout))
+		}
+	}
+	if start != "" && end != "" {
+		sql += ` and createdate >= '` + start + `' and createdate < '` + end + `'`
+	} else if start != "" && end == "" {
+		sql += ` and createdate >= '` + start + `'`
+	} else if start == "" && end != "" {
+		sql += ` and createdate < '` + end + `'`
+	}
+	if isPay {
 
-        //采购单位 用,分隔开
-        if c.Buyerclass != "" {
-            i := 0
-            sql += ` and buyerclass in (`
-            if buyClassArr := strings.Split(c.Buyerclass, ","); len(buyClassArr) > 0 {
-                for _, v := range buyClassArr {
-                    i++
-                    buyerclassid := fmt.Sprint(jy.PushMapping.Buyerclass[v])
-                    if i == len(buyClassArr) {
-                        sql += buyerclassid + `)`
-                    } else {
-                        sql += buyerclassid + ","
-                    }
-                }
-            }
-        }
-        //是否存在采购单位电话
-        if c.BuyerPhone == 1 {
-            sql += ` and buyerinfo = 1`
-        } else if c.BuyerPhone == -1 {
-            sql += ` and buyerinfo = 0`
-        }
-        //是否存在中标单位电话
-        if c.WinnerPhone == 1 {
-            sql += ` and winnerinfo = 1`
-        } else if c.WinnerPhone == -1 {
-            sql += ` and winnerinfo = 0`
-        }
-        limit = config.BidCollConfig.PayUserCollLimit
-    }
-    sql += fmt.Sprintf(` order by createdate desc limit %v`, limit)
-    return sql
+		//采购单位 用,分隔开
+		if c.Buyerclass != "" {
+			i := 0
+			sql += ` and buyerclass in (`
+			if buyClassArr := strings.Split(c.Buyerclass, ","); len(buyClassArr) > 0 {
+				for _, v := range buyClassArr {
+					i++
+					buyerclassid := fmt.Sprint(jy.PushMapping.Buyerclass[v])
+					if i == len(buyClassArr) {
+						sql += buyerclassid + `)`
+					} else {
+						sql += buyerclassid + ","
+					}
+				}
+			}
+		}
+		//是否存在采购单位电话
+		if c.BuyerPhone == 1 {
+			sql += ` and buyerinfo = 1`
+		} else if c.BuyerPhone == -1 {
+			sql += ` and buyerinfo = 0`
+		}
+		//是否存在中标单位电话
+		if c.WinnerPhone == 1 {
+			sql += ` and winnerinfo = 1`
+		} else if c.WinnerPhone == -1 {
+			sql += ` and winnerinfo = 0`
+		}
+		limit = config.BidCollConfig.PayUserCollLimit
+	}
+	sql += fmt.Sprintf(` order by createdate desc limit %v`, limit)
+	return sql
 }
 
 func ConfirmIntArr(arr []interface{}) []int {
-    tmp := make([]int, 0)
-    for _, v := range arr {
-        tmp = append(tmp, qutil.IntAll(v))
-    }
-    return tmp
+	tmp := make([]int, 0)
+	for _, v := range arr {
+		tmp = append(tmp, qutil.IntAll(v))
+	}
+	return tmp
 }
 
-//判断同一个数组是否重复
+// 判断同一个数组是否重复
 func IsRepeat(slice1 []string) bool {
-    m := make(map[string]int)
-    for _, v := range slice1 {
-        m[v]++
-        if m[v] > 1 {
-            return true
-        }
-    }
-    return false
+	m := make(map[string]int)
+	for _, v := range slice1 {
+		m[v]++
+		if m[v] > 1 {
+			return true
+		}
+	}
+	return false
 }
 
-//判断数组是否包含
+// 判断数组是否包含
 func IsContain(slice []string, s string) bool {
-    for _, qq := range slice {
-        if qq == s {
-            return true
-        }
-    }
-    return false
+	for _, qq := range slice {
+		if qq == s {
+			return true
+		}
+	}
+	return false
 }
 
 // jsonStr转map
 func JsonToMap(jsonStr string) (map[string]interface{}, error) {
-    m := map[string]interface{}{}
-    err := json.Unmarshal([]byte(jsonStr), &m)
-    if err != nil {
-        fmt.Printf("Unmarshal with error: %+v\n", err)
-        return nil, err
-    }
-    return m, nil
+	m := map[string]interface{}{}
+	err := json.Unmarshal([]byte(jsonStr), &m)
+	if err != nil {
+		fmt.Printf("Unmarshal with error: %+v\n", err)
+		return nil, err
+	}
+	return m, nil
 }
 
-//判断stringArr相等方法
+// 判断stringArr相等方法
 func StringArrEqual(a, b []string) bool {
-    if (len(a) == 0) != (len(b) == 0) {
-        return false
-    }
-    if len(a) != len(b) {
-        return false
-    }
-    for i := range a {
-        if a[i] != b[i] {
-            return false
-        }
-    }
-    return true
+	if (len(a) == 0) != (len(b) == 0) {
+		return false
+	}
+	if len(a) != len(b) {
+		return false
+	}
+	for i := range a {
+		if a[i] != b[i] {
+			return false
+		}
+	}
+	return true
 }
 
-//获取频次信息:fre="周-1"(每周周一);"天-3"：每三天一个周期；"日-3"：每天三点；
+// 获取频次信息:fre="周-1"(每周周一);"天-3"：每三天一个周期；"日-3"：每天三点；
 func GetFrequencyInfo(fre string) (string, bool, int) {
-    if fre != "" && len(strings.Split(fre, "-")) > 1 {
-        f := strings.Split(fre, "-")[0]
-        d, _ := strconv.Atoi(strings.Split(fre, "-")[1])
-        switch f {
-        case "月":
-            day := time.Now().Day()
-            return fmt.Sprintf("nps_%s", time.Now().Month().String()), day == d, 31 * 24 * 60 * 60
-        case "周":
-            mi := ConvertWeekday(time.Now().Weekday().String())
-            return fmt.Sprintf("nps_%s", WeekByDate(time.Now())), mi == d, 7 * 24 * 60 * 60
-        case "日":
-            day := time.Now().Day()
-            hour := time.Now().Hour()
-            return fmt.Sprintf("nps_%s", strconv.Itoa(day)), hour == d, 24 * 60 * 60
-        case "天":
-            return fmt.Sprintf("nps_%s", strings.Split(fre, "-")[1]), true, d * 24 * 60 * 60
-        }
-    }
-    return "", false, 0
+	if fre != "" && len(strings.Split(fre, "-")) > 1 {
+		f := strings.Split(fre, "-")[0]
+		d, _ := strconv.Atoi(strings.Split(fre, "-")[1])
+		switch f {
+		case "月":
+			day := time.Now().Day()
+			return fmt.Sprintf("nps_%s", time.Now().Month().String()), day == d, 31 * 24 * 60 * 60
+		case "周":
+			mi := ConvertWeekday(time.Now().Weekday().String())
+			return fmt.Sprintf("nps_%s", WeekByDate(time.Now())), mi == d, 7 * 24 * 60 * 60
+		case "日":
+			day := time.Now().Day()
+			hour := time.Now().Hour()
+			return fmt.Sprintf("nps_%s", strconv.Itoa(day)), hour == d, 24 * 60 * 60
+		case "天":
+			return fmt.Sprintf("nps_%s", strings.Split(fre, "-")[1]), true, d * 24 * 60 * 60
+		}
+	}
+	return "", false, 0
 }
 
-//获取当年第几周
+// 获取当年第几周
 func WeekByDate(t time.Time) string {
-    yearDay := t.YearDay()
-    yearFirstDay := t.AddDate(0, 0, -yearDay+1)
-    firstDayInWeek := int(yearFirstDay.Weekday())
+	yearDay := t.YearDay()
+	yearFirstDay := t.AddDate(0, 0, -yearDay+1)
+	firstDayInWeek := int(yearFirstDay.Weekday())
 
-    //今年第一周有几天
-    firstWeekDays := 1
-    if firstDayInWeek != 0 {
-        firstWeekDays = 7 - firstDayInWeek + 1
-    }
-    var week int
-    if yearDay <= firstWeekDays {
-        week = 1
-    } else {
-        week = (yearDay-firstWeekDays)/7 + 2
-    }
-    return fmt.Sprintf("%d-%d", t.Year(), week)
+	//今年第一周有几天
+	firstWeekDays := 1
+	if firstDayInWeek != 0 {
+		firstWeekDays = 7 - firstDayInWeek + 1
+	}
+	var week int
+	if yearDay <= firstWeekDays {
+		week = 1
+	} else {
+		week = (yearDay-firstWeekDays)/7 + 2
+	}
+	return fmt.Sprintf("%d-%d", t.Year(), week)
 }
 
 func ConvertWeekday(weekday string) int {
-    _weekday := 0
-    if weekday == "Sunday" {
-        _weekday = 7
-    } else if weekday == "Monday" {
-        _weekday = 1
-    } else if weekday == "Tuesday" {
-        _weekday = 2
-    } else if weekday == "Wednesday" {
-        _weekday = 3
-    } else if weekday == "Thursday" {
-        _weekday = 4
-    } else if weekday == "Friday" {
-        _weekday = 5
-    } else if weekday == "Saturday" {
-        _weekday = 6
-    }
-    return _weekday
+	_weekday := 0
+	if weekday == "Sunday" {
+		_weekday = 7
+	} else if weekday == "Monday" {
+		_weekday = 1
+	} else if weekday == "Tuesday" {
+		_weekday = 2
+	} else if weekday == "Wednesday" {
+		_weekday = 3
+	} else if weekday == "Thursday" {
+		_weekday = 4
+	} else if weekday == "Friday" {
+		_weekday = 5
+	} else if weekday == "Saturday" {
+		_weekday = 6
+	}
+	return _weekday
 }
 
-//map转结构体
+// map转结构体
 func JsonUnmarshal(m interface{}, s interface{}) interface{} {
-    var b []byte
-    if v, ok := m.(string); ok {
-        b = []byte(v)
-    } else if v, ok := m.([]byte); ok {
-        b = v
-    } else {
-        b, _ = json.Marshal(m)
-    }
-    json.Unmarshal(b, &s)
-    return s
+	var b []byte
+	if v, ok := m.(string); ok {
+		b = []byte(v)
+	} else if v, ok := m.([]byte); ok {
+		b = v
+	} else {
+		b, _ = json.Marshal(m)
+	}
+	json.Unmarshal(b, &s)
+	return s
+}
+
+// SetCookieValue 更新cookie信息
+func SetCookieValue(rw http.ResponseWriter, name, val string, timeOut int) {
+	http.SetCookie(rw, func() *http.Cookie {
+		maxAge := timeOut //单位秒
+		expires := time.Now().Add(time.Duration(timeOut) * time.Second)
+		cookie := &http.Cookie{
+			Name:     name,
+			Value:    val,
+			Path:     "/",
+			HttpOnly: false,
+			MaxAge:   maxAge,
+			Expires:  expires,
+			Domain:   httpsession.Domain,
+		}
+		return cookie
+	}())
 }

src/jfw/modules/subscribepay/src/baseApi.json

@@ -1,12 +1,12 @@
 {
   "appId": "10000",
   "apiList": {
-    "buyBalance": "http://127.0.0.1:8124/resources/purchaseUserBalance",
-    "useBalance": "http://127.0.0.1:8124/resources/useUserDetailed",
-    "findPreview": "http://127.0.0.1:8124/resources/findPreview",
-    "findBalance": "http://127.0.0.1:8124/resources/findBalance",
-    "findRecord": "http://127.0.0.1:8124/resources/findRecord",
-    "entdedupUrl": "http://127.0.0.1:8888/data/deduplication",
-    "updateVipTime":"http://127.0.0.1:8124/resources/updateVipTime"
+    "buyBalance": "http://127.0.0.1:8889/resources/purchaseUserBalance",
+    "useBalance": "http://127.0.0.1:8889/resources/useUserDetailed",
+    "findPreview": "http://127.0.0.1:8889/resources/findPreview",
+    "findBalance": "http://127.0.0.1:8889/resources/findBalance",
+    "findRecord": "http://127.0.0.1:8889/resources/findRecord",
+    "entdedupUrl": "http://127.0.0.1:8889/data/deduplication",
+    "updateVipTime":"http://127.0.0.1:8889/resources/updateVipTime"
   }
 }

src/jfw/modules/subscribepay/src/config.json

@@ -1,17 +1,17 @@
 {
-  "smsServiceRpc":"192.168.3.11:932",
+  "smsServiceRpc":"192.168.3.149:932",
   "mongodbServers": "192.168.3.206:27080",
   "mongodbPoolSize": 10,
   "mongodbName": "qfw",
   "mongoent":{
-    "address": "192.168.3.207:27001,192.168.3.206:27002",
+    "address": "192.168.3.206:27002",
     "size": 5,
     "dbName": "qfw_data",
     "userName": "jyDevGroup",
     "password": "jy@DevGroup"
   },
   "mongobidding":{
-    "address": "192.168.3.207:27001,192.168.3.206:27002",
+    "address": "192.168.3.206:27002",
     "size": 5,
     "dbName": "qfw_data",
     "replSet": "",
@@ -33,7 +33,7 @@
     "userName": "admin",
     "password": "123456"
   },
-  "redisaddrs": "other=192.168.3.206:1712,session=192.168.3.11:1713,push=192.168.3.206:1712,newother=192.168.3.206:1712",
+  "redisaddrs": "other=192.168.3.149:1712,session=192.168.3.149:1713,push=192.168.3.149:1712,newother=192.168.3.149:1712",
   "elasticsearch": "http://192.168.3.206:9800,http://192.168.3.206:9801",
   "elasticPoolSize": 30,
   "elasticVersion": "v7",
@@ -43,7 +43,7 @@
   "appsecret": "ed5961aa2fca99d13ccff99130ba2866",
   "webport": "86",
   "webrpcport": "84",
-  "weixinrpc": "192.168.3.11:8202",
+  "weixinrpc": "127.0.0.1:8202",
   "cassandra": {
     "log": {
       "host": [
@@ -61,7 +61,7 @@
   },
     "mysql": {
         "dbName": "jianyu",
-        "address": "192.168.3.11:3366",
+        "address": "192.168.3.149:3306",
         "userName": "root",
         "passWord": "Topnet123",
 		"maxOpenConns":5,
@@ -69,15 +69,15 @@
 	},
     "infoMysql": {
         "dbName": "base_service",
-        "address": "192.168.3.11:3366",
+        "address": "192.168.3.217:4000",
         "userName": "root",
-        "passWord": "Topnet123",
+        "passWord": "=PDT49#80Z!RVv52_z",
 		"maxOpenConns":2,
 		"maxIdleConns":2
 	},
 	"activityMysql":{
 		 "dbName": "jyactivities",
-        "address": "192.168.3.11:3366",
+        "address": "192.168.3.149:3306",
         "userName": "root",
         "passWord": "Topnet123",
 		"maxOpenConns":5,
@@ -157,5 +157,6 @@
     "etcd": {
     	"hosts": "192.168.3.149:2379",
     	"key": "powercheck.rpc"
-    }
+    },
+    "taskStartTime":1698020000
 }

src/jfw/modules/subscribepay/src/config.yaml

@@ -1,6 +1,6 @@
 etcd:
   hosts:
-  - 192.168.3.149:2379
+  - 127.0.0.1:2379
 userCenterKey: "usercenter.rpc" #用户中台rpc
 powerCheckCenterKey: "powercheck.rpc" #权益校验中台
 activityKey: "activity.rpc" #营销平台rpc

src/jfw/modules/subscribepay/src/config/config.go

@@ -3,9 +3,6 @@ package config
 import (
 	"time"
 
-	"app.yhyue.com/moapp/jypkg/middleground"
-	"github.com/gogf/gf/v2/frame/g"
-	"github.com/gogf/gf/v2/os/gcfg"
 	"github.com/gogf/gf/v2/os/gctx"
 
 	qutil "app.yhyue.com/moapp/jybase/common"
@@ -13,6 +10,9 @@ import (
 	"app.yhyue.com/moapp/jybase/mail"
 	qrpc "app.yhyue.com/moapp/jybase/rpc"
 	"app.yhyue.com/moapp/jypkg/common/src/qfw/util/middleGround"
+	"app.yhyue.com/moapp/jypkg/middleground"
+	"github.com/gogf/gf/v2/frame/g"
+	"github.com/gogf/gf/v2/os/gcfg"
 )
 
 type config struct {
@@ -116,6 +116,7 @@ type config struct {
 	}
 	KeywordsLimit     int
 	BreakRenewTipTime string
+	TaskStartTime     int64
 }
 type mgoConf struct {
 	Address           string

src/jfw/modules/subscribepay/src/entity/basePack.go

@@ -4,6 +4,7 @@ import (
 	"app.yhyue.com/moapp/jybase/go-xweb/httpsession"
 	"encoding/json"
 	"fmt"
+	"github.com/gogf/gf/v2/util/gconv"
 	"jy/src/jfw/modules/subscribepay/src/config"
 	"jy/src/jfw/modules/subscribepay/src/util"
 	"log"
@@ -13,7 +14,6 @@ import (
 	. "app.yhyue.com/moapp/jybase/date"
 	"app.yhyue.com/moapp/jybase/encrypt"
 	. "app.yhyue.com/moapp/jybase/mongodb"
-	"app.yhyue.com/moapp/jybase/redis"
 	"app.yhyue.com/moapp/jypkg/common/src/qfw/util/jy"
 )
 
@@ -26,20 +26,56 @@ func (this *UseBalanceStruct) defaultConsume() (r map[string]interface{}, m stri
 	return
 }
 
-//附件下载消费 fui：免费赠送已使用次数；pui：付费权限已使用次数
+// 附件下载消费 fui：免费赠送已使用次数；pui：付费权限已使用次数
 func (this *UseBalanceStruct) fileConsume() (r map[string]interface{}, m string, c int) {
 	_fileName := this.Remarks["fileName"].(string)
 	_id := this.Remarks["id"].(string)
 	log.Println("附件下载包。。。。。")
 	BaseMsg := jy.GetBigVipUserBaseMsg(this.Session, *config.Middleground)
 	log.Println("---:", this.Remarks)
+	//获取余额数量
+	dbs := &FindBalanceStruct{
+		AccountId:    this.UserId,
+		ResourceType: "附件下载包",
+		VipState:     BaseMsg.VipStatus,
+	}
+	this.VipState = BaseMsg.VipStatus
+	data, err := dbs.FindBalance()
+	if data == nil || err != nil {
+		c = -1
+		m = "余额不足"
+		return
+	}
+	number := 0
+	if data != nil {
+		dataArr := gconv.SliceAny(data["data"])
+		if len(dataArr) > 0 {
+			dataMap := gconv.MapStrStr(dataArr[0])
+			number = gconv.Int(dataMap["number"])
+		}
+	}
+	isExists := false
+	id := this.FindJyConsumePackRecord()
+	if id != "" && this.Remarks["downUrl"] != nil {
+		if util.MQFW.UpdateById(jyCC, id, map[string]interface{}{
+			"$set": map[string]interface{}{
+				"l_updateDate": time.Now().Unix(),
+			},
+		}) {
+			delete(this.Remarks, "id")
+			delete(this.Remarks, "title")
+			r = this.Remarks
+			r["isExists"] = true
+			isExists = true
+		}
+	}
 	if BaseMsg.Status > 0 && BaseMsg.PowerMap[3] {
 		if this.Remarks["infoType"] != nil && this.Remarks["infoType"].(string) == "S" {
 			r = SupplyInfoFile(_fileName, _id)
 		} else {
 			r = fileAttachRpc(_fileName, _id)
 		}
-		go func(this *UseBalanceStruct, r map[string]interface{}) {
+		/*go func(this *UseBalanceStruct, r map[string]interface{}) {
 			data := make(map[string]interface{})
 			data["p_type"] = "大会员用户附件下载"
 			data["p_userid"] = this.UserId
@@ -51,38 +87,21 @@ func (this *UseBalanceStruct) fileConsume() (r map[string]interface{}, m string,
 			if util.MQFW.Save("filehistroy", data) == "" {
 				log.Println("大会员附件下载-历史记录异常：" + this.UserId)
 			}
-		}(this, r)
-	} else if BaseMsg.VipStatus > 0 {
-		isExists := false
-		//查询当月附件下载历史记录-如是已下载过的附件不再扣除次数
-		id := this.FindJyConsumePackRecord()
-		if id != "" && this.Remarks["downUrl"] != nil {
-			if util.MQFW.UpdateById(jyCC, id, map[string]interface{}{
-				"$set": map[string]interface{}{
-					"l_updateDate": time.Now().Unix(),
-				},
-			}) {
-				delete(this.Remarks, "id")
-				delete(this.Remarks, "title")
-				r = this.Remarks
-				r["isExists"] = true
-				isExists = true
-			}
+		}(this, r)*/
+		if r["downUrl"] != nil {
+			this.Remarks["downUrl"] = r["downUrl"]
+			this.Remarks["size"] = r["size"]
 		}
+		if !isExists {
+			this.saveJyConsumePackList()
+		}
+	} else {
+		//查询当月附件下载历史记录-如是已下载过的附件不再扣除次数
 		// log.Println(this.Remarks, "++++++", this.AccountId, id, "-------------", isExists)
 		//当月未有消费记录
 		if !isExists {
-			isCanConsume_f := false
-			isCanConsume_p := false
 			//免费赠送已使用次数
-			mon_free := fmt.Sprintf(jy.VipFileUploadNumKey, this.UserId, fmt.Sprint(time.Now().Month()))
-			fui := redis.GetInt(jy.PowerCacheDb, mon_free)
-			if fui < config.BidfileConfig.File_number {
-				isCanConsume_f = true
-			} else if payCount := this.accountPack(); payCount > 0 { //付费未使用次数
-				isCanConsume_p = true
-			}
-			if isCanConsume_f || isCanConsume_p {
+			if number > 0 {
 				if this.Remarks["infoType"] != nil && this.Remarks["infoType"].(string) == "S" {
 					r = SupplyInfoFile(_fileName, _id)
 				} else {
@@ -92,24 +111,10 @@ func (this *UseBalanceStruct) fileConsume() (r map[string]interface{}, m string,
 					this.Remarks["downUrl"] = r["downUrl"]
 					this.Remarks["size"] = r["size"]
 					if this.saveJyConsumePackList() {
-						if isCanConsume_p {
-							//中台消费记录
-							rb, err := this.UseBalance()
-							if err != nil || (rb != nil && qutil.IntAll(rb["code"]) == 0) {
-								m = fmt.Sprintf("消费记录保存异常：%s", qutil.ObjToString(rb["message"]))
-							} else {
-								//更新redis 购买附件下载包数量
-								mon_pay := fmt.Sprintf(jy.FilePackNumKey, this.UserId, fmt.Sprint(time.Now().Month()))
-								if redis.GetInt(jy.PowerCacheDb, mon_pay) <= 0 || redis.Decrby(jy.PowerCacheDb, mon_pay, 1) < 0 {
-									log.Println(fmt.Sprintf("附件下载包 消费异常：%s,附件名称：%s", this.UserId, this.Remarks["fileName"].(string)))
-								}
-							}
-						} else if isCanConsume_f { //下载后自增一次 免费权限默认存储31d
-							if fui == 0 {
-								redis.Put(jy.PowerCacheDb, mon_free, 1, 60*60*24*31)
-							} else {
-								redis.Incr(jy.PowerCacheDb, mon_free)
-							}
+						//中台消费记录
+						rb, err := this.UseBalance()
+						if err != nil || (rb != nil && qutil.IntAll(rb["code"]) == 0) {
+							m = fmt.Sprintf("消费记录保存异常：%s", qutil.ObjToString(rb["message"]))
 						}
 					}
 				} else {
@@ -117,22 +122,8 @@ func (this *UseBalanceStruct) fileConsume() (r map[string]interface{}, m string,
 				}
 			} else {
 				c = -1
-				m = "该用户下载权限当前月已用完"
-			}
-		}
-	} else {
-		//判断免费用户是否有留资下载权限
-		if _, _, freeFileNum := jy.FreeExperience(this.UserId); freeFileNum == 1 {
-			if this.Remarks["infoType"] != nil && this.Remarks["infoType"].(string) == "S" {
-				r = SupplyInfoFile(_fileName, _id)
-			} else {
-				r = fileAttachRpc(_fileName, _id)
+				m = "该用户下载权限已用完"
 			}
-			//免费用户下载后取消下载权限
-			redis.PutKV(fmt.Sprintf(jy.PowerCacheFileKey, this.UserId), -1)
-		} else {
-			c = -1
-			m = "该用户没有下载权限"
 		}
 	}
 	return
@@ -140,7 +131,7 @@ func (this *UseBalanceStruct) fileConsume() (r map[string]interface{}, m string,
 
 var jyCC = "jy_consumepack"
 
-//查询jy 消费日志记录
+// 查询jy 消费日志记录
 func (this *UseBalanceStruct) FindJyConsumePackRecord() string {
 	query := map[string]interface{}{
 		"s_id":       this.Remarks["id"].(string),
@@ -161,7 +152,7 @@ func (this *UseBalanceStruct) FindJyConsumePackRecord() string {
 	return BsonIdToSId((*res)["_id"])
 }
 
-//保存日志
+// 保存日志
 func (this *UseBalanceStruct) saveJyConsumePackList() (b bool) {
 	saveMap := map[string]interface{}{
 		"s_id":         this.Remarks["id"],
@@ -184,7 +175,7 @@ func (this *UseBalanceStruct) saveJyConsumePackList() (b bool) {
 	return
 }
 
-//调rpc 获取附件信息
+// 调rpc 获取附件信息
 func fileAttachRpc(fileName, id string) (r map[string]interface{}) {
 	r = make(map[string]interface{})
 	// 调用rpc 获取附件信息
@@ -210,7 +201,7 @@ func fileAttachRpc(fileName, id string) (r map[string]interface{}) {
 	return
 }
 
-//供应信息附件
+// 供应信息附件
 func SupplyInfoFile(fileName, msgId string) (r map[string]interface{}) {
 	//查数据
 	data := util.InfoMysql.FindOne("supply_info", map[string]interface{}{"id": msgId}, "", "")
@@ -236,7 +227,14 @@ func SupplyInfoFile(fileName, msgId string) (r map[string]interface{}) {
 	return
 }
 
-//消费
+// 兑换作废
+func JyexchangeCance(userId, product, platform, queryTime string, pageSize, pageNum int) (list []map[string]interface{}, total int, err error) {
+	RStruct := InitFindRecord(userId, product, queryTime, platform, pageSize, pageNum, 2)
+	list, total = RStruct.DefaultData()
+	return list, total, nil
+}
+
+// 消费
 func JyConsumePack(userId, product, platform string, remarks map[string]interface{}, session *httpsession.Session) (r map[string]interface{}, m string, c int) {
 	CStruct := InitUseBalance(userId, product, product, "", "", nil, remarks, 1, platform, session)
 	switch product {
@@ -248,7 +246,7 @@ func JyConsumePack(userId, product, platform string, remarks map[string]interfac
 	return
 }
 
-//流水
+// 流水
 func JyFindRecordPack(userId, productName, queryTime, platform string, pageSize, pageNum int) (list []map[string]interface{}, total int, err error) {
 	RStruct := InitFindRecord(userId, productName, queryTime, platform, pageSize, pageNum, 0)
 	switch productName {
@@ -260,7 +258,7 @@ func JyFindRecordPack(userId, productName, queryTime, platform string, pageSize,
 	return list, total, nil
 }
 
-//数据处理-附件下载包
+// 数据处理-附件下载包
 func (this *FindRecordStruct) FindJyConsumePackAllRecord() ([]map[string]interface{}, int) {
 	var articleAddMap = map[string]string{
 		"PC":  "/article/content/%s.html",
@@ -301,7 +299,7 @@ func (this *FindRecordStruct) FindJyConsumePackAllRecord() ([]map[string]interfa
 	return *list, total
 }
 
-//数据处理-default
+// 数据处理-default
 func (this *FindRecordStruct) DefaultData() ([]map[string]interface{}, int) {
 	returnList, total, err := this.FindRecord()
 	if err != nil {

src/jfw/modules/subscribepay/src/entity/commonApi.go

@@ -1,22 +1,18 @@
 package entity
 
 import (
+	qu "app.yhyue.com/moapp/jybase/common"
 	"app.yhyue.com/moapp/jybase/go-xweb/httpsession"
+	"app.yhyue.com/moapp/jypkg/common/src/qfw/util/middleGround"
 	"encoding/json"
 	"fmt"
 	"jy/src/jfw/modules/subscribepay/src/config"
 	"log"
 	"net/url"
 	"strings"
-	"time"
-
-	qu "app.yhyue.com/moapp/jybase/common"
-	"app.yhyue.com/moapp/jybase/redis"
-	"app.yhyue.com/moapp/jypkg/common/src/qfw/util/jy"
-	"app.yhyue.com/moapp/jypkg/common/src/qfw/util/middleGround"
 )
 
-//充值
+// 充值
 type PayStruct struct {
 	AccountId    string                 //用户身份
 	Name         string                 //资源名称
@@ -27,9 +23,10 @@ type PayStruct struct {
 	Remarks      map[string]interface{} //备注
 	AppId        string                 //appId默认10000
 	VipTime      int64                  //超级订阅截止日期
+	VipState     int64                  //超级订阅状态
 }
 
-func InitPurchase(userId, product, resourceType, num, spec, endTime string, remarks map[string]interface{}, vipEndTime int64) *PayStruct {
+func InitPurchase(userId, product, resourceType, num, spec, endTime string, remarks map[string]interface{}, vipEndTime int64, vipState int) *PayStruct {
 	return &PayStruct{
 		AccountId:    userId,
 		Name:         product,      //资源名称
@@ -40,6 +37,7 @@ func InitPurchase(userId, product, resourceType, num, spec, endTime string, rema
 		Remarks:      remarks,      //备注
 		AppId:        config.CouponConfig.AppId,
 		VipTime:      vipEndTime,
+		VipState:     int64(vipState),
 	}
 }
 
@@ -72,6 +70,7 @@ func (this *PayStruct) PurchaseUserBalance() (bool, error) {
 type FindBalanceStruct struct {
 	AccountId    string //账户标识
 	ResourceType string //产品类型
+	VipState     int
 }
 
 // @Summary 余额接口【数据流量包、附件下载包。。】
@@ -81,6 +80,7 @@ func (this *FindBalanceStruct) FindBalance() (map[string]interface{}, error) {
 	param := url.Values{
 		"accountId":    []string{this.AccountId},
 		"resourceType": []string{this.ResourceType},
+		"vipState":     []string{qu.InterfaceToStr(this.VipState)},
 	}
 	rmap, err := middleGround.CommonPost(middleGround.JyApiConfig.ApiList.FindBalance, param)
 	if err != nil {
@@ -90,24 +90,28 @@ func (this *FindBalanceStruct) FindBalance() (map[string]interface{}, error) {
 	if rmap != nil && len(rmap) > 0 && this.ResourceType == "附件下载包" {
 		rdata, _ := rmap["data"].([]interface{})
 		rdataArr := qu.ObjArrToMapArr(rdata)
-		vipFileKey := fmt.Sprintf(jy.VipFileUploadNumKey, this.AccountId, fmt.Sprint(time.Now().Month()))
-		vipFileKeyNum := redis.GetInt(jy.PowerCacheDb, vipFileKey)
-		free_num := config.BidfileConfig.File_number - vipFileKeyNum //free
+		//vipFileKey := fmt.Sprintf(jy.VipFileUploadNumKey, this.AccountId, fmt.Sprint(time.Now().Month()))
+		//vipFileKeyNum := redis.GetInt(jy.PowerCacheDb, vipFileKey)
+		//free_num := config.BidfileConfig.File_number - vipFileKeyNum //free
 		if len(rdata) > 0 {
 			for k, v := range rdataArr {
 				num := qu.IntAll(v["number"]) //buy
-				v["number"] = num + free_num
+				v["number"] = num
+				v["purchaseNum"] = qu.IntAll(v["number1"]) //充值数量
+				v["exchangeNum"] = qu.IntAll(v["number2"]) //兑换数量
+				v["grantNum"] = qu.IntAll(v["number3"])    //超级订阅定期发放数量
+				v["freeNum"] = qu.IntAll(v["number4"])     //免费数量
 				rdataArr[k] = v
 			}
 		} else {
-			rdataArr = append(rdataArr, map[string]interface{}{"name": this.ResourceType, "number": free_num, "resourceType": this.ResourceType, "thirtyNum": 0})
+			rdataArr = append(rdataArr, map[string]interface{}{"name": this.ResourceType, "number": 0, "purchaseNum": 0, "exchangeNum": 0, "grantNum": 0, "freeNum": 0, "resourceType": this.ResourceType, "thirtyNum": 0})
 		}
 		rmap["data"] = rdataArr
 	}
 	return rmap, err
 }
 
-//使用
+// 使用
 type UseBalanceStruct struct {
 	AccountId        string                 //账户标识
 	Name             string                 //资源名称
@@ -121,9 +125,9 @@ type UseBalanceStruct struct {
 	InfoId           []string               //数据Id，多个以逗号隔开【数据流量包用到】
 	Platform         string                 //平台：PC;APP;WX
 	Session          *httpsession.Session
+	VipState         int
 }
 
-//
 func InitUseBalance(userId, product, resourceType, ruleId, duplicateRemoval string, infoId []string, remarks map[string]interface{}, num int, platform string, session *httpsession.Session) *UseBalanceStruct {
 	return &UseBalanceStruct{
 		AccountId:        userId,
@@ -159,6 +163,7 @@ func (this *UseBalanceStruct) UseBalance() (map[string]interface{}, error) {
 		"remarks":          []string{string(remarkBytes)},            //备注 查询条件、下载地址、导出时间、导出条数
 		"infoId":           []string{strings.Join(this.InfoId, ",")}, //数据Id，多个以逗号隔开
 		"duplicateRemoval": []string{this.DuplicateRemoval},          //是否去重0不去1去重
+		"vipState":         []string{qu.InterfaceToStr(this.VipState)},
 	})
 	if err != nil {
 		log.Println("UseBalance post err:", err)
@@ -167,7 +172,7 @@ func (this *UseBalanceStruct) UseBalance() (map[string]interface{}, error) {
 	return resMap, err
 }
 
-//流水
+// 流水
 type FindRecordStruct struct {
 	AccountId    string //账户标识
 	UserId       string //用户标识
@@ -181,7 +186,7 @@ type FindRecordStruct struct {
 
 }
 
-//定义结构体
+// 定义结构体
 func InitFindRecord(userId, resourceType, queryTime, platform string, pageSize, pageNum, state int) *FindRecordStruct {
 	if pageSize == 0 {
 		pageSize = 10
@@ -249,7 +254,7 @@ func (this *UpdateVipTimeStruct) UpdateVipEndTime() (bool, error) {
 	return ok, nil
 }
 
-//账户信息
+// 账户信息
 func (this *UseBalanceStruct) accountPack() (payCount int) {
 	resMap, err := middleGround.CommonPost(middleGround.JyApiConfig.ApiList.FindBalance, url.Values{
 		"accountId":    []string{this.UserId}, //账户标识*

src/jfw/modules/subscribepay/src/entity/dataExportPackStruct.go

@@ -625,7 +625,7 @@ func sendPackExportMail(userId, selectId, userMail, excelPath string) {
 	if userId == "" || selectId == "" || userMail == "" || excelPath == "" {
 		return
 	}
-	mailContent, err := GetPackDataExportMailContent(selectId, config.Config.WebDomain+excelPath)
+	mailContent, err := GetPackDataExportMailContent(selectId, config.Config.WxDomain+excelPath)
 	if err != nil {
 		log.Printf("SendDataExportMailForPayed SendMailToPayUser 订单号%s获取邮件内容异常%v\n", selectId, err)
 	}

src/jfw/modules/subscribepay/src/entity/dataexport.go

@@ -699,7 +699,7 @@ func GetDataExportMailContent(orderCode string) (content string, err error) {
 	product_type := qutil.ObjToString((*orderData)["product_type"]) + "导出"
 	order_money := qutil.Float64All((*orderData)["order_money"]) / 100
 	pay_time := qutil.ObjToString((*orderData)["pay_time"])
-	download_url := config.Config.WebDomain + qutil.ObjToString((*orderData)["download_url"])
+	download_url := config.Config.WxDomain + qutil.ObjToString((*orderData)["download_url"])
 
 	create_time := qutil.ObjToString((*orderData)["create_time"])
 	if create_time != "" {

src/jfw/modules/subscribepay/src/entity/resourcePackStruct.go

@@ -14,7 +14,6 @@ import (
 
 	qu "app.yhyue.com/moapp/jybase/common"
 	. "app.yhyue.com/moapp/jybase/date"
-	"app.yhyue.com/moapp/jybase/redis"
 	"app.yhyue.com/moapp/jypkg/common/src/qfw/util/jy"
 	"github.com/shopspring/decimal"
 )
@@ -68,12 +67,14 @@ func (this *resoucePackStruct) PayCallBack(param *CallBackParam) bool {
 
 			//中台资源中心更新
 			var vipEndTime int64 = 0
-			udata := util.Compatible.Select(userId, `{"l_vip_endtime":1}`)
+			var vipState int = 0
+			udata := util.Compatible.Select(userId, `{"l_vip_endtime":1,"i_vip_status":1}`)
 			if udata != nil {
 				vipEndTime = qu.Int64All((*udata)["l_vip_endtime"])
+				vipState = qu.IntAll((*udata)["i_vip_status"])
 			}
 			if ok, err := InitPurchase(userId, productType, productType, strconv.Itoa(qu.IntAll(filterM["num"])), "个",
-				JyresoucePack.LastDate(now).Format(Date_Short_Layout), filterM, vipEndTime).PurchaseUserBalance(); !ok {
+				JyresoucePack.LastDate(now).Format(Date_Short_Layout), filterM, vipEndTime, vipState).PurchaseUserBalance(); !ok {
 				log.Printf("用户%s 订单类型：%s  订单号：%s PurchaseUserBalance出错：%v", userId, productType, (*orderData)["order_code"], err)
 				return false
 			}
@@ -81,15 +82,15 @@ func (this *resoucePackStruct) PayCallBack(param *CallBackParam) bool {
 			//不同产品逻辑处理
 			switch productType {
 			case ATTACHMENT:
-				//附件下载包剩余次数
-				filePackKey := fmt.Sprintf(jy.FilePackNumKey, userId, fmt.Sprint(time.Now().Month()))
-				filePackNum := redis.GetInt(jy.PowerCacheDb, filePackKey)
-				if filePackNum == 0 {
-					redis.Put(jy.PowerCacheDb, filePackKey, qu.IntAll(filterM["num"]), int(this.LastDate(now).Unix()-now.Unix()))
-				} else {
-					filePackNum += qu.IntAll(filterM["num"])
-					redis.Put(jy.PowerCacheDb, filePackKey, filePackNum, int(this.LastDate(now).Unix()-now.Unix()))
-				}
+				/* //附件下载包剩余次数
+				   filePackKey := fmt.Sprintf(jy.FilePackNumKey, userId, fmt.Sprint(time.Now().Month()))
+				   filePackNum := redis.GetInt(jy.PowerCacheDb, filePackKey)
+				   if filePackNum == 0 {
+				       redis.Put(jy.PowerCacheDb, filePackKey, qu.IntAll(filterM["num"]), int(this.LastDate(now).Unix()-now.Unix()))
+				   } else {
+				       filePackNum += qu.IntAll(filterM["num"])
+				       redis.Put(jy.PowerCacheDb, filePackKey, filePackNum, int(this.LastDate(now).Unix()-now.Unix()))
+				   }*/
 			}
 
 			//核销卡卷
@@ -128,9 +129,6 @@ func (this *resoucePackStruct) Filter(product, userid, lotteryId, discountId str
 	case "dataExportPack":
 	//TODO
 	case "attachmentDownPack": //超级订阅用户可以购买
-		if data.VipStatus <= 0 {
-			msg = "非超级订阅用户，暂无权益"
-		}
 		num := qu.IntAll(m["num"])
 		products := fmt.Sprintf("附件下载包-%v个", num)
 		price := config.ResConf.AttachmentDownPackPrice[strconv.Itoa(num)]

src/jfw/modules/subscribepay/src/go.mod

@@ -1,6 +1,6 @@
 module jy/src/jfw/modules/subscribepay/src
 
-go 1.18
+go 1.20
 
 require (
 	app.yhyue.com/moapp/jybase v0.0.0-20230718012114-37013054344b

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

@@ -2,7 +2,6 @@ package service
 
 import (
 	"fmt"
-	"jy/src/jfw/modules/subscribepay/src/config"
 	"jy/src/jfw/modules/subscribepay/src/entity"
 	"log"
 	"time"
@@ -10,10 +9,33 @@ import (
 	. "app.yhyue.com/moapp/jybase/api"
 	qutil "app.yhyue.com/moapp/jybase/common"
 	"app.yhyue.com/moapp/jybase/encrypt"
-	"app.yhyue.com/moapp/jypkg/common/src/qfw/util/jy"
 )
 
-//“包”的消费
+// “包”的兑换过期记录
+func (this *ResourcePack) ExchangeCancelList() {
+	userId, _ := this.GetSession("userId").(string)
+	productName := this.GetString("productName")
+	pageSize, _ := this.GetInteger("pageSize")
+	pageNum, _ := this.GetInteger("pageNum")
+	queryTime := this.GetString("queryTime")
+	rData, errMsg := func() (interface{}, error) {
+		if this.Method() != "POST" {
+			return "请求方式有误", nil
+		}
+		returnList, total, err := entity.JyexchangeCance(userId, productName, "", queryTime, pageSize, pageNum)
+		returnData := map[string]interface{}{
+			"list": returnList,
+		}
+		returnData["total"] = total
+		return returnData, err
+	}()
+	if errMsg != nil {
+		log.Printf("%s %s RecordList 异常:%s\n", userId, productName, errMsg.Error())
+	}
+	this.ServeJson(NewResult(rData, errMsg))
+}
+
+// “包”的消费
 func (this *ResourcePack) ConsumePack() {
 	userId, _ := this.GetSession("userId").(string)
 	productName := this.GetString("productName")
@@ -51,7 +73,7 @@ func (this *ResourcePack) ConsumePack() {
 	})
 }
 
-//“包”的使用记录
+// “包”的使用记录
 func (this *ResourcePack) RecordList() {
 	userId, _ := this.GetSession("userId").(string)
 	productName := this.GetString("productName")
@@ -66,10 +88,6 @@ func (this *ResourcePack) RecordList() {
 		if productName == "" || platform == "" {
 			return "参数有误", nil
 		}
-		vipMsg := jy.GetBigVipUserBaseMsg(this.Session(), *config.Middleground)
-		if vipMsg.VipStatus <= 0 {
-			return "无权限,请联系管理员", nil
-		}
 		if queryTime == "" {
 			queryTime = time.Now().Format("2006-01")
 		}

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

@@ -1,6 +1,7 @@
 package service
 
 import (
+	"app.yhyue.com/moapp/jypkg/common/src/qfw/util/jy"
 	"encoding/json"
 	"fmt"
 	"jy/src/jfw/modules/subscribepay/src/config"
@@ -15,18 +16,18 @@ import (
 	qu "app.yhyue.com/moapp/jybase/common"
 	. "app.yhyue.com/moapp/jybase/date"
 	"app.yhyue.com/moapp/jybase/go-xweb/xweb"
-	"app.yhyue.com/moapp/jypkg/common/src/qfw/util/jy"
 )
 
 //资源包相关（数据流量包,附件下载包,采购单位流量包...）
 
 type ResourcePack struct {
 	*xweb.Action
-	price       xweb.Mapper `xweb:"/resourcePack/price"`       //价格
-	createOrder xweb.Mapper `xweb:"/resourcePack/createOrder"` //线上自助数据包充值-创建订单
-	account     xweb.Mapper `xweb:"/resourcePack/account"`     //个人账户
-	recordList  xweb.Mapper `xweb:"/resourcePack/recordList"`  //“资源包”使用记录
-	consumePack xweb.Mapper `xweb:"/resourcePack/consumePack"` //“资源包”消费
+	price              xweb.Mapper `xweb:"/resourcePack/price"`              //价格
+	createOrder        xweb.Mapper `xweb:"/resourcePack/createOrder"`        //线上自助数据包充值-创建订单
+	account            xweb.Mapper `xweb:"/resourcePack/account"`            //个人账户
+	recordList         xweb.Mapper `xweb:"/resourcePack/recordList"`         //“资源包”使用记录
+	consumePack        xweb.Mapper `xweb:"/resourcePack/consumePack"`        //“资源包”消费
+	exchangeCancelList xweb.Mapper `xweb:"/resourcePack/exchangeCancelList"` //“资源包”兑换作废
 }
 
 const (
@@ -167,13 +168,10 @@ func (this *ResourcePack) Account() {
 		return
 	}
 	vipMsg := jy.GetBigVipUserBaseMsg(this.Session(), *config.Middleground)
-	if vipMsg.VipStatus <= 0 {
-		this.ServeJson(Result{Error_msg: "无权限,请联系管理员"})
-		return
-	}
 	dbs := &entity.FindBalanceStruct{
 		AccountId:    userId,
 		ResourceType: config.ResConf.Product[product],
+		VipState:     vipMsg.VipStatus,
 	}
 	data, err := dbs.FindBalance()
 	if err != nil {

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

@@ -24,6 +24,7 @@ import (
 	"app.yhyue.com/moapp/jybase/mongodb"
 	"app.yhyue.com/moapp/jybase/redis"
 	"app.yhyue.com/moapp/jybase/usercenter"
+	"app.yhyue.com/moapp/jypkg/common/src/qfw/util/dataexport"
 	"app.yhyue.com/moapp/jypkg/common/src/qfw/util/jy"
 	"bp.jydev.jianyu360.cn/BaseService/userCenter/rpc/pb"
 )
@@ -119,6 +120,22 @@ func (this *UserAccount) GetAccountInfo() {
 			}
 		}
 		b := jy.GetBigVipUserBaseMsg(this.Session(), *config.Middleground)
+		//s从数据导出填写的邮箱或者从数据定制服务这里获取的邮箱
+		_, otherMail := dataexport.GetLastExportPhoneAndMail(util.Mysql, userId, qutil.ObjToString(this.GetSession("entUserId")))
+		if otherMail == "" {
+			saleData, _ := util.MQFW.FindOne("saleLeads", map[string]interface{}{
+				"userid": this.GetSession("userId"),
+				"mail": map[string]interface{}{
+					"$exists": true,
+				},
+			})
+			if saleData != nil && len(*saleData) > 0 {
+				otherMail = qutil.ObjToString((*saleData)["mail"])
+			}
+			if qutil.ObjToString((*userMsg)["s_myemail"]) != "" {
+				otherMail = qutil.ObjToString((*userMsg)["s_myemail"])
+			}
+		}
 		return map[string]interface{}{
 			"userId":        encrypt.EncodeArticleId(userId),
 			"email":         qutil.ObjToString((*userMsg)["s_myemail"]),
@@ -132,6 +149,7 @@ func (this *UserAccount) GetAccountInfo() {
 			"company":       qutil.ObjToString((*userMsg)["s_company"]),
 			"isWx":          isWx, //是否是微信账号
 			"breakRenewTip": breakRenewTip,
+			"otherMail":     otherMail, //从数据导出填写的邮箱或者从数据定制服务这里获取的邮箱
 		}, nil
 	}()
 	this.ServeJson(NewResult(rData, errMsg))
@@ -204,6 +222,19 @@ func (this *UserAccount) MailSet(doType string) {
 			}) {
 				return nil, DBUPDATE_ERROR
 			}
+			userMsg, _ := util.MQFW.FindById("user", userId, `{"l_registedate":1}`)
+			isNew := false
+			if userMsg != nil && len(*userMsg) > 0 {
+				l_registedate := qutil.Int64All((*userMsg)["l_registedate"])
+				isNew = l_registedate > config.Config.TaskStartTime //是否注册时间处于新手任务开始时间
+			}
+			jy.Publish(util.Mgo_log, config.Config.Nsq, config.Config.Nsq_Topic, "task", userId, jy.Jyweb_node2, map[string]interface{}{
+				"code":       qutil.If(isNew, 1009, 1016),
+				"types":      "bindMail",
+				"num":        50,
+				"baseUserId": this.GetSession("base_user_id"),
+				"positionId": this.GetSession("positionId"),
+			})
 			this.Session().Del(mailAuthPassSessionKey)
 		}
 		return map[string]interface{}{
@@ -408,6 +439,22 @@ func (this *UserAccount) PhoneBind() {
 							redis.Del(config.Config.ShareRedisName, shareKey)
 						}
 					}(qutil.ObjToString((*uData)["s_m_openid"]))
+
+					//绑定手机号和关注公众号
+					jy.Publish(util.Mgo_log, config.Config.Nsq, config.Config.Nsq_Topic, "task", userId, jy.Jyweb_node2, map[string]interface{}{
+						"code":       1007,
+						"types":      "bindPhone",
+						"num":        50,
+						"baseUserId": this.GetSession("base_user_id"),
+						"positionId": this.GetSession("positionId"),
+					})
+					jy.Publish(util.Mgo_log, config.Config.Nsq, config.Config.Nsq_Topic, "task", userId, jy.Jyweb_node2, map[string]interface{}{
+						"code":       1008,
+						"types":      "followWx",
+						"num":        50,
+						"baseUserId": this.GetSession("base_user_id"),
+						"positionId": this.GetSession("positionId"),
+					})
 				}
 				data := map[string]interface{}{
 					"s_unionid":      (*uData)["s_unionid"],
@@ -428,6 +475,7 @@ func (this *UserAccount) PhoneBind() {
 				}
 				//用户中台存储  结束
 				jy.CreateUserMerge(util.MQFW, util.Mysql, this.Session(), config.Middleground).FlushSession(userId) //刷新session
+
 			} else if mode == "mergeBind" { //跳转绑定-不合并绑定无效
 				if qutil.Int64All((*uData)["l_registedate"]) > config.AutoMergeTimeStamp { //新微信直接绑定
 					data := map[string]interface{}{

src/jfw/modules/subscribepay/src/util/db.go

@@ -1,6 +1,7 @@
 package util
 
 import (
+	"app.yhyue.com/moapp/jypkg/compatible"
 	. "jy/src/jfw/modules/subscribepay/src/config"
 
 	qutil "app.yhyue.com/moapp/jybase/common"
@@ -8,7 +9,6 @@ import (
 	mg "app.yhyue.com/moapp/jybase/mongodb"
 	"app.yhyue.com/moapp/jybase/mysql"
 	"app.yhyue.com/moapp/jybase/redis"
-	"app.yhyue.com/moapp/jypkg/compatible"
 )
 
 var MQFW mg.MongodbSim

src/jfw/modules/weixin/src/config.json

@@ -117,6 +117,7 @@
     "description": "剑鱼新年活动"
   },
   "nsq": "192.168.3.240:4260",
+  "nsq_topic": "jy_event",
   "cookieSource": {
     "jywkzmt": "jydocs",
     "jywkseo": "jydocs",

src/jfw/modules/weixin/src/go.mod

@@ -3,76 +3,81 @@ module jy/src/jfw/modules/weixin/src
 go 1.18
 
 require (
-	app.yhyue.com/moapp/jybase v0.0.0-20230117032034-ad7c00ffe11a
+	app.yhyue.com/moapp/jybase v0.0.0-20230718012114-37013054344b
 	app.yhyue.com/moapp/jylog v0.0.0-20230522075550-05d7230ca545
-	app.yhyue.com/moapp/jypkg v0.0.0-20230225014640-5541595140d1
-	bp.jydev.jianyu360.cn/BaseService/userCenter v1.2.13
+	app.yhyue.com/moapp/jypkg v1.0.4-0.20231108013952-a37ecebda2ed
+	bp.jydev.jianyu360.cn/BaseService/userCenter v1.2.14
 	github.com/SKatiyar/qr v0.0.0-20151201054752-25b6bdf44e67
 	github.com/gogf/gf/v2 v2.3.1
-	go.mongodb.org/mongo-driver v1.11.1
+	go.mongodb.org/mongo-driver v1.11.6
 )
 
 require (
 	app.yhyue.com/moapp/esv1 v0.0.0-20220414031211-3da4123e648d // indirect
+	app.yhyue.com/moapp/jyMarketing v0.0.2-0.20230304035551-21bb1eedf547 // indirect
 	app.yhyue.com/moapp/message v0.0.0-20221223100203-6402e389d9ae // indirect
 	bp.jydev.jianyu360.cn/BaseService/entManageApplication v0.0.0-20230214091519-89a98c01ab0e // indirect
-	bp.jydev.jianyu360.cn/BaseService/powerCheckCenter v0.0.0-20230222052351-9d6fad062447 // indirect
+	bp.jydev.jianyu360.cn/BaseService/powerCheckCenter v0.0.0-20230225125145-431a4f70093a // indirect
 	bp.jydev.jianyu360.cn/BaseService/resourceCenter v0.0.7 // indirect
 	github.com/BurntSushi/toml v1.1.0 // indirect
 	github.com/beorn7/perks v1.0.1 // indirect
 	github.com/cenkalti/backoff/v4 v4.2.1 // indirect
 	github.com/cespare/xxhash/v2 v2.2.0 // indirect
 	github.com/clbanning/mxj/v2 v2.5.5 // indirect
-	github.com/coreos/go-semver v0.3.0 // indirect
-	github.com/coreos/go-systemd/v22 v22.3.2 // indirect
+	github.com/coreos/go-semver v0.3.1 // indirect
+	github.com/coreos/go-systemd/v22 v22.5.0 // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect
-	github.com/dchest/captcha v0.0.0-20200903113550-03f5f0333e1f // indirect
 	github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect
-	github.com/fatih/color v1.13.0 // indirect
-	github.com/felixge/fgprof v0.9.3 // indirect
+	github.com/emicklei/go-restful/v3 v3.9.0 // indirect
+	github.com/fatih/color v1.15.0 // indirect
 	github.com/fsnotify/fsnotify v1.6.0 // indirect
 	github.com/garyburd/redigo v1.6.2 // indirect
 	github.com/go-logr/logr v1.2.4 // indirect
 	github.com/go-logr/stdr v1.2.2 // indirect
+	github.com/go-openapi/jsonpointer v0.19.6 // indirect
+	github.com/go-openapi/jsonreference v0.20.1 // indirect
+	github.com/go-openapi/swag v0.22.3 // indirect
 	github.com/go-redis/redis/v8 v8.11.5 // indirect
-	github.com/go-sql-driver/mysql v1.7.0 // indirect
+	github.com/go-sql-driver/mysql v1.7.1 // indirect
 	github.com/gogo/protobuf v1.3.2 // indirect
-	github.com/golang-jwt/jwt/v4 v4.4.3 // indirect
 	github.com/golang/mock v1.6.0 // indirect
-	github.com/golang/protobuf v1.5.2 // indirect
+	github.com/golang/protobuf v1.5.3 // indirect
 	github.com/golang/snappy v0.0.4 // indirect
-	github.com/gomodule/redigo v1.8.9 // indirect
+	github.com/gomodule/redigo v2.0.0+incompatible // indirect
+	github.com/google/gnostic v0.5.7-v3refs // indirect
 	github.com/google/go-cmp v0.5.9 // indirect
 	github.com/google/gofuzz v1.2.0 // indirect
-	github.com/google/pprof v0.0.0-20211214055906-6f57359322fd // indirect
-	github.com/googleapis/gnostic v0.5.5 // indirect
 	github.com/gorilla/websocket v1.5.0 // indirect
 	github.com/grokify/html-strip-tags-go v0.0.1 // indirect
-	github.com/grpc-ecosystem/grpc-gateway/v2 v2.7.0 // indirect
+	github.com/grpc-ecosystem/grpc-gateway/v2 v2.15.0 // indirect
 	github.com/hashicorp/hcl v1.0.0 // indirect
 	github.com/jinzhu/inflection v1.0.0 // indirect
 	github.com/jinzhu/now v1.1.1 // indirect
+	github.com/josharian/intern v1.0.0 // indirect
 	github.com/json-iterator/go v1.1.12 // indirect
-	github.com/klauspost/compress v1.15.11 // indirect
+	github.com/klauspost/compress v1.15.15 // indirect
 	github.com/magiconair/properties v1.8.7 // indirect
-	github.com/mattn/go-colorable v0.1.12 // indirect
-	github.com/mattn/go-isatty v0.0.14 // indirect
+	github.com/mailru/easyjson v0.7.7 // indirect
+	github.com/mattn/go-colorable v0.1.13 // indirect
+	github.com/mattn/go-isatty v0.0.17 // indirect
 	github.com/mattn/go-runewidth v0.0.13 // indirect
-	github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 // indirect
+	github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
 	github.com/mitchellh/mapstructure v1.5.0 // indirect
 	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
 	github.com/modern-go/reflect2 v1.0.2 // indirect
 	github.com/montanaflynn/stats v0.0.0-20171201202039-1bf9dbcd8cbe // indirect
+	github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
 	github.com/nsqio/go-nsq v1.1.0 // indirect
 	github.com/olekukonko/tablewriter v0.0.5 // indirect
 	github.com/olivere/elastic v6.2.37+incompatible // indirect
+	github.com/olivere/elastic/v7 v7.0.22 // indirect
 	github.com/openzipkin/zipkin-go v0.4.1 // indirect
-	github.com/pelletier/go-toml/v2 v2.0.6 // indirect
+	github.com/pelletier/go-toml/v2 v2.0.8 // indirect
 	github.com/pkg/errors v0.9.1 // indirect
-	github.com/prometheus/client_golang v1.13.0 // indirect
-	github.com/prometheus/client_model v0.2.0 // indirect
-	github.com/prometheus/common v0.37.0 // indirect
-	github.com/prometheus/procfs v0.8.0 // indirect
+	github.com/prometheus/client_golang v1.15.1 // indirect
+	github.com/prometheus/client_model v0.3.0 // indirect
+	github.com/prometheus/common v0.42.0 // indirect
+	github.com/prometheus/procfs v0.9.0 // indirect
 	github.com/rivo/uniseg v0.2.0 // indirect
 	github.com/sirupsen/logrus v1.8.3 // indirect
 	github.com/spaolacci/murmur3 v1.1.0 // indirect
@@ -86,36 +91,37 @@ require (
 	github.com/xdg-go/scram v1.1.1 // indirect
 	github.com/xdg-go/stringprep v1.0.3 // indirect
 	github.com/youmark/pkcs8 v0.0.0-20181117223130-1be2e3e5546d // indirect
-	github.com/zeromicro/go-zero v1.4.4 // indirect
-	go.etcd.io/etcd/api/v3 v3.5.6 // indirect
-	go.etcd.io/etcd/client/pkg/v3 v3.5.6 // indirect
-	go.etcd.io/etcd/client/v3 v3.5.6 // indirect
+	github.com/zeromicro/go-zero v1.5.3 // indirect
+	go.etcd.io/etcd/api/v3 v3.5.9 // indirect
+	go.etcd.io/etcd/client/pkg/v3 v3.5.9 // indirect
+	go.etcd.io/etcd/client/v3 v3.5.9 // indirect
 	go.opentelemetry.io/otel v1.15.1 // indirect
 	go.opentelemetry.io/otel/exporters/jaeger v1.15.1 // indirect
 	go.opentelemetry.io/otel/exporters/otlp/internal/retry v1.15.1 // indirect
 	go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.15.1 // indirect
 	go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.15.1 // indirect
 	go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.15.1 // indirect
+	go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.14.0 // indirect
 	go.opentelemetry.io/otel/exporters/zipkin v1.15.1 // indirect
 	go.opentelemetry.io/otel/sdk v1.15.1 // indirect
 	go.opentelemetry.io/otel/trace v1.15.1 // indirect
 	go.opentelemetry.io/proto/otlp v0.19.0 // indirect
-	go.uber.org/atomic v1.9.0 // indirect
-	go.uber.org/automaxprocs v1.5.1 // indirect
-	go.uber.org/multierr v1.8.0 // indirect
-	go.uber.org/zap v1.21.0 // indirect
-	golang.org/x/crypto v0.0.0-20221010152910-d6f0a8c073c2 // indirect
-	golang.org/x/net v0.8.0 // indirect
-	golang.org/x/oauth2 v0.4.0 // indirect
+	go.uber.org/atomic v1.10.0 // indirect
+	go.uber.org/automaxprocs v1.5.2 // indirect
+	go.uber.org/multierr v1.9.0 // indirect
+	go.uber.org/zap v1.24.0 // indirect
+	golang.org/x/crypto v0.6.0 // indirect
+	golang.org/x/net v0.10.0 // indirect
+	golang.org/x/oauth2 v0.7.0 // indirect
 	golang.org/x/sync v0.1.0 // indirect
-	golang.org/x/sys v0.7.0 // indirect
-	golang.org/x/term v0.6.0 // indirect
-	golang.org/x/text v0.8.0 // indirect
+	golang.org/x/sys v0.8.0 // indirect
+	golang.org/x/term v0.8.0 // indirect
+	golang.org/x/text v0.9.0 // indirect
 	golang.org/x/time v0.3.0 // indirect
 	google.golang.org/appengine v1.6.7 // indirect
-	google.golang.org/genproto v0.0.0-20230110181048-76db0878b65f // indirect
-	google.golang.org/grpc v1.54.0 // indirect
-	google.golang.org/protobuf v1.30.0 // indirect
+	google.golang.org/genproto v0.0.0-20230410155749-daa745c078e1 // indirect
+	google.golang.org/grpc v1.56.1 // indirect
+	google.golang.org/protobuf v1.31.0 // indirect
 	gopkg.in/alexcesaro/quotedprintable.v3 v3.0.0-20150716171945-2caba252f4dc // indirect
 	gopkg.in/inf.v0 v0.9.1 // indirect
 	gopkg.in/ini.v1 v1.67.0 // indirect
@@ -124,11 +130,14 @@ require (
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 	gorm.io/driver/mysql v1.0.5 // indirect
 	gorm.io/gorm v1.21.3 // indirect
-	k8s.io/api v0.22.9 // indirect
-	k8s.io/apimachinery v0.22.9 // indirect
-	k8s.io/client-go v0.22.9 // indirect
-	k8s.io/klog/v2 v2.80.1 // indirect
-	k8s.io/utils v0.0.0-20221108210102-8e77b1f39fe2 // indirect
-	sigs.k8s.io/structured-merge-diff/v4 v4.2.1 // indirect
-	sigs.k8s.io/yaml v1.2.0 // indirect
+	jygit.jydev.jianyu360.cn/ApplicationCenter/publicService v0.0.0-20231017031425-45003ca9f35a // indirect
+	k8s.io/api v0.26.3 // indirect
+	k8s.io/apimachinery v0.27.0-alpha.3 // indirect
+	k8s.io/client-go v0.26.3 // indirect
+	k8s.io/klog/v2 v2.90.1 // indirect
+	k8s.io/kube-openapi v0.0.0-20230307230338-69ee2d25a840 // indirect
+	k8s.io/utils v0.0.0-20230209194617-a36077c30491 // indirect
+	sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
+	sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
+	sigs.k8s.io/yaml v1.3.0 // indirect
 )

src/jfw/modules/weixin/src/service/usersource.go

@@ -0,0 +1,26 @@
+package service
+
+import (
+	qutil "app.yhyue.com/moapp/jybase/common"
+	"app.yhyue.com/moapp/jybase/date"
+	"app.yhyue.com/moapp/jybase/encrypt"
+	"app.yhyue.com/moapp/jypkg/common/src/qfw/util/jy"
+	"jy/src/jfw/modules/weixin/src/tools"
+	"time"
+)
+
+// P414
+func SaveUserSource(channelCode, userId, phone string, state int) {
+	us := jy.UserSource{
+		UserId:           userId,
+		Phone:            phone,
+		State:            state, //注册/登录标志 1：登录；2：注册
+		ChannelCode:      qutil.If(channelCode == "", "jy_wx", channelCode).(string),
+		EncryptionUserId: encrypt.SE.Encode2Hex(userId),
+		CreateTime:       time.Now().Format(date.Date_Full_Layout),
+		LoginWay:         3, //登录方式;1:手机号密码；2：手机号验证码；3：微信；4：手机号一键登录
+		Platform:         2, //登录端；1：PC；2：WX；3：APP；4：H5
+		Ip:               "",
+	}
+	jy.SaveUserSource(tools.Mysql, jy.ChannelTableName, qutil.StructToMapMore(us))
+}

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

@@ -30,7 +30,7 @@ type ReplyStruct struct {
 	User      map[string]interface{}
 }
 
-//ri 0:w.ReplyText;1:w.PostText
+// ri 0:w.ReplyText;1:w.PostText
 // isScan true:扫码；false：关注
 func (rs *ReplyStruct) SubscribeAction() (ReplyText string, ri int) {
 	ri = 0
@@ -67,7 +67,7 @@ func (rs *ReplyStruct) SubscribeAction() (ReplyText string, ri int) {
 		}
 	case "13", "130": //扫码关注项目
 		param := new(jrpc.FollowData)
-		param.UserId = FindUserId(rs.Openid) //查询userid
+		param.UserId, _ = FindUserId(rs.Openid) //查询userid
 		param.Server = fmt.Sprint(config.Sysconfig["webrpcport"])
 		param.Projectname = redis.GetStr("sso", "pc_subscribe_"+rs.Source)
 		if param.Projectname != "" {
@@ -88,7 +88,7 @@ func (rs *ReplyStruct) SubscribeAction() (ReplyText string, ri int) {
 		rs.Subkey = redis.GetStr("sso", "pc_subscribe_"+rs.Source) //企业名称
 		s_id := Findent(rs.Subkey)                                 //查询s_id
 		if rs.Subkey != "" {
-			userId := FindUserId(rs.Openid) //查询userid
+			userId, _ := FindUserId(rs.Openid) //查询userid
 			var url = fmt.Sprintf(config.Sysconfig["proxysess"].(string), tools.SE.EncodeString(fmt.Sprintf(moduleEncode, "entListFollow")))
 			pchints := config.Sysconfig["company"].(map[string]interface{})
 			if tools.MQFW.Count("jylab_followent", `{"s_userid":"`+userId+`","s_id":"`+s_id+`"}`) > 0 {
@@ -116,7 +116,7 @@ func (rs *ReplyStruct) SubscribeAction() (ReplyText string, ri int) {
 	return
 }
 
-//扫码订阅关键词
+// 扫码订阅关键词
 func (rs *ReplyStruct) ScanKeys() {
 	if rs.VipStatus > 0 {
 		if rs.Subkey != "" {
@@ -141,7 +141,7 @@ type KeysWords struct {
 	From   int      `json:"from"`
 }
 
-//免费用户扫码快速订阅关键词
+// 免费用户扫码快速订阅关键词
 func (rs *ReplyStruct) freeFastSubscribe() {
 	rs.Pcresult = "ok"
 	o_jy, _ := rs.User["o_jy"].(map[string]interface{})
@@ -201,7 +201,7 @@ func (rs *ReplyStruct) freeFastSubscribe() {
 	}
 }
 
-//付费用户扫码快速订阅关键词
+// 付费用户扫码快速订阅关键词
 func (rs *ReplyStruct) vipFastSubscribe() {
 	if rs.Subkey == "" {
 		return

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

@@ -4,6 +4,7 @@ import (
 	"encoding/json"
 	"fmt"
 	"jy/src/jfw/modules/weixin/src/config"
+	"jy/src/jfw/modules/weixin/src/service"
 	"net/url"
 
 	"app.yhyue.com/moapp/jypkg/common/src/qfw/util/jy"
@@ -701,6 +702,7 @@ func saveUserLog(shareId, openid, activeName string, shareflag bool) {
 	userData := map[string]interface{}{}
 	action := "关注"
 	infoTime := date.Unix()
+	channelCode := ""
 	if userData_redis != nil {
 		infoData := map[string]interface{}{}
 		tmp, _ := json.Marshal(userData_redis)
@@ -714,6 +716,7 @@ func saveUserLog(shareId, openid, activeName string, shareflag bool) {
 		userData["s_activeCode"] = util.ObjToString(infoData["RActiveCode"])
 		userData["s_os"] = util.ObjToString(infoData["Ros"])
 		userData["s_browse"] = util.ObjToString(infoData["Rbrowse"])
+		channelCode = util.ObjToString(infoData["channelCode"])
 	} else {
 		userData["s_module"] = "首页"
 		userData["s_referer"] = "剑鱼标讯网站"
@@ -748,6 +751,11 @@ func saveUserLog(shareId, openid, activeName string, shareflag bool) {
 	} else {
 		log.Println("register-err:", nickname)
 	}
+	//P414
+	go func(openid, channelCode string) {
+		userId, phone := FindUserId(openid)
+		service.SaveUserSource(channelCode, userId, phone, 2)
+	}(openid, channelCode)
 }
 
 // 扫码事件
@@ -917,6 +925,28 @@ func ScanHandler(w ResponseWriter, r *Request) {
 	} else {
 		log.Println("scan-error，mongodb-conn-error")
 	}
+	//P414
+	if r.EventKey != "" {
+		go func(erCode, openid string) {
+			userData := redis.Get("sso", "p_shareData_"+erCode)
+			channelCode := ""
+			if userData != nil {
+				infoData := map[string]interface{}{}
+				tmp, err := json.Marshal(userData)
+				if err == nil {
+					if err = json.Unmarshal(tmp, &infoData); err == nil {
+						channelCode = util.ObjToString(infoData["channelCode"])
+					} else {
+						log.Println("序列化异常 infoData")
+					}
+				} else {
+					log.Println("序列化异常 userData")
+				}
+			}
+			userId, phone := FindUserId(openid)
+			service.SaveUserSource(channelCode, userId, phone, 1)
+		}(r.EventKey, openid)
+	}
 }
 
 func WxBind(code, openId string, w ResponseWriter, newUnionId string) bool {
@@ -933,7 +963,7 @@ func WxBind(code, openId string, w ResponseWriter, newUnionId string) bool {
 	bindUserId := fmt.Sprint((*data)["userId"])
 	source := fmt.Sprint((*data)["source"])
 	//1查询用户微信号和扫码是否是同一个微信号
-	bindData, b := tools.MQFW.FindById("user", bindUserId, `{"s_m_phone":1,"s_phone":1,"s_unionid":1,"s_m_openid":1}`)
+	bindData, b := tools.MQFW.FindById("user", bindUserId, `{"s_m_phone":1,"s_phone":1,"s_unionid":1,"s_m_openid":1,"base_user_id":1}`)
 	if !b {
 		return true
 	}
@@ -950,10 +980,11 @@ func WxBind(code, openId string, w ResponseWriter, newUnionId string) bool {
 			return true
 		}
 	}
-
+	nsqPath, _ := config.Sysconfig["nsq"].(string)
+	nsq_topic, _ := config.Sysconfig["nsq_topic"].(string)
 	userId := ""
 	unionid := ""
-	m, b := tools.MQFW.Find("user", `{"s_unionid":"`+newUnionId+`","i_appid":2}`, nil, `{"_id":1,"s_m_phone":1,"s_phone":1}`, false, -1, -1)
+	m, b := tools.MQFW.Find("user", `{"s_unionid":"`+newUnionId+`","i_appid":2}`, nil, `{"_id":1,"s_m_phone":1,"s_phone":1,"base_user_id":1}`, false, -1, -1)
 	if len(*m) == 0 {
 		if len(bindUnionid) > 11 {
 			log.Println("对不起，微信绑定失败，请使用原微信绑定账号扫码关注")
@@ -968,7 +999,14 @@ func WxBind(code, openId string, w ResponseWriter, newUnionId string) bool {
 				"s_unionid":  newUnionId,
 			},
 		}
+
 		tools.MQFW.UpdateById("user", bindUserId, &update)
+		jy.Publish(tools.MGLOG, nsqPath, nsq_topic, "task", bindUserId, jy.Jyweb_node2, map[string]interface{}{
+			"code":       1008, //绑定手机号任务
+			"types":      "followWx",
+			"num":        50,
+			"baseUserId": (*bindData)["base_user_id"],
+		})
 		return false
 	}
 	//需要进行绑定
@@ -996,6 +1034,7 @@ func WxBind(code, openId string, w ResponseWriter, newUnionId string) bool {
 				},
 			}
 			tools.MQFW.UpdateById("user", userId, &update1)
+
 			var bindUrl = fmt.Sprintf(config.Sysconfig["proxysess"].(string), tools.SE.EncodeString(openId+","+unionid+","+strconv.Itoa(int(time.Now().Unix()))+",wxMerge"))
 			fmt.Println(fmt.Sprintf(fmt.Sprint(config.Sysconfig["merge"]), bindUrl))
 			w.ReplyText(fmt.Sprintf(fmt.Sprint(config.Sysconfig["merge"]), bindUrl))
@@ -1050,14 +1089,17 @@ func Findent(entname string) string {
 }
 
 // 通过openid查userid
-func FindUserId(openid string) string {
+func FindUserId(openid string) (userId, phone string) {
 	defer util.Catch()
-	userId := ""
-	tem, ok := tools.MQFW.FindOneByField("user", `{"s_m_openid":"`+openid+`","s_unionid":{"$ne":"`+openid+`"}}`, `{"_id":1}`)
+	tem, ok := tools.MQFW.FindOneByField("user", `{"s_m_openid":"`+openid+`","s_unionid":{"$ne":"`+openid+`"}}`, `{"_id":1,"s_m_phone":1,"s_phone":1}`)
 	if ok && len(*tem) > 0 {
 		userId = util.ObjToString(BsonIdToSId((*tem)["_id"]))
+		phone = util.ObjToString((*tem)["s_m_phone"])
+		if phone == "" {
+			phone = util.ObjToString((*tem)["s_phone"])
+		}
 	}
-	return userId
+	return
 }
 
 // 取消关注事件

src/jfw/qrmanager/qrmanager.go

@@ -1,7 +1,9 @@
 package qrmanager
 
 import (
+	"app.yhyue.com/moapp/jypkg/common/src/qfw/util/jy"
 	. "jy/src/jfw/config"
+	"log"
 	"net/http"
 	"regexp"
 	"strings"
@@ -26,6 +28,13 @@ func RedisInfo(oid, action, sione, sitwo string, i int, hsn *httpsession.Session
 		rhdua = rheader["User-Agent"][0]
 	}
 	userData := make(map[string]interface{})
+	//P414
+	channelCode, ckErr := hrt.Cookie(jy.ChannelCookieName)
+	if ckErr != nil {
+		log.Println("获取 合作商 code 异常或 无合作商code：", rheader)
+		channelCode.Value = "jy_pc"
+	}
+	userData["channelCode"] = channelCode.Value
 	userData["Ros"] = util.GetOS(rhdua)
 	userData["Rip"] = util.GetIp(hrt)
 	userData["Rbrowse"] = util.GetBrowse(rhdua)

src/web/staticres/big-member/css/unit_portrayal.css

@@ -634,3 +634,19 @@
 .zb-analysis-module {
     margin-bottom: .08rem;
 }
+.dt-text-tips{
+  padding: .24rem .32rem .48rem;
+  font-size: .24rem;
+  line-height: .36rem;
+  color: rgba(29, 29, 29, 1);
+  text-align: center;
+}
+.dt-text-tips > .highlight-text{
+  text-decoration: underline;
+  font-size: inherit;
+}
+.dt-text-tips.light-bg{
+  margin: .24rem .32rem;
+  background: linear-gradient(rgba(234, 248, 250, 1), rgba(234, 248, 250, 0));
+  border-radius: 8px;
+}

src/web/staticres/big-member/js/unit_portrayal.js

@@ -81,7 +81,9 @@ var vNode = {
                 list: [],
                 isMore:'',
                 pageCount: '',
-                isNext: true
+                isNext: true,
+                total: 0,
+                updateTime: 0
             },
             regCapSettings:{
                 showLine: ['累计采购规模'],
@@ -248,6 +250,24 @@ var vNode = {
         // 留完资的用户（保含已体验和未体验的）
         getfreeBuyerOpen: function () {
           return this.userInfo.isFree && this.userInfo.freeBuyerPort != 0;
+        },
+         // 联系客服文案：新版超级订阅（购买全国）用户余额为0、大会员自定义用户、商机管理用户
+        customerServiceStatus: function () {
+          var info = this.userInfo
+          var memberCustom = this.power.indexOf(5) === -1 && info.memberStatus > 0
+          var isNewVip = info.vipStatus > 0 && info.viper && this.usageInfo.surplus <= 0 && this.usageInfo.provin === -1
+          // 纯商机管理用户
+          var entniche = info.vipStatus <= 0 && info.memberStatus <= 0 && info.entniche
+          return memberCustom || isNewVip || entniche
+        },
+        // 升级超级订阅文案：老版超级订阅用户、新版超级订阅（购买非全国）用户余额为0
+        updateVipStatus: function () {
+          var info = this.userInfo
+          var isNoMember = info.memberStatus <= 0
+          var isOldVip = info.vipStatus > 0 && !info.viper
+          var isNewVip = info.vipStatus > 0 && info.viper && this.usageInfo.surplus <= 0
+          var isNotAll = this.usageInfo.provin !== -1
+          return (isOldVip || (isNewVip && isNotAll)) && isNoMember
         }
     },
     watch: {
@@ -628,8 +648,10 @@ var vNode = {
             data:storageSet ? Object.assign(data, storageSet) : data,
             success:function(res) {
               if(res.error_code == 0) {
+                that.dt.updateTime = new Date(Number(res.data.updateTime + '000')).pattern('yyyy-MM-dd')
                 if (res.data.list && res.data.list.length && res.data.list.length > 0) {
                   that.dt.pageCount = res.data.count
+                  that.dt.total = res.data.count
                   if (res.data.list && $.isArray(res.data.list)) {
                     that.isShow.showDynamic = true;
                     res.data.list.forEach(function(v,i){
@@ -650,11 +672,12 @@ var vNode = {
                       })
                     } catch (error) {}
                     that.dt.list = []
-                    if (res.data.list.length >= 5){
-                      that.dt.list.push(res.data.list[0],res.data.list[1],res.data.list[2],res.data.list[3],res.data.list[4])
-                    }else {
-                      that.dt.list = res.data.list
-                    }
+                    // if (res.data.list.length >= 5){
+                    //   that.dt.list.push(res.data.list[0],res.data.list[1],res.data.list[2],res.data.list[3],res.data.list[4])
+                    // }else {
+                    //   that.dt.list = res.data.list
+                    // }
+                    that.dt.list = res.data.list
                     that.colList = that.dt.list
                     that.colList.forEach((val)=>{
                       that.list.push(val.id)
@@ -928,7 +951,13 @@ var vNode = {
             } else {
               that.isShow.showScaleFb = true;
               that.$nextTick(function(){
-                that.getHotChartData(res);
+                var timer = setInterval(function () {
+                  // 判断页面所有资源已加载完毕
+                  if (document.readyState === "complete") {
+                    that.getHotChartData(res);//执行方法
+                    window.clearInterval(timer);
+                  }
+                }, 800)
               })
             }
           }
@@ -1012,7 +1041,13 @@ var vNode = {
           if (data && data.length > 0) {
             that.isShow.showScaleRate = true
             that.$nextTick(function(){
-              that.getPieCharData(data)
+              var timer = setInterval(function () {
+                // 判断页面所有资源已加载完毕
+                if (document.readyState === "complete") {
+                  that.getPieCharData(data);//执行方法
+                  window.clearInterval(timer);
+                }
+              }, 800)
             })
           }
         },
@@ -1776,6 +1811,17 @@ var vNode = {
               }
             })
           }
+        },
+        onDtTextClick: function(type) {
+          if (type === 'customer') {
+            location.href = '/big/wx/page/customer'
+          } else if (type === 'update') {
+            //跳转清除旧套餐缓存，防止计算价格出错
+            sessionStorage.removeItem('vipSub_oldBuySet')
+            location.href = '/jy_mobile/common/order/create/svip?type=upgrade'
+          } else if (type === 'buy') {
+            location.href = '/jy_mobile/common/order/create/svip?type=buy'
+          }
         }
     }
 }