From 483b60bf9529541a29c4c9cd023dc7c2e52d5a07 Mon Sep 17 00:00:00 2001
From: "feng.li" <fengli@hsayi.com>
Date: Tue, 26 Dec 2023 11:14:19 +0800
Subject: [PATCH] =?UTF-8?q?=E8=87=AA=E5=8A=A8=E5=85=B3=E9=97=AD=E4=BC=9A?=
 =?UTF-8?q?=E9=94=80=E6=96=B9=E6=B3=95=E9=94=99=E8=AF=AF=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/cool/store/dao/HyExhibitionDAO.java   | 6 +++---
 .../main/java/com/cool/store/mapper/HyExhibitionMapper.java | 2 +-
 .../src/main/resources/mapper/HyExhibitionMapper.xml        | 2 +-
 .../service/impl/exhibition/ExhibitionServiceImpl.java      | 6 +-----
 4 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/dao/HyExhibitionDAO.java b/coolstore-partner-dao/src/main/java/com/cool/store/dao/HyExhibitionDAO.java
index e95517010..dcbc78881 100644
--- a/coolstore-partner-dao/src/main/java/com/cool/store/dao/HyExhibitionDAO.java
+++ b/coolstore-partner-dao/src/main/java/com/cool/store/dao/HyExhibitionDAO.java
@@ -138,10 +138,10 @@ public class HyExhibitionDAO {
         return hyExhibitionMapper.querySelective(hyExhibitionDO);
     }
 
-    public int batchCloseExhibition(List<Integer> hyExhibitionIds) {
-        if (CollectionUtil.isEmpty(hyExhibitionIds)) {
+    public int batchCloseExhibition(List<Integer> hyExhibitionIds, Integer closedType, String closeDateTime) {
+        if (CollectionUtil.isEmpty(hyExhibitionIds) || closedType == null || closeDateTime == null) {
             return 0;
         }
-        return hyExhibitionMapper.batchCloseExhibition(hyExhibitionIds);
+        return hyExhibitionMapper.batchCloseExhibition(hyExhibitionIds, closedType, closeDateTime);
     }
 }
diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyExhibitionMapper.java b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyExhibitionMapper.java
index 80697fb72..ef99003bf 100644
--- a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyExhibitionMapper.java
+++ b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyExhibitionMapper.java
@@ -89,5 +89,5 @@ public interface HyExhibitionMapper  {
      */
     List<HyExhibitionDO> querySelective(HyExhibitionDO hyExhibitionDO);
 
-    int batchCloseExhibition(@Param("hyExhibitionIds") List<Integer> hyExhibitionIds);
+    int batchCloseExhibition(@Param("hyExhibitionIds") List<Integer> hyExhibitionIds, @Param("closedType") Integer closedType, @Param("closeDateTime") String closeDateTime);
 }
\ No newline at end of file
diff --git a/coolstore-partner-dao/src/main/resources/mapper/HyExhibitionMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/HyExhibitionMapper.xml
index fda49919d..2a5195626 100644
--- a/coolstore-partner-dao/src/main/resources/mapper/HyExhibitionMapper.xml
+++ b/coolstore-partner-dao/src/main/resources/mapper/HyExhibitionMapper.xml
@@ -462,7 +462,7 @@
 
   <update id="batchCloseExhibition">
     update hy_exhibition
-        set closed_type = 2, close_time = now()
+        set closed_type = #{closedType}, close_time = #{closeDateTime}
         where id in (
           <foreach collection="hyExhibitionIds" item="hyExhibitionId" separator=",">
             #{hyExhibitionId}
diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/exhibition/ExhibitionServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/exhibition/ExhibitionServiceImpl.java
index cbcc1ccc6..339918547 100644
--- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/exhibition/ExhibitionServiceImpl.java
+++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/exhibition/ExhibitionServiceImpl.java
@@ -709,11 +709,7 @@ public class ExhibitionServiceImpl implements ExhibitionService {
         List<Integer> exhibitionIds = hyExhibitionDOS.stream().map(HyExhibitionDO::getId).collect(Collectors.toList());
 
         //2. 批量刷新会销为结束状态
-        hyExhibitionDOS.forEach(x->{
-            x.setClosedType(1);
-            x.setCloseTime(new Date());
-        });
-        int res = hyExhibitionDAO.batchCloseExhibition(exhibitionIds);
+        int res = hyExhibitionDAO.batchCloseExhibition(exhibitionIds, 1, DateUtil.format(now, CoolDateUtils.DATE_FORMAT_SEC));
 
         //3. 处理需要关闭的会销组
         hyExhibitionGroupDAO.batchCloseExhibitionGroup();