20220902

xiaoyong931011

2022-09-24 777d32df7c722eec53b8efd5863a64ee12e8a67e

 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;
@@ -286,12 +279,21 @@
    }

    @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<>();
                //充值到账通知
                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);
            }
        }
        return wxTemplates;