From 2608277896d8e03c6c35dd45244cd3bbda807978 Mon Sep 17 00:00:00 2001 From: wulin Date: Mon, 24 Aug 2020 09:20:20 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=8A=BD=E5=A5=96?= =?UTF-8?q?=E7=9B=B8=E5=85=B3=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/lz/common/utils/DingTalkUtil.java | 1 + src/main/java/com/lz/config/ShiroConfig.java | 2 + .../luck/controller/LuckController.java | 122 +++++++++++++++++- .../lz/modules/luck/dao/LuckGoodsMapper.java | 6 + .../com/lz/modules/luck/dao/LuckMapper.java | 1 + .../lz/modules/luck/dao/LuckRecordMapper.java | 7 + .../luck/entity/LuckDetailInfoReq.java | 13 ++ .../com/lz/modules/luck/entity/LuckGoods.java | 6 +- .../lz/modules/luck/entity/LuckGoodsReq.java | 95 +------------- .../lz/modules/luck/entity/LuckRecord.java | 4 +- .../lz/modules/luck/entity/LuckRecordReq.java | 97 +------------- .../luck/service/LuckGoodsService.java | 6 + .../luck/service/LuckRecordService.java | 7 + .../lz/modules/luck/service/LuckService.java | 1 + .../service/impl/LuckGoodsServiceImpl.java | 10 ++ .../service/impl/LuckRecordServiceImpl.java | 17 +++ .../luck/service/impl/LuckServiceImpl.java | 5 + .../resources/mapper/luck/LuckGoodsMapper.xml | 7 + src/main/resources/mapper/luck/LuckMapper.xml | 6 +- .../mapper/luck/LuckRecordMapper.xml | 29 ++++- 20 files changed, 244 insertions(+), 198 deletions(-) create mode 100644 src/main/java/com/lz/modules/luck/entity/LuckDetailInfoReq.java diff --git a/src/main/java/com/lz/common/utils/DingTalkUtil.java b/src/main/java/com/lz/common/utils/DingTalkUtil.java index 008c3c1a..ce5c0029 100644 --- a/src/main/java/com/lz/common/utils/DingTalkUtil.java +++ b/src/main/java/com/lz/common/utils/DingTalkUtil.java @@ -378,6 +378,7 @@ public class DingTalkUtil { luckRecord.setStaffId(staffEntity.getId()); luckRecord.setLuckId(luckId); luckRecord.setName(staffEntity.getName()); + luckRecord.setMobile(staffEntity.getMobile()); luckRecordService.insertLuckRecord(luckRecord); } diff --git a/src/main/java/com/lz/config/ShiroConfig.java b/src/main/java/com/lz/config/ShiroConfig.java index 19a8dd28..7337a0bb 100644 --- a/src/main/java/com/lz/config/ShiroConfig.java +++ b/src/main/java/com/lz/config/ShiroConfig.java @@ -65,6 +65,8 @@ public class ShiroConfig { filterMap.put("/dtlg/login", "anon"); filterMap.put("/dtlg/luck", "anon"); filterMap.put("/dtlg/look", "anon"); + filterMap.put("/luck/getLuckById", "anon"); + filterMap.put("/luck/updateLuck", "anon"); filterMap.put("/**", "oauth2"); shiroFilter.setFilterChainDefinitionMap(filterMap); 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 aec0be48..842f5620 100644 --- a/src/main/java/com/lz/modules/luck/controller/LuckController.java +++ b/src/main/java/com/lz/modules/luck/controller/LuckController.java @@ -1,18 +1,21 @@ package com.lz.modules.luck.controller; +import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.lz.common.utils.PageUtils; import com.lz.common.utils.R; import com.lz.common.utils.StringUtil; -import com.lz.modules.luck.entity.Luck; +import com.lz.modules.luck.entity.*; +import com.lz.modules.luck.service.LuckGoodsService; +import com.lz.modules.luck.service.LuckRecordService; import com.lz.modules.luck.service.LuckService; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; +import java.util.ArrayList; import java.util.HashMap; +import java.util.List; import java.util.Map; @RestController @@ -23,6 +26,12 @@ public class LuckController { @Autowired private LuckService luckService; + @Autowired + private LuckGoodsService luckGoodsService; + + @Autowired + private LuckRecordService luckRecordService; + @RequestMapping("/list") public R list(@RequestBody String body) { @@ -37,8 +46,111 @@ public class LuckController { return R.ok().put("luck",luck); } + @GetMapping("/getLuckById") + public R getLuckById(@RequestParam Long luckId) { + return getLuck(luckId); + } - @RequestMapping("/update") + private R getLuck(Long luckId){ + Luck luck = luckService.selectLuckById(luckId); + if(luck != null){ + LuckDetailInfoReq luckDetailInfoReq = new LuckDetailInfoReq(); + if(luck.getFinish().intValue() == 0){//活动未结束 + luckDetailInfoReq.setId(luckId); + luckDetailInfoReq.setName(luck.getName()); + List luckGoods = luckGoodsService.getByLuckId(luckId); + if(luckGoods.size() > 0){ + List luckGoodsReqs = new ArrayList<>(); + for (LuckGoods luckGood:luckGoods + ) { + LuckGoodsReq luckGoodsReq = new LuckGoodsReq(); + luckGoodsReq.setCounts(luckGood.getCounts()); + luckGoodsReq.setId(luckGood.getId()); + luckGoodsReq.setName(luckGood.getName()); + luckGoodsReq.setWeight(luckGood.getWeight()); + luckGoodsReqs.add(luckGoodsReq); + } + luckDetailInfoReq.setLuckGoodsReqs(luckGoodsReqs); + List luckRecords = luckRecordService.selectLuckRecordByLuckId(String.valueOf(luckId)); + if(luckRecords.size() > 0){ + List luckRecordReqList = new ArrayList<>(); + for (LuckRecord luckRecord:luckRecords + ) { + LuckRecordReq luckRecordReq = new LuckRecordReq(); + luckRecordReq.setName(luckRecord.getName()); + luckRecordReq.setId(luckRecord.getId()); + luckRecordReq.setGoodsId(luckRecord.getGoodsId()); + luckRecordReq.setGoodsName(luckRecord.getGoodsName()); + luckRecordReq.setIsLuck(luckRecord.getIsLuck()); + luckRecordReq.setWeight(luckRecord.getWeight()); + luckRecordReq.setMobile(luckRecord.getMobile()); + luckRecordReqList.add(luckRecordReq); + } + luckDetailInfoReq.setLuckRecordReqs(luckRecordReqList); + return R.ok().put("luck",luckDetailInfoReq); + } + return R.error("活动暂无人员报名"); + } + return R.error("活动无相关奖品信息"); + }else{ + //获取获奖人员信息 + luckDetailInfoReq.setIsFinish(1); + luckDetailInfoReq.setId(luckId); + luckDetailInfoReq.setName(luck.getName()); + List luckRecords = luckRecordService.selectGoodLuckRecordByLuckId(String.valueOf(luckId)); + if(luckRecords.size() > 0) { + List luckRecordReqList = new ArrayList<>(); + for (LuckRecord luckRecord : luckRecords + ) { + LuckRecordReq luckRecordReq = new LuckRecordReq(); + luckRecordReq.setName(luckRecord.getName()); + luckRecordReq.setId(luckRecord.getId()); + luckRecordReq.setGoodsId(luckRecord.getGoodsId()); + luckRecordReq.setGoodsName(luckRecord.getGoodsName()); + luckRecordReq.setIsLuck(luckRecord.getIsLuck()); + luckRecordReq.setWeight(luckRecord.getWeight()); + luckRecordReq.setMobile(luckRecord.getMobile()); + luckRecordReqList.add(luckRecordReq); + } + luckDetailInfoReq.setLuckRecordReqs(luckRecordReqList); + return R.ok().put("luck", luckDetailInfoReq); + } + } + } + return R.error("无相关活动"); + } + + @PostMapping("/updateLuck") + public R updateLuck(@RequestBody String body) { + JSONArray jsonArray = JSONObject.parseArray(body); + Long luckId = 0L; + for(int i = 0; i < jsonArray.size(); i++){ + JSONObject json = jsonArray.getJSONObject(i); + LuckRecordReq luckRecordReq = json.toJavaObject(LuckRecordReq.class); + luckId = luckRecordReq.getLuckId(); + luckRecordService.updateLuckRecordByReqWithId(luckRecordReq); + } + int count = luckRecordService.selectCountGoodLuckRecordByLuckId(luckId); + + int count1 = luckGoodsService.selectNumGoodLuckRecordByLuckId(luckId); + if(count < count1){ + //获取未中奖人列表 + return getLuck(luckId); + }else{ + //设置中将结束 + luckService.setLuckFinishById(luckId); + Luck luck = luckService.selectLuckById(luckId); + LuckDetailInfoReq luckDetailInfoReq = new LuckDetailInfoReq(); + luckDetailInfoReq.setIsFinish(1); + luckDetailInfoReq.setName(luck.getName()); + luckDetailInfoReq.setId(luck.getId()); + return R.ok().put("luck", luckDetailInfoReq); + } + } + + + + @RequestMapping("/update") public R update(@RequestBody Luck luck) { luckService.updateLuckById(luck); return R.ok(); 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 918b10a7..07c0d2f2 100644 --- a/src/main/java/com/lz/modules/luck/dao/LuckGoodsMapper.java +++ b/src/main/java/com/lz/modules/luck/dao/LuckGoodsMapper.java @@ -11,6 +11,9 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.lz.modules.luck.entity.LuckGoods; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; + +import java.util.List; + @Mapper public interface LuckGoodsMapper extends BaseMapper { @@ -30,4 +33,7 @@ public interface LuckGoodsMapper extends BaseMapper { int deleteLuckGoodsById(@Param("id")Long id); + List getByLuckId(@Param("luckId") Long luckId); + + int selectNumGoodLuckRecordByLuckId(@Param("luckId") Long luckId); } \ No newline at end of file diff --git a/src/main/java/com/lz/modules/luck/dao/LuckMapper.java b/src/main/java/com/lz/modules/luck/dao/LuckMapper.java index 4ab84b1c..b4833029 100644 --- a/src/main/java/com/lz/modules/luck/dao/LuckMapper.java +++ b/src/main/java/com/lz/modules/luck/dao/LuckMapper.java @@ -30,4 +30,5 @@ public interface LuckMapper extends BaseMapper { int deleteLuckById(@Param("id")Long id); + void setLuckFinishById(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 ffc62a79..8ae110b1 100644 --- a/src/main/java/com/lz/modules/luck/dao/LuckRecordMapper.java +++ b/src/main/java/com/lz/modules/luck/dao/LuckRecordMapper.java @@ -9,6 +9,7 @@ package com.lz.modules.luck.dao; */ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.lz.modules.luck.entity.LuckRecord; +import com.lz.modules.luck.entity.LuckRecordReq; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -36,4 +37,10 @@ public interface LuckRecordMapper extends BaseMapper { LuckRecord selectLuckRecordByLuckIdAndStaffId(@Param("luckId") Long luckId, @Param("id") Long id); List selectLuckRecordByLuckId(@Param("luckId") String luckId); + + void updateLuckRecordByReqWithId(LuckRecordReq luckRecordReq); + + List selectGoodLuckRecordByLuckId(String luckId); + + int selectCountGoodLuckRecordByLuckId(@Param("luckId") Long luckId); } \ No newline at end of file diff --git a/src/main/java/com/lz/modules/luck/entity/LuckDetailInfoReq.java b/src/main/java/com/lz/modules/luck/entity/LuckDetailInfoReq.java new file mode 100644 index 00000000..f6419926 --- /dev/null +++ b/src/main/java/com/lz/modules/luck/entity/LuckDetailInfoReq.java @@ -0,0 +1,13 @@ +package com.lz.modules.luck.entity; + +import lombok.Data; + +import java.util.List; +@Data +public class LuckDetailInfoReq { + private String name;//活动名称 + private Long Id;//活动名称 + private int isFinish;//活动是否结束 + private List luckGoodsReqs;//奖品列表 + private List luckRecordReqs;//参与抽奖人员列表 +} 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 26399e8d..818e2079 100644 --- a/src/main/java/com/lz/modules/luck/entity/LuckGoods.java +++ b/src/main/java/com/lz/modules/luck/entity/LuckGoods.java @@ -28,7 +28,7 @@ public class LuckGoods implements java.io.Serializable { private Long luckId; //奖品名称 private String name; - //权重 + //权重权重，抽奖顺序 private Integer weight; //备注 private String remark; @@ -125,14 +125,14 @@ public class LuckGoods implements java.io.Serializable { } /** - * 权重 + * 权重 权重，抽奖顺序 * @return */ public Integer getWeight() { return weight; } /** - * 权重 + * 权重 权重，抽奖顺序 * @param weight */ public void setWeight(Integer weight) { diff --git a/src/main/java/com/lz/modules/luck/entity/LuckGoodsReq.java b/src/main/java/com/lz/modules/luck/entity/LuckGoodsReq.java index 108e95bd..19604bb2 100644 --- a/src/main/java/com/lz/modules/luck/entity/LuckGoodsReq.java +++ b/src/main/java/com/lz/modules/luck/entity/LuckGoodsReq.java @@ -13,26 +13,13 @@ import java.util.Date; @Data public class LuckGoodsReq implements java.io.Serializable { - private int page = 1; - private int rows = 10; - private String sort; - private String order; - // + private Long id; - // - private Integer isDelete; - // - private Date gmtCreate; - // - private Date gmtModified; - //活动ID - private Long luckId; + //奖品名称 private String name; //权重 private Integer weight; - //备注 - private String remark; //数量 private Integer counts; /** @@ -50,65 +37,7 @@ public class LuckGoodsReq implements java.io.Serializable { this.id = id; } - /** - * - * @return - */ - public Integer getIsDelete() { - return isDelete; - } - /** - * - * @param isDelete - */ - public void setIsDelete(Integer isDelete) { - this.isDelete = isDelete; - } - /** - * - * @return - */ - public Date getGmtCreate() { - return gmtCreate; - } - /** - * - * @param gmtCreate - */ - public void setGmtCreate(Date gmtCreate) { - this.gmtCreate = gmtCreate; - } - - /** - * - * @return - */ - public Date getGmtModified() { - return gmtModified; - } - /** - * - * @param gmtModified - */ - public void setGmtModified(Date gmtModified) { - this.gmtModified = gmtModified; - } - - /** - * 活动ID - * @return - */ - public Long getLuckId() { - return luckId; - } - /** - * 活动ID - * @param luckId - */ - public void setLuckId(Long luckId) { - this.luckId = luckId; - } /** * 奖品名称 @@ -140,20 +69,7 @@ public class LuckGoodsReq implements java.io.Serializable { this.weight = weight; } - /** - * 备注 - * @return - */ - public String getRemark() { - return remark; - } - /** - * 备注 - * @param remark - */ - public void setRemark(String remark) { - this.remark = remark; - } + /** * 数量 @@ -174,13 +90,8 @@ public class LuckGoodsReq implements java.io.Serializable { public String toString() { return "LuckGoods{" + ",id=" + id + - ",isDelete=" + isDelete + - ",gmtCreate=" + gmtCreate + - ",gmtModified=" + gmtModified + - ",luckId=" + luckId + ",name=" + name + ",weight=" + weight + - ",remark=" + remark + ",counts=" + counts + "}"; } diff --git a/src/main/java/com/lz/modules/luck/entity/LuckRecord.java b/src/main/java/com/lz/modules/luck/entity/LuckRecord.java index 040451bb..6efe0889 100644 --- a/src/main/java/com/lz/modules/luck/entity/LuckRecord.java +++ b/src/main/java/com/lz/modules/luck/entity/LuckRecord.java @@ -28,7 +28,9 @@ public class LuckRecord implements java.io.Serializable { private Long staffId; //姓名 private String name; - //是否中将 0为中将 1中将 + //手机号 + private String mobile; + //是否中将 0为中将 是否中将 0为中将 1 特等奖或者一等奖，以此类推 private Integer isLuck; //权重，或者排序 private Integer weight; diff --git a/src/main/java/com/lz/modules/luck/entity/LuckRecordReq.java b/src/main/java/com/lz/modules/luck/entity/LuckRecordReq.java index 28c26bf0..633f3e6c 100644 --- a/src/main/java/com/lz/modules/luck/entity/LuckRecordReq.java +++ b/src/main/java/com/lz/modules/luck/entity/LuckRecordReq.java @@ -13,22 +13,11 @@ import java.util.Date; @Data public class LuckRecordReq implements java.io.Serializable { - private int page = 1; - private int rows = 10; - private String sort; - private String order; - // + private Long id; - //是否删除 0未删除 1删除 - private Integer isDelete; - // - private Date gmtCreate; - // - private Date gmtModified; - //员工staff_id - private Long staffId; //姓名 private String name; + private String mobile; //是否中将 0为中将 1中将 private Integer isLuck; //权重，或者排序 @@ -39,8 +28,6 @@ public class LuckRecordReq implements java.io.Serializable { private String goodsName; //奖品ID，目前不设置ID了 private Long goodsId; - //备注 - private String remark; /** * * @return @@ -56,66 +43,6 @@ public class LuckRecordReq implements java.io.Serializable { this.id = id; } - /** - * 是否删除 0未删除 1删除 - * @return - */ - public Integer getIsDelete() { - return isDelete; - } - /** - * 是否删除 0未删除 1删除 - * @param isDelete - */ - public void setIsDelete(Integer isDelete) { - this.isDelete = isDelete; - } - - /** - * - * @return - */ - public Date getGmtCreate() { - return gmtCreate; - } - /** - * - * @param gmtCreate - */ - public void setGmtCreate(Date gmtCreate) { - this.gmtCreate = gmtCreate; - } - - /** - * - * @return - */ - public Date getGmtModified() { - return gmtModified; - } - /** - * - * @param gmtModified - */ - public void setGmtModified(Date gmtModified) { - this.gmtModified = gmtModified; - } - - /** - * 员工staff_id - * @return - */ - public Long getStaffId() { - return staffId; - } - /** - * 员工staff_id - * @param staffId - */ - public void setStaffId(Long staffId) { - this.staffId = staffId; - } - /** * 姓名 * @return @@ -206,36 +133,18 @@ public class LuckRecordReq implements java.io.Serializable { this.goodsId = goodsId; } - /** - * 备注 - * @return - */ - public String getRemark() { - return remark; - } - /** - * 备注 - * @param remark - */ - public void setRemark(String remark) { - this.remark = remark; - } + @Override public String toString() { return "LuckRecord{" + ",id=" + id + - ",isDelete=" + isDelete + - ",gmtCreate=" + gmtCreate + - ",gmtModified=" + gmtModified + - ",staffId=" + staffId + ",name=" + name + ",isLuck=" + isLuck + ",weight=" + weight + ",luckId=" + luckId + ",goodsName=" + goodsName + ",goodsId=" + goodsId + - ",remark=" + remark + "}"; } } \ 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 ecf0a83b..3b65b415 100644 --- a/src/main/java/com/lz/modules/luck/service/LuckGoodsService.java +++ b/src/main/java/com/lz/modules/luck/service/LuckGoodsService.java @@ -3,6 +3,8 @@ package com.lz.modules.luck.service; import com.baomidou.mybatisplus.extension.service.IService; import com.lz.modules.luck.entity.LuckGoods; +import java.util.List; + /** *

* 奖品表 服务类 @@ -30,4 +32,8 @@ public interface LuckGoodsService extends IService { int deleteLuckGoodsById(Long id); + List getByLuckId(Long luckId); + + //获取奖品总数 + int selectNumGoodLuckRecordByLuckId(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 c19e362e..2fa805bd 100644 --- a/src/main/java/com/lz/modules/luck/service/LuckRecordService.java +++ b/src/main/java/com/lz/modules/luck/service/LuckRecordService.java @@ -2,6 +2,7 @@ package com.lz.modules.luck.service; import com.baomidou.mybatisplus.extension.service.IService; import com.lz.modules.luck.entity.LuckRecord; +import com.lz.modules.luck.entity.LuckRecordReq; import java.util.List; @@ -35,4 +36,10 @@ public interface LuckRecordService extends IService { LuckRecord selectLuckRecordByLuckIdAndStaffId(Long luckId, Long id); List selectLuckRecordByLuckId(String luckId); + + void updateLuckRecordByReqWithId(LuckRecordReq luckRecordReq); + + List selectGoodLuckRecordByLuckId(String valueOf); + //获取中奖人数 + int selectCountGoodLuckRecordByLuckId(Long luckId); } \ No newline at end of file diff --git a/src/main/java/com/lz/modules/luck/service/LuckService.java b/src/main/java/com/lz/modules/luck/service/LuckService.java index 9807716b..e30e8556 100644 --- a/src/main/java/com/lz/modules/luck/service/LuckService.java +++ b/src/main/java/com/lz/modules/luck/service/LuckService.java @@ -30,4 +30,5 @@ public interface LuckService extends IService { int deleteLuckById(Long id); + void setLuckFinishById(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 28ed79eb..01d0b276 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 @@ -7,6 +7,8 @@ import com.lz.modules.luck.service.LuckGoodsService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.util.List; + /** *

* 奖品表 服务类 @@ -58,6 +60,14 @@ public class LuckGoodsServiceImpl extends ServiceImpl getByLuckId(Long luckId){ + return luckGoodsMapper.getByLuckId(luckId); + } + @Override + public int selectNumGoodLuckRecordByLuckId(Long luckId){ + return luckGoodsMapper.selectNumGoodLuckRecordByLuckId(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 fb5c4813..19e23fcf 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 @@ -3,6 +3,7 @@ package com.lz.modules.luck.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.lz.modules.luck.dao.LuckRecordMapper; import com.lz.modules.luck.entity.LuckRecord; +import com.lz.modules.luck.entity.LuckRecordReq; import com.lz.modules.luck.service.LuckRecordService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -70,4 +71,20 @@ public class LuckRecordServiceImpl extends ServiceImpl selectGoodLuckRecordByLuckId(String luckId){ + return luckRecordMapper.selectGoodLuckRecordByLuckId(luckId); + } + + @Override + public int selectCountGoodLuckRecordByLuckId(Long luckId){ + return luckRecordMapper.selectCountGoodLuckRecordByLuckId(luckId); + } + + } diff --git a/src/main/java/com/lz/modules/luck/service/impl/LuckServiceImpl.java b/src/main/java/com/lz/modules/luck/service/impl/LuckServiceImpl.java index 7826e001..d9a755d0 100644 --- a/src/main/java/com/lz/modules/luck/service/impl/LuckServiceImpl.java +++ b/src/main/java/com/lz/modules/luck/service/impl/LuckServiceImpl.java @@ -58,6 +58,11 @@ public class LuckServiceImpl extends ServiceImpl implements Lu return luckMapper.deleteLuckById(id); } + @Override + public void setLuckFinishById(Long luckId){ + luckMapper.setLuckFinishById(luckId); + } + } diff --git a/src/main/resources/mapper/luck/LuckGoodsMapper.xml b/src/main/resources/mapper/luck/LuckGoodsMapper.xml index 30bb1ed1..3c801818 100644 --- a/src/main/resources/mapper/luck/LuckGoodsMapper.xml +++ b/src/main/resources/mapper/luck/LuckGoodsMapper.xml @@ -89,5 +89,12 @@ update luck_goods set is_delete = 1 where id=#{id} limit 1 + + + diff --git a/src/main/resources/mapper/luck/LuckMapper.xml b/src/main/resources/mapper/luck/LuckMapper.xml index cd598df1..878b58de 100644 --- a/src/main/resources/mapper/luck/LuckMapper.xml +++ b/src/main/resources/mapper/luck/LuckMapper.xml @@ -91,7 +91,11 @@ - update luck set is_delete = 1 where id=#{id} limit 1 + update luck set is_delete = 1, gmt_modified=now() where id=#{id} limit 1 + + + + update luck set finish = 1, gmt_modified=now() where id=#{luckId} limit 1 diff --git a/src/main/resources/mapper/luck/LuckRecordMapper.xml b/src/main/resources/mapper/luck/LuckRecordMapper.xml index 8c1ce33a..93f45a60 100644 --- a/src/main/resources/mapper/luck/LuckRecordMapper.xml +++ b/src/main/resources/mapper/luck/LuckRecordMapper.xml @@ -10,6 +10,7 @@ + @@ -21,7 +22,7 @@ - id AS id, is_delete AS isDelete, gmt_create AS gmtCreate, gmt_modified AS gmtModified, staff_id AS staffId, name AS name, is_luck AS isLuck, weight AS weight, luck_id AS luckId, goods_name AS goodsName, goods_id AS goodsId, remark AS remark + id AS id, is_delete AS isDelete, gmt_create AS gmtCreate, gmt_modified AS gmtModified, staff_id AS staffId, name AS name, mobile AS mobile, is_luck AS isLuck, weight AS weight, luck_id AS luckId, goods_name AS goodsName, goods_id AS goodsId, remark AS remark @@ -36,6 +37,7 @@ insert into luck_record( staff_id, name, + name, is_luck, weight, luck_id, @@ -48,6 +50,7 @@ )values( #{ staffId}, #{ name}, + #{ mobile}, #{ isLuck}, #{ weight}, #{ luckId}, @@ -69,6 +72,7 @@ gmt_create = #{gmtCreate}, staff_id = #{staffId}, name = #{name}, + mobile = #{mobile}, is_luck = #{isLuck}, weight = #{weight}, luck_id = #{luckId}, @@ -89,6 +93,7 @@ gmt_create = #{gmtCreate}, staff_id = #{staffId}, name = #{name}, + mobile = #{mobile}, is_luck = #{isLuck}, weight = #{weight}, luck_id = #{luckId}, @@ -109,7 +114,27 @@ + + + update + luck_record + set + is_luck = #{isLuck}, + luck_id = #{luckId}, + goods_name = #{goodsName}, + goods_id = #{goodsId} + ,gmt_modified = now() + where id = #{id} + + + + + From d9e1fdb3ab14a74e85757b2e726b2933e25184e5 Mon Sep 17 00:00:00 2001 From: wulin Date: Mon, 24 Aug 2020 10:41:02 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=97=A5=E5=BF=97?= =?UTF-8?q?=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/logback-dev.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/logback-dev.xml b/src/main/resources/logback-dev.xml index 7ff5149b..731c7621 100644 --- a/src/main/resources/logback-dev.xml +++ b/src/main/resources/logback-dev.xml @@ -3,7 +3,7 @@ - + From ad6e09395114c868ca4305faa2951a4f999bfca8 Mon Sep 17 00:00:00 2001 From: wulin Date: Mon, 24 Aug 2020 10:53:31 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=97=A5=E5=BF=97?= =?UTF-8?q?=E7=BA=BF=E4=B8=8A=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/logback-prod.xml | 120 ++++++++++++++++++++++++++++ 1 file changed, 120 insertions(+) create mode 100644 src/main/resources/logback-prod.xml diff --git a/src/main/resources/logback-prod.xml b/src/main/resources/logback-prod.xml new file mode 100644 index 00000000..731c7621 --- /dev/null +++ b/src/main/resources/logback-prod.xml @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + %d{yyyy-MM-dd HH:mm:ss.SSS} 【%p】 [%sampleClass:%sampleLine] %m%n + + + INFO + + + + ${LOG_HOME}/info.log + + ${LOG_HOME}/logs/info.%d{yyyy-MM-dd-HH }.%i.log + + 500MB + + + + + + + %d{yyyy-MM-dd HH:mm:ss.SSS} 【%p】 [%sampleClass:%sampleLine] %m%n + + + INFO + + + + ${LOG_HOME}/warn.log + + ${LOG_HOME}/logs/warn.%d{yyyy-MM-dd-HH }.%i.log + 500MB + + + + + %d{yyyy-MM-dd HH:mm:ss.SSS} 【%p】 [%sampleClass:%sampleLine] %m%n + + + WARN + + + + ${LOG_HOME}/error.log + + ${LOG_HOME}/logs/error.%d{yyyy-MM-dd-HH }.%i.log + 500MB + + + + + %d{yyyy-MM-dd HH:mm:ss.SSS} 【%p】 [%sampleClass:%sampleLine] %m%n + + + ERROR + + + + ${LOG_HOME}/all.log + + ${LOG_HOME}/logs/all.%i.log.gz + 0 + 0 + + + 1GB + + + %d{yyyy-MM-dd HH:mm:ss.SSS} 【%p】 [%sampleClass:%sampleLine] %m%n + + + INFO + + + + + ${LOG_HOME}/bi.log + + ${LOG_HOME}/logs/bi.%d{yyyy-MM-dd-HH }.%i.log + + 500MB + + + + + + + %d{yyyy-MM-dd HH:mm:ss.SSS} 【%p】 [%sampleClass:%sampleLine] %m%n + + + INFO + + + + + + + + + + + + + + + From aa2ac64ff74b6d529fee2c7ab62a5f91678c52f8 Mon Sep 17 00:00:00 2001 From: wulin Date: Mon, 24 Aug 2020 10:56:46 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E4=B8=B4=E6=97=B6=E5=85=B3=E9=97=AD?= =?UTF-8?q?=E9=92=89=E9=92=89=E5=90=8C=E6=AD=A5=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/lz/config/ShiroConfig.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/java/com/lz/config/ShiroConfig.java b/src/main/java/com/lz/config/ShiroConfig.java index 7337a0bb..07e3d6f4 100644 --- a/src/main/java/com/lz/config/ShiroConfig.java +++ b/src/main/java/com/lz/config/ShiroConfig.java @@ -66,6 +66,7 @@ public class ShiroConfig { filterMap.put("/dtlg/luck", "anon"); filterMap.put("/dtlg/look", "anon"); filterMap.put("/luck/getLuckById", "anon"); + filterMap.put("/thirdAppConfig/syn", "anon"); filterMap.put("/luck/updateLuck", "anon"); filterMap.put("/**", "oauth2"); shiroFilter.setFilterChainDefinitionMap(filterMap); From 9683f6c3ec15c456b6b616b72d49e776e7096028 Mon Sep 17 00:00:00 2001 From: wulin Date: Mon, 24 Aug 2020 10:58:34 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E9=83=A8=E5=88=86?= =?UTF-8?q?=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../lz/modules/third/controller/DingTalkLoginController.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/main/java/com/lz/modules/third/controller/DingTalkLoginController.java b/src/main/java/com/lz/modules/third/controller/DingTalkLoginController.java index 1a028098..7b6e250e 100644 --- a/src/main/java/com/lz/modules/third/controller/DingTalkLoginController.java +++ b/src/main/java/com/lz/modules/third/controller/DingTalkLoginController.java @@ -8,6 +8,7 @@ import com.lz.modules.luck.entity.Luck; import com.lz.modules.luck.entity.LuckRecord; import com.lz.modules.luck.service.LuckRecordService; import com.lz.modules.luck.service.LuckService; +import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.*; @@ -17,6 +18,7 @@ import java.util.List; @RestController @RequestMapping("/dtlg") +@Slf4j public class DingTalkLoginController { @Autowired DingtalkBusiness dingtalkBusiness; @@ -27,6 +29,7 @@ public class DingTalkLoginController { static String appid = "855818566"; @PostMapping("/login") public R login(@RequestBody String body){ + log.info("钉钉免登录luck{}", body); JSONObject json = JSONObject.parseObject(body); return dingtalkBusiness.login(json.getString("code"), appid); @@ -34,6 +37,7 @@ public class DingTalkLoginController { @PostMapping("/luck") public R luck(@RequestBody String body){ + log.info("luck{}", body); JSONObject json = JSONObject.parseObject(body); Luck luck = luckService.selectLuckById(1L);//默认第一个活动 if(luck.getStopTime().getTime() > System.currentTimeMillis()){