Merge branch 'fix-template' into 'master'

fix template

See merge request rays/pcloud-book!209

pcloud-service-book/src/main/java/com/pcloud/book/appeal/biz/impl/BookAppealBizImpl.java

 package com.pcloud.book.appeal.biz.impl;
 
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-import org.springframework.transaction.annotation.Transactional;
 import com.alibaba.druid.util.StringUtils;
 import com.pcloud.book.appeal.biz.BookAppealBiz;
 import com.pcloud.book.appeal.dao.BookAppealDao;
@@ -50,6 +38,18 @@ import com.pcloud.common.utils.ListUtils;
 import com.pcloud.common.utils.string.StringUtil;
 import com.pcloud.usercenter.party.adviser.dto.AdviserBaseInfoDto;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
 /**
  * 书刊申诉业务处理实现类
  * @version 1.0
@@ -423,9 +423,8 @@ public class BookAppealBizImpl implements BookAppealBiz {
         String channelName = channelConsr.getNameById(channelId);
         Map<String, String> temParam = new HashMap<>();
         temParam.put("first", "编辑变更");
-        temParam.put("keyword2", "RAYS编辑");
-        temParam.put("keyword1", "您在" + channelName + "运营的书刊" + StringUtil.addBracket(bookName) + "已将您设置为主编辑，请尽快去PC端配置书刊的相关资源等信息");
-        temParam.put("keyword3", "通知");
+        temParam.put("keyword1", "RAYS编辑");
+        temParam.put("keyword2", "您在" + channelName + "运营的书刊" + StringUtil.addBracket(bookName) + "已将您设置为主编辑，请尽快去PC端配置书刊的相关资源等信息");
         temParam.put("remark", "请抽空处理");
         templateConsr.sendManage(SceneCode.PROJECT_TASK_SCENE.value, agentId, adviserId, SystemCode.adviser.code, "",
                 temParam, SendType.SEND_BY_PARTY_ID.value, false);
@@ -443,9 +442,8 @@ public class BookAppealBizImpl implements BookAppealBiz {
         String channelName = channelConsr.getNameById(channelId);
         Map<String, String> temParam = new HashMap<>();
         temParam.put("first", "编辑变更");
-        temParam.put("keyword2", "RAYS编辑");
-        temParam.put("keyword1", "您在" + channelName + "运营的书刊" + StringUtil.addBracket(bookName) + "被申诉成功，已被移除，请知悉");
-        temParam.put("keyword3", "通知");
+        temParam.put("keyword1", "RAYS编辑");
+        temParam.put("keyword2", "您在" + channelName + "运营的书刊" + StringUtil.addBracket(bookName) + "被申诉成功，已被移除，请知悉");
         temParam.put("remark", "请抽空处理");
         templateConsr.sendManage(SceneCode.PROJECT_TASK_SCENE.value, agentId, adviserId, SystemCode.adviser.code, "",
                 temParam, SendType.SEND_BY_PARTY_ID.value, false);
@@ -463,9 +461,8 @@ public class BookAppealBizImpl implements BookAppealBiz {
         String channelName = channelConsr.getNameById(channelId);
         Map<String, String> temParam = new HashMap<>();
         temParam.put("first", "编辑变更");
-        temParam.put("keyword2", "RAYS编辑");
-        temParam.put("keyword1", "您在" + channelName + "运营的书刊" + StringUtil.addBracket(bookName) + "被申诉成功，已将您设置为副编辑，请知悉");
-        temParam.put("keyword3", "通知");
+        temParam.put("keyword1", "RAYS编辑");
+        temParam.put("keyword2", "您在" + channelName + "运营的书刊" + StringUtil.addBracket(bookName) + "被申诉成功，已将您设置为副编辑，请知悉");
         temParam.put("remark", "请抽空处理");
         templateConsr.sendManage(SceneCode.PROJECT_TASK_SCENE.value, agentId, adviserId, SystemCode.adviser.code, "",
                 temParam, SendType.SEND_BY_PARTY_ID.value, false);

pcloud-service-book/src/main/java/com/pcloud/book/book/biz/impl/BookAdviserBizImpl.java

@@ -438,7 +438,6 @@ public class BookAdviserBizImpl implements BookAdviserBiz {
 			temParam.put("first", "编辑变更");
 			temParam.put("keyword1", "RAYS编辑");
 			temParam.put("keyword2", "您的书刊" + StringUtil.addBracket(bookName) + "已被移除，请知悉");
-			temParam.put("keyword3", "通知");
 			temParam.put("remark", "请抽空处理");
 			templateConsr.sendManage(SceneCode.PROJECT_TASK_SCENE.value, agentId, adviserId,
 					SystemCode.adviser.code, "", temParam, SendType.SEND_BY_PARTY_ID.value, false);

pcloud-service-book/src/main/java/com/pcloud/book/copyright/biz/impl/BookAuthOrderBizImpl.java

@@ -72,8 +72,8 @@ public class BookAuthOrderBizImpl implements BookAuthOrderBiz {
         //发送模板消息
         Map<String, String> paramMap = new HashMap<>();
         paramMap.put("first", "正版授权成功");
-        paramMap.put("orderMoneySum", genuine.getMoney() == null ? "" : genuine.getMoney().toString());
-        paramMap.put("orderProductName", bookDto == null ? "" : StringUtil.addBracket(bookDto.getBookName()) + "正版授权费");
+        paramMap.put("keyword1", genuine.getMoney() == null ? "" : genuine.getMoney().toString());
+        paramMap.put("keyword2", bookDto == null ? "" : StringUtil.addBracket(bookDto.getBookName()) + "正版授权费");
         paramMap.put("Remark", "支持正版图书，享受专属资源");
         String  url = "/C" + genuine.getChannelId() + "/qrcode/" + genuine.getSceneId() + "?adviserId=" + genuine.getAdviserId() + "&sceneId=" + genuine.getSceneId() + "&source_type=QRCODE";
         templateConsr.sendOperate(SceneCode.PAY_SUCCESS_SCENE.value, genuine.getChannelId(), genuine.getWechatUserId(), url, paramMap, SendType.SEND_BY_WECHAT_USER_ID.value, false);