From d9e3af57631fcc9bc495d89df94ccd97c66a6286 Mon Sep 17 00:00:00 2001 From: wangpengfei <1928057482@qq.com> Date: Mon, 4 Dec 2023 17:12:00 +0800 Subject: [PATCH] 12/4 --- .../yxt/yyth/api/lpkgiftcard/AppletVo.java | 4 ++ .../LpkReserveOrderCardVo.java | 6 +++ .../LpkReserveOrderGoods.java | 1 + .../biz/lpkgiftcard/LpkGiftCardService.java | 49 ++++++++++++------- .../yxt/yyth/biz/lpkgoods/LpkGoodsMapper.xml | 3 +- .../LpkReserveOrderMapper.java | 3 ++ .../lpkreserveorder/LpkReserveOrderMapper.xml | 3 +- .../LpkReserveOrderService.java | 15 +++++- .../LpkReserveOrderGoodsMapper.java | 2 + .../LpkReserveOrderGoodsService.java | 3 ++ 10 files changed, 68 insertions(+), 21 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 399a168..a907598 100644 --- a/src/main/java/com/yxt/yyth/api/lpkgiftcard/AppletVo.java +++ b/src/main/java/com/yxt/yyth/api/lpkgiftcard/AppletVo.java @@ -2,6 +2,7 @@ package com.yxt.yyth.api.lpkgiftcard; import cn.hutool.core.date.DateUtil; import com.yxt.common.base.utils.StringUtils; +import com.yxt.yyth.api.lpkreserveorder.LpkReserveOrderCardVo; import com.yxt.yyth.api.lpkstore.StoreSelect; import lombok.Data; @@ -37,6 +38,8 @@ public class AppletVo { private String storeSid;//上次提货地点 private String addressName; private String isReservation;//是否超过预约时间 0 否 1是 + private boolean notRese=true; //是否能预约 + private List orderCardVoList; public String getStart() { @@ -90,6 +93,7 @@ public class AppletVo { if(states.equals("5")){ if(isReservation.equals("0")){ this.state="已预约"; + this.notRese=false; }else{ this.state="已完成"; showBtn=false; 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 5817f71..2350628 100644 --- a/src/main/java/com/yxt/yyth/api/lpkreserveorder/LpkReserveOrderCardVo.java +++ b/src/main/java/com/yxt/yyth/api/lpkreserveorder/LpkReserveOrderCardVo.java @@ -3,10 +3,12 @@ package com.yxt.yyth.api.lpkreserveorder; import cn.hutool.core.date.DateUtil; import com.fasterxml.jackson.annotation.JsonFormat; import com.yxt.common.core.vo.Vo; +import com.yxt.yyth.api.lpkgiftcard.GoodsVo; import lombok.Data; import java.text.SimpleDateFormat; import java.util.Date; +import java.util.List; /** * @author Fan @@ -16,16 +18,20 @@ import java.util.Date; @Data public class LpkReserveOrderCardVo implements Vo { private String code; //卡号 + private String sid; // @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8") @JsonFormat(pattern = "yyyy-MM-dd",timezone="GMT+8") private Date reserveDate; //预约时间 private String store; //提货门店 + private String storeSid; //提货门店 private String bagName; //礼包 private String cardSid; // 提货卡sid private String orderSid; //预约订单sid private String userName; private String userPhone; private String state;//提货状态 + private List goodsVos; + private String goods; public String getState() { SimpleDateFormat sdf =new SimpleDateFormat("yyyy-MM-dd"); diff --git a/src/main/java/com/yxt/yyth/api/lpkreserveordergoods/LpkReserveOrderGoods.java b/src/main/java/com/yxt/yyth/api/lpkreserveordergoods/LpkReserveOrderGoods.java index e876d4e..026fa4f 100644 --- a/src/main/java/com/yxt/yyth/api/lpkreserveordergoods/LpkReserveOrderGoods.java +++ b/src/main/java/com/yxt/yyth/api/lpkreserveordergoods/LpkReserveOrderGoods.java @@ -20,5 +20,6 @@ public class LpkReserveOrderGoods { private String cardSid; private String goodsSid; private double goodsNumber; + private String num; private String orderSid; } 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 2bbd65a..fdb55be 100644 --- a/src/main/java/com/yxt/yyth/biz/lpkgiftcard/LpkGiftCardService.java +++ b/src/main/java/com/yxt/yyth/biz/lpkgiftcard/LpkGiftCardService.java @@ -19,7 +19,9 @@ 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.lpkgoods.LpkGoods; import com.yxt.yyth.api.lpkreserveorder.LpkReserveOrder; +import com.yxt.yyth.api.lpkreserveorder.LpkReserveOrderCardVo; import com.yxt.yyth.api.lpkreserveorder.LpkReserveOrderVo; import com.yxt.yyth.api.lpkreserveordergoods.LpkReserveOrderGoods; import com.yxt.yyth.api.lpkstore.LpkStoreDetailsVo; @@ -28,6 +30,7 @@ import com.yxt.yyth.biz.lpkcardbuildrecord.LpkCardBuildRecordService; import com.yxt.yyth.biz.lpkcardgrantrecord.LpkCardGrantRecordService; import com.yxt.yyth.biz.lpkgiftbag.LpkGiftBagService; import com.yxt.yyth.biz.lpkgiftcard.generateRule.UniqueIdGenerator; +import com.yxt.yyth.biz.lpkgoods.LpkGoodsService; import com.yxt.yyth.biz.lpkreserveorder.LpkReserveOrderService; import com.yxt.yyth.biz.lpkreserveordergoods.LpkReserveOrderGoodsService; import com.yxt.yyth.biz.lpkstore.LpkStoreService; @@ -70,6 +73,8 @@ public class LpkGiftCardService extends MybatisBaseService goodsVos = new ArrayList<>(); list.forEach(s -> { LpkReserveOrderGoods goods = lpkReserveOrderGoodsService.getReserveByCardSid(vo.getSid(), s.getGoodsSid()).getData(); + GoodsVo goodsVo = new GoodsVo(); + goodsVo.setGoods(s.getGoodsName()); + goodsVo.setNum(s.getGoodsNumber()); + goodsVo.setGoodsSid(s.getGoodsSid()); + goodsVo.setRemarks(s.getRemarks()); + goodsVo.setPic(urlPrefix + s.getPicUrl()); if (vo.getState().equals("已过期")) { - GoodsVo goodsVo = new GoodsVo(); - goodsVo.setGoods(s.getGoodsName()); - goodsVo.setNum(s.getGoodsNumber()); - goodsVo.setGoodsSid(s.getGoodsSid()); - goodsVo.setRemarks(s.getRemarks()); - goodsVo.setPic(urlPrefix + s.getPicUrl()); goodsVo.setLNum(0); goodsVos.add(goodsVo); } else if (!vo.isShowBtn()) { - GoodsVo goodsVo = new GoodsVo(); - goodsVo.setGoods(s.getGoodsName()); - goodsVo.setNum(s.getGoodsNumber()); - goodsVo.setGoodsSid(s.getGoodsSid()); - goodsVo.setRemarks(s.getRemarks()); - goodsVo.setPic(urlPrefix + s.getPicUrl()); goodsVo.setLNum(0); goodsVos.add(goodsVo); } else { - GoodsVo goodsVo = new GoodsVo(); - goodsVo.setGoods(s.getGoodsName()); - goodsVo.setNum(s.getGoodsNumber()); - goodsVo.setGoodsSid(s.getGoodsSid()); - goodsVo.setRemarks(s.getRemarks()); - goodsVo.setPic(urlPrefix + s.getPicUrl()); if (null != goods) { if (goods.getGoodsNumber() != s.getGoodsNumber()) { goodsVo.setLNum(s.getGoodsNumber() - goods.getGoodsNumber()); @@ -200,6 +193,26 @@ public class LpkGiftCardService extends MybatisBaseServicelpkReserveOrderCardVos=lpkReserveOrderService.selOrderByCardSid(sid).getData(); + for(LpkReserveOrderCardVo vo2:lpkReserveOrderCardVos){ + List goodsVos1=new ArrayList<>(); + List goods =lpkReserveOrderGoodsService.selByOrderSid(vo2.getSid()); + for(LpkReserveOrderGoods goods1:goods){ + GoodsVo goodsVo=new GoodsVo(); + LpkGoods lpkGoods=lpkGoodsService.getOne(new QueryWrapper().eq("sid",goods1.getGoodsSid())); + goodsVo.setNum(goods1.getGoodsNumber()); + goodsVo.setGoods(lpkGoods.getName()); + goodsVo.setRemarks(lpkGoods.getRemarks()); + goodsVos1.add(goodsVo); +// if(StringUtils.isBlank(vo.getGoods())){ +// vo.setGoods(lpkGoods.getName()+"："+goods1.getNum()+lpkGoods.getUnitName()); +// }else{ +// vo.setGoods(vo.getGoods()+" "+lpkGoods.getName()+"："+goods1.getNum()+lpkGoods.getUnitName()); +// } + } + vo2.setGoodsVos(goodsVos1); + } + vo.setOrderCardVoList(lpkReserveOrderCardVos); vo.setGoodsVos(goodsVos); return rb.success().setData(vo); } diff --git a/src/main/java/com/yxt/yyth/biz/lpkgoods/LpkGoodsMapper.xml b/src/main/java/com/yxt/yyth/biz/lpkgoods/LpkGoodsMapper.xml index 93c2b43..847adb2 100644 --- a/src/main/java/com/yxt/yyth/biz/lpkgoods/LpkGoodsMapper.xml +++ b/src/main/java/com/yxt/yyth/biz/lpkgoods/LpkGoodsMapper.xml @@ -42,7 +42,8 @@ typeCode, price, picUrl, - remarks + remarks, + appContent from lpk_goods where sid=#{sid} 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 7ede007..8ae33d1 100644 --- a/src/main/java/com/yxt/yyth/biz/lpkreserveorder/LpkReserveOrderMapper.java +++ b/src/main/java/com/yxt/yyth/biz/lpkreserveorder/LpkReserveOrderMapper.java @@ -28,4 +28,7 @@ public interface LpkReserveOrderMapper extends BaseMapper { 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); + @Select("SELECT o.*,st.`name` AS store FROM lpk_reserve_order o LEFT JOIN lpk_store st ON o.storeSid = st.sid where o.cardSid =#{sid} ORDER BY o.reserveDate desc") + List selOrderByCardSid(@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 5a450c5..a594a09 100644 --- a/src/main/java/com/yxt/yyth/biz/lpkreserveorder/LpkReserveOrderMapper.xml +++ b/src/main/java/com/yxt/yyth/biz/lpkreserveorder/LpkReserveOrderMapper.xml @@ -55,7 +55,8 @@ o.cardSid as cardSid, o.sid as orderSid, o.userName, - o.userPhone + o.userPhone, + o.sid 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 e7f6bb8..60ed53f 100644 --- a/src/main/java/com/yxt/yyth/biz/lpkreserveorder/LpkReserveOrderService.java +++ b/src/main/java/com/yxt/yyth/biz/lpkreserveorder/LpkReserveOrderService.java @@ -137,6 +137,17 @@ public class LpkReserveOrderService extends MybatisBaseService page = PagerUtil.queryToPage(pq); IPage pagging = baseMapper.orderListByUserSid(page, qw); + for(LpkReserveOrderCardVo vo:pagging.getRecords()){ + List goods =lpkReserveOrderGoodsService.selByOrderSids(vo.getSid()); + for(LpkReserveOrderGoods goods1:goods){ + LpkGoods lpkGoods=lpkGoodsService.getOne(new QueryWrapper().eq("sid",goods1.getGoodsSid())); + if(StringUtils.isBlank(vo.getGoods())){ + vo.setGoods(lpkGoods.getName()+"："+goods1.getNum()+lpkGoods.getUnitName()); + }else{ + vo.setGoods(vo.getGoods()+" "+lpkGoods.getName()+"："+goods1.getNum()+lpkGoods.getUnitName()); + } + } + } PagerVo p = PagerUtil.pageToVo(pagging, null); return rb.success().setData(p); } @@ -269,5 +280,7 @@ public class LpkReserveOrderService extends MybatisBaseService selByCardSid(String sid) { return new ResultBean().success().setData(baseMapper.selByCardSid(sid)); } - + public ResultBean> selOrderByCardSid(String sid) { + return new ResultBean().success().setData(baseMapper.selOrderByCardSid(sid)); + } } diff --git a/src/main/java/com/yxt/yyth/biz/lpkreserveordergoods/LpkReserveOrderGoodsMapper.java b/src/main/java/com/yxt/yyth/biz/lpkreserveordergoods/LpkReserveOrderGoodsMapper.java index 232628a..36e3c00 100644 --- a/src/main/java/com/yxt/yyth/biz/lpkreserveordergoods/LpkReserveOrderGoodsMapper.java +++ b/src/main/java/com/yxt/yyth/biz/lpkreserveordergoods/LpkReserveOrderGoodsMapper.java @@ -21,4 +21,6 @@ public interface LpkReserveOrderGoodsMapper extends BaseMapper selByOrderSid(String orderSid); + @Select("select *,goodsNumber as num from lpk_reserve_order_goods where orderSid=#{orderSid}") + List selByOrderSids(String orderSid); } 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 cc98ab8..c713f95 100644 --- a/src/main/java/com/yxt/yyth/biz/lpkreserveordergoods/LpkReserveOrderGoodsService.java +++ b/src/main/java/com/yxt/yyth/biz/lpkreserveordergoods/LpkReserveOrderGoodsService.java @@ -71,4 +71,7 @@ public class LpkReserveOrderGoodsService extends MybatisBaseService selByOrderSid(String orderSid) { return baseMapper.selByOrderSid(orderSid); } + public List selByOrderSids(String orderSid) { + return baseMapper.selByOrderSids(orderSid); + } }