valhalla / fw-hestia

Commit 5f3630d11bbd258b4e674be31f845c33cede693a

Authored by 张志伟
1 parent 3915b862

fix(*): bug修复 

- bug修复
Inline Side-by-side
Showing 2 changed files with 6 additions and 7 deletions
fw-hestia-service/src/main/java/cn/fw/hestia/component/SettingProperty.java
  View file @5f3630d
... ... @@ -17,15 +17,15 @@ import org.springframework.boot.context.properties.ConfigurationProperties;
17 17 @ConfigurationProperties(prefix = "mptemplate")
18 18 public class SettingProperty {
19 19 private String tempId;
20   - private String thing3;
21   - private String thing13;
  20 + private String typeSort1;
  21 + private String typeSort2;
22 22  
23 23 @Override
24 24 public String toString() {
25 25 return "SettingProperty{" +
26 26 "tempId='" + tempId + '\'' +
27   - ", thing3='" + thing3 + '\'' +
28   - ", thing13='" + thing13 + '\'' +
  27 + ", typeSort1='" + typeSort1 + '\'' +
  28 + ", typeSort2='" + typeSort2 + '\'' +
29 29 '}';
30 30 }
31 31 }
... ...
fw-hestia-service/src/main/java/cn/fw/hestia/service/buz/MessageCenterBizService.java
  View file @5f3630d
... ... @@ -12,7 +12,6 @@ import cn.fw.hestia.domain.db.SendLog;
12 12 import cn.fw.hestia.domain.enums.MessageStateEnum;
13 13 import cn.fw.hestia.domain.vo.HistoryQuery;
14 14 import cn.fw.hestia.domain.vo.MessageHistoryVO;
15   -import cn.fw.hestia.rpc.member.MemberRpcService;
16 15 import cn.fw.hestia.rpc.passport.TemplateMessageService;
17 16 import cn.fw.hestia.rpc.passport.dto.TMParam;
18 17 import cn.fw.hestia.sdk.params.TemplateMessageParam;
... ... @@ -321,8 +320,8 @@ public class MessageCenterBizService {
321 320 messageHistory.setState(MessageStateEnum.MADA);
322 321  
323 322 List<WxMpTempMessageData> keywords = Arrays.asList(
324   - new WxMpTempMessageData(settingProperty.getThing3(), param.getTitle()),
325   - new WxMpTempMessageData(settingProperty.getThing13(), StringUtils.isEmpty(param.getRemark()) ? "~" : param.getRemark())
  323 + new WxMpTempMessageData(settingProperty.getTypeSort1(), param.getTitle()),
  324 + new WxMpTempMessageData(settingProperty.getTypeSort2(), StringUtils.isEmpty(param.getRemark()) ? "~" : param.getRemark())
326 325 );
327 326 messageHistory.setKeywords(JSONArray.toJSONString(keywords));
328 327 if (!CollectionUtils.isEmpty(param.getParamMap())) {
... ...