关键词和关回活动类型处理

src/main/java/com/yaoyaozw/customer/components/CustomerKeywordComponent.java

@@ -282,9 +282,10 @@ public class CustomerKeywordComponent {
             name = name.replace("{bookName}", referral.getBookName());
         } else if (newsType.equals(CustomerCommonConstant.ACTIVITY_NEWS_TYPE)) {
             // 系统-客服-{newsType}-{accountNickName}-{storeType}-{currentDate}-充{recharge}送{gift}
-            name = name.replace("{recharge}", referral.getRechargeAmount().stripTrailingZeros().toPlainString()).replace("{gift}", referral.getGiftAmount().toString());
             if (StringUtils.isNotEmpty(referral.getConfigName())) {
                 name = name.replace("{configName}", referral.getConfigName());
+            } else {
+                name = name.replace("{recharge}", referral.getRechargeAmount().stripTrailingZeros().toPlainString()).replace("{gift}", referral.getGiftAmount().toString());
             }
         }
         name = name.replace("客服", "关键词");

src/main/java/com/yaoyaozw/customer/components/FollowReplyComponent.java

@@ -283,9 +283,10 @@ public class FollowReplyComponent {
             name = name.replace("{bookName}", referral.getBookName());
         } else if (newsType.equals(CustomerCommonConstant.ACTIVITY_NEWS_TYPE)) {
             // 系统-客服-{newsType}-{accountNickName}-{storeType}-{currentDate}-充{recharge}送{gift}
-            name = name.replace("{recharge}", referral.getRechargeAmount().stripTrailingZeros().toPlainString()).replace("{gift}", referral.getGiftAmount().toString());
             if (StringUtils.isNotEmpty(referral.getConfigName())) {
                 name = name.replace("{configName}", referral.getConfigName());
+            } else {
+                name = name.replace("{recharge}", referral.getRechargeAmount().stripTrailingZeros().toPlainString()).replace("{gift}", referral.getGiftAmount().toString());
             }
         }
         name = name.replace("客服", "关回");

src/main/java/com/yaoyaozw/customer/entity/CommonReferralBody.java

@@ -97,6 +97,10 @@ public class CommonReferralBody implements Serializable {
     @ApiModelProperty(value = "模板Id")
     private String templateId;
 
+    private String configName;
+
+    private String configId;
+
     private String h5Content;
 
     public Date getStartTime() {