From ae6f6e0be0c82cc801fc1a9bb0c7af91d8d02bff Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Wed, 30 Apr 2025 10:03:31 +0800
Subject: [PATCH] refactor(mall): 修改快乐活动订单支付逻辑判断
---
src/main/java/cc/mrbird/febs/mall/service/impl/HappyActivityServiceImpl.java | 42 ++++++++++++++++++------------------------
1 files changed, 18 insertions(+), 24 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 4be125f..6ab4751 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
@@ -618,7 +618,8 @@
try {
// 根据支付类型处理不同的支付逻辑
- if (StateUpDownEnum.PAY_METHOD_NO_PAY.getCode() == payType) {
+// if (StateUpDownEnum.PAY_METHOD_NO_PAY.getCode() == payType) {
+ if (BigDecimal.ZERO.compareTo(happyActivityOrder.getAmount()) == 0) {
// 处理无需支付的订单逻辑
processNoPayOrder(happyActivityOrder, orderId);
} else if (StateUpDownEnum.PAY_METHOD_WECHAT.getCode() == payType) {
@@ -899,31 +900,25 @@
HappyActivityOrderItem happyActivityOrderItem = happyActivityOrderItemMapper.selectOne(
new LambdaQueryWrapper<HappyActivityOrderItem>()
.eq(HappyActivityOrderItem::getCode, orderItemCode)
- .eq(HappyActivityOrderItem::getState, StateUpDownEnum.DOWN.getCode())
.last("limit 1")
);
- if(happyActivityOrderItem != null){
-
- if(StateUpDownEnum.UP.getCode() == happyActivityOrderItem.getState()){
- throw new FebsException("该票号已核销！");
- }
-
- HappyActivity happyActivity = this.baseMapper.selectById(happyActivityOrderItem.getActivityId());
- ApiCheckOrderVo apiCheckOrderVo = new ApiCheckOrderVo();
- apiCheckOrderVo.setActivityName(happyActivity.getName());
- apiCheckOrderVo.setActivityStartTime(happyActivity.getStartTime());
- apiCheckOrderVo.setActivityEndTime(happyActivity.getEndTime());
- apiCheckOrderVo.setActivityAddress(happyActivity.getAddress());
- apiCheckOrderVo.setCode(happyActivityOrderItem.getCode());
- apiCheckOrderVo.setName(happyActivityOrderItem.getName());
- apiCheckOrderVo.setPhone(happyActivityOrderItem.getPhone());
- apiCheckOrderVo.setPrice(happyActivityOrderItem.getPrice());
- apiCheckOrderVo.setState(happyActivityOrderItem.getState());
-
- return new FebsResponse().success().data(apiCheckOrderVo);
+ if(happyActivityOrderItem == null){
+ throw new FebsException("票号异常！");
}
- return new FebsResponse().fail().message("核销失败！");
+ HappyActivity happyActivity = this.baseMapper.selectById(happyActivityOrderItem.getActivityId());
+ ApiCheckOrderVo apiCheckOrderVo = new ApiCheckOrderVo();
+ apiCheckOrderVo.setActivityName(happyActivity.getName());
+ apiCheckOrderVo.setActivityStartTime(happyActivity.getStartTime());
+ apiCheckOrderVo.setActivityEndTime(happyActivity.getEndTime());
+ apiCheckOrderVo.setActivityAddress(happyActivity.getAddress());
+ apiCheckOrderVo.setCode(happyActivityOrderItem.getCode());
+ apiCheckOrderVo.setName(happyActivityOrderItem.getName());
+ apiCheckOrderVo.setPhone(happyActivityOrderItem.getPhone());
+ apiCheckOrderVo.setPrice(happyActivityOrderItem.getPrice());
+ apiCheckOrderVo.setState(happyActivityOrderItem.getState());
+
+ return new FebsResponse().success().data(apiCheckOrderVo);
}
@Override
@@ -942,12 +937,11 @@
HappyActivityOrderItem happyActivityOrderItem = happyActivityOrderItemMapper.selectOne(
new LambdaQueryWrapper<HappyActivityOrderItem>()
.eq(HappyActivityOrderItem::getCode, orderItemCode)
- .eq(HappyActivityOrderItem::getState, StateUpDownEnum.DOWN.getCode())
.last("limit 1")
);
if(happyActivityOrderItem != null){
if(StateUpDownEnum.UP.getCode() == happyActivityOrderItem.getState()){
- throw new FebsException("该票号已核销！");
+ throw new FebsException("票号已核销！");
}
happyActivityOrderItem.setState(StateUpDownEnum.UP.getCode());
--
Gitblit v1.9.1