Merge branch 'dev4.6.2.1' of http://192.168.3.207:8080/qmx/jy into dev4.6.2.1

src/jfw/modules/app/src/web/staticres/jyapp/vipsubscribe/js/vip_index_new.js

@@ -74,7 +74,6 @@ var subNode = new Vue({
                         $('.update_renew').hide()
                         if(num == 1) {
                             $('.custom-header-title').html('<span class="title-text"><em class="title_icon icon_zj"></em>订阅管理-大会员</span>')
- 
                         } else if(num == 2) {
                             $('.custom-header-title').html('<span class="title-text"><em class="title_icon icon_zh"></em>订阅管理-大会员</span>')
 
@@ -333,10 +332,9 @@ $(function () {
               } else if (switchProduct == 'free') {
                 subNode.initData = r.data
               } else {
-                res = r
+                res = resObj
               }
           }
-          if (!res.success) return;
           if(!res.data.industry) {
               res.data.industry = []
           }

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

@@ -858,12 +858,14 @@
             let thisType = sessionStorage.getItem('userIsNew')
             if (userNewType || thisType) {
                 location.href = '/jyapp/vipsubscribe/toSubVipSetPage'
-            }
-            if(vm.rootInfo.memberStatus > 0) {
-                location.href = '/jyapp/vipsubscribe/toSubVipSetPage'
             } else {
-                tokeyset()
+                if(vm.rootInfo.memberStatus > 0) {
+                    location.href = '/jyapp/vipsubscribe/toSubVipSetPage'
+                } else {
+                    tokeyset()
+                }
             }
+            
         });
         $(".tab_left .area").hide();
         if (r.isPassCount) {
@@ -887,12 +889,14 @@
             let thisType = sessionStorage.getItem('userIsNew')
             if (userNewType || thisType) {
                 location.href = '/jyapp/vipsubscribe/toSubVipSetPage'
-            }
-            if(vm.selectPro) {
-                location.href = '/jyapp/vipsubscribe/toSubVipSetPage'
             } else {
-                tosetpage()
+                if(vm.selectPro) {
+                    location.href = '/jyapp/vipsubscribe/toSubVipSetPage'
+                } else {
+                    tosetpage()
+                }
             }
+            
         });
         if(productType == 0) {
             $(".vip_report").show();

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

@@ -237,7 +237,7 @@ func (this *Portrait) BuyerPortraitData(screen *PortraitScreen, flag string) (ma
 		return nil, errors.New("企业名称异常")
 	}
 	buyerPortraitData := map[string]interface{}{}
-	if !screen.HasPower || screen.IsEmptySearch() { //空查询读缓存
+	if screen.IsEmptySearch() { //空查询读缓存
 		buyerPortraitData = TryFunc(GetPortraitCache, screen.Ent, "buyer", 2)
 	} else {
 		Screen_Thread <- true

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

@@ -273,40 +273,37 @@ func (pwp *PortraitProjectScreen) GetBuyerList() (list []map[string]interface{},
 
 	sTime, eTime := pwp.Screen.PareTimeSelect()
 	mustQueryArr = append(mustQueryArr, fmt.Sprintf(`{"range":{"firsttime":{"gte":"%d","lte":"%d"}}}`, sTime.Unix(), eTime.Unix()))
-	if pwp.Screen.HasPower {
-		//文本输入框，字数限制50个字，超过上限不再允许输入内容
-		if pwp.Screen.Match != "" {
-			if pareWord := pwp.Screen.PareMatchWord(); pareWord != "" {
-				findFields := fmt.Sprintf(`"%s"`, strings.Join(pwp.Screen.PareMatchType(false), "\",\""))
-				var keywordArr []string
-				for _, keyword := range strings.Split(pareWord, " ") {
-					if keyword == "" {
-						continue
-					}
-					keywordArr = append(keywordArr, fmt.Sprintf(multi_match, keyword, findFields))
-				}
-				if pwp.Screen.ExactMatch { //精确匹配(必须包含每个关键词)
-					mustQueryArr = append(mustQueryArr, fmt.Sprintf(must_match, strings.Join(keywordArr, ",")))
-				} else { //模糊匹配(只需包含一个关键词)
-					mustQueryArr = append(mustQueryArr, fmt.Sprintf(should_match, strings.Join(keywordArr, ",")))
+
+	//文本输入框，字数限制50个字，超过上限不再允许输入内容
+	if pwp.Screen.Match != "" {
+		if pareWord := pwp.Screen.PareMatchWord(); pareWord != "" {
+			findFields := fmt.Sprintf(`"%s"`, strings.Join(pwp.Screen.PareMatchType(false), "\",\""))
+			var keywordArr []string
+			for _, keyword := range strings.Split(pareWord, " ") {
+				if keyword == "" {
+					continue
 				}
+				keywordArr = append(keywordArr, fmt.Sprintf(multi_match, keyword, findFields))
+			}
+			if pwp.Screen.ExactMatch { //精确匹配(必须包含每个关键词)
+				mustQueryArr = append(mustQueryArr, fmt.Sprintf(must_match, strings.Join(keywordArr, ",")))
+			} else { //模糊匹配(只需包含一个关键词)
+				mustQueryArr = append(mustQueryArr, fmt.Sprintf(should_match, strings.Join(keywordArr, ",")))
 			}
 		}
+	}
 
-		//按照当前年份，往前推4年，共5个年份可选
-		sTime, eTime := pwp.Screen.PareTimeSelect()
-		mustQueryArr = append(mustQueryArr, fmt.Sprintf(`{"range":{"firsttime":{"gte":"%d","lte":"%d"}}}`, sTime.Unix(), eTime.Unix()))
-
-		//地区多选，选项：全部（初始值）、项目地区（省、直辖市）
-		if pwp.Screen.Area != "" {
-			mustQueryArr = append(mustQueryArr, fmt.Sprintf(`{"terms":{"area":["%s"]}}`, strings.ReplaceAll(pwp.Screen.Area, ",", "\",\"")))
-		}
+	//地区多选，选项：全部（初始值）、项目地区（省、直辖市）
+	if pwp.Screen.Area != "" {
+		mustQueryArr = append(mustQueryArr, fmt.Sprintf(`{"terms":{"area":["%s"]}}`, strings.ReplaceAll(pwp.Screen.Area, ",", "\",\"")))
+	}
 
-		//行业多选
-		if pwp.Screen.ScopeClass != "" {
-			mustQueryArr = append(mustQueryArr, fmt.Sprintf(`{"terms":{"s_subscopeclass":["%s"]}}`, strings.ReplaceAll(pwp.Screen.ScopeClass, ",", "\",\"")))
-		}
+	//行业多选
+	if pwp.Screen.ScopeClass != "" {
+		mustQueryArr = append(mustQueryArr, fmt.Sprintf(`{"terms":{"s_subscopeclass":["%s"]}}`, strings.ReplaceAll(pwp.Screen.ScopeClass, ",", "\",\"")))
+	}
 
+	if pwp.Screen.HasPower {
 		pwp.PageNum = qutil.If(pwp.PageNum == 0, 1, pwp.PageNum).(int)     //默认第一页
 		pwp.PageSize = qutil.If(pwp.PageSize == 0, 10, pwp.PageSize).(int) //默认每页10条
 	} else { //免费用户可以查看三条

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

@@ -209,6 +209,7 @@ func (this *EntPortrait) WinnerMiniPortrait() {
 }
 
 //BuyerSelects 采购单位画像可供筛选的条件
+//dev.6.2.1免费用户可筛选画像
 func (this *EntPortrait) BuyerSelects() {
 	userId := qutil.ObjToString(this.GetSession("userId"))
 	rData, errMsg := func() (interface{}, error) {
@@ -216,13 +217,10 @@ func (this *EntPortrait) BuyerSelects() {
 		if buyer == "" {
 			return nil, fmt.Errorf("企业参数异常")
 		}
-		_, hasPower, err := entity.CreatePortraitManager(userId, "buyerPortrait")
+		_, _, err := entity.CreatePortraitManager(userId, "buyerPortrait")
 		if err != nil {
 			return nil, err
 		}
-		if !hasPower {
-			return nil, fmt.Errorf("非法请求")
-		}
 		pwp := &entity.PortraitScreen{Ent: buyer}
 		return pwp.GetProjectSelectItems(false)
 	}()

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

@@ -92,6 +92,35 @@ func DataCount(uid, item string, index int) int64 {
 	return elastic.Count(INDEX, TYPE, qstr)
 }
 
+func KeysetDataCount(userId, key, notkey string, matchway int) int64 {
+	key = strings.TrimSpace(key)
+	notkey = strings.TrimSpace(notkey)
+	if key == "" {
+		return 0
+	}
+	// sql := GetSqlObjFromId(userId, "", -1)
+	sql := GetSqlObjFromFreeId(userId, "", -1)
+	viewKeyWords := []ViewKeyWord{}
+	if matchway == 0 {
+		viewKeyWords = append(viewKeyWords, ViewKeyWord{
+			Keyword:  strings.Split(key, " "),
+			Exclude:  strings.Split(notkey, " "),
+			MatchWay: matchway,
+		})
+	} else {
+		for _, v := range strings.Split(key, " ") {
+			viewKeyWords = append(viewKeyWords, ViewKeyWord{
+				Keyword:  []string{v},
+				Exclude:  strings.Split(notkey, " "),
+				MatchWay: matchway,
+			})
+		}
+	}
+	sql.Keyword = viewKeyWords
+	qstr := GetVIPViewSql(userId, sql)
+	return elastic.Count(INDEX, TYPE, qstr)
+}
+
 func SubViewDatas(userId, allquery string, pageNum int) (keys []interface{}, list *[]map[string]interface{}, hasNextPage bool) {
 	if userId == "" {
 		return

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

@@ -6,9 +6,10 @@ import (
 
 type ServiceStruct struct {
 	*xweb.Action
-	subscribeMsg   xweb.Mapper `xweb:"/free/subscribe"`      //获取用户订阅信息
-	getPushCount   xweb.Mapper `xweb:"/free/pushcount"`      //推送结果预览 计数
-	getPushView    xweb.Mapper `xweb:"/free/pushview"`       //推送结果预览
-	areaPackEndTip xweb.Mapper `xweb:"/free/areapack/(.*)"`  //省份订阅包到期提醒
-	oneProvinceSet xweb.Mapper `xweb:"/free/oneProvinceSet"` //免费老用户点击去升级订阅设置
+	subscribeMsg     xweb.Mapper `xweb:"/free/subscribe"`      //获取用户订阅信息
+	getPushCount     xweb.Mapper `xweb:"/free/pushcount"`      //推送结果预览 计数
+	getPushView      xweb.Mapper `xweb:"/free/pushview"`       //推送结果预览
+	getPushCountitem xweb.Mapper `xweb:"/free/pushcountitem"`  //单组推送结果预览 计数
+	areaPackEndTip   xweb.Mapper `xweb:"/free/areapack/(.*)"`  //省份订阅包到期提醒
+	oneProvinceSet   xweb.Mapper `xweb:"/free/oneProvinceSet"` //免费老用户点击去升级订阅设置
 }

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

@@ -67,6 +67,17 @@ func (this *ServiceStruct) GetPushCount() {
 	}
 }
 
+func (this *ServiceStruct) GetPushCountitem() {
+	defer qu.Catch()
+	userId, _ := this.GetSession("userId").(string)
+	if userId != "" {
+		matchway, _ := this.GetInteger("matchway")
+		this.ServeJson(map[string]interface{}{
+			"count": entity.KeysetDataCount(userId, this.GetString("key"), this.GetString("notkey"), matchway),
+		})
+	}
+}
+
 //
 func (this *ServiceStruct) AreaPackEndTip(types string) {
 	userId, _ := this.GetSession("userId").(string)