20220902

xiaoyong931011

2022-09-24 57a83bef7cf3dd9a76561c979cfa98557bd239cf

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

@@ -218,10 +218,10 @@
        orderStateMsgVo.setTemplate_id(info.getTemplateId());//订阅消息模板id
        orderStateMsgVo.setPage(info.getPage());
        Map<String, WxTemplateData> m = new HashMap<>(4);
        m.put("thing19.DATA", new WxTemplateData(info.getAddressArea()));
        m.put("phone_number18.DATA", new WxTemplateData(info.getLeaderPhone()));
        m.put("thing3.DATA", new WxTemplateData(info.getGoodsName()));
        m.put("thing15.DATA", new WxTemplateData(info.getRemark()));
        m.put("thing19", new WxTemplateData(info.getAddressArea()));
        m.put("phone_number18", new WxTemplateData(info.getLeaderPhone()));
        m.put("thing3", new WxTemplateData(info.getGoodsName()));
        m.put("thing15", new WxTemplateData(info.getRemark()));
        orderStateMsgVo.setData(m);
        String s = JSONUtil.toJsonStr(orderStateMsgVo);
        log.info(s);
@@ -285,15 +285,9 @@
        if(CollUtil.isNotEmpty(wxTemplateList)){
            for(DataDictionaryCustom dic : wxTemplateList){
                HashMap<String, String> objectObjectHashMap = new HashMap<>();
                //充值到账通知
                if("WX_TEMPLATE_ID_TWO".equals(dic.getCode())){
                    objectObjectHashMap.put("WX_TEMPLATE_ID_TWO",dic.getValue());
                }
                //提货通知
                if("WX_TEMPLATE_ID_THREE".equals(dic.getCode())){
                    objectObjectHashMap.put("WX_TEMPLATE_ID_THREE",dic.getValue());
                }
                wxTemplates.add( objectObjectHashMap);
                objectObjectHashMap.put("name",dic.getCode());
                objectObjectHashMap.put("value",dic.getValue());
                wxTemplates.add(objectObjectHashMap);
            }
        }
        return wxTemplates;