From 6fef366af3d06ea6dbf96082eec2d90d3785eca1 Mon Sep 17 00:00:00 2001 From: wangpengfei <1928057482@qq.com> Date: Thu, 28 Dec 2023 08:50:50 +0800 Subject: [PATCH] 12/28 --- .../yxt/yyth/api/empcardgift/EmpCardGift.java | 6 + .../yyth/api/empcardgift/EmpCardGiftDto.java | 1 + .../yyth/api/empcardgift/EmpGiftAppletVo.java | 11 +- .../yxt/yyth/api/lpkgiftcard/AppletVo.java | 13 +- .../yxt/yyth/api/lpkgiftcard/LpkGiftCard.java | 1 + .../yxt/yyth/biz/empcard/EmpCardService.java | 13 +- .../biz/empcardgift/EmpCardGiftMapper.xml | 10 +- .../yyth/biz/empcardgift/EmpCardGiftRest.java | 12 +- .../biz/empcardgift/EmpCardGiftService.java | 159 +++++++++++++++++- .../biz/lpkgiftcard/LpkGiftCardMapper.xml | 2 +- .../yyth/biz/lpkgiftcard/LpkGiftCardRest.java | 6 + .../biz/lpkgiftcard/LpkGiftCardService.java | 21 +++ .../LpkReserveOrderMapper.java | 3 +- .../lpkreserveorder/LpkReserveOrderMapper.xml | 46 ++++- .../LpkReserveOrderService.java | 3 +- 15 files changed, 276 insertions(+), 31 deletions(-) diff --git a/src/main/java/com/yxt/yyth/api/empcardgift/EmpCardGift.java b/src/main/java/com/yxt/yyth/api/empcardgift/EmpCardGift.java index 67e13c0..da5a25b 100644 --- a/src/main/java/com/yxt/yyth/api/empcardgift/EmpCardGift.java +++ b/src/main/java/com/yxt/yyth/api/empcardgift/EmpCardGift.java @@ -37,5 +37,11 @@ public class EmpCardGift { private String isItInvalid; private String isReservation; private String isShare; + private String cardType; //1企业卡 2 福礼卡 3提货卡 + private String isTransfer; //是否转增 0 未转赠 1 转赠 + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date endDate; //结束日期 + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date startDate; //开始日期 } 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 351f194..331c53c 100644 --- a/src/main/java/com/yxt/yyth/api/empcardgift/EmpCardGiftDto.java +++ b/src/main/java/com/yxt/yyth/api/empcardgift/EmpCardGiftDto.java @@ -40,4 +40,5 @@ public class EmpCardGiftDto implements Dto { private String iReservation; private List goodsVoList; private String count; + private String cardType; } diff --git a/src/main/java/com/yxt/yyth/api/empcardgift/EmpGiftAppletVo.java b/src/main/java/com/yxt/yyth/api/empcardgift/EmpGiftAppletVo.java index 8d4f52c..5e6930f 100644 --- a/src/main/java/com/yxt/yyth/api/empcardgift/EmpGiftAppletVo.java +++ b/src/main/java/com/yxt/yyth/api/empcardgift/EmpGiftAppletVo.java @@ -48,9 +48,12 @@ public class EmpGiftAppletVo { private String isReservation;//是否超过预约时间 0 否 1是 private boolean notRese = true; //是否能预约 private List orderCardVoList; + private EmpCardGift empCardGift; private String value; private String serialNumber; private String isEnable; + private String isTransfer;//是否转增 0 未转赠 1 转赠 + public String getStart() { @@ -128,7 +131,13 @@ public class EmpGiftAppletVo { }else if(isEnable.equals("2")){ state="已作废"; showBtn=false; - }else{ + } + else if(isTransfer.equals("1")){ + state="已转赠"; +// showBtn=false; + this.notRese=false; + } + else{ state="待提货"; if(states.equals("5")){ if(isReservation.equals("0")){ diff --git a/src/main/java/com/yxt/yyth/api/lpkgiftcard/AppletVo.java b/src/main/java/com/yxt/yyth/api/lpkgiftcard/AppletVo.java index 1271d4d..45bb9a0 100644 --- a/src/main/java/com/yxt/yyth/api/lpkgiftcard/AppletVo.java +++ b/src/main/java/com/yxt/yyth/api/lpkgiftcard/AppletVo.java @@ -3,6 +3,8 @@ package com.yxt.yyth.api.lpkgiftcard; import cn.hutool.core.date.DateUnit; import cn.hutool.core.date.DateUtil; import com.yxt.common.base.utils.StringUtils; +import com.yxt.yyth.api.empcardgift.EmpCardGift; +import com.yxt.yyth.api.empcardgift.EmpCardGiftVo; import com.yxt.yyth.api.lpkreserveorder.LpkReserveOrderCardVo; import com.yxt.yyth.api.lpkstore.StoreSelect; import lombok.Data; @@ -45,9 +47,12 @@ public class AppletVo { private String isReservation;//是否超过预约时间 0 否 1是 private boolean notRese=true; //是否能预约 private List orderCardVoList; + private EmpCardGift empCardGift; private String value; private String serialNumber; private String isEnable; + private String isTransfer;//是否转增 0 未转赠 1 转赠 + @@ -126,7 +131,13 @@ public class AppletVo { }else if(isEnable.equals("2")){ state="已作废"; showBtn=false; - }else{ + } + else if(isTransfer.equals("1")){ + state="已转赠"; +// showBtn=false; + this.notRese=false; + } + else{ state="待提货"; if(states.equals("5")){ if(isReservation.equals("0")){ diff --git a/src/main/java/com/yxt/yyth/api/lpkgiftcard/LpkGiftCard.java b/src/main/java/com/yxt/yyth/api/lpkgiftcard/LpkGiftCard.java index be408e4..8a29d87 100644 --- a/src/main/java/com/yxt/yyth/api/lpkgiftcard/LpkGiftCard.java +++ b/src/main/java/com/yxt/yyth/api/lpkgiftcard/LpkGiftCard.java @@ -38,4 +38,5 @@ public class LpkGiftCard { private Date bindDate; private String isItInvalid; private String isReservation ;//是否超过预约时间 0 否 1是 + private String isTransfer;//是否转增 0 未转赠 1 转赠 } 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 39791ae..0c7908a 100644 --- a/src/main/java/com/yxt/yyth/biz/empcard/EmpCardService.java +++ b/src/main/java/com/yxt/yyth/biz/empcard/EmpCardService.java @@ -326,10 +326,12 @@ public class EmpCardService extends MybatisBaseService { // empCardGiftService.updateById(empCardGift); } l.forEach(c->{ - if (StringUtils.isBlank(s.getGoods())) { - s.setGoods(c.getName() + "：" + c.getGoodsNumber() + c.getUnitName()); - } else { - s.setGoods(s.getGoods() + " " + c.getName() + "：" + c.getGoodsNumber() + c.getUnitName()); + if(c.getGoodsNumber()!=0){ + if (StringUtils.isBlank(s.getGoods())) { + s.setGoods(c.getName() + "：" + c.getGoodsNumber() + c.getUnitName()); + } else { + s.setGoods(s.getGoods() + " " + c.getName() + "：" + c.getGoodsNumber() + c.getUnitName()); + } } }); }); @@ -337,11 +339,8 @@ public class EmpCardService extends MybatisBaseService { vo.setGoodsVos(goodsVos); String uuid = UniqueIdGenerator.generateUniqueID(); int randomNumber = new Random().nextInt(900000) + 100000; - vo.setGiftCodeKey(String.valueOf(randomNumber)); vo.setGiftCode("99"+uuid.substring(2)); -// vo.setQrCode("https://supervise.yxtsoft.com/lpkapi?qy="+vo.getGiftCode()); - vo.setQrCode(qrUrl+vo.getGiftCode()); return rb.success().setData(vo); } diff --git a/src/main/java/com/yxt/yyth/biz/empcardgift/EmpCardGiftMapper.xml b/src/main/java/com/yxt/yyth/biz/empcardgift/EmpCardGiftMapper.xml index 5e6a005..4758efb 100644 --- a/src/main/java/com/yxt/yyth/biz/empcardgift/EmpCardGiftMapper.xml +++ b/src/main/java/com/yxt/yyth/biz/empcardgift/EmpCardGiftMapper.xml @@ -10,8 +10,8 @@ gi.*, gi.state AS states, gi.serialNumber AS serialNumber, - gif.dateStart, - gif.dateEnd, + gi.startDate as dateStart, + gi.endDate as dateEnd, CASE gi.state WHEN 3 THEN @@ -28,15 +28,15 @@ ${ew.sqlSegment} - ORDER BY gi.isItInvalid desc,gi.bindDate desc + ORDER BY gi.isItInvalid asc,gi.bindDate desc + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/main/java/com/yxt/yyth/biz/lpkreserveorder/LpkReserveOrderService.java b/src/main/java/com/yxt/yyth/biz/lpkreserveorder/LpkReserveOrderService.java index b758a13..5191717 100644 --- a/src/main/java/com/yxt/yyth/biz/lpkreserveorder/LpkReserveOrderService.java +++ b/src/main/java/com/yxt/yyth/biz/lpkreserveorder/LpkReserveOrderService.java @@ -409,9 +409,10 @@ public class LpkReserveOrderService extends MybatisBaseService page = PagerUtil.queryToPage(pq); - IPage pagging = baseMapper.orderListByUserSid(page, qw); + IPage pagging = baseMapper.orderListByUserSid(page, query.getUserSid()); for(LpkReserveOrderCardVo vo:pagging.getRecords()){ List goods =lpkReserveOrderGoodsService.selByOrderSids(vo.getSid()); for(LpkReserveOrderGoods goods1:goods){