From 369d5cb00b6c87dbb5e6ea6b3482742e034c27ea Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Thu, 24 Apr 2025 10:49:07 +0800
Subject: [PATCH] feat(mall): 更新订单状态逻辑并调整支付相关功能
---
src/main/java/cc/mrbird/febs/mall/service/impl/HappyActivityServiceImpl.java | 13 +++++++------
1 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/mall/service/impl/HappyActivityServiceImpl.java b/src/main/java/cc/mrbird/febs/mall/service/impl/HappyActivityServiceImpl.java
index a0df434..05d3b88 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/impl/HappyActivityServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/mall/service/impl/HappyActivityServiceImpl.java
@@ -446,7 +446,7 @@
BrandWCPayRequestData brandWCPayRequestData = iXcxPayService.startPaymentActivity(happyActivityOrder);
wxResultStr = JSONUtil.toJsonStr(brandWCPayRequestData);
payResultStr = brandWCPayRequestData.getPrepay_id();
- updateOrderState(happyActivityOrder, payType, StateUpDownEnum.PAY_STATE_NOT_PAY.getCode());
+ updateOrderState(happyActivityOrder, payType, StateUpDownEnum.PAY_STATE_NOT_PAY.getCode(),StateUpDownEnum.ORDER_STATE_WAIT_PAY.getCode());
} else if (StateUpDownEnum.PAY_METHOD_BALANCE.getCode() == payType ||
StateUpDownEnum.PAY_METHOD_INTEGRAL.getCode() == payType) {
// 处理余额或积分支付逻辑，验证交易密码并完成支付
@@ -492,22 +492,23 @@
}
}
- // 处理未支付订单
+ // 处理无需支付订单
private void processNoPayOrder(HappyActivityOrder order, Long orderId) {
- updateOrderState(order, StateUpDownEnum.PAY_METHOD_NO_PAY.getCode(), StateUpDownEnum.PAY_STATE_PAY_SUCCESS.getCode());
+ updateOrderState(order, StateUpDownEnum.PAY_METHOD_NO_PAY.getCode(), StateUpDownEnum.PAY_STATE_PAY_SUCCESS.getCode(),StateUpDownEnum.ORDER_STATE_WAIT_USE.getCode());
generateOrderItemCodes(orderId);
}
- // 处理已支付订单
+ // 处理余额和积分支付的订单
private void processPaidOrder(HappyActivityOrder order, Long orderId, Integer payType) {
- updateOrderState(order, payType, StateUpDownEnum.PAY_STATE_PAY_SUCCESS.getCode());
+ updateOrderState(order, payType, StateUpDownEnum.PAY_STATE_PAY_SUCCESS.getCode(),StateUpDownEnum.ORDER_STATE_WAIT_USE.getCode());
generateOrderItemCodes(orderId);
}
// 更新订单状态
- private void updateOrderState(HappyActivityOrder order, Integer payType, Integer payState) {
+ private void updateOrderState(HappyActivityOrder order, Integer payType, Integer payState, Integer state) {
order.setPayState(payState);
order.setPayType(payType);
+ order.setState(state);
if (payState == StateUpDownEnum.PAY_STATE_PAY_SUCCESS.getCode()) {
order.setPayTime(new Date());
}
--
Gitblit v1.9.1