From d52904be5cc576bd0559241cdba963a0b61dc6ee Mon Sep 17 00:00:00 2001
From: KKSU <15274802129@163.com>
Date: Mon, 10 Feb 2025 15:16:44 +0800
Subject: [PATCH] refactor(pay): 优化支付流程和日志记录
---
src/main/java/cc/mrbird/febs/pay/controller/FIUUController.java | 109 +++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 103 insertions(+), 6 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 204ebef..71b3f99 100644
--- a/src/main/java/cc/mrbird/febs/pay/controller/FIUUController.java
+++ b/src/main/java/cc/mrbird/febs/pay/controller/FIUUController.java
@@ -1,15 +1,27 @@
package cc.mrbird.febs.pay.controller;
import cc.mrbird.febs.common.entity.FebsResponse;
+import cc.mrbird.febs.common.enumerates.FlowTypeEnum;
+import cc.mrbird.febs.common.enumerates.MoneyFlowTypeEnum;
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.LoginUserUtil;
+import cc.mrbird.febs.common.utils.MallUtils;
import cc.mrbird.febs.common.utils.ValidateEntityUtils;
+import cc.mrbird.febs.mall.entity.MallMember;
+import cc.mrbird.febs.mall.entity.MallMoneyFlow;
import cc.mrbird.febs.mall.entity.MallOrderInfo;
import cc.mrbird.febs.mall.entity.MallOrderItem;
+import cc.mrbird.febs.mall.mapper.MallMemberMapper;
import cc.mrbird.febs.mall.mapper.MallOrderInfoMapper;
+import cc.mrbird.febs.mall.service.IApiMallMemberWalletService;
+import cc.mrbird.febs.mall.service.IMallMoneyFlowService;
+import cc.mrbird.febs.pay.model.FIUUInitChargeRequest;
import cc.mrbird.febs.pay.model.FIUUInitPayRequest;
import cn.hutool.core.date.DateUtil;
import cn.hutool.json.JSONUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
@@ -22,6 +34,7 @@
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
+import java.math.BigDecimal;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -34,18 +47,35 @@
@Resource
private MallOrderInfoMapper mallOrderInfoMapper;
+
+ @Resource
+ private IMallMoneyFlowService mallMoneyFlowService;
+
+ @Resource
+ private IApiMallMemberWalletService memberWalletService;
+
+ @Resource
+ private MallMemberMapper mallMemberMapper;
@ApiOperation(value = "初始化FIUU支付信息", notes = "初始化FIUU支付信息")
@PostMapping("/initPayment")
public FebsResponse initPayment(@RequestBody FIUUInitPayRequest orderRequest) {
+
+ Long memberId = LoginUserUtil.getLoginUser().getId();
+
Long orderId = orderRequest.getOrderId();
MallOrderInfo mallOrderInfo = ValidateEntityUtils.ensureColumnReturnEntity(orderId, MallOrderInfo::getId, mallOrderInfoMapper::selectOne, "订单不存在");
ValidateEntityUtils.ensureNotEqual("1", mallOrderInfo.getPayResult(), "订单已支付");
+
+ MallMember mallMember = ValidateEntityUtils.ensureColumnReturnEntity(memberId, MallMember::getId, mallMemberMapper::selectOne, "用户不存在");
+ ValidateEntityUtils.ensureNotEqual(mallMember.getRealName(), null, "请完善个人信息");
+ ValidateEntityUtils.ensureNotEqual(mallMember.getEmail(), null, "请完善个人信息");
+ ValidateEntityUtils.ensureNotEqual(mallMember.getPhone(), null, "请完善个人信息");
String amount = mallOrderInfo.getAmount().toString();
String productNames = getProductNames(mallOrderInfo.getMemberId(), mallOrderInfo.getId());
try {
String merchantId = "e2umart01";
String verifyKey = "4e3a4ed58e62ddbfacf41f6d5ec56bf2";
- String returnUrl = "https://api.mye2u.com/api/fuPayReturn/callback"; // 支付结果回调地址
+ String returnUrl = "https://api.mye2u.com/api/fuPayReturn/payment/callback"; // 支付结果回调地址
// 生成 vcode（MD5(amount + merchantId + orderId + verifyKey)）
String vcode = DigestUtils.md5Hex(
@@ -60,9 +90,63 @@
params.put("merchant_id", merchantId);
params.put("orderid", String.valueOf(orderId));
params.put("amount", amount);
- params.put("bill_name", orderRequest.getBuyerName());
- params.put("bill_email", orderRequest.getBuyerEmail());
- params.put("bill_mobile", orderRequest.getBuyerMobile());
+ params.put("bill_name", mallMember.getRealName());
+ params.put("bill_email", mallMember.getEmail());
+ params.put("bill_mobile", mallMember.getPhone());
+ params.put("bill_desc", productNames);
+ params.put("currency", "MYR"); // 默认 MYR
+ params.put("vcode", vcode);
+ params.put("returnurl", returnUrl);
+
+ return new FebsResponse().success().data(params);
+ } catch (Exception e) {
+ return new FebsResponse().fail().message("支付参数校验失败");
+ }
+ }
+
+ @ApiOperation(value = "初始化FIUU充值信息", notes = "初始化FIUU充值信息")
+ @PostMapping("/initCharge")
+ public FebsResponse initCharge(@RequestBody FIUUInitChargeRequest orderRequest) {
+ Long memberId = LoginUserUtil.getLoginUser().getId();
+ MallMember mallMember = ValidateEntityUtils.ensureColumnReturnEntity(memberId, MallMember::getId, mallMemberMapper::selectOne, "用户不存在");
+ ValidateEntityUtils.ensureNotEqual(mallMember.getRealName(), null, "请完善个人信息");
+ ValidateEntityUtils.ensureNotEqual(mallMember.getEmail(), null, "请完善个人信息");
+ ValidateEntityUtils.ensureNotEqual(mallMember.getPhone(), null, "请完善个人信息");
+ BigDecimal amount = orderRequest.getAmount();
+ if(BigDecimal.ZERO.compareTo(amount) >= 0){
+ throw new FebsException("金额异常");
+ }
+ String amountStr = orderRequest.getAmount().toString();
+ String productNames = "CHARGE INFO";
+ String rechargeNo = "CZ_"+MallUtils.getOrderNum();
+ mallMoneyFlowService.addMoneyFlow(
+ memberId,
+ amount,
+ MoneyFlowTypeEnum.RECHARGE.getValue(),
+ rechargeNo,
+ FlowTypeEnum.BALANCE.getValue(),
+ "FIUU充值",1);
+ try {
+ String merchantId = "e2umart01";
+ String verifyKey = "4e3a4ed58e62ddbfacf41f6d5ec56bf2";
+ String returnUrl = "https://api.mye2u.com/api/fuPayReturn/payment/callback"; // 支付结果回调地址
+
+ // 生成 vcode（MD5(amount + merchantId + orderId + verifyKey)）
+ String vcode = DigestUtils.md5Hex(
+ amountStr +
+ merchantId +
+ rechargeNo +
+ verifyKey
+ );
+
+ // 返回支付参数
+ Map<String, String> params = new HashMap<>();
+ params.put("merchant_id", merchantId);
+ params.put("orderid", rechargeNo);
+ params.put("amount", amountStr);
+ params.put("bill_name", mallMember.getRealName());
+ params.put("bill_email", mallMember.getEmail());
+ params.put("bill_mobile", mallMember.getPhone());
params.put("bill_desc", productNames);
params.put("currency", "MYR"); // 默认 MYR
params.put("vcode", vcode);
@@ -101,10 +185,23 @@
log.info("notify status: {}", status);
// 4. 根据状态码更新订单
if ("00".equals(status)) {
- // 支付成功，更新订单状态
- updateOrderStatus(orderId, status, amount, paydate, tranID);
+
// 可选：记录交易ID防止重复处理
log.info("Payment succeeded for order: {}", orderId);
+ MallMoneyFlow mallMoneyFlow = mallMoneyFlowService.getBaseMapper().selectOne(new LambdaQueryWrapper<MallMoneyFlow>().eq(MallMoneyFlow::getOrderNo, orderId));
+ if (mallMoneyFlow != null) {
+ // 更新订单状态为已支付
+ mallMoneyFlow.setStatus(2);
+ mallMoneyFlowService.getBaseMapper().updateById(mallMoneyFlow);
+
+ memberWalletService.addBalance(mallMoneyFlow.getAmount(),mallMoneyFlow.getMemberId());
+ }else{
+ MallOrderInfo mallOrderInfo = mallOrderInfoMapper.selectById(Long.parseLong(orderId));
+ if(mallOrderInfo != null){
+ // 支付成功，更新订单状态
+ updateOrderStatus(orderId, status, amount, paydate, tranID);
+ }
+ }
} else {
// 支付失败或待处理
log.warn("Payment failed/pending for order: {}", orderId);
--
Gitblit v1.9.1