From fd5d67411cc7afa7aff2b0a53da7c8075a20fe03 Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Tue, 13 May 2025 17:13:58 +0800
Subject: [PATCH] fix: 修改商品类型查询逻辑 - 移除了商品类型为1 和非 3 时对现价不为 0 的限制 - 统一了商品类型查询条件，提高了查询的准确性
---
src/main/java/cc/mrbird/febs/mall/service/impl/HappyActivityServiceImpl.java | 22 ++++++++++++----------
1 files changed, 12 insertions(+), 10 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 41ca214..404035b 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
@@ -908,7 +908,7 @@
.last("limit 1")
);
if(happyActivityOrderItem == null){
- throw new FebsException("票号异常！");
+ throw new FebsException("票号不存在！");
}
HappyActivity happyActivity = this.baseMapper.selectById(happyActivityOrderItem.getActivityId());
@@ -944,16 +944,18 @@
.eq(HappyActivityOrderItem::getCode, orderItemCode)
.last("limit 1")
);
- if(happyActivityOrderItem != null){
- if(StateUpDownEnum.UP.getCode() == happyActivityOrderItem.getState()){
- throw new FebsException("票号已核销！");
- }
-
- happyActivityOrderItem.setState(StateUpDownEnum.UP.getCode());
- happyActivityOrderItem.setTransferItemId(memberId);
- happyActivityOrderItemMapper.updateById(happyActivityOrderItem);
- agentProducer.sendCheckActivityItem(happyActivityOrderItem.getOrderId());
+ if(happyActivityOrderItem == null){
+ throw new FebsException("票号不存在！");
}
+ if(StateUpDownEnum.UP.getCode() == happyActivityOrderItem.getState()){
+ throw new FebsException("票号已核销！");
+ }
+
+ happyActivityOrderItem.setState(StateUpDownEnum.UP.getCode());
+ happyActivityOrderItem.setTransferItemId(memberId);
+ happyActivityOrderItem.setUpdatedTime(DateUtil.date());
+ happyActivityOrderItemMapper.updateById(happyActivityOrderItem);
+ agentProducer.sendCheckActivityItem(happyActivityOrderItem.getOrderId());
return new FebsResponse().success().message("操作成功");
}
--
Gitblit v1.9.1