20220902

xiaoyong931011

2022-09-24 3ddef0887c7446b7eab55caf067ef68dc399e166

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

@@ -18,17 +18,11 @@
import cc.mrbird.febs.pay.util.WeixinServiceUtil;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.text.StrFormatter;
import cn.hutool.core.util.IdUtil;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil;
import cn.hutool.extra.spring.SpringUtil;
import cn.hutool.http.HttpRequest;
import cn.hutool.http.HttpResponse;
import cn.hutool.json.JSONObject;
import cn.hutool.json.JSONUtil;
import com.alibaba.fastjson.JSON;
import com.baomidou.dynamic.datasource.toolkit.Base64;
import com.baomidou.mybatisplus.extension.exceptions.ApiException;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections.CollectionUtils;
@@ -46,7 +40,6 @@

import java.io.*;
import java.math.BigDecimal;
import java.net.*;
import java.nio.charset.Charset;
import java.util.ArrayList;
import java.util.HashMap;
@@ -224,11 +217,10 @@
        orderStateMsgVo.setTouser(info.getOpenId());//用户的openId
        orderStateMsgVo.setTemplate_id(info.getTemplateId());//订阅消息模板id
        orderStateMsgVo.setPage(info.getPage());
        Map<String, WxTemplateData> m = new HashMap<>(5);
        m.put("thing4.DATA", new WxTemplateData(info.getAddressArea()));
        m.put("phone_number14.DATA", new WxTemplateData(info.getLeaderPhone()));
        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("thing5.DATA", new WxTemplateData(info.getDetailAddress()));
        m.put("thing15.DATA", new WxTemplateData(info.getRemark()));
        orderStateMsgVo.setData(m);
        String s = JSONUtil.toJsonStr(orderStateMsgVo);
@@ -287,12 +279,15 @@
    }

    @Override
    public List<String> getTemplateId() {
        List<String> wxTemplates = new ArrayList<>();
    public List<HashMap<String, String>> getTemplateId() {
        List<HashMap<String, String>> wxTemplates = new ArrayList<>();
        List<DataDictionaryCustom> wxTemplateList = dataDictionaryCustomMapper.selectDicByType(DataDictionaryEnum.WX_TEMPLATE_ID_THREE.getType());
        if(CollUtil.isNotEmpty(wxTemplateList)){
            for(DataDictionaryCustom dic : wxTemplateList){
                wxTemplates.add(dic.getValue());
                HashMap<String, String> objectObjectHashMap = new HashMap<>();
                objectObjectHashMap.put("name",dic.getCode());
                objectObjectHashMap.put("value",dic.getValue());
                wxTemplates.add(objectObjectHashMap);
            }
        }
        return wxTemplates;