fix:邮件关键词拼接修改

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

@@ -194,6 +194,9 @@ func (this *SubVipPortrait) SubVipPortrait() {
 		if err != nil {
 			return nil, err
 		}
+		if userId == "" && power <= 1 {
+			return nil, fmt.Errorf("无查看权益")
+		}
 		rData, err := cepm.WinnerPortraitData(&entity.PortraitScreen{
 			Ent:        entId,
 			Match:      this.GetString("match"),
@@ -464,7 +467,7 @@ func (this *SubVipPortrait) BuyerPortrait() {
 			return nil, err
 		}
 		redisKey := fmt.Sprintf("buyerPortraitKey_%s", buyerName)
-		if userId == "" || power <= 1 {
+		if userId == "" && power <= 1 {
 			if bytes, err := redis.GetBytes("other", redisKey); err == nil && bytes != nil {
 				rData := make(map[string]interface{})
 				if err = json.Unmarshal(*bytes, &rData); err != nil {

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

@@ -96,14 +96,17 @@ func PdfSendEmail(rData map[string]interface{}) error {
 		)
 		if err := json.Unmarshal([]byte(qutil.InterfaceToStr(rData["s_keysItems"])), &mae.FormatParam.KeysItems); err == nil {
 			for _, item := range mae.FormatParam.KeysItems {
+				var keyGroup []string
 				for _, word := range item.A_Key {
 					matchWayStr := "(精准)"
 					if word.MatchWay == 1 {
 						matchWayStr = "(模糊)"
 					}
-					for _, s := range word.Keyword {
-						keyWords = append(keyWords, fmt.Sprintf("%s %s", s, matchWayStr))
-					}
+					keyGroup = append(keyGroup, word.Keyword...)
+					keyGroup = append(keyGroup, word.Appended...)
+					keyGroup = append(keyGroup, matchWayStr)
+
+					keyWords = append(keyWords, strings.Join(keyGroup, " "))
 				}
 			}
 		}