From da3b1c420009a4d80df3e247015b7c100ea99bc4 Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Wed, 30 Apr 2025 14:53:56 +0800
Subject: [PATCH] refactor(mall): 优化票号验证逻辑

---
 src/main/java/cc/mrbird/febs/mall/service/impl/HappyActivityServiceImpl.java |   21 +++++++++++----------
 1 files changed, 11 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..035ddd5 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,17 @@
                         .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);
+        happyActivityOrderItemMapper.updateById(happyActivityOrderItem);
+        agentProducer.sendCheckActivityItem(happyActivityOrderItem.getOrderId());
         return new FebsResponse().success().message("操作成功");
     }
 

--
Gitblit v1.9.1