From 529ad9dd8d1876b57e852bc45b602ba3ccc8df2a Mon Sep 17 00:00:00 2001
From: KKSU <15274802129@163.com>
Date: Wed, 10 Apr 2024 17:19:08 +0800
Subject: [PATCH] 公告-首页公告调整
---
src/main/java/cc/mrbird/febs/pay/controller/XcxPayController.java | 14 ++++++++++++--
1 files changed, 12 insertions(+), 2 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 fef552f..5629e7b 100644
--- a/src/main/java/cc/mrbird/febs/pay/controller/XcxPayController.java
+++ b/src/main/java/cc/mrbird/febs/pay/controller/XcxPayController.java
@@ -27,6 +27,7 @@
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
@@ -38,6 +39,10 @@
import java.math.BigDecimal;
import java.math.RoundingMode;
import java.nio.charset.StandardCharsets;
+import java.security.InvalidKeyException;
+import java.security.NoSuchAlgorithmException;
+import java.security.SignatureException;
+import java.text.ParseException;
import java.util.Date;
import java.util.HashMap;
import java.util.Map;
@@ -245,12 +250,13 @@
// }
/**
* 微信电子发票回调接口
+ * POST方式回调
* @return
*/
@Transactional(rollbackFor = Exception.class)
@RequestMapping(value = "/fapiaoCallBack")
- public Map<String, Object> fapiaoCallBack(HttpServletResponse response, HttpServletRequest request) throws IOException {
- return wxFaPiaoService.fapiaoCallBack(response,request);
+ public Map<String, Object> fapiaoCallBack(HttpServletRequest request, @RequestBody Map<String, Object> requestBody) {
+ return wxFaPiaoService.fapiaoCallBack(request,requestBody);
}
@@ -300,6 +306,8 @@
resXml = WechatConfigure.RESULT_XML_SUCCESS;
// 支付费用
Double total_fee = Double.parseDouble(data.getTotal_fee());
+ //微信支付订单号
+ String transaction_id = data.getTransaction_id();
// 商户订单号
String payNum = data.getOut_trade_no();
@@ -315,9 +323,11 @@
order.setPayResult("1");
order.setPayTime(new Date());
order.setDeliveryState(OrderDeliveryStateEnum.DELIVERY_WAIT.getValue());
+ order.setPayOrderNo(transaction_id);
mallOrderInfoMapper.updateById(order);
agentProducer.sendOrderCoupon(order.getId());
+// agentProducer.sendGetScoreMsg(order.getId());
mallMoneyFlowService.addMoneyFlow(
order.getMemberId(),
--
Gitblit v1.9.1