From ec724265ebaf3cc14131bd7c3d9f58868f689306 Mon Sep 17 00:00:00 2001 From: wangpengfei <1928057482@qq.com> Date: Sun, 3 Dec 2023 15:41:20 +0800 Subject: [PATCH] 12/3 --- .../yxt/yyth/api/lpkgiftcard/AppletVo.java | 43 +++++++++---- .../yxt/yyth/api/lpkgiftcard/LpkGiftCard.java | 1 + .../LpkReserveOrderCardVo.java | 19 +++++- .../lpkreserveorder/LpkReserveOrderVo.java | 5 +- .../biz/lpkgiftcard/LpkGiftCardService.java | 62 +++++++++++++++---- .../LpkReserveOrderMapper.java | 2 + .../lpkreserveorder/LpkReserveOrderMapper.xml | 3 +- .../LpkReserveOrderService.java | 4 ++ .../LpkReserveOrderGoodsService.java | 2 +- 9 files changed, 113 insertions(+), 28 deletions(-) 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 007395d..9323d87 100644 --- a/src/main/java/com/yxt/yyth/api/lpkgiftcard/AppletVo.java +++ b/src/main/java/com/yxt/yyth/api/lpkgiftcard/AppletVo.java @@ -36,6 +36,7 @@ public class AppletVo { private List select; private String storeSid;//上次提货地点 private String addressName; + private String isReservation;//是否超过预约时间 0 否 1是 public String getStart() { @@ -52,8 +53,6 @@ public class AppletVo { return start; } - - public String getName() { name=name+code; return name; @@ -66,7 +65,6 @@ public class AppletVo { time=sdf.format(DateUtil.parse(dateStart))+"~"+sdf.format(DateUtil.parse(dateEnd)); } } - return time; } @@ -83,24 +81,45 @@ public class AppletVo { if(StringUtils.isNotBlank(dateEnd)){ int i=DateUtil.parse(sdf.format(DateUtil.parse(dateEnd))).compareTo(DateUtil.parse(sdf.format(DateUtil.date()))); if( String.valueOf(i).equals("-1")){ - state="失效"; + state="已过期"; showBtn=false; -// appletVo.setShowBtn(true); }else{ - state="正常"; + state="待提货"; if(states.equals("5")){ - this.state="失效"; - showBtn=false; + if(isReservation.equals("0")){ + this.state="已预约"; + }else{ + this.state="已完成"; + showBtn=false; + } + }else if(states.equals("4")){ + if(isReservation.equals("0")){ + this.state="已预约"; + }else{ + this.state="待提货"; + } } +// if(states.equals("5")){ +// this.state="失效"; +// showBtn=false; +// } } }else{ - state="正常"; + state="待提货"; if(states.equals("5")){ - this.state="失效"; - showBtn=false; + if(isReservation.equals("0")){ + this.state="已预约"; + }else{ + this.state="已完成"; + showBtn=false; + } } +// state="正常"; +// if(states.equals("5")){ +// this.state="失效"; +// showBtn=false; +// } } - return state; } } 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 bb5d2f7..69a0ea9 100644 --- a/src/main/java/com/yxt/yyth/api/lpkgiftcard/LpkGiftCard.java +++ b/src/main/java/com/yxt/yyth/api/lpkgiftcard/LpkGiftCard.java @@ -36,4 +36,5 @@ public class LpkGiftCard { private String recordId; @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date bindDate; + private String isReservation ;//是否超过预约时间 0 否 1是 } diff --git a/src/main/java/com/yxt/yyth/api/lpkreserveorder/LpkReserveOrderCardVo.java b/src/main/java/com/yxt/yyth/api/lpkreserveorder/LpkReserveOrderCardVo.java index 0504265..05a96cd 100644 --- a/src/main/java/com/yxt/yyth/api/lpkreserveorder/LpkReserveOrderCardVo.java +++ b/src/main/java/com/yxt/yyth/api/lpkreserveorder/LpkReserveOrderCardVo.java @@ -1,8 +1,12 @@ package com.yxt.yyth.api.lpkreserveorder; +import cn.hutool.core.date.DateUtil; import com.yxt.common.core.vo.Vo; import lombok.Data; +import java.text.SimpleDateFormat; +import java.util.Date; + /** * @author Fan * @description @@ -11,10 +15,23 @@ import lombok.Data; @Data public class LpkReserveOrderCardVo implements Vo { private String code; //卡号 - private String reserveDate; //预约时间 + private Date reserveDate; //预约时间 private String store; //提货门店 private String bagName; //礼包 private String cardSid; // 提货卡sid private String orderSid; //预约订单sid + private String userName; + private String userPhone; + private String state;//提货状态 + public String getState() { + SimpleDateFormat sdf =new SimpleDateFormat("yyyy-MM-dd"); + int c= DateUtil.parse(sdf.format(reserveDate)).compareTo(DateUtil.parse(sdf.format(new Date()))); + if(String.valueOf(c).equals("-1")){ + this.state="已提货"; + }else{ + this.state="未提货"; + } + return state; + } } diff --git a/src/main/java/com/yxt/yyth/api/lpkreserveorder/LpkReserveOrderVo.java b/src/main/java/com/yxt/yyth/api/lpkreserveorder/LpkReserveOrderVo.java index acadc72..e5e23b9 100644 --- a/src/main/java/com/yxt/yyth/api/lpkreserveorder/LpkReserveOrderVo.java +++ b/src/main/java/com/yxt/yyth/api/lpkreserveorder/LpkReserveOrderVo.java @@ -1,9 +1,11 @@ package com.yxt.yyth.api.lpkreserveorder; +import com.fasterxml.jackson.annotation.JsonFormat; import com.yxt.common.core.vo.Vo; import lombok.Data; import java.util.ArrayList; +import java.util.Date; import java.util.List; /** @@ -18,7 +20,8 @@ public class LpkReserveOrderVo implements Vo { private String userPhone; //用户电话 private String store; //门店 private String storeSid; //门店 - private String reserveDate; //预约时间 + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8") + private Date reserveDate; //预约时间 private String bagName; //礼包 private String code; //卡号 private List goodsVo = new ArrayList<>(); diff --git a/src/main/java/com/yxt/yyth/biz/lpkgiftcard/LpkGiftCardService.java b/src/main/java/com/yxt/yyth/biz/lpkgiftcard/LpkGiftCardService.java index 1e7d75c..7728024 100644 --- a/src/main/java/com/yxt/yyth/biz/lpkgiftcard/LpkGiftCardService.java +++ b/src/main/java/com/yxt/yyth/biz/lpkgiftcard/LpkGiftCardService.java @@ -1,6 +1,7 @@ package com.yxt.yyth.biz.lpkgiftcard; import cn.hutool.core.date.DateTime; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.img.ImgUtil; import cn.hutool.extra.qrcode.QrCodeUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -18,6 +19,7 @@ import com.yxt.yyth.api.lpkcardgrantrecord.LpkCardGrantRecordDto; import com.yxt.yyth.api.lpkgiftbag.LpkGiftBag; import com.yxt.yyth.api.lpkgiftbaggoods.LpkGiftBagGoodsVo; import com.yxt.yyth.api.lpkgiftcard.*; +import com.yxt.yyth.api.lpkreserveorder.LpkReserveOrder; import com.yxt.yyth.api.lpkreserveorder.LpkReserveOrderVo; import com.yxt.yyth.api.lpkreserveordergoods.LpkReserveOrderGoods; import com.yxt.yyth.api.lpkstore.LpkStoreDetailsVo; @@ -73,11 +75,11 @@ public class LpkGiftCardService extends MybatisBaseService().eq("code", bindCardDto.getCode()) .eq("codeKey", bindCardDto.getCodeKey())); - AppletVo vo = baseMapper.getGifCardBySid(lpkGiftCard.getSid()); if (null == lpkGiftCard) { return rb.setMsg("请核对卡号和密钥"); } - if (vo.getState().equals("失效")) { + AppletVo vo = baseMapper.getGifCardBySid(lpkGiftCard.getSid()); + if (vo.getState().equals("已过期")) { return rb.setMsg("该卡已过期"); } if (StringUtils.isNotBlank(lpkGiftCard.getCustomerSid())) { @@ -94,7 +96,7 @@ public class LpkGiftCardService extends MybatisBaseService qw = new QueryWrapper<>(); - updateIsItInvalid(); + updateIsItInvalid(query.getCustomerSid()); if (StringUtils.isNotBlank(query.getCustomerSid())) { qw.eq("customerSid", query.getCustomerSid()); } @@ -104,17 +106,53 @@ public class LpkGiftCardService extends MybatisBaseService lpkGiftBags = lpkGiftBagService.list(new QueryWrapper().lt("dateEnd", sdf.format(new Date()))); +// for (LpkGiftBag lpkGiftBag : lpkGiftBags) { +// Integer i = baseMapper.selectCount(new QueryWrapper().eq("giftbagSid", lpkGiftBag.getSid()).ne("state", "5")); +// if (i != 0) { +// baseMapper.updateIsItInvalid(lpkGiftBag.getSid(), "5"); +// } +// } +// return rb.success(); +// } + public ResultBean updateIsItInvalid(String customerSid) { ResultBean rb = new ResultBean(); - SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); - List lpkGiftBags = lpkGiftBagService.list(new QueryWrapper().lt("dateEnd", sdf.format(new Date()))); - for (LpkGiftBag lpkGiftBag : lpkGiftBags) { - Integer i = baseMapper.selectCount(new QueryWrapper().eq("giftbagSid", lpkGiftBag.getSid()).ne("state", "5")); - if (i != 0) { - baseMapper.updateIsItInvalid(lpkGiftBag.getSid(), "5"); + List lpkGiftBags = lpkGiftBagService.list(new QueryWrapper()); + SimpleDateFormat sdf =new SimpleDateFormat("yyyy-MM-dd"); + for(LpkGiftBag lpkGiftBag : lpkGiftBags){ + int in= DateUtil.parse(sdf.format(lpkGiftBag.getDateEnd())).compareTo(DateUtil.parse(sdf.format(new Date()))); + if(String.valueOf(in).equals("-1")){ + Integer i = baseMapper.selectCount(new QueryWrapper().eq("giftbagSid", lpkGiftBag.getSid()).ne("state", "5")); + if (i != 0) { + baseMapper.updateIsItInvalid(lpkGiftBag.getSid(), "5"); + } + }else{ + Listlist= baseMapper.selectList(new QueryWrapper().eq("customerSid",customerSid).eq("giftbagSid",lpkGiftBag.getSid())); + for (LpkGiftCard card:list){ + LpkReserveOrderVo LpkReserveOrderVo=lpkReserveOrderService.selByCardSid(card.getSid()).getData(); + if(null!=LpkReserveOrderVo){ + int c= DateUtil.parse(sdf.format(LpkReserveOrderVo.getReserveDate())).compareTo(DateUtil.parse(sdf.format(new Date()))); + LpkGiftCard card1= baseMapper.selectOne(new QueryWrapper().eq("sid",card.getSid())); + if(String.valueOf(c).equals("-1")){ + card1.setIsReservation("1"); + baseMapper.updateById(card1); + } + } + } } } + +// SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); +// List lpkGiftBags = lpkGiftBagService.list(new QueryWrapper().lt("dateEnd", sdf.format(new Date()))); +// for (LpkGiftBag lpkGiftBag : lpkGiftBags) { +// Integer i = baseMapper.selectCount(new QueryWrapper().eq("giftbagSid", lpkGiftBag.getSid()).ne("state", "5")); +// if (i != 0) { +// baseMapper.updateIsItInvalid(lpkGiftBag.getSid(), "5"); +// } +// } return rb.success(); } @@ -125,7 +163,7 @@ public class LpkGiftCardService extends MybatisBaseService goodsVos = new ArrayList<>(); list.forEach(s -> { LpkReserveOrderGoods goods = lpkReserveOrderGoodsService.getReserveByCardSid(vo.getSid(), s.getGoodsSid()).getData(); - if (vo.getState().equals("失效")) { + if (vo.getState().equals("已过期")) { GoodsVo goodsVo = new GoodsVo(); goodsVo.setGoods(s.getGoodsName()); goodsVo.setNum(s.getGoodsNumber()); diff --git a/src/main/java/com/yxt/yyth/biz/lpkreserveorder/LpkReserveOrderMapper.java b/src/main/java/com/yxt/yyth/biz/lpkreserveorder/LpkReserveOrderMapper.java index 71dd42f..7ede007 100644 --- a/src/main/java/com/yxt/yyth/biz/lpkreserveorder/LpkReserveOrderMapper.java +++ b/src/main/java/com/yxt/yyth/biz/lpkreserveorder/LpkReserveOrderMapper.java @@ -26,4 +26,6 @@ public interface LpkReserveOrderMapper extends BaseMapper { List exportExcel(@Param(Constants.WRAPPER) QueryWrapper qw); @Select("select * from lpk_reserve_order where customerSid =#{sid} order by createTime desc limit 1") LpkReserveOrderVo getStoreByCustomerSid(@Param("sid") String sid); + @Select("select * from lpk_reserve_order where cardSid =#{sid} order by reserveDate desc limit 1") + LpkReserveOrderVo selByCardSid(@Param("sid") String sid); } diff --git a/src/main/java/com/yxt/yyth/biz/lpkreserveorder/LpkReserveOrderMapper.xml b/src/main/java/com/yxt/yyth/biz/lpkreserveorder/LpkReserveOrderMapper.xml index d7bef63..0147691 100644 --- a/src/main/java/com/yxt/yyth/biz/lpkreserveorder/LpkReserveOrderMapper.xml +++ b/src/main/java/com/yxt/yyth/biz/lpkreserveorder/LpkReserveOrderMapper.xml @@ -53,7 +53,8 @@ s.`name` as store, b.`name` as bagName, o.cardSid as cardSid, - o.sid as orderSid + o.sid as orderSid, + FROM lpk_reserve_order AS o LEFT JOIN lpk_store AS s ON o.storeSid = s.sid LEFT JOIN lpk_giftcard AS c ON o.cardSid = c.sid 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 d79e056..42eff46 100644 --- a/src/main/java/com/yxt/yyth/biz/lpkreserveorder/LpkReserveOrderService.java +++ b/src/main/java/com/yxt/yyth/biz/lpkreserveorder/LpkReserveOrderService.java @@ -266,4 +266,8 @@ public class LpkReserveOrderService extends MybatisBaseService getStoreByCustomerSid(String sid) { return new ResultBean().success().setData(baseMapper.getStoreByCustomerSid(sid)); } + public ResultBean selByCardSid(String sid) { + return new ResultBean().success().setData(baseMapper.selByCardSid(sid)); + } + } diff --git a/src/main/java/com/yxt/yyth/biz/lpkreserveordergoods/LpkReserveOrderGoodsService.java b/src/main/java/com/yxt/yyth/biz/lpkreserveordergoods/LpkReserveOrderGoodsService.java index d244c28..cc98ab8 100644 --- a/src/main/java/com/yxt/yyth/biz/lpkreserveordergoods/LpkReserveOrderGoodsService.java +++ b/src/main/java/com/yxt/yyth/biz/lpkreserveordergoods/LpkReserveOrderGoodsService.java @@ -52,7 +52,7 @@ public class LpkReserveOrderGoodsService extends MybatisBaseService