20220902

xiaoyong931011

2022-09-20 ccaa5b832d9a741b1c1ca97130205cf25450c86a

 src/main/java/cc/mrbird/febs/pay/service/impl/XcxPayServiceImpl.java

@@ -225,11 +225,11 @@
        orderStateMsgVo.setTemplate_id(info.getTemplateId());//订阅消息模板id
        orderStateMsgVo.setPage(info.getPage());
        Map<String, WxTemplateData> m = new HashMap<>(4);
        m.put("phrase1", new WxTemplateData(info.getOrderState()));
        m.put("thing2", new WxTemplateData(info.getAddressArea()));
        m.put("thing3", new WxTemplateData(info.getDetailAddress()));
        m.put("thing6", new WxTemplateData(info.getGoodsName()));
        m.put("character_string11", new WxTemplateData(info.getTakeCode()));
        m.put("thing4.DATA", new WxTemplateData(info.getAddressArea()));
        m.put("phone_number14.DATA", new WxTemplateData(info.getLeaderPhone()));
        m.put("thing3.DATA", new WxTemplateData(info.getGoodsName()));
        m.put("thing5.DATA", new WxTemplateData(info.getDetailAddress()));
        m.put("thing15.DATA", new WxTemplateData(info.getRemark()));
        orderStateMsgVo.setData(m);
        String s = JSONUtil.toJsonStr(orderStateMsgVo);
        log.info(s);
@@ -289,7 +289,7 @@
    @Override
    public List<String> getTemplateId() {
        List<String> wxTemplates = new ArrayList<>();
        List<DataDictionaryCustom> wxTemplateList = dataDictionaryCustomMapper.selectDicByType(DataDictionaryEnum.WX_TEMPLATE_ID_ONE.getType());
        List<DataDictionaryCustom> wxTemplateList = dataDictionaryCustomMapper.selectDicByType(DataDictionaryEnum.WX_TEMPLATE_ID_THREE.getType());
        if(CollUtil.isNotEmpty(wxTemplateList)){
            for(DataDictionaryCustom dic : wxTemplateList){
                wxTemplates.add(dic.getValue());