Merge branch 'system-zyj' of uskycloud/usky-cloud into system-165

base-modules/service-system/service-system-biz/src/main/java/com/usky/system/service/impl/MceMbuserServiceImpl.java

@@ -7,6 +7,7 @@ import com.usky.common.core.exception.BusinessException;
 import com.usky.common.redis.core.RedisHelper;
 import com.usky.system.domain.MceMbuser;
 import com.usky.system.mapper.MceMbuserMapper;
+import com.usky.system.service.ISysDictDataService;
 import com.usky.system.service.MceMbuserService;
 import com.usky.system.constant.constant;
 import com.usky.common.mybatis.core.AbstractCrudService;
@@ -41,6 +42,8 @@ public class MceMbuserServiceImpl extends AbstractCrudService<MceMbuserMapper, M
 
     @Autowired
     private RedisHelper redisHelper;
+    @Autowired
+    private ISysDictDataService sysDictDataService;
 
     public String getWeChatAccessToken() {
         try {
@@ -72,7 +75,7 @@ public class MceMbuserServiceImpl extends AbstractCrudService<MceMbuserMapper, M
     @Override
     public JSONObject sendWeChatMessage(@RequestBody SendWeChatMessageRequestVO requestVO) {
 
-        String infoType = requestVO.getInfoType();
+        String infoType = sysDictDataService.selectDictLabel("message_type",requestVO.getInfoType());
         String infoTitle = requestVO.getInfoTitle();
         String infoContent = requestVO.getInfoContent();
         Integer infoId = requestVO.getInfoId();
@@ -107,8 +110,8 @@ public class MceMbuserServiceImpl extends AbstractCrudService<MceMbuserMapper, M
         TemplateMsgEntityVO messageVo=new TemplateMsgEntityVO();
         messageVo.setTTitle(infoTitle);
         messageVo.setTKeyword1(infoContent);
-//        messageVo.setTKeyword2("测试2");
-//        messageVo.setTKeyword3("测试3");
+        messageVo.setTKeyword2(infoType);
+        messageVo.setTKeyword3(LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
         messageVo.setTRemark(infoContent);
         messageVo.setTUrl(String.format(constant.WE_CHAT_CUSTOMER_CALL_URL,infoType,infoId));
         messageVo.setTemplateId(constant.WE_CHAT_TEMPLATE_ID);
@@ -118,8 +121,8 @@ public class MceMbuserServiceImpl extends AbstractCrudService<MceMbuserMapper, M
         Map<String, TemplateData> data = new HashMap<>();
         data.put("first",new TemplateData(messageVo.getTTitle(),"#44b549"));
         data.put("keyword1",new TemplateData(messageVo.getTKeyword1(),"#173177"));
-//        data.put("keyword2",new TemplateData(messageVo.getTKeyword2(),"#173177"));
-//        data.put("keyword3",new TemplateData(messageVo.getTKeyword3(),"#173177"));
+        data.put("keyword2",new TemplateData(messageVo.getTKeyword2(),"#173177"));
+        data.put("keyword3",new TemplateData(messageVo.getTKeyword3(),"#173177"));
         data.put("remark",new TemplateData(messageVo.getTRemark(),"#173177"));
 
         content.put("touser",openId);