Merge branch 'feature/1003453' into 'master'

feat: [1003453] 群内回复问题反馈文案修改意见调整

See merge request rays/pcloud-book!905

pcloud-service-book/src/main/java/com/pcloud/book/group/tools/SendWeixinRequestTools.java

@@ -14,6 +14,7 @@ import com.pcloud.book.keywords.dto.ReplyKeywordDTO;
 import com.pcloud.book.keywords.dto.SendMessageDTO;
 import com.pcloud.book.keywords.enums.ReplyTypeEnum;
 import com.pcloud.book.keywords.vo.ReplyMessageVO;
+import com.pcloud.book.util.properties.BookProps;
 import com.pcloud.channelcenter.base.constants.ChannelConstants;
 import com.pcloud.channelcenter.wechat.dto.AccountSettingDto;
 import com.pcloud.common.core.aspect.ParamLog;
@@ -452,11 +453,19 @@ public class SendWeixinRequestTools {
     private static StringBuilder createGroupKeyword(KeywordStatusDTO keywordStatusDTO, GroupClassifyQrcodeDTO classifyQrcodeInfo, StringBuilder sb, boolean isOld, AccountSettingDto accountSettingDto) {
         // 运营关键词
         StringBuilder groupKeyword = getGroupKeyword(keywordStatusDTO, sb, isOld);
+        //根据编辑id判断是否是heals的群
+        Boolean isHeals = false;
+        if (null != classifyQrcodeInfo && Objects.equals(BookProps.getHealsAdviserId(),classifyQrcodeInfo.getAdviserId())) {
+            isHeals = true ;
+            LOGGER.info("系统的heals的编辑账号是：{}，群的编辑账号是：{}",BookProps.getHealsAdviserId(), classifyQrcodeInfo.getAdviserId() );
+        }
         // 拼接反馈链接
         String feedbackUrl = "*common/C" + classifyQrcodeInfo.getChannelId() + "/A0/feedback/suggest?groupQrcodeId=" + classifyQrcodeInfo.getGroupQrcodeId();
-        String url = splitUrl(accountSettingDto, feedbackUrl);
+        if (isHeals) {
+            feedbackUrl = feedbackUrl + "&isHeals=1";
+        }String url = splitUrl(accountSettingDto, feedbackUrl);
         LOGGER.info("发送欢迎语反馈链接feedbackUrl:{}, url:{}", feedbackUrl, url);
-        groupKeyword.append("想看更多类似资源？请点击这里反馈吧\n->").append(UrlUtils.getShortUrl4Own(url));
+        groupKeyword.append("如果您在使用本群过程中有任何意见或建议，请点击这里反馈吧\n->").append(UrlUtils.getShortUrl4Own(url));
         return groupKeyword;
     }
 

pcloud-service-book/src/main/java/com/pcloud/book/util/properties/BookProps.java

@@ -113,4 +113,14 @@ public class BookProps {
 	public void setOurManagerAccountId(Long ourManagerAccountId) {
 		this.ourManagerAccountId = ourManagerAccountId;
 	}
+
+	private static  Long healsAdviserId;
+
+	public static Long getHealsAdviserId() {
+		return healsAdviserId;
+	}
+	@Value("${heals.adviserId}")
+	public void setHealsAdviserId(Long healsAdviserId) {
+		BookProps.healsAdviserId = healsAdviserId;
+	}
 }