From b9ffcb7e034ba7e889246f62d803960a507d3e97 Mon Sep 17 00:00:00 2001 From: fanzongzhe <285169773@qq.com> Date: Sun, 21 Jan 2024 12:01:07 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E7=94=9F=E6=88=90=E7=BB=91=E5=8D=A1?= =?UTF-8?q?=E6=B5=81=E6=B0=B4=E8=AE=B0=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/vegereplenish/VegeReplenish.java | 31 ++ .../VegeReplenishDetail.java | 32 ++ .../yythmall/biz/empcard/EmpCardService.java | 135 ++++--- .../biz/empcardgift/EmpCardGiftService.java | 347 +++++++++--------- .../EmpCardGiftGoodsMapper.java | 2 + .../EmpCardGiftGoodsMapper.xml | 24 +- .../EmpCardGiftGoodsService.java | 5 + .../biz/lpkgiftbag/LpkGiftBagRest.java | 3 +- .../biz/lpkgiftbag/LpkGiftBagService.java | 2 +- .../biz/lpkgiftcard/LpkGiftCardService.java | 197 +++++----- .../vegereplenish/VegeReplenishMapper.java | 19 + .../biz/vegereplenish/VegeReplenishMapper.xml | 8 + .../biz/vegereplenish/VegeReplenishRest.java | 27 ++ .../vegereplenish/VegeReplenishService.java | 129 +++++++ .../VegeReplenishDetailMapper.java | 15 + .../VegeReplenishDetailMapper.xml | 8 + .../VegeReplenishDetailRest.java | 19 + .../VegeReplenishDetailService.java | 15 + 18 files changed, 696 insertions(+), 322 deletions(-) create mode 100644 src/main/java/com/yxt/yythmall/api/vegereplenish/VegeReplenish.java create mode 100644 src/main/java/com/yxt/yythmall/api/vegereplenishdetail/VegeReplenishDetail.java create mode 100644 src/main/java/com/yxt/yythmall/biz/vegereplenish/VegeReplenishMapper.java create mode 100644 src/main/java/com/yxt/yythmall/biz/vegereplenish/VegeReplenishMapper.xml create mode 100644 src/main/java/com/yxt/yythmall/biz/vegereplenish/VegeReplenishRest.java create mode 100644 src/main/java/com/yxt/yythmall/biz/vegereplenish/VegeReplenishService.java create mode 100644 src/main/java/com/yxt/yythmall/biz/vegereplenishdetail/VegeReplenishDetailMapper.java create mode 100644 src/main/java/com/yxt/yythmall/biz/vegereplenishdetail/VegeReplenishDetailMapper.xml create mode 100644 src/main/java/com/yxt/yythmall/biz/vegereplenishdetail/VegeReplenishDetailRest.java create mode 100644 src/main/java/com/yxt/yythmall/biz/vegereplenishdetail/VegeReplenishDetailService.java diff --git a/src/main/java/com/yxt/yythmall/api/vegereplenish/VegeReplenish.java b/src/main/java/com/yxt/yythmall/api/vegereplenish/VegeReplenish.java new file mode 100644 index 0000000..a72c5e4 --- /dev/null +++ b/src/main/java/com/yxt/yythmall/api/vegereplenish/VegeReplenish.java @@ -0,0 +1,31 @@ +package com.yxt.yythmall.api.vegereplenish; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModel; +import lombok.Data; + +import java.util.Date; +import java.util.UUID; + +/** + * @author Fan + * @description + * @date 2024/1/21 10:49 + */ + +@ApiModel(value = "绑卡记录", description = "绑卡记录") +@TableName("vege_replenish") +@Data +public class VegeReplenish { + + private String id; + private String sid= UUID.randomUUID().toString(); + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8") + private Date createTime; + private String remarks; + private String customerSid;//客户sid + private String cardCode;//卡编码，个人卡、企业卡是卡编码，转赠记录的是转赠编码 + private String cardtype;//0 个人卡 1 企业卡 2 转赠的 + +} diff --git a/src/main/java/com/yxt/yythmall/api/vegereplenishdetail/VegeReplenishDetail.java b/src/main/java/com/yxt/yythmall/api/vegereplenishdetail/VegeReplenishDetail.java new file mode 100644 index 0000000..c9cce26 --- /dev/null +++ b/src/main/java/com/yxt/yythmall/api/vegereplenishdetail/VegeReplenishDetail.java @@ -0,0 +1,32 @@ +package com.yxt.yythmall.api.vegereplenishdetail; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModel; +import lombok.Data; + +import java.util.Date; +import java.util.UUID; + +/** + * @author Fan + * @description + * @date 2024/1/21 10:49 + */ + +@ApiModel(value = "绑卡记录商品信息", description = "绑卡记录商品信息") +@TableName("vege_replenish_detail") +@Data +public class VegeReplenishDetail { + + private String id; + private String sid = UUID.randomUUID().toString(); + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date createTime; + private String remarks; + private String orderSid;//订单SID + private String goodsSid;//商品Sid + private String goodsName;//商品名称 + private Integer goodsNumber;//商品数量 + +} diff --git a/src/main/java/com/yxt/yythmall/biz/empcard/EmpCardService.java b/src/main/java/com/yxt/yythmall/biz/empcard/EmpCardService.java index 3edd52e..ec2da8d 100644 --- a/src/main/java/com/yxt/yythmall/biz/empcard/EmpCardService.java +++ b/src/main/java/com/yxt/yythmall/biz/empcard/EmpCardService.java @@ -42,6 +42,7 @@ import com.yxt.yythmall.biz.lpkgoods.LpkGoodsService; import com.yxt.yythmall.biz.lpkreserveorder.LpkReserveOrderService; import com.yxt.yythmall.biz.lpkreserveordergoods.LpkReserveOrderGoodsService; import com.yxt.yythmall.biz.lpkstore.LpkStoreService; +import com.yxt.yythmall.biz.vegereplenish.VegeReplenishService; import com.yxt.yythmall.biz.vegetablecellar.VegetableCellarService; import com.yxt.yythmall.utils.StyleUtils; import org.apache.poi.ss.usermodel.HorizontalAlignment; @@ -93,6 +94,8 @@ public class EmpCardService extends MybatisBaseService { @Autowired private VegetableCellarService vegetableCellarService; @Autowired + private VegeReplenishService vegeReplenishService; + @Autowired private HttpServletResponse response; @Value("${image.url.prefix:http://127.0.0.1:8080/upload/}") private String urlPrefix; @@ -100,7 +103,6 @@ public class EmpCardService extends MybatisBaseService { String qrUrl; - public ResultBean bindCard(EmpCardDto bindCardDto) { ResultBean rb = new ResultBean().fail(); EmpCard lpkGiftCard = baseMapper.selectOne(new QueryWrapper().eq("code", bindCardDto.getCode()) @@ -121,6 +123,7 @@ public class EmpCardService extends MybatisBaseService { baseMapper.updateById(lpkGiftCard); return rb.success().setMsg("绑定成功"); } + public ResultBean bindCardA(BindCardDto bindCardDto) { ResultBean rb = new ResultBean().fail(); EmpCard lpkGiftCard = baseMapper.selectOne(new QueryWrapper().eq("code", bindCardDto.getCode()) @@ -139,31 +142,33 @@ public class EmpCardService extends MybatisBaseService { lpkGiftCard.setState("2"); lpkGiftCard.setBindDate(new Date()); baseMapper.updateById(lpkGiftCard); - List k=baseMapper.getGoodsList(lpkGiftCard.getSid()); - VegetableCellarDto dto=new VegetableCellarDto(); + List k = baseMapper.getGoodsList(lpkGiftCard.getSid()); + VegetableCellarDto dto = new VegetableCellarDto(); dto.setCustomerSid(dto.getCustomerSid()); dto.setVos(k); vegetableCellarService.save1Goods(dto); + vegeReplenishService.saveBindRecord(bindCardDto, "1"); return rb.success().setMsg("绑定成功"); } public ResultBean updateEmpCardState(String empCardSid) { ResultBean rb = new ResultBean().fail(); - List vos=baseMapper.selEmpCardSid(empCardSid); - int i=0; - for(EmpCardVo vo:vos){ - EmpCardGrantLogVo empCardGrantLogVo=empCardGrantLogService.recordGoodsSid(empCardSid,vo.getGoodsSid()).getData(); - if(vo.getGoodsNumber()==empCardGrantLogVo.getGoodsNumber()){ + List vos = baseMapper.selEmpCardSid(empCardSid); + int i = 0; + for (EmpCardVo vo : vos) { + EmpCardGrantLogVo empCardGrantLogVo = empCardGrantLogService.recordGoodsSid(empCardSid, vo.getGoodsSid()).getData(); + if (vo.getGoodsNumber() == empCardGrantLogVo.getGoodsNumber()) { i++; } - if(i==vos.size()){ - EmpCard empCard=baseMapper.selectOne(new QueryWrapper().eq("sid",empCardSid)); + if (i == vos.size()) { + EmpCard empCard = baseMapper.selectOne(new QueryWrapper().eq("sid", empCardSid)); empCard.setState("3"); baseMapper.updateById(empCard); } } return rb.success().setMsg("绑定成功"); } + @Transactional(rollbackFor = Exception.class) public ResultBean generateCard(EmpCardDto dto) { ResultBean rb = ResultBean.fireFail(); @@ -231,6 +236,7 @@ public class EmpCardService extends MybatisBaseService { empCardBuildRecordService.updateById(cardBuildRecord); return rb.success(); } + public ResultBean> cardList(PagerQuery pq) { ResultBean rb = ResultBean.fireFail(); EmpCardQuery query = pq.getParams(); @@ -250,6 +256,7 @@ public class EmpCardService extends MybatisBaseService { PagerVo p = PagerUtil.pageToVo(pagging, null); return rb.success().setData(p); } + public ResultBean> recordDetails(PagerQuery pq) { ResultBean rb = ResultBean.fireFail(); EmpCardQuery query = pq.getParams(); @@ -270,6 +277,7 @@ public class EmpCardService extends MybatisBaseService { PagerVo p = PagerUtil.pageToVo(pagging, null); return rb.success().setData(p); } + public void exportExcel(LpkGiftCardListQuery query) { // String finUrl = "https://supervise.yxtsoft.com/lpkapi?qy="; @@ -307,11 +315,13 @@ public class EmpCardService extends MybatisBaseService { ExportExcelUtils.export(fileNameURL, exportList, EmpCardExport.class, response); } + public ResultBean cardGrantCount(String recordSid) { ResultBean rb = new ResultBean().fail(); Integer i = baseMapper.cardGrantCount(recordSid); return rb.success().setData(i); } + public ResultBean getEmpCardByCustomerSid(PagerQuery pq) { ResultBean rb = new ResultBean().fail(); EmpCardQuery query = pq.getParams(); @@ -330,13 +340,14 @@ public class EmpCardService extends MybatisBaseService { SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); return rb.success().setData(p); } + public ResultBean> getEmpCardsBySid(String sid) { ResultBean rb = new ResultBean().fail(); EmpAppletNewVo vo = baseMapper.getEmpCardsBySid(sid); - List list=lpkGiftBagGoodsService.getGoodsByEmpGiftSid(sid); - List list1=new ArrayList<>(); + List list = lpkGiftBagGoodsService.getGoodsByEmpGiftSid(sid); + List list1 = new ArrayList<>(); list.forEach(s -> { - LpkGifGoodsVo g=new LpkGifGoodsVo(); + LpkGifGoodsVo g = new LpkGifGoodsVo(); EmpCardGiftVo goods = empCardGiftService.getEmpCardGoods(vo.getSid(), s.getGoodsSid()).getData(); LpkReserveOrderGoods goodsOne = lpkReserveOrderGoodsService.getReserveByCardSid(vo.getSid(), s.getGoodsSid()).getData(); GoodsVo goodsVo = new GoodsVo(); @@ -346,24 +357,24 @@ public class EmpCardService extends MybatisBaseService { goodsVo.setLNum(0); } else { if (null != goods && null != goodsOne) { - if ((goods.getGoodsNumber()+goodsOne.getGoodsNumber()) != s.getGoodsNumber()) { - goodsVo.setLNum(s.getGoodsNumber() - goods.getGoodsNumber()- goodsOne.getGoodsNumber()); + if ((goods.getGoodsNumber() + goodsOne.getGoodsNumber()) != s.getGoodsNumber()) { + goodsVo.setLNum(s.getGoodsNumber() - goods.getGoodsNumber() - goodsOne.getGoodsNumber()); } - } else if(null != goodsOne){ + } else if (null != goodsOne) { if (goodsOne.getGoodsNumber() != s.getGoodsNumber()) { - goodsVo.setLNum(s.getGoodsNumber()- goodsOne.getGoodsNumber()); + goodsVo.setLNum(s.getGoodsNumber() - goodsOne.getGoodsNumber()); } - }else if(null != goods){ + } else if (null != goods) { if (goods.getGoodsNumber() != s.getGoodsNumber()) { goodsVo.setLNum(s.getGoodsNumber() - goods.getGoodsNumber()); } - }else{ + } else { goodsVo.setLNum(s.getGoodsNumber()); } - if(goodsVo.getLNum()!=0){ + if (goodsVo.getLNum() != 0) { // g.setContent("剩余"+goodsVo.getLNum()+"份/"+"共"+s.getGoodsNumber()+"份"); - g.setContent("共"+(int)goodsVo.getLNum()+"份"); - g.setRemarks(s.getWeight()+s.getSpecificationUnit()+"/"+s.getUnitName()); + g.setContent("共" + (int) goodsVo.getLNum() + "份"); + g.setRemarks(s.getWeight() + s.getSpecificationUnit() + "/" + s.getUnitName()); g.setGoodsName(s.getGoodsName()); list1.add(g); } @@ -371,6 +382,7 @@ public class EmpCardService extends MybatisBaseService { }); return rb.success().setData(list1); } + public ResultBean getEmpCardBySid(String sid) { ResultBean rb = new ResultBean().fail(); EmpAppletVo vo = baseMapper.getEmpCardBySid(sid); @@ -395,39 +407,39 @@ public class EmpCardService extends MybatisBaseService { goodsVos.add(goodsVo); } else { if (null != goods && null != goodsOne) { - if ((goods.getGoodsNumber()+goodsOne.getGoodsNumber()) != s.getGoodsNumber()) { - goodsVo.setLNum(s.getGoodsNumber() - goods.getGoodsNumber()- goodsOne.getGoodsNumber()); + if ((goods.getGoodsNumber() + goodsOne.getGoodsNumber()) != s.getGoodsNumber()) { + goodsVo.setLNum(s.getGoodsNumber() - goods.getGoodsNumber() - goodsOne.getGoodsNumber()); goodsVo.setSelect(0); } - } else if(null != goodsOne){ + } else if (null != goodsOne) { if (goodsOne.getGoodsNumber() != s.getGoodsNumber()) { - goodsVo.setLNum(s.getGoodsNumber()- goodsOne.getGoodsNumber()); + goodsVo.setLNum(s.getGoodsNumber() - goodsOne.getGoodsNumber()); goodsVo.setSelect(0); } - }else if(null != goods){ + } else if (null != goods) { if (goods.getGoodsNumber() != s.getGoodsNumber()) { goodsVo.setLNum(s.getGoodsNumber() - goods.getGoodsNumber()); goodsVo.setSelect(0); } - }else{ + } else { goodsVo.setLNum(s.getGoodsNumber()); goodsVo.setSelect(0); } goodsVos.add(goodsVo); } }); - List EmpCardGiftVos= empCardGiftService.recordList(vo.getSid()).getData(); - EmpCardGiftVos.forEach(s->{ - List l=empCardGiftGoodsService.getGoodsByEmpCardGiftSid(s.getSid()).getData(); - if(StringUtils.isNotBlank(s.getCustomerSid())){ - EmpCardGift empCardGift=new EmpCardGift(); + List EmpCardGiftVos = empCardGiftService.recordList(vo.getSid()).getData(); + EmpCardGiftVos.forEach(s -> { + List l = empCardGiftGoodsService.getGoodsByEmpCardGiftSid(s.getSid()).getData(); + if (StringUtils.isNotBlank(s.getCustomerSid())) { + EmpCardGift empCardGift = new EmpCardGift(); // BeanUtil.copyProperties(EmpCardGiftVos, empCardGift, "id", "sid"); s.setShare("3"); // empCardGift.setIsShare("3"); // empCardGiftService.updateById(empCardGift); } - l.forEach(c->{ - if(c.getGoodsNumber()!=0){ + l.forEach(c -> { + if (c.getGoodsNumber() != 0) { if (StringUtils.isBlank(s.getGoods())) { s.setGoods(c.getName() + "：" + c.getGoodsNumber() + c.getUnitName()); } else { @@ -441,8 +453,8 @@ public class EmpCardService extends MybatisBaseService { String uuid = UniqueIdGenerator.generateUniqueID(); int randomNumber = new Random().nextInt(900000) + 100000; vo.setGiftCodeKey(String.valueOf(randomNumber)); - vo.setGiftCode("99"+uuid.substring(2)); - vo.setQrCode(qrUrl+vo.getGiftCode()); + vo.setGiftCode("99" + uuid.substring(2)); + vo.setQrCode(qrUrl + vo.getGiftCode()); List empReserveOrderCardVos = lpkReserveOrderService.selOrderByCardSid(sid).getData(); for (LpkReserveOrderCardVo vo2 : empReserveOrderCardVos) { List goods = lpkReserveOrderGoodsService.selByOrderSids(vo2.getSid()); @@ -468,6 +480,7 @@ public class EmpCardService extends MybatisBaseService { vo.setOrderCardVoList(empReserveOrderCardVos); return rb.success().setData(vo); } + public ResultBean changState(String cardSid, String state) { ResultBean rb = new ResultBean().fail(); EmpCard card = baseMapper.selectOne(new QueryWrapper().eq("sid", cardSid)); @@ -476,23 +489,24 @@ public class EmpCardService extends MybatisBaseService { baseMapper.updateById(card); return rb.success().setData("成功"); } - public ResultBean getBagGoods(String sid,String goodsSid) { + + public ResultBean getBagGoods(String sid, String goodsSid) { ResultBean rb = new ResultBean().fail(); - EmpCardVo card = baseMapper.getBagGoods(sid,goodsSid); + EmpCardVo card = baseMapper.getBagGoods(sid, goodsSid); return rb.success().setData(card); } public void cardStatisticsListExport(EmpCardQuery query) { - ResultBean rb=new ResultBean(); + ResultBean rb = new ResultBean(); QueryWrapper qw = new QueryWrapper<>(); qw.eq("1", "1"); - if(StringUtils.isNotBlank(query.getSerialNumber())){ - qw.like("a.serialNumber",query.getSerialNumber()); + if (StringUtils.isNotBlank(query.getSerialNumber())) { + qw.like("a.serialNumber", query.getSerialNumber()); } qw.groupBy("a.sid"); qw.orderByDesc("a.createTime"); // qw.groupBy("c.goodsSid"); - List statisticsExportVos=baseMapper.cardStatisticsListExport(qw); + List statisticsExportVos = baseMapper.cardStatisticsListExport(qw); // statisticsExportVos.forEach(s->{ // if(s.getIsEnable().equals("2")){ // s.setStateValue("已作废"); @@ -500,9 +514,9 @@ public class EmpCardService extends MybatisBaseService { // }); String excelName = "提货卡信息.xlsx"; String fileNameURL = "1"; - response.setContentType( "application/vnd.ms-excel"); + response.setContentType("application/vnd.ms-excel"); response.setCharacterEncoding("utf8"); - response.setHeader("Content-disposition","attachment;filename="+ excelName ); + response.setHeader("Content-disposition", "attachment;filename=" + excelName); ServletOutputStream outputStream = null; try { WriteCellStyle headWriteCellStyle = new WriteCellStyle(); @@ -527,13 +541,14 @@ public class EmpCardService extends MybatisBaseService { } } + public ResultBean cardStatisticsList(PagerQuery pq) { - ResultBean rb=new ResultBean(); + ResultBean rb = new ResultBean(); EmpCardQuery query = pq.getParams(); QueryWrapper qw = new QueryWrapper<>(); qw.eq("1", "1"); - if(StringUtils.isNotBlank(query.getSerialNumber())){ - qw.like("a.serialNumber",query.getSerialNumber()); + if (StringUtils.isNotBlank(query.getSerialNumber())) { + qw.like("a.serialNumber", query.getSerialNumber()); } qw.groupBy("a.sid"); qw.orderByDesc("a.createTime"); @@ -551,11 +566,11 @@ public class EmpCardService extends MybatisBaseService { public ResultBean isSaturAndSun(String cardSid) { ResultBean rb = new ResultBean().fail(); AppletVo appletVo = baseMapper.getCardBySid(cardSid); - Date date =new Date(); - SimpleDateFormat sdf1 =new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); - String nowDate =sdf1.format(date); + Date date = new Date(); + SimpleDateFormat sdf1 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + String nowDate = sdf1.format(date); LocalDate now = DateUtil.parse(nowDate).toSqlDate().toLocalDate(); - LocalDate endD = DateUtil.parse(appletVo.getDateEnd()).toSqlDate().toLocalDate(); + LocalDate endD = DateUtil.parse(appletVo.getDateEnd()).toSqlDate().toLocalDate(); List weekMap = new ArrayList<>(); // 第一个星期六 LocalDate saturday = now.with(DayOfWeek.SATURDAY); @@ -587,13 +602,14 @@ public class EmpCardService extends MybatisBaseService { } /** - *是否转赠 + * 是否转赠 + * * @param sid * @return */ - public ResultBean cardTransfer(String sid ) { - ResultBean rb=new ResultBean(); - EmpCard card=baseMapper.selectOne(new QueryWrapper().eq("sid",sid)); + public ResultBean cardTransfer(String sid) { + ResultBean rb = new ResultBean(); + EmpCard card = baseMapper.selectOne(new QueryWrapper().eq("sid", sid)); card.setIsTransfer("1"); card.setIsItInvalid("1");//失效 baseMapper.updateById(card); @@ -623,7 +639,7 @@ public class EmpCardService extends MybatisBaseService { qw.in("card.serialNumber", serialNumbers); } } - qw.eq("card.isEnable","1"); + qw.eq("card.isEnable", "1"); IPage page = PagerUtil.queryToPage(pq); IPage pagging = baseMapper.selGiftCard(page, qw); pagging.getRecords().forEach(s -> { @@ -634,4 +650,9 @@ public class EmpCardService extends MybatisBaseService { // System.out.println(a); return rb.success().setData(p); } + + public EmpCard selectOneByCodeAndCodeKey(String code, String codeKey) { + return baseMapper.selectOne(new QueryWrapper().eq("code", code) + .eq("codeKey", codeKey)); + } } diff --git a/src/main/java/com/yxt/yythmall/biz/empcardgift/EmpCardGiftService.java b/src/main/java/com/yxt/yythmall/biz/empcardgift/EmpCardGiftService.java index beb25ea..14c9b70 100644 --- a/src/main/java/com/yxt/yythmall/biz/empcardgift/EmpCardGiftService.java +++ b/src/main/java/com/yxt/yythmall/biz/empcardgift/EmpCardGiftService.java @@ -47,6 +47,7 @@ import com.yxt.yythmall.biz.lpkreserveordergoods.LpkReserveOrderGoodsService; import com.yxt.yythmall.biz.lpkstore.LpkStoreService; import com.yxt.yythmall.biz.ordorder.OrdOrderService; import com.yxt.yythmall.biz.ordorderdetails.OrdOrderDetailService; +import com.yxt.yythmall.biz.vegereplenish.VegeReplenishService; import com.yxt.yythmall.biz.vegetablecellar.VegetableCellarService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; @@ -72,11 +73,11 @@ public class EmpCardGiftService extends MybatisBaseService k=baseMapper.getGoodsList(empCardGift.getSid()); - VegetableCellarDto dto=new VegetableCellarDto(); + List k = baseMapper.getGoodsList(empCardGift.getSid()); + VegetableCellarDto dto = new VegetableCellarDto(); dto.setCustomerSid(dto.getCustomerSid()); dto.setVos(k); vegetableCellarService.save1Goods(dto); + vegeReplenishService.saveBindRecord(bindCardDto,"2"); return rb.success().setMsg("绑定成功"); } @@ -201,37 +204,37 @@ public class EmpCardGiftService extends MybatisBaseService> getGifCardsBySid(String sid) { ResultBean rb = new ResultBean().fail(); EmpGiftAppletNVo vo = baseMapper.getGifCardsBySid(sid); - List list=empCardGiftGoodsService.getGoodsByGiftSid(sid).getData(); - List list1=new ArrayList<>(); + List list = empCardGiftGoodsService.getGoodsByGiftSid(sid).getData(); + List list1 = new ArrayList<>(); list.forEach(s -> { - LpkGifGoodsVo g=new LpkGifGoodsVo(); + LpkGifGoodsVo g = new LpkGifGoodsVo(); LpkReserveOrderGoods goods = lpkReserveOrderGoodsService.getReserveByCardSid(vo.getSid(), s.getGoodsSid()).getData(); - EmpCardGiftVo vo1=baseMapper.getEmpCardGoods(vo.getSid(),s.getGoodsSid()); + EmpCardGiftVo vo1 = baseMapper.getEmpCardGoods(vo.getSid(), s.getGoodsSid()); GoodsVo goodsVo = new GoodsVo(); if (vo.getState().equals("已过期")) { goodsVo.setLNum(0); } else if (!vo.isShowBtn()) { goodsVo.setLNum(0); } else { - if (null != goods && null!=vo1) { + if (null != goods && null != vo1) { if (goods.getGoodsNumber() != s.getGoodsNumber()) { - goodsVo.setLNum(s.getGoodsNumber() - goods.getGoodsNumber()-vo1.getGoodsNumber()); + goodsVo.setLNum(s.getGoodsNumber() - goods.getGoodsNumber() - vo1.getGoodsNumber()); } - }else if(null != vo1){ + } else if (null != vo1) { if (vo1.getGoodsNumber() != s.getGoodsNumber()) { - goodsVo.setLNum(s.getGoodsNumber()- vo1.getGoodsNumber()); + goodsVo.setLNum(s.getGoodsNumber() - vo1.getGoodsNumber()); } - }else if(null != goods) { + } else if (null != goods) { if (goods.getGoodsNumber() != s.getGoodsNumber()) { goodsVo.setLNum(s.getGoodsNumber() - goods.getGoodsNumber()); } } else { goodsVo.setLNum(s.getGoodsNumber()); } - if(goodsVo.getLNum()!=0){ + if (goodsVo.getLNum() != 0) { // g.setContent("剩余"+goodsVo.getLNum()+"份/"+"共"+s.getGoodsNumber()+"份"); - g.setContent("共"+(int)goodsVo.getLNum()+"份"); - g.setRemarks(s.getWeight()+s.getSpecificationUnit()+"/"+s.getUnitName()); + g.setContent("共" + (int) goodsVo.getLNum() + "份"); + g.setRemarks(s.getWeight() + s.getSpecificationUnit() + "/" + s.getUnitName()); g.setGoodsName(s.getGoodsName()); list1.add(g); } @@ -239,6 +242,7 @@ public class EmpCardGiftService extends MybatisBaseService getGifCardBySid(String sid) { ResultBean rb = new ResultBean().fail(); EmpGiftAppletVo vo = baseMapper.getGifCardBySid(sid); @@ -247,7 +251,7 @@ public class EmpCardGiftService extends MybatisBaseService { // EmpReserveOrderGoods goods = empReserveOrderGoodsService.getReserveByCardSid(vo.getSid(), s.getGoodsSid()).getData(); LpkReserveOrderGoods goods = lpkReserveOrderGoodsService.getReserveByCardSid(vo.getSid(), s.getGoodsSid()).getData(); - EmpCardGiftVo vo1=baseMapper.getEmpCardGoods(vo.getSid(),s.getGoodsSid()); + EmpCardGiftVo vo1 = baseMapper.getEmpCardGoods(vo.getSid(), s.getGoodsSid()); GoodsVo goodsVo = new GoodsVo(); goodsVo.setGoods(s.getName()); goodsVo.setNum(s.getGoodsNumber()); @@ -262,18 +266,18 @@ public class EmpCardGiftService extends MybatisBaseService empCardGift =baseMapper.selectList(new QueryWrapper().eq("empCardSid",vo.getSid()).eq("cardType","2").orderByDesc("createTime")); - empCardGift.forEach(s->{ - List list1= empCardGiftGoodsService.list(new QueryWrapper().eq("empCardGiftSid",s.getSid())); - list1.forEach(l->{ - LpkGoods goods=lpkGoodsService.getOne(new QueryWrapper().eq("sid",l.getGoodsSid())); - if(StringUtils.isBlank(s.getGoods())){ - s.setGoods(goods.getName()+":"+l.getGoodsNumber()+"份"); - }else{ - s.setGoods(s.getGoods()+" "+goods.getName()+":"+l.getGoodsNumber()+"份"); + List empCardGift = baseMapper.selectList(new QueryWrapper().eq("empCardSid", vo.getSid()).eq("cardType", "2").orderByDesc("createTime")); + empCardGift.forEach(s -> { + List list1 = empCardGiftGoodsService.list(new QueryWrapper().eq("empCardGiftSid", s.getSid())); + list1.forEach(l -> { + LpkGoods goods = lpkGoodsService.getOne(new QueryWrapper().eq("sid", l.getGoodsSid())); + if (StringUtils.isBlank(s.getGoods())) { + s.setGoods(goods.getName() + ":" + l.getGoodsNumber() + "份"); + } else { + s.setGoods(s.getGoods() + " " + goods.getName() + ":" + l.getGoodsNumber() + "份"); } }); }); vo.setEmpCardGifts(empCardGift); vo.setOrderCardVoList(empReserveOrderCardVos); vo.setGoodsVos(goodsVos); - if(vo.getIsSenior().equals("1")){ + if (vo.getIsSenior().equals("1")) { vo.setPName("家庭菜窖"); - }else{ + } else { vo.setPName("亲情菜窖"); } return rb.success().setData(vo); } + public ResultBean> recordList(String empCardSid) { ResultBean rb = ResultBean.fireFail(); List pagging = baseMapper.recordList(empCardSid); return rb.success().setData(pagging); } - public ResultBean shareEmpCard(String sid) { + + public ResultBean shareEmpCard(String sid) { ResultBean rb = new ResultBean().fail(); - EmpCardGift empCardGift=baseMapper.selectOne(new QueryWrapper().eq("sid",sid)); + EmpCardGift empCardGift = baseMapper.selectOne(new QueryWrapper().eq("sid", sid)); empCardGift.setIsShare("2"); baseMapper.updateById(empCardGift); return rb.success().setMsg("成功"); } -// + + // // public ResultBean getReservationBySid(String sid) { // ResultBean rb = new ResultBean().fail(); // EmpGiftAppletVo vo = baseMapper.getGifCardBySid(sid); @@ -404,36 +411,36 @@ public class EmpCardGiftService extends MybatisBaseServicegoodsVo.getLNum()){ + EmpAppletVo empAppletVo = empCardService.getEmpCardBySid(dto.getEmpCardSid()).getData(); + for (com.yxt.yythmall.api.lpkgiftcard.GoodsVo goodsVo : empAppletVo.getGoodsVos()) { + for (GoodsVo gv : dto.getGoodsVoList()) { + if (goodsVo.getGoodsSid().equals(gv.getGoodsSid())) { + if (gv.getSelect() * count > goodsVo.getLNum()) { return rb.setMsg("商品数量不足，请重新选择"); } } } } - LpkGiftBag bag=lpkGiftBagService.getOne(new QueryWrapper().eq("sid",empCard.getGiftbagSid())); + LpkGiftBag bag = lpkGiftBagService.getOne(new QueryWrapper().eq("sid", empCard.getGiftbagSid())); for (int k = 0; k < count; k++) { EmpCardGrantLog record = new EmpCardGrantLog(); record.setCreateTime(new DateTime()); @@ -454,12 +461,12 @@ public class EmpCardGiftService extends MybatisBaseService().eq("cardSid",empCard.getSid())); - if(i1==0){ + int i1 = lpkReserveOrderGoodsMapper.selectCount(new QueryWrapper().eq("cardSid", empCard.getSid())); + if (i1 == 0) { //如果没有预约记录 直接改转赠状态 empCardService.cardTransfer(dto.getEmpCardSid()); - }else{ + } else { empCardService.changState(empCard.getSid(), "5"); } } @@ -530,13 +537,13 @@ public class EmpCardGiftService extends MybatisBaseServicegoodsVo.getLNum()){ + AppletVo empAppletVo = lpkGiftCardService.getGifCardBySid(dto.getEmpCardSid()).getData(); + for (com.yxt.yythmall.api.lpkgiftcard.GoodsVo goodsVo : empAppletVo.getGoodsVos()) { + for (GoodsVo gv : dto.getGoodsVoList()) { + if (goodsVo.getGoodsSid().equals(gv.getGoodsSid())) { + if (gv.getSelect() * count > goodsVo.getLNum()) { return rb.setMsg("商品数量不足，请重新选择"); } } } } - LpkGiftBag bag=lpkGiftBagService.getOne(new QueryWrapper().eq("sid",empCard.getGiftbagSid())); + LpkGiftBag bag = lpkGiftBagService.getOne(new QueryWrapper().eq("sid", empCard.getGiftbagSid())); for (int k = 0; k < count; k++) { EmpCardGift card = new EmpCardGift(); card.setCardType("3"); @@ -590,7 +597,7 @@ public class EmpCardGiftService extends MybatisBaseService().eq("cardSid",empCard.getSid())); - if(i1==0){ + int i1 = lpkReserveOrderGoodsMapper.selectCount(new QueryWrapper().eq("cardSid", empCard.getSid())); + if (i1 == 0) { //如果没有预约记录 直接改转赠状态 lpkGiftCardService.cardTransfer(dto.getEmpCardSid()); - }else{ + } else { lpkGiftCardService.changState(empCard.getSid(), "5"); } } @@ -639,24 +646,24 @@ public class EmpCardGiftService extends MybatisBaseService().eq("sid",dto.getEmpCardSid())); + EmpCardGift empCard = baseMapper.selectOne(new QueryWrapper().eq("sid", dto.getEmpCardSid())); if (null == empCard) { return rb.setMsg("请选择正确的福礼卡"); } - EmpGiftAppletVo empAppletVo =getGifCardBySid(dto.getEmpCardSid()).getData(); - for(GoodsVo goodsVo:empAppletVo.getGoodsVos()){ - for(GoodsVo gv :dto.getGoodsVoList()){ - if(goodsVo.getGoodsSid().equals(gv.getGoodsSid())){ - if(gv.getSelect()*count>goodsVo.getLNum()){ + EmpGiftAppletVo empAppletVo = getGifCardBySid(dto.getEmpCardSid()).getData(); + for (GoodsVo goodsVo : empAppletVo.getGoodsVos()) { + for (GoodsVo gv : dto.getGoodsVoList()) { + if (goodsVo.getGoodsSid().equals(gv.getGoodsSid())) { + if (gv.getSelect() * count > goodsVo.getLNum()) { return rb.setMsg("商品数量不足，请重新选择"); } } @@ -697,7 +704,7 @@ public class EmpCardGiftService extends MybatisBaseService().eq("cardSid",empCard.getSid())); - if(i1==0){ + int i1 = lpkReserveOrderGoodsMapper.selectCount(new QueryWrapper().eq("cardSid", empCard.getSid())); + if (i1 == 0) { //如果没有预约记录 直接改转赠状态 cardTransfer(dto.getEmpCardSid()); - }else{ + } else { changState(empCard.getSid(), "5"); } } @@ -740,24 +747,28 @@ public class EmpCardGiftService extends MybatisBaseService().eq("sid",sid)); + public ResultBean cardTransfer(String sid) { + ResultBean rb = new ResultBean(); + EmpCardGift card = baseMapper.selectOne(new QueryWrapper().eq("sid", sid)); card.setIsTransfer("1"); card.setIsItInvalid("1"); baseMapper.updateById(card); return rb.success().setData("成功"); } + public ResultBean getEmpCardGoods(String empCardSid, String goodsSid) { ResultBean rb = ResultBean.fireFail(); - return rb.success().setData(baseMapper.getEmpCardGoods(empCardSid,goodsSid)); + return rb.success().setData(baseMapper.getEmpCardGoods(empCardSid, goodsSid)); } -// + + // // public ResultBean> cardList(PagerQuery pq) { // ResultBean rb = ResultBean.fireFail(); // EmpCardGiftListQuery query = pq.getParams(); @@ -903,7 +914,8 @@ public class EmpCardGiftService extends MybatisBaseService isSaturAndSun(String cardSid) { ResultBean rb = new ResultBean().fail(); - EmpCardGift empCardGift=baseMapper.selectOne(new QueryWrapper().eq("sid",cardSid)); - SimpleDateFormat sdf1 =new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + EmpCardGift empCardGift = baseMapper.selectOne(new QueryWrapper().eq("sid", cardSid)); + SimpleDateFormat sdf1 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); // LocalDate now = DateUtil.parse(sdf1.format(empCardGift.getStartDate())).toSqlDate().toLocalDate(); LocalDate now = DateUtil.parse(sdf1.format(new Date())).toSqlDate().toLocalDate(); LocalDate endD = DateUtil.parse(sdf1.format(empCardGift.getEndDate())).toSqlDate().toLocalDate(); @@ -1025,13 +1037,13 @@ public class EmpCardGiftService extends MybatisBaseService qw = new QueryWrapper<>(); qw.eq("1", "1"); - if(StringUtils.isNotBlank(params.getSerialNumber())){ - qw.like("a.serialNumber",params.getSerialNumber()); + if (StringUtils.isNotBlank(params.getSerialNumber())) { + qw.like("a.serialNumber", params.getSerialNumber()); } qw.groupBy("a.sid"); qw.orderByDesc("a.createTime"); IPage page = PagerUtil.queryToPage(query); - IPage pagging = baseMapper.empCardGiftStatisticsList(page,qw); + IPage pagging = baseMapper.empCardGiftStatisticsList(page, qw); return rb.success().setData(pagging); } // @@ -1073,8 +1085,8 @@ public class EmpCardGiftService extends MybatisBaseService2 1 、1<2 -1 、1=2 0 - int k=DateUtil.parse(sdf1.format(DateUtil.parse(sdf1.format(new Date())))).compareTo(DateUtil.parse(sdf1.format(DateUtil.parse(sdf1.format(date))))); - if(String.valueOf(k).equals("1")){ - vo.setStart(sdf.format(DateUtil.offsetDay(new Date(),+2))); - }else{ - vo.setStart(sdf.format(DateUtil.offsetDay(new Date(),+1))); + int k = DateUtil.parse(sdf1.format(DateUtil.parse(sdf1.format(new Date())))).compareTo(DateUtil.parse(sdf1.format(DateUtil.parse(sdf1.format(date))))); + if (String.valueOf(k).equals("1")) { + vo.setStart(sdf.format(DateUtil.offsetDay(new Date(), +2))); + } else { + vo.setStart(sdf.format(DateUtil.offsetDay(new Date(), +1))); } - if(StringUtils.isNotBlank(vo.getDateStart())){ - int i=DateUtil.parse(sdf.format(DateUtil.parse(vo.getStart()))).compareTo(DateUtil.parse(sdf.format(DateUtil.parse(vo.getDateEnd())))); - if(String.valueOf(i).equals("-1")){ - long o=DateUtil.between(DateUtil.parse(vo.getStart()),DateUtil.parse(vo.getDateEnd()), DateUnit.DAY); - if(o<10){ - vo.setEnd(sdf.format(DateUtil.offsetDay(DateUtil.parse(vo.getDateEnd()),10))); - }else{ + if (StringUtils.isNotBlank(vo.getDateStart())) { + int i = DateUtil.parse(sdf.format(DateUtil.parse(vo.getStart()))).compareTo(DateUtil.parse(sdf.format(DateUtil.parse(vo.getDateEnd())))); + if (String.valueOf(i).equals("-1")) { + long o = DateUtil.between(DateUtil.parse(vo.getStart()), DateUtil.parse(vo.getDateEnd()), DateUnit.DAY); + if (o < 10) { + vo.setEnd(sdf.format(DateUtil.offsetDay(DateUtil.parse(vo.getDateEnd()), 10))); + } else { // end=sdf.format(DateUtil.parse(dateEnd)); - vo.setEnd(sdf.format(DateUtil.offsetDay(DateUtil.parse(vo.getStart()),4))); + vo.setEnd(sdf.format(DateUtil.offsetDay(DateUtil.parse(vo.getStart()), 4))); } - }else{ - if(String.valueOf(k).equals("1")){ - vo.setEnd(sdf.format(DateUtil.offsetDay(DateUtil.parse(vo.getDateEnd()),2))); - }else{ - vo.setEnd(sdf.format(DateUtil.offsetDay(DateUtil.parse(vo.getDateEnd()),1))); + } else { + if (String.valueOf(k).equals("1")) { + vo.setEnd(sdf.format(DateUtil.offsetDay(DateUtil.parse(vo.getDateEnd()), 2))); + } else { + vo.setEnd(sdf.format(DateUtil.offsetDay(DateUtil.parse(vo.getDateEnd()), 1))); } } } vo.setReserveDate(vo.getStart()); return vo; } + @Transactional(rollbackFor = Exception.class) public ResultBean generateTopEmpCard(String mainSid) { ResultBean rb = ResultBean.fireFail(); - int count=0; - OrdOrder order=ordOrderService.getOne(new QueryWrapper().eq("mainSid",mainSid)); - count=order.getCardNumber(); - List list=ordOrderDetailsService.list(new QueryWrapper().eq("orderSid",order.getSid())); + int count = 0; + OrdOrder order = ordOrderService.getOne(new QueryWrapper().eq("mainSid", mainSid)); + count = order.getCardNumber(); + List list = ordOrderDetailsService.list(new QueryWrapper().eq("orderSid", order.getSid())); for (int k = 0; k < count; k++) { EmpCardGift card = new EmpCardGift(); card.setCardType("3"); @@ -1153,19 +1166,23 @@ public class EmpCardGiftService extends MybatisBaseService().eq("code", code) + .eq("codeKey", codeKey)); + } + /// } diff --git a/src/main/java/com/yxt/yythmall/biz/empcardgiftgoods/EmpCardGiftGoodsMapper.java b/src/main/java/com/yxt/yythmall/biz/empcardgiftgoods/EmpCardGiftGoodsMapper.java index aeab9ad..6c70ec8 100644 --- a/src/main/java/com/yxt/yythmall/biz/empcardgiftgoods/EmpCardGiftGoodsMapper.java +++ b/src/main/java/com/yxt/yythmall/biz/empcardgiftgoods/EmpCardGiftGoodsMapper.java @@ -33,4 +33,6 @@ public interface EmpCardGiftGoodsMapper extends BaseMapper { "WHERE\n" + "\tg.sid =#{sid}") List getGoodsByGiftSid(String sid); + + List getGoodsDetailsByEmpCardGiftSid(@Param("empCardGiftSid") String empCardGiftSid); } diff --git a/src/main/java/com/yxt/yythmall/biz/empcardgiftgoods/EmpCardGiftGoodsMapper.xml b/src/main/java/com/yxt/yythmall/biz/empcardgiftgoods/EmpCardGiftGoodsMapper.xml index 8304be1..437fdaa 100644 --- a/src/main/java/com/yxt/yythmall/biz/empcardgiftgoods/EmpCardGiftGoodsMapper.xml +++ b/src/main/java/com/yxt/yythmall/biz/empcardgiftgoods/EmpCardGiftGoodsMapper.xml @@ -4,16 +4,22 @@ + \ No newline at end of file diff --git a/src/main/java/com/yxt/yythmall/biz/empcardgiftgoods/EmpCardGiftGoodsService.java b/src/main/java/com/yxt/yythmall/biz/empcardgiftgoods/EmpCardGiftGoodsService.java index 4e10e04..8dff5c6 100644 --- a/src/main/java/com/yxt/yythmall/biz/empcardgiftgoods/EmpCardGiftGoodsService.java +++ b/src/main/java/com/yxt/yythmall/biz/empcardgiftgoods/EmpCardGiftGoodsService.java @@ -47,4 +47,9 @@ public class EmpCardGiftGoodsService extends MybatisBaseService list= baseMapper.getGoodsByGiftSid(sid); return rb.success().setData(list); } + public ResultBean> getGoodsDetailsByEmpCardGiftSid(String empCardGiftSid) { + ResultBean rb = ResultBean.fireFail(); + List list= baseMapper.getGoodsDetailsByEmpCardGiftSid(empCardGiftSid); + return rb.success().setData(list); + } } diff --git a/src/main/java/com/yxt/yythmall/biz/lpkgiftbag/LpkGiftBagRest.java b/src/main/java/com/yxt/yythmall/biz/lpkgiftbag/LpkGiftBagRest.java index b1ff161..b38b2d1 100644 --- a/src/main/java/com/yxt/yythmall/biz/lpkgiftbag/LpkGiftBagRest.java +++ b/src/main/java/com/yxt/yythmall/biz/lpkgiftbag/LpkGiftBagRest.java @@ -4,6 +4,7 @@ import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; import com.yxt.yythmall.api.lpkgiftbag.LpkGiftBagDto; +import com.yxt.yythmall.api.lpkgiftbag.LpkGiftBagInitVo; import com.yxt.yythmall.api.lpkgiftbag.LpkGiftBagQuery; import com.yxt.yythmall.api.lpkgiftbag.LpkGiftBagVo; import io.swagger.annotations.Api; @@ -39,7 +40,7 @@ public class LpkGiftBagRest { @ApiOperation("礼包初始化") @GetMapping("/giftBagInit/{sid}") - public ResultBean giftBagInit(@PathVariable String sid) { + public ResultBean giftBagInit(@PathVariable String sid) { return lpkGiftBagService.giftBagInit(sid); } diff --git a/src/main/java/com/yxt/yythmall/biz/lpkgiftbag/LpkGiftBagService.java b/src/main/java/com/yxt/yythmall/biz/lpkgiftbag/LpkGiftBagService.java index 3d56eaa..c2afb3a 100644 --- a/src/main/java/com/yxt/yythmall/biz/lpkgiftbag/LpkGiftBagService.java +++ b/src/main/java/com/yxt/yythmall/biz/lpkgiftbag/LpkGiftBagService.java @@ -117,7 +117,7 @@ public class LpkGiftBagService extends MybatisBaseService giftBagInit(String sid) { ResultBean rb = ResultBean.fireFail(); LpkGiftBagInitVo vo = new LpkGiftBagInitVo(); LpkGiftBag entity = fetchBySid(sid); diff --git a/src/main/java/com/yxt/yythmall/biz/lpkgiftcard/LpkGiftCardService.java b/src/main/java/com/yxt/yythmall/biz/lpkgiftcard/LpkGiftCardService.java index e406c8e..92b4d4a 100644 --- a/src/main/java/com/yxt/yythmall/biz/lpkgiftcard/LpkGiftCardService.java +++ b/src/main/java/com/yxt/yythmall/biz/lpkgiftcard/LpkGiftCardService.java @@ -64,6 +64,7 @@ import com.yxt.yythmall.biz.lpkreserveorder.LpkReserveOrderService; import com.yxt.yythmall.biz.lpkreserveordergoods.LpkReserveOrderGoodsService; import com.yxt.yythmall.biz.lpkstore.LpkStoreService; import com.yxt.yythmall.biz.shoppingcart.ShoppingCartService; +import com.yxt.yythmall.biz.vegereplenish.VegeReplenishService; import com.yxt.yythmall.biz.vegetablecellar.VegetableCellarService; import com.yxt.yythmall.utils.StyleUtils; import org.apache.poi.hssf.usermodel.HSSFWorkbook; @@ -127,6 +128,8 @@ public class LpkGiftCardService extends MybatisBaseService().eq("code", bindCardDto.getCode())); @@ -195,16 +199,18 @@ public class LpkGiftCardService extends MybatisBaseService k=baseMapper.getGoodsList(lpkGiftCard.getSid()); - VegetableCellarDto dto=new VegetableCellarDto(); + List k = baseMapper.getGoodsList(lpkGiftCard.getSid()); + VegetableCellarDto dto = new VegetableCellarDto(); //生成绑卡流水 //加入菜窖 dto.setCustomerSid(dto.getCustomerSid()); dto.setVos(k); vegetableCellarService.save1Goods(dto); + vegeReplenishService.saveBindRecord(bindCardDto, "0"); return rb.success().setMsg("绑定成功"); } + public ResultBean getGifCardByCustomerSid(PagerQuery pq) { ResultBean rb = new ResultBean().fail(); LpkGiftCardQuery query = pq.getParams(); @@ -221,6 +227,7 @@ public class LpkGiftCardService extends MybatisBaseService pq) { ResultBean rb = new ResultBean().fail(); LpkGiftCardQuery query = pq.getParams(); @@ -234,18 +241,18 @@ public class LpkGiftCardService extends MybatisBaseService page = PagerUtil.queryToPage(pq); IPage list = baseMapper.getGifCardsByCustomerSid(page, query.getCustomerSid()); - list.getRecords().forEach(s->{ - if(s.getLogo().equals("1")){ + list.getRecords().forEach(s -> { + if (s.getLogo().equals("1")) { //家庭卡 - List vo= getGifCardsBySid(s.getSid()).getData(); + List vo = getGifCardsBySid(s.getSid()).getData(); s.setList(vo); - }else if(s.getLogo().equals("2")){ + } else if (s.getLogo().equals("2")) { //亲情卡 - List vo= empCardGiftService.getGifCardsBySid(s.getSid()).getData(); + List vo = empCardGiftService.getGifCardsBySid(s.getSid()).getData(); s.setList(vo); } else if (s.getLogo().equals("3")) { //企业卡 - List list1=empCardService.getEmpCardsBySid(s.getSid()).getData(); + List list1 = empCardService.getEmpCardsBySid(s.getSid()).getData(); s.setList(list1); } }); @@ -253,41 +260,42 @@ public class LpkGiftCardService extends MybatisBaseService> getGifCardsBySid(String sid) { ResultBean rb = new ResultBean().fail(); AppletNewVo vo = baseMapper.getGifCardsBySid(sid); - List list=LpkGiftBagGoodsService.getGoodsByGiftSid(sid); - List list1=new ArrayList<>(); + List list = LpkGiftBagGoodsService.getGoodsByGiftSid(sid); + List list1 = new ArrayList<>(); List goodsVos = new ArrayList<>(); list.forEach(s -> { - LpkGifGoodsVo g=new LpkGifGoodsVo(); + LpkGifGoodsVo g = new LpkGifGoodsVo(); LpkReserveOrderGoods goods = lpkReserveOrderGoodsService.getReserveByCardSid(vo.getSid(), s.getGoodsSid()).getData(); - EmpCardGiftVo vo1=empCardGiftService.getEmpCardGoods(vo.getSid(),s.getGoodsSid()).getData(); + EmpCardGiftVo vo1 = empCardGiftService.getEmpCardGoods(vo.getSid(), s.getGoodsSid()).getData(); GoodsVo goodsVo = new GoodsVo(); if (vo.getState().equals("已过期")) { goodsVo.setLNum(0); } else if (!vo.isShowBtn()) { goodsVo.setLNum(0); } else { - if (null != goods && null!=vo1) { + if (null != goods && null != vo1) { if (goods.getGoodsNumber() != s.getGoodsNumber()) { - goodsVo.setLNum(s.getGoodsNumber() - goods.getGoodsNumber()-vo1.getGoodsNumber()); + goodsVo.setLNum(s.getGoodsNumber() - goods.getGoodsNumber() - vo1.getGoodsNumber()); } - } else if(null != vo1){ + } else if (null != vo1) { if (vo1.getGoodsNumber() != s.getGoodsNumber()) { - goodsVo.setLNum(s.getGoodsNumber()- vo1.getGoodsNumber()); + goodsVo.setLNum(s.getGoodsNumber() - vo1.getGoodsNumber()); } - }else if(null != goods) { + } else if (null != goods) { if (goods.getGoodsNumber() != s.getGoodsNumber()) { goodsVo.setLNum(s.getGoodsNumber() - goods.getGoodsNumber()); } - }else { + } else { goodsVo.setLNum(s.getGoodsNumber()); } - if(goodsVo.getLNum()!=0){ + if (goodsVo.getLNum() != 0) { // g.setContent("剩余"+goodsVo.getLNum()+"份/"+"共"+s.getGoodsNumber()+"份"); - g.setContent("共"+(int)goodsVo.getLNum()+"份"); - g.setRemarks(s.getWeight()+s.getSpecificationUnit()+"/"+s.getUnitName()); + g.setContent("共" + (int) goodsVo.getLNum() + "份"); + g.setRemarks(s.getWeight() + s.getSpecificationUnit() + "/" + s.getUnitName()); g.setGoodsName(s.getGoodsName()); list1.add(g); } @@ -296,6 +304,7 @@ public class LpkGiftCardService extends MybatisBaseService getGifCardBySid(String sid) { ResultBean rb = new ResultBean().fail(); AppletVo vo = baseMapper.getGifCardBySid(sid); @@ -303,7 +312,7 @@ public class LpkGiftCardService extends MybatisBaseService goodsVos = new ArrayList<>(); list.forEach(s -> { LpkReserveOrderGoods goods = lpkReserveOrderGoodsService.getReserveByCardSid(vo.getSid(), s.getGoodsSid()).getData(); - EmpCardGiftVo vo1=empCardGiftService.getEmpCardGoods(vo.getSid(),s.getGoodsSid()).getData(); + EmpCardGiftVo vo1 = empCardGiftService.getEmpCardGoods(vo.getSid(), s.getGoodsSid()).getData(); GoodsVo goodsVo = new GoodsVo(); goodsVo.setGoods(s.getGoodsName()); goodsVo.setNum(s.getGoodsNumber()); @@ -318,23 +327,23 @@ public class LpkGiftCardService extends MybatisBaseService empCardGift =empCardGiftService.list(new QueryWrapper().eq("empCardSid",vo.getSid()).eq("cardType","3").orderByDesc("createTime")); - empCardGift.forEach(s->{ - List list1= empCardGiftGoodsService.list(new QueryWrapper().eq("empCardGiftSid",s.getSid())); - list1.forEach(l->{ - LpkGoods goods=lpkGoodsService.getOne(new QueryWrapper().eq("sid",l.getGoodsSid())); - if(StringUtils.isBlank(s.getGoods())){ - s.setGoods(goods.getName()+":"+l.getGoodsNumber()+"份"); - }else{ - s.setGoods(s.getGoods()+" "+goods.getName()+":"+l.getGoodsNumber()+"份"); + List empCardGift = empCardGiftService.list(new QueryWrapper().eq("empCardSid", vo.getSid()).eq("cardType", "3").orderByDesc("createTime")); + empCardGift.forEach(s -> { + List list1 = empCardGiftGoodsService.list(new QueryWrapper().eq("empCardGiftSid", s.getSid())); + list1.forEach(l -> { + LpkGoods goods = lpkGoodsService.getOne(new QueryWrapper().eq("sid", l.getGoodsSid())); + if (StringUtils.isBlank(s.getGoods())) { + s.setGoods(goods.getName() + ":" + l.getGoodsNumber() + "份"); + } else { + s.setGoods(s.getGoods() + " " + goods.getName() + ":" + l.getGoodsNumber() + "份"); } }); }); @@ -600,7 +609,7 @@ public class LpkGiftCardService extends MybatisBaseService page = PagerUtil.queryToPage(pq); IPage pagging = baseMapper.selGiftCard(page, qw); pagging.getRecords().forEach(s -> { @@ -650,8 +659,8 @@ public class LpkGiftCardService extends MybatisBaseService page = PagerUtil.queryToPage(pq); IPage pagging = baseMapper.recordDetails(page, qw); PagerVo p = PagerUtil.pageToVo(pagging, null); - p.getRecords().forEach(s->{ - if(s.getIsEnable().equals("2")){ + p.getRecords().forEach(s -> { + if (s.getIsEnable().equals("2")) { s.setState("已作废"); } @@ -748,13 +757,13 @@ public class LpkGiftCardService extends MybatisBaseService isSaturAndSun(String cardSid) { ResultBean rb = new ResultBean().fail(); AppletVo appletVo = baseMapper.getGifCardBySid(cardSid); - Date date =new Date(); - SimpleDateFormat sdf1 =new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); - String nowDate =sdf1.format(date); + Date date = new Date(); + SimpleDateFormat sdf1 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + String nowDate = sdf1.format(date); // AppletVo vo = getGifCardBySid(cardSid).getData(); // LocalDate now = DateUtil.parse(sdf1.format(DateUtil.parse(appletVo.getStart()))).toSqlDate().toLocalDate(); LocalDate now = DateUtil.parse(nowDate).toSqlDate().toLocalDate(); - LocalDate endD = DateUtil.parse(appletVo.getDateEnd()).toSqlDate().toLocalDate(); + LocalDate endD = DateUtil.parse(appletVo.getDateEnd()).toSqlDate().toLocalDate(); List weekMap = new ArrayList<>(); @@ -1570,26 +1579,26 @@ public class LpkGiftCardService extends MybatisBaseService qw = new QueryWrapper<>(); qw.eq("1", "1"); - if(StringUtils.isNotBlank(query.getSerialNumber())){ - qw.like("a.serialNumber",query.getSerialNumber()); + if (StringUtils.isNotBlank(query.getSerialNumber())) { + qw.like("a.serialNumber", query.getSerialNumber()); } qw.groupBy("a.sid"); qw.orderByDesc("a.createTime"); // qw.groupBy("c.goodsSid"); - List statisticsExportVos=baseMapper.cardStatisticsListExport(qw); - statisticsExportVos.forEach(s->{ - if(s.getIsEnable().equals("2")){ + List statisticsExportVos = baseMapper.cardStatisticsListExport(qw); + statisticsExportVos.forEach(s -> { + if (s.getIsEnable().equals("2")) { s.setStateValue("已作废"); } }); String excelName = "提货卡信息.xlsx"; String fileNameURL = "1"; - response.setContentType( "application/vnd.ms-excel"); + response.setContentType("application/vnd.ms-excel"); response.setCharacterEncoding("utf8"); - response.setHeader("Content-disposition","attachment;filename="+ excelName ); + response.setHeader("Content-disposition", "attachment;filename=" + excelName); ServletOutputStream outputStream = null; try { WriteCellStyle headWriteCellStyle = new WriteCellStyle(); @@ -1614,76 +1623,80 @@ public class LpkGiftCardService extends MybatisBaseService pq) { - ResultBean rb=new ResultBean(); + ResultBean rb = new ResultBean(); LpkReserveOrderQuery query = pq.getParams(); QueryWrapper qw = new QueryWrapper<>(); qw.eq("1", "1"); - if(StringUtils.isNotBlank(query.getSerialNumber())){ - qw.like("a.serialNumber",query.getSerialNumber()); + if (StringUtils.isNotBlank(query.getSerialNumber())) { + qw.like("a.serialNumber", query.getSerialNumber()); } qw.groupBy("a.sid"); qw.orderByDesc("a.createTime"); // qw.groupBy("c.goodsSid"); IPage page = PagerUtil.queryToPage(pq); IPage pagging = baseMapper.cardStatisticsList(page, qw); - pagging.getRecords().forEach(s->{ - if(s.getIsEnable().equals("2")){ + pagging.getRecords().forEach(s -> { + if (s.getIsEnable().equals("2")) { s.setStateValue("已作废"); } }); return rb.success().setData(pagging); } - public ResultBean isEnable(String sid ) { - ResultBean rb=new ResultBean(); - LpkGiftCard card=baseMapper.selectOne(new QueryWrapper().eq("sid",sid)); + public ResultBean isEnable(String sid) { + ResultBean rb = new ResultBean(); + LpkGiftCard card = baseMapper.selectOne(new QueryWrapper().eq("sid", sid)); card.setIsEnable("2"); baseMapper.updateById(card); return rb.success().setData("成功"); } /** - *是否转赠 + * 是否转赠 + * * @param sid * @return */ - public ResultBean cardTransfer(String sid ) { - ResultBean rb=new ResultBean(); - LpkGiftCard card=baseMapper.selectOne(new QueryWrapper().eq("sid",sid)); + public ResultBean cardTransfer(String sid) { + ResultBean rb = new ResultBean(); + LpkGiftCard card = baseMapper.selectOne(new QueryWrapper().eq("sid", sid)); card.setIsTransfer("1"); card.setIsItInvalid("1");//失效 baseMapper.updateById(card); return rb.success().setData("成功"); } + /** - *共享家庭卡详情 + * 共享家庭卡详情 + * * @param sid * @return */ - public ResultBean cardShareDetail(String sid ) { - ResultBean rb=new ResultBean().fail(); - CardShareDetailVo vo=new CardShareDetailVo(); + public ResultBean cardShareDetail(String sid) { + ResultBean rb = new ResultBean().fail(); + CardShareDetailVo vo = new CardShareDetailVo(); vo.setCode("11111111111111111111"); - vo.setPeriodValidity(vo.getStartDate()+"~"+vo.getEndDate()); + vo.setPeriodValidity(vo.getStartDate() + "~" + vo.getEndDate()); vo.setCount("6种蔬菜"); - List list=new ArrayList<>(); - ShareUserVo vo1=new ShareUserVo(); + List list = new ArrayList<>(); + ShareUserVo vo1 = new ShareUserVo(); vo1.setName("测试一"); vo1.setIconUrl(""); - ShareUserVo vo2=new ShareUserVo(); + ShareUserVo vo2 = new ShareUserVo(); vo1.setName("测试二"); vo1.setIconUrl(""); list.add(vo1); list.add(vo2); - List v=new ArrayList<>(); - ShareRecord record=new ShareRecord(); + List v = new ArrayList<>(); + ShareRecord record = new ShareRecord(); record.setDate("2023-12-25 09:30"); record.setOperate("xx接受共享邀请"); - ShareRecord record1=new ShareRecord(); + ShareRecord record1 = new ShareRecord(); record1.setDate("2023-12-27 10:10"); record1.setOperate("xx接受共享邀请"); - ShareRecord record2=new ShareRecord(); + ShareRecord record2 = new ShareRecord(); record2.setDate("2023-12-28 12:30"); record2.setOperate("xx接受共享邀请"); v.add(record); @@ -1693,13 +1706,14 @@ public class LpkGiftCardService extends MybatisBaseService goods=new ArrayList<>(); - com.yxt.yythmall.api.appletgiftbag.GiftBagGoods goodss=new com.yxt.yythmall.api.appletgiftbag.GiftBagGoods(); + vo.setPeriodValidity(vo.getStartDate() + "~" + vo.getEndDate()); + List goods = new ArrayList<>(); + com.yxt.yythmall.api.appletgiftbag.GiftBagGoods goodss = new com.yxt.yythmall.api.appletgiftbag.GiftBagGoods(); goodss.setRemark("富含蛋白顾、钙、铁、硒等有益元素。"); goodss.setName("西瓜红密薯"); goodss.setUnitName("份"); @@ -1708,7 +1722,7 @@ public class LpkGiftCardService extends MybatisBaseService().eq("code", code) + .eq("codeKey", codeKey)); + } + // public ResultBean getGoodsByTypeSid(LpkGiftCardQuery query) { // ResultBean rb=new ResultBean().fail(); // List giftBagGoodss=lpkGoodsService.getAllGoodsApplets(query).getData(); diff --git a/src/main/java/com/yxt/yythmall/biz/vegereplenish/VegeReplenishMapper.java b/src/main/java/com/yxt/yythmall/biz/vegereplenish/VegeReplenishMapper.java new file mode 100644 index 0000000..6a65626 --- /dev/null +++ b/src/main/java/com/yxt/yythmall/biz/vegereplenish/VegeReplenishMapper.java @@ -0,0 +1,19 @@ +package com.yxt.yythmall.biz.vegereplenish; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.yxt.yythmall.api.vegecallerreservedetails.VegeCellarReserveDetails; +import com.yxt.yythmall.api.vegereplenish.VegeReplenish; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; + +import java.util.List; + +/** + * @author wangpengfei + * @date 2023/11/23 10:36 + */ +@Mapper +public interface VegeReplenishMapper extends BaseMapper { + +} diff --git a/src/main/java/com/yxt/yythmall/biz/vegereplenish/VegeReplenishMapper.xml b/src/main/java/com/yxt/yythmall/biz/vegereplenish/VegeReplenishMapper.xml new file mode 100644 index 0000000..e363afb --- /dev/null +++ b/src/main/java/com/yxt/yythmall/biz/vegereplenish/VegeReplenishMapper.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/src/main/java/com/yxt/yythmall/biz/vegereplenish/VegeReplenishRest.java b/src/main/java/com/yxt/yythmall/biz/vegereplenish/VegeReplenishRest.java new file mode 100644 index 0000000..8c27ea5 --- /dev/null +++ b/src/main/java/com/yxt/yythmall/biz/vegereplenish/VegeReplenishRest.java @@ -0,0 +1,27 @@ +package com.yxt.yythmall.biz.vegereplenish; + +import com.yxt.common.core.result.ResultBean; +import com.yxt.yythmall.api.lpkgiftcard.BindCardDto; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +/** + * @author wangpengfei + * @date 2023/11/23 10:35 + */ +@Api(tags = "绑卡记录") +@RestController +@RequestMapping("vegereplenish") +public class VegeReplenishRest { + @Autowired + VegeReplenishService vegeReplenishService; + + @ApiOperation("保存") + @PostMapping("/saveBindRecord") + public ResultBean saveBindRecord(@RequestBody BindCardDto dto, @RequestParam("type") String type) { + return vegeReplenishService.saveBindRecord(dto,type); + } + +} diff --git a/src/main/java/com/yxt/yythmall/biz/vegereplenish/VegeReplenishService.java b/src/main/java/com/yxt/yythmall/biz/vegereplenish/VegeReplenishService.java new file mode 100644 index 0000000..9b0eb09 --- /dev/null +++ b/src/main/java/com/yxt/yythmall/biz/vegereplenish/VegeReplenishService.java @@ -0,0 +1,129 @@ +package com.yxt.yythmall.biz.vegereplenish; + +import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.date.DateTime; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.yxt.common.base.service.MybatisBaseService; +import com.yxt.common.core.result.ResultBean; +import com.yxt.yythmall.api.customerstore.CustomerStoreDto; +import com.yxt.yythmall.api.empcard.EmpCard; +import com.yxt.yythmall.api.empcardgift.EmpCardGift; +import com.yxt.yythmall.api.empcardgiftgoods.EmpCardGiftGoodsVo; +import com.yxt.yythmall.api.lpkgiftbag.GiftBagGoods; +import com.yxt.yythmall.api.lpkgiftbag.LpkGiftBagInitVo; +import com.yxt.yythmall.api.lpkgiftcard.BindCardDto; +import com.yxt.yythmall.api.lpkgiftcard.GoodsVo; +import com.yxt.yythmall.api.lpkgiftcard.LpkGiftCard; +import com.yxt.yythmall.api.lpkgoods.LpkGoods; +import com.yxt.yythmall.api.vegecallerreservedetails.VegeCellarReserveDetails; +import com.yxt.yythmall.api.vegecallerreserveorder.VegeCellarReserveOrderDto; +import com.yxt.yythmall.api.vegereplenish.VegeReplenish; +import com.yxt.yythmall.api.vegereplenishdetail.VegeReplenishDetail; +import com.yxt.yythmall.api.vegetablecellar.VegetableCellar; +import com.yxt.yythmall.biz.customerstore.CustomerStoreService; +import com.yxt.yythmall.biz.empcard.EmpCardService; +import com.yxt.yythmall.biz.empcardgift.EmpCardGiftService; +import com.yxt.yythmall.biz.empcardgiftgoods.EmpCardGiftGoodsService; +import com.yxt.yythmall.biz.lpkgiftbag.LpkGiftBagService; +import com.yxt.yythmall.biz.lpkgiftcard.LpkGiftCardService; +import com.yxt.yythmall.biz.lpkgoods.LpkGoodsService; +import com.yxt.yythmall.biz.vegereplenishdetail.VegeReplenishDetailService; +import com.yxt.yythmall.biz.vegetablecellar.VegetableCellarService; +import com.yxt.yythmall.mallplus.biz.util.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.List; + +/** + * @author wangpengfei + * @date 2023/11/23 10:36 + */ +@Service +public class VegeReplenishService extends MybatisBaseService { + + @Autowired + private VegeReplenishDetailService vegeReplenishDetailService; + @Autowired + private LpkGiftCardService lpkGiftCardService; + @Autowired + private LpkGiftBagService lpkGiftBagService; + @Autowired + private EmpCardService empCardService; + @Autowired + private EmpCardGiftService empCardGiftService; + @Autowired + private EmpCardGiftGoodsService empCardGiftGoodsService; + + @Transactional(rollbackFor = Exception.class) + public ResultBean saveBindRecord(BindCardDto dto, String type) { + ResultBean rb = new ResultBean().fail(); + VegeReplenish entity = new VegeReplenish(); + if (StringUtils.isNotBlank(dto.getCustomerSid())) { + entity.setCustomerSid(dto.getCustomerSid()); + } + if (StringUtils.isNotBlank(dto.getCode())) { + entity.setCardCode(dto.getCode()); + } + entity.setCreateTime(new DateTime()); + entity.setCardtype(type); + baseMapper.insert(entity); + if (type.equals("0")) { + //个人卡 + LpkGiftCard card = lpkGiftCardService.selectOneByCodeAndCodeKey(dto.getCode(), dto.getCodeKey()); + if (null != card) { + LpkGiftBagInitVo giftBagInitVo = lpkGiftBagService.giftBagInit(card.getGiftbagSid()).getData(); + if (null != giftBagInitVo) { + List goods = giftBagInitVo.getGoods(); + if (!goods.isEmpty()) { + goods.stream().forEach(g -> { + VegeReplenishDetail detail = new VegeReplenishDetail(); + detail.setGoodsSid(g.getGoodsSid()); + detail.setGoodsNumber(Integer.parseInt(g.getGoodsNumber())); + detail.setOrderSid(entity.getSid()); + detail.setCreateTime(new DateTime()); + vegeReplenishDetailService.insert(detail); + }); + } + } + } + } else if (type.equals("1")) { + //企业卡 + EmpCard card = empCardService.selectOneByCodeAndCodeKey(dto.getCode(), dto.getCodeKey()); + if (null != card) { + LpkGiftBagInitVo giftBagInitVo = lpkGiftBagService.giftBagInit(card.getGiftbagSid()).getData(); + if (null != giftBagInitVo) { + List goods = giftBagInitVo.getGoods(); + if (!goods.isEmpty()) { + goods.stream().forEach(g -> { + VegeReplenishDetail detail = new VegeReplenishDetail(); + detail.setGoodsSid(g.getGoodsSid()); + detail.setGoodsNumber(Integer.parseInt(g.getGoodsNumber())); + detail.setOrderSid(entity.getSid()); + detail.setCreateTime(new DateTime()); + vegeReplenishDetailService.insert(detail); + }); + } + } + } + } else if (type.equals("2")) { + //转赠卡 + EmpCardGift card = empCardGiftService.selectOneByCodeAndCodeKey(dto.getCode(), dto.getCodeKey()); + if (null != card) { + List goods = empCardGiftGoodsService.getGoodsDetailsByEmpCardGiftSid(card.getSid()).getData(); + if (!goods.isEmpty()) { + goods.stream().forEach(g -> { + VegeReplenishDetail detail = new VegeReplenishDetail(); + detail.setGoodsSid(g.getGoodsSid()); + detail.setGoodsNumber(g.getGoodsNumber()); + detail.setOrderSid(entity.getSid()); + detail.setCreateTime(new DateTime()); + vegeReplenishDetailService.insert(detail); + }); + } + } + } + return rb.success(); + } +} diff --git a/src/main/java/com/yxt/yythmall/biz/vegereplenishdetail/VegeReplenishDetailMapper.java b/src/main/java/com/yxt/yythmall/biz/vegereplenishdetail/VegeReplenishDetailMapper.java new file mode 100644 index 0000000..c9b0458 --- /dev/null +++ b/src/main/java/com/yxt/yythmall/biz/vegereplenishdetail/VegeReplenishDetailMapper.java @@ -0,0 +1,15 @@ +package com.yxt.yythmall.biz.vegereplenishdetail; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.yxt.yythmall.api.vegereplenish.VegeReplenish; +import com.yxt.yythmall.api.vegereplenishdetail.VegeReplenishDetail; +import org.apache.ibatis.annotations.Mapper; + +/** + * @author wangpengfei + * @date 2023/11/23 10:36 + */ +@Mapper +public interface VegeReplenishDetailMapper extends BaseMapper { + +} diff --git a/src/main/java/com/yxt/yythmall/biz/vegereplenishdetail/VegeReplenishDetailMapper.xml b/src/main/java/com/yxt/yythmall/biz/vegereplenishdetail/VegeReplenishDetailMapper.xml new file mode 100644 index 0000000..155242b --- /dev/null +++ b/src/main/java/com/yxt/yythmall/biz/vegereplenishdetail/VegeReplenishDetailMapper.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/src/main/java/com/yxt/yythmall/biz/vegereplenishdetail/VegeReplenishDetailRest.java b/src/main/java/com/yxt/yythmall/biz/vegereplenishdetail/VegeReplenishDetailRest.java new file mode 100644 index 0000000..ff2e606 --- /dev/null +++ b/src/main/java/com/yxt/yythmall/biz/vegereplenishdetail/VegeReplenishDetailRest.java @@ -0,0 +1,19 @@ +package com.yxt.yythmall.biz.vegereplenishdetail; + +import io.swagger.annotations.Api; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +/** + * @author wangpengfei + * @date 2023/11/23 10:35 + */ +@Api(tags = "绑卡记录详情") +@RestController +@RequestMapping("vegereplenishdetail") +public class VegeReplenishDetailRest { + @Autowired + VegeReplenishDetailService vegeReplenishDetailService; + +} diff --git a/src/main/java/com/yxt/yythmall/biz/vegereplenishdetail/VegeReplenishDetailService.java b/src/main/java/com/yxt/yythmall/biz/vegereplenishdetail/VegeReplenishDetailService.java new file mode 100644 index 0000000..61818f8 --- /dev/null +++ b/src/main/java/com/yxt/yythmall/biz/vegereplenishdetail/VegeReplenishDetailService.java @@ -0,0 +1,15 @@ +package com.yxt.yythmall.biz.vegereplenishdetail; + +import com.yxt.common.base.service.MybatisBaseService; +import com.yxt.yythmall.api.vegereplenish.VegeReplenish; +import com.yxt.yythmall.api.vegereplenishdetail.VegeReplenishDetail; +import org.springframework.stereotype.Service; + +/** + * @author wangpengfei + * @date 2023/11/23 10:36 + */ +@Service +public class VegeReplenishDetailService extends MybatisBaseService { + +} From 3ccd2b9a74d18251d5b43ed724df1535780a3ba1 Mon Sep 17 00:00:00 2001 From: wangpengfei <1928057482@qq.com> Date: Sun, 21 Jan 2024 12:23:00 +0800 Subject: [PATCH 2/2] 1/21 --- .../api/transferrecords/TransferRecordsQuery.java | 1 + .../biz/transferrecords/TransferRecordsMapper.java | 1 + .../biz/transferrecords/TransferRecordsMapper.xml | 6 ++++-- .../biz/transferrecords/TransferRecordsService.java | 8 +++++++- 4 files changed, 13 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/yxt/yythmall/api/transferrecords/TransferRecordsQuery.java b/src/main/java/com/yxt/yythmall/api/transferrecords/TransferRecordsQuery.java index 010dcdf..48bb2f2 100644 --- a/src/main/java/com/yxt/yythmall/api/transferrecords/TransferRecordsQuery.java +++ b/src/main/java/com/yxt/yythmall/api/transferrecords/TransferRecordsQuery.java @@ -18,4 +18,5 @@ public class TransferRecordsQuery implements Query { private String bankSid; private String bankName; private String serialNumber; + private String state; } diff --git a/src/main/java/com/yxt/yythmall/biz/transferrecords/TransferRecordsMapper.java b/src/main/java/com/yxt/yythmall/biz/transferrecords/TransferRecordsMapper.java index df5b92a..e816998 100644 --- a/src/main/java/com/yxt/yythmall/biz/transferrecords/TransferRecordsMapper.java +++ b/src/main/java/com/yxt/yythmall/biz/transferrecords/TransferRecordsMapper.java @@ -33,4 +33,5 @@ public interface TransferRecordsMapper extends BaseMapper { List selByOrderSids(String orderSid); IPage orderListByUserSid(IPage page, @Param("query") TransferRecordsQuery query); + IPage orderListByUserSid1(IPage page, @Param("query") TransferRecordsQuery query); } diff --git a/src/main/java/com/yxt/yythmall/biz/transferrecords/TransferRecordsMapper.xml b/src/main/java/com/yxt/yythmall/biz/transferrecords/TransferRecordsMapper.xml index efe6b7f..39bc128 100644 --- a/src/main/java/com/yxt/yythmall/biz/transferrecords/TransferRecordsMapper.xml +++ b/src/main/java/com/yxt/yythmall/biz/transferrecords/TransferRecordsMapper.xml @@ -19,7 +19,10 @@ transfer_records WHERE customerSid=#{query.customerSid} - UNION + + + + - \ No newline at end of file diff --git a/src/main/java/com/yxt/yythmall/biz/transferrecords/TransferRecordsService.java b/src/main/java/com/yxt/yythmall/biz/transferrecords/TransferRecordsService.java index 99f4a7b..25e47e4 100644 --- a/src/main/java/com/yxt/yythmall/biz/transferrecords/TransferRecordsService.java +++ b/src/main/java/com/yxt/yythmall/biz/transferrecords/TransferRecordsService.java @@ -4,6 +4,7 @@ import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.date.DateTime; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.yxt.common.base.service.MybatisBaseService; import com.yxt.common.base.utils.PagerUtil; import com.yxt.common.base.utils.StringUtils; @@ -71,8 +72,13 @@ public class TransferRecordsService extends MybatisBaseService qw = new QueryWrapper<>(); qw.eq("o.customerSid", query.getCustomerSid()); IPage page = PagerUtil.queryToPage(pq); + IPage pagging =new Page<>(); + if(query.getState().equals("1")){ + pagging = baseMapper.orderListByUserSid(page, query); + }else{ + pagging = baseMapper.orderListByUserSid1(page, query); + } - IPage pagging = baseMapper.orderListByUserSid(page, query); List goodsVo = new ArrayList<>(); for(TransferRecordsVo vo:pagging.getRecords()){ List goods =transferRecordsGoodsDetailsService.selByOrderSids(vo.getSid());