From 65930df95074557d2eb3e3c06c580cbb5699a7b2 Mon Sep 17 00:00:00 2001 From: wulin Date: Mon, 24 Aug 2020 15:33:16 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=8A=BD=E5=A5=96=E9=83=A8?= =?UTF-8?q?=E5=88=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/luck/controller/LuckController.java | 9 ++++++--- .../com/lz/modules/luck/dao/LuckGoodsMapper.java | 2 ++ .../com/lz/modules/luck/dao/LuckRecordMapper.java | 4 ++++ .../com/lz/modules/luck/entity/LuckGoods.java | 11 +++++++++++ .../lz/modules/luck/service/LuckGoodsService.java | 2 ++ .../modules/luck/service/LuckRecordService.java | 4 ++++ .../luck/service/impl/LuckGoodsServiceImpl.java | 5 +++++ .../luck/service/impl/LuckRecordServiceImpl.java | 10 ++++++++++ src/main/resources/application-dev.yml | 6 +++--- .../resources/mapper/luck/LuckGoodsMapper.xml | 15 ++++++++++++--- .../resources/mapper/luck/LuckRecordMapper.xml | 8 ++++++++ 11 files changed, 67 insertions(+), 9 deletions(-) diff --git a/src/main/java/com/lz/modules/luck/controller/LuckController.java b/src/main/java/com/lz/modules/luck/controller/LuckController.java index 842f5620..a8172ef6 100644 --- a/src/main/java/com/lz/modules/luck/controller/LuckController.java +++ b/src/main/java/com/lz/modules/luck/controller/LuckController.java @@ -58,7 +58,7 @@ public class LuckController { if(luck.getFinish().intValue() == 0){//活动未结束 luckDetailInfoReq.setId(luckId); luckDetailInfoReq.setName(luck.getName()); - List luckGoods = luckGoodsService.getByLuckId(luckId); + List luckGoods = luckGoodsService.getNoFinishByLuckId(luckId); if(luckGoods.size() > 0){ List luckGoodsReqs = new ArrayList<>(); for (LuckGoods luckGood:luckGoods @@ -71,7 +71,7 @@ public class LuckController { luckGoodsReqs.add(luckGoodsReq); } luckDetailInfoReq.setLuckGoodsReqs(luckGoodsReqs); - List luckRecords = luckRecordService.selectLuckRecordByLuckId(String.valueOf(luckId)); + List luckRecords = luckRecordService.selectNoGoodLuckRecordByLuckId(String.valueOf(luckId)); if(luckRecords.size() > 0){ List luckRecordReqList = new ArrayList<>(); for (LuckRecord luckRecord:luckRecords @@ -130,11 +130,14 @@ public class LuckController { luckId = luckRecordReq.getLuckId(); luckRecordService.updateLuckRecordByReqWithId(luckRecordReq); } + int count0 = luckRecordService.selectCountRecordByLuckId(luckId); + int count = luckRecordService.selectCountGoodLuckRecordByLuckId(luckId); int count1 = luckGoodsService.selectNumGoodLuckRecordByLuckId(luckId); - if(count < count1){ + if(count < count1 && count != count0){ //获取未中奖人列表 + return getLuck(luckId); }else{ //设置中将结束 diff --git a/src/main/java/com/lz/modules/luck/dao/LuckGoodsMapper.java b/src/main/java/com/lz/modules/luck/dao/LuckGoodsMapper.java index 07c0d2f2..163ace5d 100644 --- a/src/main/java/com/lz/modules/luck/dao/LuckGoodsMapper.java +++ b/src/main/java/com/lz/modules/luck/dao/LuckGoodsMapper.java @@ -36,4 +36,6 @@ public interface LuckGoodsMapper extends BaseMapper { List getByLuckId(@Param("luckId") Long luckId); int selectNumGoodLuckRecordByLuckId(@Param("luckId") Long luckId); + + List getNoFinishByLuckId(Long luckId); } \ No newline at end of file diff --git a/src/main/java/com/lz/modules/luck/dao/LuckRecordMapper.java b/src/main/java/com/lz/modules/luck/dao/LuckRecordMapper.java index 8ae110b1..67582956 100644 --- a/src/main/java/com/lz/modules/luck/dao/LuckRecordMapper.java +++ b/src/main/java/com/lz/modules/luck/dao/LuckRecordMapper.java @@ -43,4 +43,8 @@ public interface LuckRecordMapper extends BaseMapper { List selectGoodLuckRecordByLuckId(String luckId); int selectCountGoodLuckRecordByLuckId(@Param("luckId") Long luckId); + + List selectNoGoodLuckRecordByLuckId(String luckId); + + int selectCountRecordByLuckId(Long luckId); } \ No newline at end of file diff --git a/src/main/java/com/lz/modules/luck/entity/LuckGoods.java b/src/main/java/com/lz/modules/luck/entity/LuckGoods.java index 818e2079..54a10d27 100644 --- a/src/main/java/com/lz/modules/luck/entity/LuckGoods.java +++ b/src/main/java/com/lz/modules/luck/entity/LuckGoods.java @@ -34,6 +34,8 @@ public class LuckGoods implements java.io.Serializable { private String remark; //数量 private Integer counts; + + private Integer isFinish; /** * * @return @@ -169,6 +171,14 @@ public class LuckGoods implements java.io.Serializable { this.counts = counts; } + public Integer getIsFinish() { + return isFinish; + } + + public void setIsFinish(Integer isFinish) { + this.isFinish = isFinish; + } + @Override public String toString() { return "LuckGoods{" + @@ -181,6 +191,7 @@ public class LuckGoods implements java.io.Serializable { ",weight=" + weight + ",remark=" + remark + ",counts=" + counts + + ",isFinish=" + isFinish + "}"; } } \ No newline at end of file diff --git a/src/main/java/com/lz/modules/luck/service/LuckGoodsService.java b/src/main/java/com/lz/modules/luck/service/LuckGoodsService.java index 3b65b415..d37f2793 100644 --- a/src/main/java/com/lz/modules/luck/service/LuckGoodsService.java +++ b/src/main/java/com/lz/modules/luck/service/LuckGoodsService.java @@ -36,4 +36,6 @@ public interface LuckGoodsService extends IService { //获取奖品总数 int selectNumGoodLuckRecordByLuckId(Long luckId); + + List getNoFinishByLuckId(Long luckId); } \ No newline at end of file diff --git a/src/main/java/com/lz/modules/luck/service/LuckRecordService.java b/src/main/java/com/lz/modules/luck/service/LuckRecordService.java index 2fa805bd..63aa7c66 100644 --- a/src/main/java/com/lz/modules/luck/service/LuckRecordService.java +++ b/src/main/java/com/lz/modules/luck/service/LuckRecordService.java @@ -42,4 +42,8 @@ public interface LuckRecordService extends IService { List selectGoodLuckRecordByLuckId(String valueOf); //获取中奖人数 int selectCountGoodLuckRecordByLuckId(Long luckId); + //获取为未奖人数 + List selectNoGoodLuckRecordByLuckId(String valueOf); + //获取参与人数 + int selectCountRecordByLuckId(Long luckId); } \ No newline at end of file diff --git a/src/main/java/com/lz/modules/luck/service/impl/LuckGoodsServiceImpl.java b/src/main/java/com/lz/modules/luck/service/impl/LuckGoodsServiceImpl.java index 01d0b276..058e5f91 100644 --- a/src/main/java/com/lz/modules/luck/service/impl/LuckGoodsServiceImpl.java +++ b/src/main/java/com/lz/modules/luck/service/impl/LuckGoodsServiceImpl.java @@ -70,4 +70,9 @@ public class LuckGoodsServiceImpl extends ServiceImpl getNoFinishByLuckId(Long luckId){ + return luckGoodsMapper.getNoFinishByLuckId(luckId); + } + } diff --git a/src/main/java/com/lz/modules/luck/service/impl/LuckRecordServiceImpl.java b/src/main/java/com/lz/modules/luck/service/impl/LuckRecordServiceImpl.java index 19e23fcf..61cadc93 100644 --- a/src/main/java/com/lz/modules/luck/service/impl/LuckRecordServiceImpl.java +++ b/src/main/java/com/lz/modules/luck/service/impl/LuckRecordServiceImpl.java @@ -86,5 +86,15 @@ public class LuckRecordServiceImpl extends ServiceImpl selectNoGoodLuckRecordByLuckId(String luckId){ + return luckRecordMapper.selectNoGoodLuckRecordByLuckId(luckId); + } + + @Override + public int selectCountRecordByLuckId(Long luckId){ + return luckRecordMapper.selectCountRecordByLuckId(luckId); + } + } diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml index 00e06772..16e8aaaa 100644 --- a/src/main/resources/application-dev.yml +++ b/src/main/resources/application-dev.yml @@ -3,9 +3,9 @@ spring: type: com.alibaba.druid.pool.DruidDataSource druid: driver-class-name: com.mysql.cj.jdbc.Driver - url: jdbc:mysql://rm-bp1xhc66ruz72t68p.mysql.rds.aliyuncs.com:3306/lz_manger?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai - username: lz_manger - password: N8zfBwhOC + url: jdbc:mysql://172.16.157.238:3306/lz_management?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai + username: ldd_biz + password: Hello1234 initial-size: 10 max-active: 100 min-idle: 10 diff --git a/src/main/resources/mapper/luck/LuckGoodsMapper.xml b/src/main/resources/mapper/luck/LuckGoodsMapper.xml index 3c801818..ab7756c1 100644 --- a/src/main/resources/mapper/luck/LuckGoodsMapper.xml +++ b/src/main/resources/mapper/luck/LuckGoodsMapper.xml @@ -13,12 +13,13 @@ + - id AS id, is_delete AS isDelete, gmt_create AS gmtCreate, gmt_modified AS gmtModified, luck_id AS luckId, name AS name, weight AS weight, remark AS remark, counts AS counts + id AS id, is_delete AS isDelete, gmt_create AS gmtCreate, gmt_modified AS gmtModified, luck_id AS luckId, name AS name, weight AS weight, remark AS remark, counts AS counts, is_finish as isFinish @@ -36,6 +37,7 @@ weight, remark, counts, + is_finish, is_delete, gmt_create, gmt_modified @@ -45,6 +47,7 @@ #{ weight}, #{ remark}, #{ counts}, + #{ isFinish}, 0, now(), now() @@ -62,7 +65,8 @@ name = #{name}, weight = #{weight}, remark = #{remark}, - counts = #{counts} + counts = #{counts} + is_finish = #{isFinish} ,gmt_modified = now() where id = #{id} @@ -79,7 +83,8 @@ name = #{name}, weight = #{weight}, remark = #{remark}, - counts = #{counts} + counts = #{counts}, + is_finish = #{isFinish}, ,gmt_modified = now() where id = #{id} @@ -96,5 +101,9 @@ + + diff --git a/src/main/resources/mapper/luck/LuckRecordMapper.xml b/src/main/resources/mapper/luck/LuckRecordMapper.xml index a2eadfb0..679488ce 100644 --- a/src/main/resources/mapper/luck/LuckRecordMapper.xml +++ b/src/main/resources/mapper/luck/LuckRecordMapper.xml @@ -137,5 +137,13 @@ select count(1) from luck_record where luck_id=#{luckId} and is_delete = 0 and is_luck=1 + + + +