From 205217b3d786b9290efd2595e6206f3770e9554c Mon Sep 17 00:00:00 2001
From: KKSU <15274802129@163.com>
Date: Fri, 07 Feb 2025 17:36:42 +0800
Subject: [PATCH] refactor(pay): 重构 FIUU 支付接口并创建专用的回调控制器
---
src/main/java/cc/mrbird/febs/pay/controller/FiuuReturnController.java | 83 +++++++++++++++++++++++++++
src/main/java/cc/mrbird/febs/pay/controller/FIUUController.java | 43 -------------
src/main/java/cc/mrbird/febs/common/configure/WebMvcConfigure.java | 2
3 files changed, 86 insertions(+), 42 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/common/configure/WebMvcConfigure.java b/src/main/java/cc/mrbird/febs/common/configure/WebMvcConfigure.java
index 90674f2..83acd92 100644
--- a/src/main/java/cc/mrbird/febs/common/configure/WebMvcConfigure.java
+++ b/src/main/java/cc/mrbird/febs/common/configure/WebMvcConfigure.java
@@ -33,7 +33,7 @@
registration.excludePathPatterns("/api/xcxPay/wxpayCallback");
registration.excludePathPatterns("/api/xcxPay/rechargeCallBack");
registration.excludePathPatterns("/api/xcxPay/fapiaoCallBack");
- registration.excludePathPatterns("/api/fuPay/callback");
+ registration.excludePathPatterns("/api/fuPayReturn/callback");
registration.excludePathPatterns("/api/fuPay/notify");
// 添加Swagger UI相关路径
diff --git a/src/main/java/cc/mrbird/febs/pay/controller/FIUUController.java b/src/main/java/cc/mrbird/febs/pay/controller/FIUUController.java
index dba9f02..99bcc32 100644
--- a/src/main/java/cc/mrbird/febs/pay/controller/FIUUController.java
+++ b/src/main/java/cc/mrbird/febs/pay/controller/FIUUController.java
@@ -3,7 +3,6 @@
import cc.mrbird.febs.common.entity.FebsResponse;
import cc.mrbird.febs.common.enumerates.OrderDeliveryStateEnum;
import cc.mrbird.febs.common.enumerates.OrderStatusEnum;
-import cc.mrbird.febs.common.exception.FebsException;
import cc.mrbird.febs.common.utils.ValidateEntityUtils;
import cc.mrbird.febs.mall.entity.MallOrderInfo;
import cc.mrbird.febs.mall.entity.MallOrderItem;
@@ -16,12 +15,10 @@
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.codec.digest.DigestUtils;
import org.apache.commons.collections.CollectionUtils;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
@@ -30,7 +27,7 @@
import java.util.Map;
@Slf4j
-@Controller
+@RestController
@Api(value = "FIUUController", tags = "FIUU支付")
@RequestMapping(value = "/api/fuPay")
public class FIUUController {
@@ -159,42 +156,6 @@
mallOrderInfoMapper.updateById(mallOrderInfo);
}
- // Java 通知接口 暂时停止使用
- @PostMapping("/callback")
- public String handlePaymentCallback(@RequestParam Map<String, String> params, Model model) {
- String secretKey = "59c709fc18978a6a83b87f05d37cecbf";
- String tranID = params.get("tranID");
- String orderId = params.get("orderid");
- String status = params.get("status");
- String domain = params.get("domain");
- String amount = params.get("amount");
- String currency = params.get("currency");
- String paydate = params.get("paydate");
- String skey = params.get("skey");
-
- // 计算 skey 验证
- String preSkey = DigestUtils.md5Hex(tranID + orderId + status + domain + amount + currency);
- String calculatedSkey = DigestUtils.md5Hex(paydate + domain + preSkey + secretKey);
- MallOrderInfo mallOrderInfo = ValidateEntityUtils
- .ensureColumnReturnEntity(orderId, MallOrderInfo::getId, mallOrderInfoMapper::selectOne, "订单不存在");
- log.info("callback status: {}", status);
- log.info("callback skey: {}", preSkey);
- log.info("callback calculatedSkey: {}", calculatedSkey);
- log.info("callback payResult: {}", mallOrderInfo.getPayResult());
- if("1".equals(mallOrderInfo.getPayResult())){
- return "success";
- }
-
- if (!calculatedSkey.equals(skey)) {
- throw new FebsException("订单回调失败，---"+orderId);
- }
- if ("00".equals(status)) {
- updateOrderStatus(orderId, status, amount, paydate, tranID);
- return "success";
- }else{
- return "fail";
- }
- }
/**
* 根据用户ID和订单ID获取所购买商品名称
diff --git a/src/main/java/cc/mrbird/febs/pay/controller/FiuuReturnController.java b/src/main/java/cc/mrbird/febs/pay/controller/FiuuReturnController.java
new file mode 100644
index 0000000..1f79e7b
--- /dev/null
+++ b/src/main/java/cc/mrbird/febs/pay/controller/FiuuReturnController.java
@@ -0,0 +1,83 @@
+package cc.mrbird.febs.pay.controller;
+
+import cc.mrbird.febs.common.enumerates.OrderDeliveryStateEnum;
+import cc.mrbird.febs.common.enumerates.OrderStatusEnum;
+import cc.mrbird.febs.common.exception.FebsException;
+import cc.mrbird.febs.common.utils.ValidateEntityUtils;
+import cc.mrbird.febs.mall.entity.MallOrderInfo;
+import cc.mrbird.febs.mall.mapper.MallOrderInfoMapper;
+import cn.hutool.core.date.DateUtil;
+import io.swagger.annotations.Api;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.codec.digest.DigestUtils;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+
+import javax.annotation.Resource;
+import java.util.Map;
+
+@Slf4j
+@Controller
+@Api(value = "FIUUController", tags = "FIUU支付")
+@RequestMapping(value = "/api/fuPayReturn")
+public class FiuuReturnController {
+
+
+ @Resource
+ private MallOrderInfoMapper mallOrderInfoMapper;
+
+ // Java 通知接口 暂时停止使用
+ @PostMapping("/callback")
+ public String handlePaymentCallback(@RequestParam Map<String, String> params, Model model) {
+ String secretKey = "59c709fc18978a6a83b87f05d37cecbf";
+ String tranID = params.get("tranID");
+ String orderId = params.get("orderid");
+ String status = params.get("status");
+ String domain = params.get("domain");
+ String amount = params.get("amount");
+ String currency = params.get("currency");
+ String paydate = params.get("paydate");
+ String skey = params.get("skey");
+
+ // 计算 skey 验证
+ String preSkey = DigestUtils.md5Hex(tranID + orderId + status + domain + amount + currency);
+ String calculatedSkey = DigestUtils.md5Hex(paydate + domain + preSkey + secretKey);
+ MallOrderInfo mallOrderInfo = ValidateEntityUtils
+ .ensureColumnReturnEntity(orderId, MallOrderInfo::getId, mallOrderInfoMapper::selectOne, "订单不存在");
+ log.info("callback status: {}", status);
+ log.info("callback skey: {}", preSkey);
+ log.info("callback calculatedSkey: {}", calculatedSkey);
+ log.info("callback payResult: {}", mallOrderInfo.getPayResult());
+ if("1".equals(mallOrderInfo.getPayResult())){
+ return "success";
+ }
+
+ if (!calculatedSkey.equals(skey)) {
+ throw new FebsException("订单回调失败，---"+orderId);
+ }
+ if ("00".equals(status)) {
+ updateOrderStatus(orderId, status, amount, paydate, tranID);
+ return "success";
+ }else{
+ return "fail";
+ }
+ }
+
+ private void updateOrderStatus(String orderId, String status, String amount, String paydate, String tranID) {
+ // 实现订单状态更新逻辑（如更新数据库）
+ MallOrderInfo mallOrderInfo = ValidateEntityUtils.ensureColumnReturnEntity(orderId, MallOrderInfo::getId, mallOrderInfoMapper::selectOne, "订单不存在");
+ ValidateEntityUtils.ensureNotEqual(mallOrderInfo.getPayResult(), "1", "订单已支付");
+ ValidateEntityUtils.ensureEqual(mallOrderInfo.getAmount().toString(), amount, "订单金额异常");
+ // 更新订单状态
+ mallOrderInfo.setPayMethod("FIUU支付");
+ mallOrderInfo.setStatus(OrderStatusEnum.WAIT_SHIPPING.getValue());
+ mallOrderInfo.setPayResult("1");
+ mallOrderInfo.setPayTime(DateUtil.parseDateTime(paydate));
+ mallOrderInfo.setDeliveryState(OrderDeliveryStateEnum.DELIVERY_WAIT.getValue());
+ mallOrderInfo.setPayOrderNo(tranID);
+ mallOrderInfoMapper.updateById(mallOrderInfo);
+ }
+}
--
Gitblit v1.9.1