From 0e3064b8722b33ee2cf67f8fac581a8b0e04832b Mon Sep 17 00:00:00 2001
From: KKSU <15274802129@163.com>
Date: Fri, 22 Dec 2023 18:15:58 +0800
Subject: [PATCH] 富文本框输入版本变化
---
src/main/java/cc/mrbird/febs/pay/controller/XcxPayController.java | 26 +++++++++++++-------------
1 files changed, 13 insertions(+), 13 deletions(-)
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 caf30b6..c0d2b1d 100644
--- a/src/main/java/cc/mrbird/febs/pay/controller/XcxPayController.java
+++ b/src/main/java/cc/mrbird/febs/pay/controller/XcxPayController.java
@@ -73,11 +73,11 @@
@Autowired
private IApiMallMemberWalletService memberWalletService;
- @Autowired
- private WxPayService wxPayService;
-
- @Autowired
- private IXcxCodePayService xcxCodePayService;
+// @Autowired
+// private WxPayService wxPayService;
+//
+// @Autowired
+// private IXcxCodePayService xcxCodePayService;
@Autowired
private IXcxPayService iXcxPayService;
@@ -254,7 +254,7 @@
if (order != null && OrderStatusEnum.WAIT_PAY.getValue() == order.getStatus()) {
log.debug("检查支付金额payMoney={},order.getPayMoney()={}", payMoney, order.getAmount());
order.setStatus(OrderStatusEnum.WAIT_SHIPPING.getValue());
- order.setPayResult("1");
+ order.setPayResult(1);
order.setPayTime(new Date());
order.setDeliveryState(OrderDeliveryStateEnum.DELIVERY_WAIT.getValue());
mallOrderInfoMapper.updateById(order);
@@ -299,13 +299,13 @@
}
- @PostMapping(value = "/xcxCodePayCallBack")
- public String xcxCodePayCallBack(@RequestBody String xmlData) throws WxPayException {
- log.info("=======微信支付码付款回调:{}========", xmlData);
- WxPayOrderNotifyResult notifyResult = this.wxPayService.parseOrderNotifyResult(xmlData);
- xcxCodePayService.payCallback(notifyResult.toMap());
- return WxPayNotifyResponse.success("成功");
- }
+// @PostMapping(value = "/xcxCodePayCallBack")
+// public String xcxCodePayCallBack(@RequestBody String xmlData) throws WxPayException {
+// log.info("=======微信支付码付款回调:{}========", xmlData);
+// WxPayOrderNotifyResult notifyResult = wxPayService.parseOrderNotifyResult(xmlData);
+// xcxCodePayService.payCallback(notifyResult.toMap());
+// return WxPayNotifyResponse.success("成功");
+// }
}
--
Gitblit v1.9.1