客服消息发送文本兼容自定义链接

.gitignore

@@ -2,3 +2,4 @@
 /target/
 /customer-service/
 /test-customer-service/
+/.idea/

src/main/java/com/yaoyaozw/customer/service/wechat/service/WeChatServiceImpl.java

@@ -205,7 +205,9 @@ public class WeChatServiceImpl implements WeChatService{
             //文本类客服，需要判断替换链接的个数
             Map<Integer, String> sortReferral = urlList!=null&&!urlList.isEmpty()?urlList.stream().collect(Collectors.toMap(ReferralEntityVo::getSort, ReferralEntityVo::getReferral, (v1, v2) -> v2)):new HashMap<>(1);
 
-            if (customerGraphics.getReferralSize()!=null&&customerGraphics.getReferralSize().equals(sortReferral.size())){
+            // 统计生成完成的非自定义链接的链接数量
+            int actualReferralCount = urlList == null ? 0 : (int) urlList.stream().filter(v -> !StringUtils.isAnyBlank(v.getAppid(), v.getReferral()) && v.getNewsType() != null && v.getNewsType() != -1).count();
+            if (customerGraphics.getReferralSize()!=null && customerGraphics.getReferralSize().equals(actualReferralCount)){
 
                 String content = customerGraphics.getContent();
 

src/main/java/com/yaoyaozw/customer/vo/referral/ReferralEntityVo.java

@@ -13,6 +13,8 @@ public class ReferralEntityVo implements Serializable {
 
     private Long materialGraphicsId;
 
+    private Integer newsType;
+
     private String accountId;
 
     private String appid;

src/main/resources/mapper/ReferralEntityMapper.xml

@@ -35,16 +35,14 @@
 
   <select id="findByMaterialGraphicsId" resultType="com.yaoyaozw.customer.vo.referral.ReferralEntityVo">
 
-    select material_graphics_id ,referral.account_id,authInfo.appid,referral.referral,referral.sort
+    select material_graphics_id ,referral.account_id,authInfo.appid,referral.referral,referral.sort, referral.news_type
 
     from referral_entity referral left join authorizer_info authInfo
 
     on referral.account_id=authInfo.account_id
 
-    where referral.material_graphics_id=#{graphicsId} and referral.is_deleted=0 and referral.account_id is not null and referral.referral!='error'
-
-
-
+    where referral.material_graphics_id=#{graphicsId} and referral.is_deleted=0 and referral.referral!='error'
+    and (referral.account_id is not null or referral.news_type = -1)
 
   </select>