From 777d32df7c722eec53b8efd5863a64ee12e8a67e Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Sat, 24 Sep 2022 11:27:55 +0800
Subject: [PATCH] 20220902
---
src/main/java/cc/mrbird/febs/pay/controller/XcxPayController.java | 2 +-
src/main/java/cc/mrbird/febs/mall/quartz/OrderSettlementJob.java | 4 +++-
src/main/java/cc/mrbird/febs/pay/service/IXcxPayService.java | 4 +++-
src/main/java/cc/mrbird/febs/pay/service/impl/XcxPayServiceImpl.java | 22 ++++++++++++----------
4 files changed, 19 insertions(+), 13 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/mall/quartz/OrderSettlementJob.java b/src/main/java/cc/mrbird/febs/mall/quartz/OrderSettlementJob.java
index 6d244b4..b6505bb 100644
--- a/src/main/java/cc/mrbird/febs/mall/quartz/OrderSettlementJob.java
+++ b/src/main/java/cc/mrbird/febs/mall/quartz/OrderSettlementJob.java
@@ -102,7 +102,9 @@
/**
* 自动确认收货
*/
- @Scheduled(cron = "0 0 0 * * ?")
+// @Scheduled(cron = "0 0 0 * * ?")
+
+ @Scheduled(cron = "1 * * * * ?")
public void orderAutoConfirmJob() {
log.info("自动确认收货");
DataDictionaryCustom dic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(DataDictionaryEnum.OEDER_AUTO_CONFIRM.getType(), DataDictionaryEnum.OEDER_AUTO_CONFIRM.getCode());
diff --git a/src/main/java/cc/mrbird/febs/pay/controller/XcxPayController.java b/src/main/java/cc/mrbird/febs/pay/controller/XcxPayController.java
index dcc08f2..011abe4 100644
--- a/src/main/java/cc/mrbird/febs/pay/controller/XcxPayController.java
+++ b/src/main/java/cc/mrbird/febs/pay/controller/XcxPayController.java
@@ -274,7 +274,7 @@
// resXml = AppConstance.RESULT_XML_FAIL.replace(ERRORMSG, "支付回调签名错误");
} finally {
// 通知线程消息
- PayThreadPool.notifyThread(Integer.valueOf(orderId), threadResult);
+// PayThreadPool.notifyThread(Integer.valueOf(orderId), threadResult);
sendResultBack(response, resXml);
}
return;
diff --git a/src/main/java/cc/mrbird/febs/pay/service/IXcxPayService.java b/src/main/java/cc/mrbird/febs/pay/service/IXcxPayService.java
index 4736056..fe0ec26 100644
--- a/src/main/java/cc/mrbird/febs/pay/service/IXcxPayService.java
+++ b/src/main/java/cc/mrbird/febs/pay/service/IXcxPayService.java
@@ -9,7 +9,9 @@
import cc.mrbird.febs.pay.model.OrderStateDto;
import cc.mrbird.febs.pay.model.WxGenerateQrCodeDto;
+import java.util.HashMap;
import java.util.List;
+import java.util.Map;
public interface IXcxPayService {
@@ -28,7 +30,7 @@
*/
void uniformMessageSend(OrderStateDto info);
- List<String> getTemplateId();
+ List<HashMap<String, String>> getTemplateId();
/**
* 生成小程序二维码
diff --git a/src/main/java/cc/mrbird/febs/pay/service/impl/XcxPayServiceImpl.java b/src/main/java/cc/mrbird/febs/pay/service/impl/XcxPayServiceImpl.java
index 7897586..7b9231b 100644
--- a/src/main/java/cc/mrbird/febs/pay/service/impl/XcxPayServiceImpl.java
+++ b/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;
--
Gitblit v1.9.1