From c08844c08e64ad79f25a7e68bbc3f41fea3cded8 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Wed, 25 Oct 2023 15:52:18 +0800
Subject: [PATCH] 版本管理
---
src/main/java/cc/mrbird/febs/pay/service/impl/WxPayServiceImpl.java | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/pay/service/impl/WxPayServiceImpl.java b/src/main/java/cc/mrbird/febs/pay/service/impl/WxPayServiceImpl.java
index 9e4e884..92941d0 100644
--- a/src/main/java/cc/mrbird/febs/pay/service/impl/WxPayServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/pay/service/impl/WxPayServiceImpl.java
@@ -53,7 +53,9 @@
@Autowired
private MallOrderInfoMapper orderInfoMapper;
- private WxPayService wxPayService = new com.github.binarywang.wxpay.service.impl.WxPayServiceImpl();
+ @Autowired
+ private WxPayService wxPayService;
+// private WxPayService wxPayService = new com.github.binarywang.wxpay.service.impl.WxPayServiceImpl();
@Autowired
private WxPayProperties wxPayProperties;
@@ -79,7 +81,8 @@
request.setSpbillCreateIp("127.0.0.1");
request.setTradeType("APP");
- if ("dev".equals(active) || "test".equals(active)) {
+// if ("dev".equals(active) || "test".equals(active)) {
+ if ("dev".equals(active)) {
request.setTotalFee(1);
} else {
request.setTotalFee(orderInfo.getAmount().add(orderInfo.getCarriage()).multiply(new BigDecimal(100)).intValue());
@@ -114,8 +117,6 @@
commonService.addAchieveAndUpdateLevel(orderInfo.getId(),orderInfo.getMemberId());
mallMoneyFlowService.addMoneyFlow(orderInfo.getMemberId(), orderInfo.getAmount().negate(), MoneyFlowTypeEnum.PAY.getValue(), orderInfo.getOrderNo(), FlowTypeEnum.WX.getValue());
- agentProducer.sendAutoLevelUpMsg(orderInfo.getMemberId());
- agentProducer.sendReturnMoneyMsg(orderInfo.getId());
}
}
--
Gitblit v1.9.1