From 7436fc4a44b9f2677b3e3380f2cd2e5d841a6832 Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Tue, 29 Apr 2025 15:10:01 +0800
Subject: [PATCH] feat(mall): 添加票据状态字段并更新相关服务
---
src/main/java/cc/mrbird/febs/mall/service/impl/HappyActivityServiceImpl.java | 39 +++++++++++++++++++--------------------
1 files changed, 19 insertions(+), 20 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..aaee810 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
@@ -902,28 +902,27 @@
.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("核销失败！");
+ 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);
}
@Override
--
Gitblit v1.9.1