From fcc1ced7adbaf3338c1e68b0c90275dfae14b4f8 Mon Sep 17 00:00:00 2001
From: KKSU <15274802129@163.com>
Date: Mon, 17 Feb 2025 10:45:57 +0800
Subject: [PATCH] test: 更新测试用例中的运单编号
---
src/main/java/cc/mrbird/febs/pay/controller/FIUUController.java | 170 +++++++++++++++++++++++++++++++++++++++-----------------
1 files changed, 117 insertions(+), 53 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 c162297..817567b 100644
--- a/src/main/java/cc/mrbird/febs/pay/controller/FIUUController.java
+++ b/src/main/java/cc/mrbird/febs/pay/controller/FIUUController.java
@@ -1,25 +1,40 @@
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;
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;
+import java.math.BigDecimal;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -32,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/fuPay/callback"; // 支付结果回调地址
+ String returnUrl = "https://api.mye2u.com/api/fuPayReturn/payment/callback"; // 支付结果回调地址
// 生成 vcode（MD5(amount + merchantId + orderId + verifyKey)）
String vcode = DigestUtils.md5Hex(
@@ -58,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);
@@ -99,10 +185,27 @@
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) {
+ if(1 == mallMoneyFlow.getStatus()){
+ memberWalletService.addBalance(mallMoneyFlow.getAmount(),mallMoneyFlow.getMemberId());
+ // 更新订单状态为已支付
+ mallMoneyFlow.setStatus(2);
+ mallMoneyFlowService.getBaseMapper().updateById(mallMoneyFlow);
+ }
+ }else{
+ MallOrderInfo mallOrderInfo = mallOrderInfoMapper.selectById(Long.parseLong(orderId));
+ if(mallOrderInfo != null){
+ if("1" == mallOrderInfo.getPayResult()){
+ return;
+ }
+ // 支付成功，更新订单状态
+ updateOrderStatus(orderId, status, amount, paydate, tranID);
+ }
+ }
} else {
// 支付失败或待处理
log.warn("Payment failed/pending for order: {}", orderId);
@@ -145,54 +248,15 @@
ValidateEntityUtils.ensureNotEqual(mallOrderInfo.getPayResult(), "1", "订单已支付");
ValidateEntityUtils.ensureEqual(mallOrderInfo.getAmount().toString(), amount, "订单金额异常");
// 更新订单状态
- if ("00".equals(status)) {
- 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);
- }
+ 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);
- MallOrderInfo mallOrderInfo = ValidateEntityUtils
- .ensureColumnReturnEntity(orderId, MallOrderInfo::getId, mallOrderInfoMapper::selectOne, "订单不存在");
- log.info("callback payResult: {}", mallOrderInfo.getPayResult());
- if("1".equals(mallOrderInfo.getPayResult())){
- return new FebsResponse().success().data("/pages/order/pay/paySuccess?amount="+ amount +"&type=3");
- }
-
- log.info("callback skey: {}", preSkey);
- log.info("callback calculatedSkey: {}", calculatedSkey);
-
- if (!calculatedSkey.equals(skey)) {
- throw new FebsException("订单回调失败，---"+orderId);
- }
-
- updateOrderStatus(orderId, status, amount, paydate, tranID);
- if ("00".equals(status)) {
- return new FebsResponse().success().data("/pages/order/pay/paySuccess?amount="+ amount +"&type=3");
- }else{
- return new FebsResponse().fail().message("支付失败");
- }
- }
/**
* 根据用户ID和订单ID获取所购买商品名称
--
Gitblit v1.9.1