From 37e34bbbb9f1838481c41a7848a2185a30f5617e Mon Sep 17 00:00:00 2001
From: KKSU <15274802129@163.com>
Date: Sat, 08 Feb 2025 16:48:23 +0800
Subject: [PATCH] refactor(pay): 重构 FiuuReturnController 中的 skey 计算逻辑
---
src/main/java/cc/mrbird/febs/pay/controller/FIUUController.java | 51 ++++++++++++++++-----------------------------------
1 files changed, 16 insertions(+), 35 deletions(-)
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 462cc83..7d2ef65 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,7 +15,10 @@
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.codec.digest.DigestUtils;
import org.apache.commons.collections.CollectionUtils;
-import org.springframework.web.bind.annotation.*;
+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.RestController;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
@@ -43,7 +45,7 @@
try {
String merchantId = "e2umart01";
String verifyKey = "4e3a4ed58e62ddbfacf41f6d5ec56bf2";
- String returnUrl = "https://api.mye2u.com/api/fuPay/callback"; // 支付结果回调地址
+ String returnUrl = "https://api.mye2u.com/api/fuPayReturn/payment/callback"; // 支付结果回调地址
// 生成 vcode（MD5(amount + merchantId + orderId + verifyKey)）
String vcode = DigestUtils.md5Hex(
@@ -72,6 +74,10 @@
}
}
+ /**
+ * FIUU 回调接口
+ * @param request
+ */
@PostMapping("/notify")
public void handlePaymentNotification(HttpServletRequest request) {
// 1. 从POST请求中获取参数
@@ -141,40 +147,15 @@
ValidateEntityUtils.ensureNotEqual(mallOrderInfo.getPayResult(), "1", "订单已支付");
ValidateEntityUtils.ensureEqual(mallOrderInfo.getAmount().toString(), amount, "订单金额异常");
// 更新订单状态
- if ("00".equals(status)) {
- 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);
- }
+ 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);
}
- // Java 回调接口
- @PostMapping("/callback")
- public FebsResponse handlePaymentCallback(@RequestParam Map<String, String> params) {
- 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);
-
- if (!calculatedSkey.equals(skey)) {
- throw new FebsException("订单回调失败，---"+orderId);
- }
-
- updateOrderStatus(orderId, status, amount, paydate, tranID);
- return new FebsResponse().success().data("/pages/order/pay/paySuccess?amount="+ amount +"&type=3");
- }
/**
* 根据用户ID和订单ID获取所购买商品名称
--
Gitblit v1.9.1