From abac185a94433d03ddf6954ff5d545c095e5088a Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Mon, 28 Apr 2025 17:47:15 +0800
Subject: [PATCH] feat(votesActivity): 更新订单列表筛选状态

---
 src/main/java/cc/mrbird/febs/mall/service/impl/AdminHappyActivityServiceImpl.java |   29 ++++++++++++++++-------------
 1 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/src/main/java/cc/mrbird/febs/mall/service/impl/AdminHappyActivityServiceImpl.java b/src/main/java/cc/mrbird/febs/mall/service/impl/AdminHappyActivityServiceImpl.java
index 6d75e0d..b07a107 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/impl/AdminHappyActivityServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/mall/service/impl/AdminHappyActivityServiceImpl.java
@@ -207,6 +207,8 @@
         happyActivity.setName(dto.getName());
         happyActivity.setType(dto.getType());
         happyActivity.setJoinCnt(dto.getJoinCnt());
+        happyActivity.setExpectCnt(dto.getJoinCnt());
+        happyActivity.setSurplusCnt(dto.getSurplusCnt());
         happyActivity.setStartTime(dto.getStartTime());
         happyActivity.setEndTime(dto.getEndTime());
         happyActivity.setPhone(dto.getPhone());
@@ -368,26 +370,27 @@
     }
 
     @Override
-    public FebsResponse checkOrder(AdminHappyActivityCheckOrderDto dto) {
+    public FebsResponse checkOrder(List<Long> ids) {
 
-        List<Long> ids = dto.getIds();
         if (CollUtil.isEmpty(ids)){
             return new FebsResponse().fail().message("请选择需要核销的订单");
         }
         for(Long id : ids){
             HappyActivityOrder happyActivityOrder = happyActivityOrderMapper.selectById(id);
-            happyActivityOrder.setState(StateUpDownEnum.ORDER_STATE_USED.getCode());
-            happyActivityOrderMapper.updateById(happyActivityOrder);
+            if(StateUpDownEnum.ORDER_STATE_WAIT_USE.getCode() == happyActivityOrder.getState()){
+                happyActivityOrder.setState(StateUpDownEnum.ORDER_STATE_USED.getCode());
+                happyActivityOrderMapper.updateById(happyActivityOrder);
 
-            List<HappyActivityOrderItem> happyActivityOrderItems = happyActivityOrderItemMapper.selectList(
-                    new LambdaQueryWrapper<HappyActivityOrderItem>()
-                            .eq(HappyActivityOrderItem::getOrderId, id)
-            );
-            if(CollUtil.isNotEmpty(happyActivityOrderItems)){
-                happyActivityOrderItems.forEach(happyActivityOrderItem -> {
-                    happyActivityOrderItem.setState(StateUpDownEnum.UP.getCode());
-                    happyActivityOrderItemMapper.updateById(happyActivityOrderItem);
-                });
+                List<HappyActivityOrderItem> happyActivityOrderItems = happyActivityOrderItemMapper.selectList(
+                        new LambdaQueryWrapper<HappyActivityOrderItem>()
+                                .eq(HappyActivityOrderItem::getOrderId, id)
+                );
+                if(CollUtil.isNotEmpty(happyActivityOrderItems)){
+                    happyActivityOrderItems.forEach(happyActivityOrderItem -> {
+                        happyActivityOrderItem.setState(StateUpDownEnum.UP.getCode());
+                        happyActivityOrderItemMapper.updateById(happyActivityOrderItem);
+                    });
+                }
             }
         }
 

--
Gitblit v1.9.1