From 620abb583b332d168073266c6549d7f28f3b662e Mon Sep 17 00:00:00 2001
From: hupeng <guchengwuyue@163.com>
Date: Wed, 27 May 2020 19:42:16 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A0=8D=E4=BB=B7=E6=96=B0=E5=A2=9E=E7=8A=B6?=
 =?UTF-8?q?=E6=80=81=E6=98=BE=E7=A4=BA,=E6=96=B0=E5=A2=9E=E7=8A=B6?=
 =?UTF-8?q?=E6=80=81=E6=A3=80=E6=B5=8Butil?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/dto/YxStoreBargainDto.java        |  2 ++
 .../impl/YxStoreBargainServiceImpl.java       | 26 ++++++++++++-------
 .../impl/YxStoreSeckillServiceImpl.java       | 16 +++---------
 3 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/yshop-shop/src/main/java/co/yixiang/modules/activity/service/dto/YxStoreBargainDto.java b/yshop-shop/src/main/java/co/yixiang/modules/activity/service/dto/YxStoreBargainDto.java
index 2cc614b5..55178a1c 100644
--- a/yshop-shop/src/main/java/co/yixiang/modules/activity/service/dto/YxStoreBargainDto.java
+++ b/yshop-shop/src/main/java/co/yixiang/modules/activity/service/dto/YxStoreBargainDto.java
@@ -114,4 +114,6 @@ public class YxStoreBargainDto implements Serializable {
     private Timestamp endTimeDate;
 
     private Timestamp startTimeDate;
+
+    private String statusStr;
 }
diff --git a/yshop-shop/src/main/java/co/yixiang/modules/activity/service/impl/YxStoreBargainServiceImpl.java b/yshop-shop/src/main/java/co/yixiang/modules/activity/service/impl/YxStoreBargainServiceImpl.java
index dde82667..ac412c68 100644
--- a/yshop-shop/src/main/java/co/yixiang/modules/activity/service/impl/YxStoreBargainServiceImpl.java
+++ b/yshop-shop/src/main/java/co/yixiang/modules/activity/service/impl/YxStoreBargainServiceImpl.java
@@ -1,7 +1,6 @@
 /**
  * Copyright (C) 2018-2020
  * All rights reserved, Designed By www.yixiang.co
-
  */
 package co.yixiang.modules.activity.service.impl;
 
@@ -12,8 +11,10 @@ import co.yixiang.modules.activity.domain.YxStoreBargain;
 import co.yixiang.modules.activity.service.YxStoreBargainService;
 import co.yixiang.modules.activity.service.dto.YxStoreBargainDto;
 import co.yixiang.modules.activity.service.dto.YxStoreBargainQueryCriteria;
+import co.yixiang.modules.activity.service.dto.YxStoreSeckillDto;
 import co.yixiang.modules.activity.service.mapper.YxStoreBargainMapper;
 import co.yixiang.utils.FileUtil;
+import co.yixiang.utils.OrderUtil;
 import com.github.pagehelper.PageInfo;
 import lombok.AllArgsConstructor;
 import org.springframework.data.domain.Pageable;
@@ -34,9 +35,9 @@ import java.util.Map;
 //import org.springframework.cache.annotation.Cacheable;
 
 /**
-* @author hupeng
-* @date 2020-05-13
-*/
+ * @author hupeng
+ * @date 2020-05-13
+ */
 @Service
 @AllArgsConstructor
 //@CacheConfig(cacheNames = "yxStoreBargain")
@@ -51,7 +52,14 @@ public class YxStoreBargainServiceImpl extends BaseServiceImpl<YxStoreBargainMap
         getPage(pageable);
         PageInfo<YxStoreBargain> page = new PageInfo<>(queryAll(criteria));
         Map<String, Object> map = new LinkedHashMap<>(2);
-        map.put("content", generator.convert(page.getList(), YxStoreBargainDto.class));
+        List<YxStoreBargainDto> storeBargainDtoList = generator.convert(page.getList(), YxStoreBargainDto.class);
+        for (YxStoreBargainDto storeBargainDto : storeBargainDtoList) {
+
+            String statusStr = OrderUtil.checkActivityStatus(storeBargainDto.getStartTime(),
+                    storeBargainDto.getStopTime(), storeBargainDto.getStatus());
+            storeBargainDto.setStatusStr(statusStr);
+        }
+        map.put("content", storeBargainDtoList);
         map.put("totalElements", page.getTotal());
         return map;
     }
@@ -59,7 +67,7 @@ public class YxStoreBargainServiceImpl extends BaseServiceImpl<YxStoreBargainMap
 
     @Override
     //@Cacheable
-    public List<YxStoreBargain> queryAll(YxStoreBargainQueryCriteria criteria){
+    public List<YxStoreBargain> queryAll(YxStoreBargainQueryCriteria criteria) {
         return baseMapper.selectList(QueryHelpPlus.getPredicate(YxStoreBargain.class, criteria));
     }
 
@@ -68,7 +76,7 @@ public class YxStoreBargainServiceImpl extends BaseServiceImpl<YxStoreBargainMap
     public void download(List<YxStoreBargainDto> all, HttpServletResponse response) throws IOException {
         List<Map<String, Object>> list = new ArrayList<>();
         for (YxStoreBargainDto yxStoreBargain : all) {
-            Map<String,Object> map = new LinkedHashMap<>();
+            Map<String, Object> map = new LinkedHashMap<>();
             map.put("关联产品ID", yxStoreBargain.getProductId());
             map.put("砍价活动名称", yxStoreBargain.getTitle());
             map.put("砍价活动图片", yxStoreBargain.getImage());
@@ -99,8 +107,8 @@ public class YxStoreBargainServiceImpl extends BaseServiceImpl<YxStoreBargainMap
             map.put("砍价规则", yxStoreBargain.getRule());
             map.put("砍价产品浏览量", yxStoreBargain.getLook());
             map.put("砍价产品分享量", yxStoreBargain.getShare());
-            map.put(" endTimeDate",  yxStoreBargain.getEndTimeDate());
-            map.put(" startTimeDate",  yxStoreBargain.getStartTimeDate());
+            map.put(" endTimeDate", yxStoreBargain.getEndTimeDate());
+            map.put(" startTimeDate", yxStoreBargain.getStartTimeDate());
             list.add(map);
         }
         FileUtil.downloadExcel(list, response);
diff --git a/yshop-shop/src/main/java/co/yixiang/modules/activity/service/impl/YxStoreSeckillServiceImpl.java b/yshop-shop/src/main/java/co/yixiang/modules/activity/service/impl/YxStoreSeckillServiceImpl.java
index f0d6f4ae..f36b7147 100644
--- a/yshop-shop/src/main/java/co/yixiang/modules/activity/service/impl/YxStoreSeckillServiceImpl.java
+++ b/yshop-shop/src/main/java/co/yixiang/modules/activity/service/impl/YxStoreSeckillServiceImpl.java
@@ -52,20 +52,10 @@ public class YxStoreSeckillServiceImpl extends BaseServiceImpl<YxStoreSeckillMap
         getPage(pageable);
         PageInfo<YxStoreSeckill> page = new PageInfo<>(queryAll(criteria));
         List<YxStoreSeckillDto> storeSeckillDTOS = generator.convert(page.getList(),YxStoreSeckillDto.class);
-        int nowTime = OrderUtil.getSecondTimestampTwo();
         for (YxStoreSeckillDto storeSeckillDTO : storeSeckillDTOS){
-            if(storeSeckillDTO.getStatus() > 0){
-                if(storeSeckillDTO.getStartTime() > nowTime){
-                    storeSeckillDTO.setStatusStr("活动未开始");
-                }else if(storeSeckillDTO.getStopTime() < nowTime){
-                    storeSeckillDTO.setStatusStr("活动已结束");
-                }else if(storeSeckillDTO.getStopTime() > nowTime && storeSeckillDTO.getStartTime() < nowTime){
-                    storeSeckillDTO.setStatusStr("正在进行中");
-                }
-            }else {
-                storeSeckillDTO.setStatusStr("关闭");
-            }
-
+            String statusStr = OrderUtil.checkActivityStatus(storeSeckillDTO.getStartTime(),
+                    storeSeckillDTO.getStopTime(), storeSeckillDTO.getStatus());
+            storeSeckillDTO.setStatusStr(statusStr);
         }
         Map<String,Object> map = new LinkedHashMap<>(2);
         map.put("content",storeSeckillDTOS);