From af1d82b8ddd60143362696d9e5ad0b221e0671cd Mon Sep 17 00:00:00 2001
From: stivepeim <peimm126@126.com>
Date: Mon, 15 Nov 2021 11:22:52 +0800
Subject: [PATCH] =?UTF-8?q?1.=20=E7=A7=92=E6=9D=80=E5=90=8E=E5=8F=B0?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E8=BF=9B=E8=A1=8C=E4=B8=AD=EF=BC=8C=E5=89=8D?=
 =?UTF-8?q?=E7=AB=AF=E5=8D=B4=E4=B8=8D=E8=83=BD=E4=B8=8B=E5=8D=95=20@?=
 =?UTF-8?q?=E5=BC=A0=E9=9C=9E=EF=BD=9E=202.=20=E5=9F=BA=E7=A1=80=E5=95=86?=
 =?UTF-8?q?=E5=93=81=E5=88=86=E4=BA=AB=E4=BA=8C=E7=BB=B4=E7=A0=81=E4=B9=8B?=
 =?UTF-8?q?=E5=90=8E=E6=8F=90=E7=A4=BA=E6=89=BE=E4=B8=8D=E5=88=B0=E8=AF=A5?=
 =?UTF-8?q?=E5=95=86=E5=93=81=203.=20=E5=9C=B0=E5=9D=80=E9=80=89=E6=8B=A9?=
 =?UTF-8?q?=E6=A1=86=E7=9A=84=E6=95=B0=E6=8D=AE=E5=9C=A8=E5=89=8D=E4=B8=80?=
 =?UTF-8?q?=E9=A1=B5=E7=BC=93=E5=AD=98=E8=B5=B7=E6=9D=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md                                                   | 6 ++++--
 .../zbkj/crmeb/front/response/SecKillDetailH5Response.java  | 6 +++---
 .../crmeb/seckill/service/impl/StoreSeckillServiceImpl.java | 6 ++++++
 3 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/README.md b/README.md
index f4403443..46290dc1 100644
--- a/README.md
+++ b/README.md
@@ -49,7 +49,9 @@ JAVA版商城系统是基于Java(SpringBoot) + Vue(Element UI) + UniApp开发的
 ## 反馈交流
 技术交流社区：https://q.crmeb.net
 
-[CRMEB JAVA 技术交流QQ群 1群](<a target="_blank" href="https://qm.qq.com/cgi-bin/qm/qr?k=XJ79nw1CVADxGTl1Ju0iMxzq9HMIhTR0&jump_from=webapi">点击加群 893839288</a>)
+CRMEB JAVA 技术交流QQ群 1群 🈵️
+
+[CRMEB JAVA 技术交流QQ群 2群 482685880 🔥](<a target="_blank" href="https://qm.qq.com/cgi-bin/qm/qr?k=Ss382XU1MITXy9B-qx15GC3G7WVaImIG&jump_from=webapi"><img border="0" src="//pub.idqqimg.com/wpa/images/group.png" alt="CRMEB Java技术交流2群" title="CRMEB Java技术交流2群"> 点击添加群 482685880</a>)
 
 使用中遇到bug 或者问题可以在gitee 上提 [Issues](https://gitee.com/ZhongBangKeJi/crmeb_java/issues)
 
@@ -152,7 +154,7 @@ CRMEB打通版：https://gitee.com/ZhongBangKeJi/CRMEB
 ## 反馈交流
 技术交流社区：https://q.crmeb.net
 
-CRMEB JAVA 技术交流QQ群 1群 893839288 🈵️
+CRMEB JAVA 技术交流QQ群 1群 🈵️
 
 [CRMEB JAVA 技术交流QQ群 2群 482685880 🔥](<a target="_blank" href="https://qm.qq.com/cgi-bin/qm/qr?k=Ss382XU1MITXy9B-qx15GC3G7WVaImIG&jump_from=webapi"><img border="0" src="//pub.idqqimg.com/wpa/images/group.png" alt="CRMEB Java技术交流2群" title="CRMEB Java技术交流2群"> 点击添加群 482685880</a>)
 
diff --git a/crmeb/src/main/java/com/zbkj/crmeb/front/response/SecKillDetailH5Response.java b/crmeb/src/main/java/com/zbkj/crmeb/front/response/SecKillDetailH5Response.java
index 202d2226..658513ac 100644
--- a/crmeb/src/main/java/com/zbkj/crmeb/front/response/SecKillDetailH5Response.java
+++ b/crmeb/src/main/java/com/zbkj/crmeb/front/response/SecKillDetailH5Response.java
@@ -1,8 +1,5 @@
 package com.zbkj.crmeb.front.response;
 
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -92,4 +89,7 @@ public class SecKillDetailH5Response implements Serializable {
 
     @ApiModelProperty(value = "商品详情")
     private String content;
+
+    @ApiModelProperty(value = "结束时间（前端用）")
+    private String timeSwap;
 }
diff --git a/crmeb/src/main/java/com/zbkj/crmeb/seckill/service/impl/StoreSeckillServiceImpl.java b/crmeb/src/main/java/com/zbkj/crmeb/seckill/service/impl/StoreSeckillServiceImpl.java
index 062445e6..5279336d 100644
--- a/crmeb/src/main/java/com/zbkj/crmeb/seckill/service/impl/StoreSeckillServiceImpl.java
+++ b/crmeb/src/main/java/com/zbkj/crmeb/seckill/service/impl/StoreSeckillServiceImpl.java
@@ -456,6 +456,12 @@ public class StoreSeckillServiceImpl extends ServiceImpl<StoreSeckillDao, StoreS
         detailH5Response.setFicti(storeProduct.getFicti());
         productDetailResponse.setStoreSeckill(detailH5Response);
 
+        StoreSeckillManger seckillManger = storeSeckillMangerService.getById(storeSeckill.getTimeId());
+        if (ObjectUtil.isNotNull(seckillManger)) {
+            int secKillEndSecondTimestamp = DateUtil.getSecondTimestamp(DateUtil.nowDateTime("yyyy-MM-dd " + seckillManger.getEndTime() + ":00:00"));
+            detailH5Response.setTimeSwap(secKillEndSecondTimestamp + "");
+        }
+
         // 获取秒杀商品规格
         StoreProductAttr spaPram = new StoreProductAttr();
         spaPram.setProductId(skillId).setType(Constants.PRODUCT_TYPE_SECKILL);