From 7008884e36b72fb85195807d46945d773c2b55a2 Mon Sep 17 00:00:00 2001 From: wangpengfei <1928057482@qq.com> Date: Thu, 23 Nov 2023 18:07:57 +0800 Subject: [PATCH] 11/23 --- .../yxt/yyth/api/lpkgiftcard/AppletVo.java | 19 +++++++++++++++ .../com/yxt/yyth/api/lpkgiftcard/GoodsVo.java | 2 ++ .../yxt/yyth/api/lpkreserveorder/Goods.java | 14 +++++++++++ .../lpkreserveorder/LpkReserveOrderDto.java | 16 ++++++++++++- .../LpkReserveOrderGoodsDto.java | 6 +++++ .../yyth/biz/lpkgiftbag/LpkGiftBagMapper.java | 3 +++ .../yyth/biz/lpkgiftbag/LpkGiftBagMapper.xml | 5 ++++ .../yyth/biz/lpkgiftbag/LpkGiftBagRest.java | 6 ++++- .../biz/lpkgiftbag/LpkGiftBagService.java | 5 ++++ .../biz/lpkgiftcard/LpkGiftCardService.java | 1 + .../lpkreserveorder/LpkReserveOrderRest.java | 8 ++++--- .../LpkReserveOrderService.java | 19 +++++++++++++-- .../LpkReserveOrderGoodsMapper.java | 4 ++++ .../LpkReserveOrderGoodsRest.java | 8 ++++--- .../LpkReserveOrderGoodsService.java | 24 ++++++++++++++++++- 15 files changed, 129 insertions(+), 11 deletions(-) create mode 100644 src/main/java/com/yxt/yyth/api/lpkreserveorder/Goods.java 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 6a4e415..120146b 100644 --- a/src/main/java/com/yxt/yyth/api/lpkgiftcard/AppletVo.java +++ b/src/main/java/com/yxt/yyth/api/lpkgiftcard/AppletVo.java @@ -5,6 +5,7 @@ import com.yxt.yyth.api.lpkstore.StoreSelect; import lombok.Data; import java.text.SimpleDateFormat; +import java.util.Date; import java.util.List; /** @@ -26,9 +27,27 @@ public class AppletVo { private String time; private String name="卡号："; private String pName; + private String start; + private String end; private List goodsVos; private List select; + + public String getStart() { + SimpleDateFormat sdf =new SimpleDateFormat("yyyy-MM-dd"); + start=sdf.format(DateUtil.offsetDay(new Date(),+2)); + + int i=DateUtil.parse(sdf.format(DateUtil.parse(start))).compareTo(DateUtil.parse(sdf.format(DateUtil.parse(dateEnd)))); + if(String.valueOf(i).equals("-1")){ + end=sdf.format(DateUtil.parse(dateEnd)); + }else{ + end=sdf.format(DateUtil.offsetDay(DateUtil.parse(dateEnd),2)); + } + return start; + } + + + public String getName() { name=name+code; return name; diff --git a/src/main/java/com/yxt/yyth/api/lpkgiftcard/GoodsVo.java b/src/main/java/com/yxt/yyth/api/lpkgiftcard/GoodsVo.java index a0ea5e0..e23d271 100644 --- a/src/main/java/com/yxt/yyth/api/lpkgiftcard/GoodsVo.java +++ b/src/main/java/com/yxt/yyth/api/lpkgiftcard/GoodsVo.java @@ -13,4 +13,6 @@ public class GoodsVo { private String pic; private double num; private double lNum; + private double select=0; + private String goodsSid; } diff --git a/src/main/java/com/yxt/yyth/api/lpkreserveorder/Goods.java b/src/main/java/com/yxt/yyth/api/lpkreserveorder/Goods.java new file mode 100644 index 0000000..1c04878 --- /dev/null +++ b/src/main/java/com/yxt/yyth/api/lpkreserveorder/Goods.java @@ -0,0 +1,14 @@ +package com.yxt.yyth.api.lpkreserveorder; + +import lombok.Data; + +/** + * @author wangpengfei + * @date 2023/11/23 14:34 + */ +@Data +public class Goods { + private double goodsNumber;//数量 + private String goodsSid;//商品sid + +} diff --git a/src/main/java/com/yxt/yyth/api/lpkreserveorder/LpkReserveOrderDto.java b/src/main/java/com/yxt/yyth/api/lpkreserveorder/LpkReserveOrderDto.java index a017c65..4088086 100644 --- a/src/main/java/com/yxt/yyth/api/lpkreserveorder/LpkReserveOrderDto.java +++ b/src/main/java/com/yxt/yyth/api/lpkreserveorder/LpkReserveOrderDto.java @@ -1,8 +1,22 @@ package com.yxt.yyth.api.lpkreserveorder; +import com.yxt.common.core.dto.Dto; +import com.yxt.yyth.api.lpkgiftcard.GoodsVo; +import lombok.Data; + +import java.util.List; + /** * @author wangpengfei * @date 2023/11/23 10:29 */ -public class LpkReserveOrderDto { +@Data +public class LpkReserveOrderDto implements Dto { + private String cardSid;//礼包卡sid + private String sid; + private String value; + private String storeSid;//发放点 + private String customerSid;//客户sid + private String reserveDate;//发放时间 + private List goodsVos; } diff --git a/src/main/java/com/yxt/yyth/api/lpkreserveordergoods/LpkReserveOrderGoodsDto.java b/src/main/java/com/yxt/yyth/api/lpkreserveordergoods/LpkReserveOrderGoodsDto.java index 5a30d0c..218ecd4 100644 --- a/src/main/java/com/yxt/yyth/api/lpkreserveordergoods/LpkReserveOrderGoodsDto.java +++ b/src/main/java/com/yxt/yyth/api/lpkreserveordergoods/LpkReserveOrderGoodsDto.java @@ -1,8 +1,14 @@ package com.yxt.yyth.api.lpkreserveordergoods; +import lombok.Data; + /** * @author wangpengfei * @date 2023/11/23 10:29 */ +@Data public class LpkReserveOrderGoodsDto { + private String cardSid; + private String goodsSid; + private String goodsNumber; } diff --git a/src/main/java/com/yxt/yyth/biz/lpkgiftbag/LpkGiftBagMapper.java b/src/main/java/com/yxt/yyth/biz/lpkgiftbag/LpkGiftBagMapper.java index 38e9a5e..57886a5 100644 --- a/src/main/java/com/yxt/yyth/biz/lpkgiftbag/LpkGiftBagMapper.java +++ b/src/main/java/com/yxt/yyth/biz/lpkgiftbag/LpkGiftBagMapper.java @@ -11,6 +11,8 @@ import com.yxt.yyth.api.lpkgiftbag.LpkGiftBagVo; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; +import java.util.List; + /** * @author wangpengfei * @date 2023/11/21 15:03 @@ -20,4 +22,5 @@ public interface LpkGiftBagMapper extends BaseMapper { IPage giftBagListPage(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); + List giftBagList(); } diff --git a/src/main/java/com/yxt/yyth/biz/lpkgiftbag/LpkGiftBagMapper.xml b/src/main/java/com/yxt/yyth/biz/lpkgiftbag/LpkGiftBagMapper.xml index 7dbdeb1..191cd87 100644 --- a/src/main/java/com/yxt/yyth/biz/lpkgiftbag/LpkGiftBagMapper.xml +++ b/src/main/java/com/yxt/yyth/biz/lpkgiftbag/LpkGiftBagMapper.xml @@ -18,4 +18,9 @@ ${ew.sqlSegment} + \ No newline at end of file diff --git a/src/main/java/com/yxt/yyth/biz/lpkgiftbag/LpkGiftBagRest.java b/src/main/java/com/yxt/yyth/biz/lpkgiftbag/LpkGiftBagRest.java index 3bd3113..3eb1933 100644 --- a/src/main/java/com/yxt/yyth/biz/lpkgiftbag/LpkGiftBagRest.java +++ b/src/main/java/com/yxt/yyth/biz/lpkgiftbag/LpkGiftBagRest.java @@ -53,5 +53,9 @@ public class LpkGiftBagRest { public ResultBean deleteBag(@PathVariable("sid") String sid) { return lpkGiftBagService.deleteBag(sid); } - + @ApiOperation("礼包信息列表") + @GetMapping("/giftBagList") + public ResultBean giftBagList() { + return lpkGiftBagService.giftBagList(); + } } diff --git a/src/main/java/com/yxt/yyth/biz/lpkgiftbag/LpkGiftBagService.java b/src/main/java/com/yxt/yyth/biz/lpkgiftbag/LpkGiftBagService.java index a69ad25..dffc814 100644 --- a/src/main/java/com/yxt/yyth/biz/lpkgiftbag/LpkGiftBagService.java +++ b/src/main/java/com/yxt/yyth/biz/lpkgiftbag/LpkGiftBagService.java @@ -172,4 +172,9 @@ public class LpkGiftBagService extends MybatisBaseService pagging = baseMapper.giftBagList(); + return rb.success().setData(pagging); + } } 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 3a570b7..8086f34 100644 --- a/src/main/java/com/yxt/yyth/biz/lpkgiftcard/LpkGiftCardService.java +++ b/src/main/java/com/yxt/yyth/biz/lpkgiftcard/LpkGiftCardService.java @@ -115,6 +115,7 @@ public class LpkGiftCardService extends MybatisBaseService { - public ResultBean submission(){ + @Autowired + LpkReserveOrderGoodsService lpkReserveOrderGoodsService; + public ResultBean submission( LpkReserveOrderDto dto){ ResultBean rb=new ResultBean(); - return rb.success().setData("1"); + LpkReserveOrder order=new LpkReserveOrder(); + BeanUtil.copyProperties(dto, order, "id", "sid"); + order.setStoreSid(dto.getValue()); + baseMapper.insert(order); + + lpkReserveOrderGoodsService.submissionDetail(dto); + return rb.success().setData("预约成功"); } } 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 632ffbf..e560ac7 100644 --- a/src/main/java/com/yxt/yyth/biz/lpkreserveordergoods/LpkReserveOrderGoodsMapper.java +++ b/src/main/java/com/yxt/yyth/biz/lpkreserveordergoods/LpkReserveOrderGoodsMapper.java @@ -3,6 +3,8 @@ package com.yxt.yyth.biz.lpkreserveordergoods; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.yxt.yyth.api.lpkreserveordergoods.LpkReserveOrderGoods; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; /** * @author wangpengfei @@ -10,4 +12,6 @@ import org.apache.ibatis.annotations.Mapper; */ @Mapper public interface LpkReserveOrderGoodsMapper extends BaseMapper { + @Select("select sum(goodsNumber) as goodsNumber , goodsSid as goodsSid from lpk_reserve_order_goods where cardSid=#{cardSid} and goodsSid=#{goodsSid}") + LpkReserveOrderGoods getReserveByCardSid (@Param("cardSid")String cardSid,@Param("goodsSid") String goodsSid); } diff --git a/src/main/java/com/yxt/yyth/biz/lpkreserveordergoods/LpkReserveOrderGoodsRest.java b/src/main/java/com/yxt/yyth/biz/lpkreserveordergoods/LpkReserveOrderGoodsRest.java index 5017147..99fd8f7 100644 --- a/src/main/java/com/yxt/yyth/biz/lpkreserveordergoods/LpkReserveOrderGoodsRest.java +++ b/src/main/java/com/yxt/yyth/biz/lpkreserveordergoods/LpkReserveOrderGoodsRest.java @@ -1,6 +1,8 @@ package com.yxt.yyth.biz.lpkreserveordergoods; import com.yxt.common.core.result.ResultBean; +import com.yxt.yyth.api.lpkreserveorder.LpkReserveOrderDto; +import com.yxt.yyth.api.lpkreserveordergoods.LpkReserveOrderGoodsDto; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; @@ -21,8 +23,8 @@ public class LpkReserveOrderGoodsRest { // @ApiOperation("预约提交") -// @PostMapping("/getReserveByCardSid") -// public ResultBean getReserveByCardSid(String sid){ -// return lpkReserveOrderGoodsService.getReserveByCardSid(sid); +// @PostMapping("/submissionDetail") +// public ResultBean submissionDetail(LpkReserveOrderGoodsDto dto){ +// return lpkReserveOrderGoodsService.submissionDetail(dto); // } } 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 44cce71..33d5201 100644 --- a/src/main/java/com/yxt/yyth/biz/lpkreserveordergoods/LpkReserveOrderGoodsService.java +++ b/src/main/java/com/yxt/yyth/biz/lpkreserveordergoods/LpkReserveOrderGoodsService.java @@ -1,9 +1,15 @@ package com.yxt.yyth.biz.lpkreserveordergoods; +import cn.hutool.core.bean.BeanUtil; 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.yyth.api.lpkgiftcard.GoodsVo; +import com.yxt.yyth.api.lpkreserveorder.Goods; +import com.yxt.yyth.api.lpkreserveorder.LpkReserveOrder; +import com.yxt.yyth.api.lpkreserveorder.LpkReserveOrderDto; import com.yxt.yyth.api.lpkreserveordergoods.LpkReserveOrderGoods; +import com.yxt.yyth.api.lpkreserveordergoods.LpkReserveOrderGoodsDto; import org.springframework.stereotype.Service; import java.util.List; @@ -16,7 +22,23 @@ import java.util.List; public class LpkReserveOrderGoodsService extends MybatisBaseService { public ResultBean getReserveByCardSid(String carSid,String goodsSid){ ResultBean rb=new ResultBean(); - LpkReserveOrderGoods goods= baseMapper.selectOne(new QueryWrapper().eq("cardSid",carSid).eq("goodsSid",goodsSid)); + LpkReserveOrderGoods goods= baseMapper.getReserveByCardSid(carSid,goodsSid); return rb.success().setData(goods); } + public ResultBean submissionDetail(LpkReserveOrderDto dto){ + ResultBean rb=new ResultBean(); + LpkReserveOrderGoods goods=new LpkReserveOrderGoods(); + BeanUtil.copyProperties(dto, goods, "id", "sid"); + goods.setCardSid(dto.getSid()); + for (GoodsVo goods1:dto.getGoodsVos()){ + if(goods1.getSelect()!=0){ + goods.setCardSid(dto.getCardSid()); + goods.setGoodsSid(goods1.getGoodsSid()); + goods.setGoodsNumber(goods1.getSelect()); + baseMapper.insert(goods); + } + } + + return rb.success().setData("预约成功"); + } }