From f957218dfa0e7eb7de8f73e52d07834e0f78b835 Mon Sep 17 00:00:00 2001 From: wangpengfei <1928057482@qq.com> Date: Mon, 25 Dec 2023 15:35:38 +0800 Subject: [PATCH] 12/25 --- .../yyth/api/empcardgift/EmpCardGiftDto.java | 1 + .../api/lpkgiftbaggoods/LpkGiftBagGoods.java | 1 + .../yxt/yyth/biz/empcard/EmpCardMapper.java | 1 + .../yxt/yyth/biz/empcard/EmpCardMapper.xml | 12 +- .../yxt/yyth/biz/empcard/EmpCardService.java | 7 +- .../yyth/biz/empcardgift/EmpCardGiftRest.java | 4 - .../biz/empcardgift/EmpCardGiftService.java | 118 ++++++++++-------- .../yyth/biz/lpkgiftbag/LpkGiftBagMapper.xml | 3 +- .../biz/lpkgiftbag/LpkGiftBagService.java | 2 +- .../biz/lpkgiftcard/LpkGiftCardMapper.xml | 33 +---- .../yyth/config/SaTokenGloableException.java | 10 +- 11 files changed, 95 insertions(+), 97 deletions(-) diff --git a/src/main/java/com/yxt/yyth/api/empcardgift/EmpCardGiftDto.java b/src/main/java/com/yxt/yyth/api/empcardgift/EmpCardGiftDto.java index 7bbfaf7..6a55f07 100644 --- a/src/main/java/com/yxt/yyth/api/empcardgift/EmpCardGiftDto.java +++ b/src/main/java/com/yxt/yyth/api/empcardgift/EmpCardGiftDto.java @@ -39,4 +39,5 @@ public class EmpCardGiftDto implements Dto { private String isItlnvalid; private String iReservation; private List goodsVoList; + private String count; } diff --git a/src/main/java/com/yxt/yyth/api/lpkgiftbaggoods/LpkGiftBagGoods.java b/src/main/java/com/yxt/yyth/api/lpkgiftbaggoods/LpkGiftBagGoods.java index 3d25c0d..7c77247 100644 --- a/src/main/java/com/yxt/yyth/api/lpkgiftbaggoods/LpkGiftBagGoods.java +++ b/src/main/java/com/yxt/yyth/api/lpkgiftbaggoods/LpkGiftBagGoods.java @@ -24,4 +24,5 @@ public class LpkGiftBagGoods { private String giftbagSid; private String goodsSid; private String goodsNumber; + private String isGrounding; } diff --git a/src/main/java/com/yxt/yyth/biz/empcard/EmpCardMapper.java b/src/main/java/com/yxt/yyth/biz/empcard/EmpCardMapper.java index 8cfae4d..4b7725c 100644 --- a/src/main/java/com/yxt/yyth/biz/empcard/EmpCardMapper.java +++ b/src/main/java/com/yxt/yyth/biz/empcard/EmpCardMapper.java @@ -34,4 +34,5 @@ public interface EmpCardMapper extends BaseMapper { IPage getEmpCardByCustomerSid(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); List selEmpCardSid(@Param("empCardSid")String empCardSid); + EmpCardVo getBagGoods(@Param("sid")String sid ,@Param("goodsSid")String goodsSid); } diff --git a/src/main/java/com/yxt/yyth/biz/empcard/EmpCardMapper.xml b/src/main/java/com/yxt/yyth/biz/empcard/EmpCardMapper.xml index 9758db8..4bd1575 100644 --- a/src/main/java/com/yxt/yyth/biz/empcard/EmpCardMapper.xml +++ b/src/main/java/com/yxt/yyth/biz/empcard/EmpCardMapper.xml @@ -121,11 +121,21 @@ + + \ No newline at end of file diff --git a/src/main/java/com/yxt/yyth/biz/empcard/EmpCardService.java b/src/main/java/com/yxt/yyth/biz/empcard/EmpCardService.java index 7a2f9d3..d27d834 100644 --- a/src/main/java/com/yxt/yyth/biz/empcard/EmpCardService.java +++ b/src/main/java/com/yxt/yyth/biz/empcard/EmpCardService.java @@ -220,7 +220,7 @@ public class EmpCardService extends MybatisBaseService { if (StringUtils.isNotBlank(query.getNumber())) { qw.like("serialNumber", query.getNumber()); } -// qw.eq("recordSid", query.getSid()); + qw.eq("recordSid", query.getSid()); //得到所有要导出的数据 List exportList = baseMapper.exportExcel(qw); if (!exportList.isEmpty()) { @@ -344,4 +344,9 @@ public class EmpCardService extends MybatisBaseService { baseMapper.updateById(card); return rb.success().setData("成功"); } + public ResultBean getBagGoods(String sid,String goodsSid) { + ResultBean rb = new ResultBean().fail(); + EmpCardVo card = baseMapper.getBagGoods(sid,goodsSid); + return rb.success().setData(card); + } } diff --git a/src/main/java/com/yxt/yyth/biz/empcardgift/EmpCardGiftRest.java b/src/main/java/com/yxt/yyth/biz/empcardgift/EmpCardGiftRest.java index 4046a6e..499a895 100644 --- a/src/main/java/com/yxt/yyth/biz/empcardgift/EmpCardGiftRest.java +++ b/src/main/java/com/yxt/yyth/biz/empcardgift/EmpCardGiftRest.java @@ -109,8 +109,4 @@ public class EmpCardGiftRest { // public ResultBean cardGrant(@RequestBody CardGrantDto dto) { // return EmpCardGiftService.cardGrant(dto); // } -//@Scheduled(cron = "0/1 * * * * ?") -//public void test() { -// System.out.println("执行"); -//} } diff --git a/src/main/java/com/yxt/yyth/biz/empcardgift/EmpCardGiftService.java b/src/main/java/com/yxt/yyth/biz/empcardgift/EmpCardGiftService.java index 2f9dc00..d5b3e91 100644 --- a/src/main/java/com/yxt/yyth/biz/empcardgift/EmpCardGiftService.java +++ b/src/main/java/com/yxt/yyth/biz/empcardgift/EmpCardGiftService.java @@ -14,6 +14,7 @@ import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; import com.yxt.yyth.api.empcard.EmpAppletVo; import com.yxt.yyth.api.empcard.EmpCard; +import com.yxt.yyth.api.empcard.EmpCardVo; import com.yxt.yyth.api.empcardgift.*; import com.yxt.yyth.api.empcardgiftgoods.EmpCardGiftGoodsDto; import com.yxt.yyth.api.empcardgiftgoods.EmpCardGiftGoodsVo; @@ -326,65 +327,76 @@ public class EmpCardGiftService extends MybatisBaseServicevo.getGoodsNumber()){ + return rb.setMsg("商品数量不足，请重新选择"); } - card.setSerialNumber(cardArea + num); } - baseMapper.insert(card); - for(GoodsVo vo:dto.getGoodsVoList()){ - EmpCardGiftGoodsDto dto1=new EmpCardGiftGoodsDto(); - dto1.setEmpCardGiftSid(card.getSid()); - dto1.setGoodsSid(vo.getGoodsSid()); - dto1.setGoodsNumber(vo.getSelect()); - empCardGiftGoodsService.save(dto1); + for (int k = 0; k < Integer.valueOf(dto.getCount()); k++) { + EmpCardGrantLog record = new EmpCardGrantLog(); + record.setCreateTime(new DateTime()); + record.setEmpCardSid(dto.getEmpCardSid()); + record.setEmpCardCustomerSid(empCard.getCustomerSid()); + empCardGrantLogService.insert(record); - } - record.setSerialNumber(card.getSerialNumber()); - record.setEmpCardSid(dto.getEmpCardSid()); - record.setCode(dto.getCode()); - empCardGrantLogService.updateById(record); + EmpCardGift card = new EmpCardGift(); + card.setRemarks(dto.getRemarks()); + card.setEmpCardSid(dto.getEmpCardSid()); + card.setEmpCardSerialNumber(empCard.getSerialNumber()); + card.setEmpCardCode(empCard.getCode()); + card.setEmpCardCustomerSid(empCard.getCustomerSid()); + card.setRecordSid(record.getSid()); + card.setState("1"); + card.setCreateTime(new DateTime()); + card.setGrantDate(new Date()); - EmpAppletVo vo = empCardService.getEmpCardBySid(empCard.getSid()).getData(); - int i = 0; - for (com.yxt.yyth.api.lpkgiftcard.GoodsVo vo1 : vo.getGoodsVos()) { - EmpCardGrantLogVo goods1 = empCardGrantLogService.recordListGoods(dto.getEmpCardSid(), vo1.getGoodsSid()).getData(); - if (null != goods1) { - if (vo1.getNum() <= goods1.getGoodsNumber()) { - i++; + String cardArea="9"; + String maxSerNum = baseMapper.selctMaxSerNum(cardArea); + String uuid = UniqueIdGenerator.generateUniqueID(); + int randomNumber = new Random().nextInt(900000) + 100000; + card.setCodeKey(String.valueOf(randomNumber)); + card.setCode("99"+uuid.substring(2)); + if (StringUtils.isBlank(maxSerNum)) { + card.setSerialNumber(cardArea + "0000001"); + } else { + String substringSer = maxSerNum.substring(cardArea.length()); + int i1 = Integer.parseInt(substringSer); + int finNum = i1 + 1; + int length = String.valueOf(finNum).length(); + int len = 7 - length; + String num = String.valueOf(finNum); + for (int a = 0; a < len; a++) { + num = "0" + num; } + card.setSerialNumber(cardArea + num); + } + baseMapper.insert(card); + for(GoodsVo vo:dto.getGoodsVoList()){ + EmpCardGiftGoodsDto dto1=new EmpCardGiftGoodsDto(); + dto1.setEmpCardGiftSid(card.getSid()); + dto1.setGoodsSid(vo.getGoodsSid()); + dto1.setGoodsNumber(vo.getSelect()); + empCardGiftGoodsService.save(dto1); + } - if (vo.getGoodsVos().size() == i) { - empCardService.changState(dto.getEmpCardSid(), "3"); + record.setSerialNumber(card.getSerialNumber()); + record.setEmpCardSid(dto.getEmpCardSid()); + record.setCode(dto.getCode()); + empCardGrantLogService.updateById(record); + + EmpAppletVo vo = empCardService.getEmpCardBySid(empCard.getSid()).getData(); + int i = 0; + for (com.yxt.yyth.api.lpkgiftcard.GoodsVo vo1 : vo.getGoodsVos()) { + EmpCardGrantLogVo goods1 = empCardGrantLogService.recordListGoods(dto.getEmpCardSid(), vo1.getGoodsSid()).getData(); + if (null != goods1) { + if (vo1.getNum() <= goods1.getGoodsNumber()) { + i++; + } + } + if (vo.getGoodsVos().size() == i) { + empCardService.changState(dto.getEmpCardSid(), "3"); + } } } return rb.success(); diff --git a/src/main/java/com/yxt/yyth/biz/lpkgiftbag/LpkGiftBagMapper.xml b/src/main/java/com/yxt/yyth/biz/lpkgiftbag/LpkGiftBagMapper.xml index 0f0ffca..ada0003 100644 --- a/src/main/java/com/yxt/yyth/biz/lpkgiftbag/LpkGiftBagMapper.xml +++ b/src/main/java/com/yxt/yyth/biz/lpkgiftbag/LpkGiftBagMapper.xml @@ -21,7 +21,8 @@ boundary, boundaryPrice, iconUrl, - isEnable + isEnable, + isGrounding from lpk_giftbag ${ew.sqlSegment} diff --git a/src/main/java/com/yxt/yyth/biz/lpkgiftbag/LpkGiftBagService.java b/src/main/java/com/yxt/yyth/biz/lpkgiftbag/LpkGiftBagService.java index ab8df40..0fe7875 100644 --- a/src/main/java/com/yxt/yyth/biz/lpkgiftbag/LpkGiftBagService.java +++ b/src/main/java/com/yxt/yyth/biz/lpkgiftbag/LpkGiftBagService.java @@ -183,7 +183,7 @@ public class LpkGiftBagService extends MybatisBaseService pagging = baseMapper.giftBagList(); return rb.success().setData(pagging); } - public ResultBean isGrounding(String sid,String state) { + public ResultBean isGrounding(String sid,String state) { ResultBean rb = new ResultBean().fail(); LpkGiftBag bag=baseMapper.selectOne(new QueryWrapper().eq("sid",sid)); bag.setIsGrounding(state); diff --git a/src/main/java/com/yxt/yyth/biz/lpkgiftcard/LpkGiftCardMapper.xml b/src/main/java/com/yxt/yyth/biz/lpkgiftcard/LpkGiftCardMapper.xml index abaa195..491a7bc 100644 --- a/src/main/java/com/yxt/yyth/biz/lpkgiftcard/LpkGiftCardMapper.xml +++ b/src/main/java/com/yxt/yyth/biz/lpkgiftcard/LpkGiftCardMapper.xml @@ -182,37 +182,6 @@ LEFT JOIN lpk_goods d ON d.sid = c.goodsSid GROUP BY a.sid, - c.goodsSid UNION ALL - SELECT - a.CODE AS CODE, - a.createTime AS createTime, - CASE - WHEN a.CODE IS NOT NULL THEN - '福利卡' - END cardType, - CASE - a.state - WHEN 1 THEN - '未绑卡' - WHEN 2 THEN - '未绑卡' - WHEN 3 THEN - '未预约' - WHEN 4 THEN - '已预约' - WHEN 5 THEN - '已完成' - END stateValue, - a.customerSid AS bind, - a.bindDate AS bindDate, - d.NAME AS goodsName, - c.goodsNumber AS goodsNumber - FROM - emp_card_gift a - LEFT JOIN emp_card_gift_goods c ON c.empCardGiftSid = a.sid - LEFT JOIN lpk_goods d ON d.sid = c.goodsSid - GROUP BY - a.sid, - c.goodsSid; + c.goodsSid \ No newline at end of file diff --git a/src/main/java/com/yxt/yyth/config/SaTokenGloableException.java b/src/main/java/com/yxt/yyth/config/SaTokenGloableException.java index afb0517..9029af6 100644 --- a/src/main/java/com/yxt/yyth/config/SaTokenGloableException.java +++ b/src/main/java/com/yxt/yyth/config/SaTokenGloableException.java @@ -31,11 +31,13 @@ public class SaTokenGloableException extends GlobalExceptionHandler { } @ExceptionHandler({Exception.class}) public ResultBean handleException(Exception e) { - - if(e.getMessage().contains("token 无效：")){ - L.error(e.getMessage(), e); - return ResultBean.fireFail().setCode("5000").setMsg("系统异常：：" + e.getMessage()); + if(null !=e.getMessage()){ + if(e.getMessage().contains("token 无效：")){ + L.error(e.getMessage(), e); + return ResultBean.fireFail().setCode("5000").setMsg("系统异常：：" + e.getMessage()); + } } + L.error(e.getMessage(), e); return ResultBean.fireFail().setMsg("系统异常：：" + e.getMessage()); }