From 8a914b41fbe15fadb9603e788b50cf90053d439d Mon Sep 17 00:00:00 2001 From: fanzongzhe <285169773@qq.com> Date: Mon, 27 Nov 2023 18:09:59 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A2=84=E7=BA=A6=E6=8F=90=E8=B4=A7=E7=B3=BB?= =?UTF-8?q?=E7=BB=9F=E8=AF=A6=E6=83=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../yxt/yyth/api/lpkgiftcard/AppletVo.java | 2 + .../com/yxt/yyth/api/lpkgiftcard/GoodsVo.java | 3 +- .../api/lpkreserveorder/LpkReserveOrder.java | 3 +- .../LpkReserveOrderCardVo.java | 19 +++ .../lpkreserveorder/LpkReserveOrderDto.java | 3 + .../lpkreserveorder/LpkReserveOrderQuery.java | 11 +- .../lpkreserveorder/LpkReserveOrderVo.java | 18 +++ .../LpkReserveOrderGoods.java | 5 +- .../biz/lpkgiftcard/LpkGiftCardService.java | 11 +- .../LpkReserveOrderMapper.java | 13 ++ .../lpkreserveorder/LpkReserveOrderMapper.xml | 40 +++++ .../lpkreserveorder/LpkReserveOrderRest.java | 39 ++++- .../LpkReserveOrderService.java | 148 +++++++++++++++++- .../LpkReserveOrderGoodsMapper.java | 1 + .../LpkReserveOrderGoodsMapper.xml | 7 + .../LpkReserveOrderGoodsService.java | 44 +++--- 16 files changed, 331 insertions(+), 36 deletions(-) create mode 100644 src/main/java/com/yxt/yyth/api/lpkreserveorder/LpkReserveOrderCardVo.java create mode 100644 src/main/java/com/yxt/yyth/api/lpkreserveorder/LpkReserveOrderVo.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 5a75608..d2f8b2a 100644 --- a/src/main/java/com/yxt/yyth/api/lpkgiftcard/AppletVo.java +++ b/src/main/java/com/yxt/yyth/api/lpkgiftcard/AppletVo.java @@ -30,6 +30,8 @@ public class AppletVo { private String pName; private String start; private String end; + private String store; //门店 + private String reserveDate; //预约时间 private List goodsVos; private List select; 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 e23d271..ada7d45 100644 --- a/src/main/java/com/yxt/yyth/api/lpkgiftcard/GoodsVo.java +++ b/src/main/java/com/yxt/yyth/api/lpkgiftcard/GoodsVo.java @@ -13,6 +13,7 @@ public class GoodsVo { private String pic; private double num; private double lNum; - private double select=0; + private double select = 0; private String goodsSid; + private double orderNum; //预约数量 } diff --git a/src/main/java/com/yxt/yyth/api/lpkreserveorder/LpkReserveOrder.java b/src/main/java/com/yxt/yyth/api/lpkreserveorder/LpkReserveOrder.java index ba533f4..25732e1 100644 --- a/src/main/java/com/yxt/yyth/api/lpkreserveorder/LpkReserveOrder.java +++ b/src/main/java/com/yxt/yyth/api/lpkreserveorder/LpkReserveOrder.java @@ -3,6 +3,7 @@ package com.yxt.yyth.api.lpkreserveorder; import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; +import java.util.Date; import java.util.UUID; /** @@ -14,7 +15,7 @@ public class LpkReserveOrder{ private String id; private String sid= UUID.randomUUID().toString(); @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8") - private String createTime; + private Date createTime; private String remarks; private String reserveType; private String cardSid; diff --git a/src/main/java/com/yxt/yyth/api/lpkreserveorder/LpkReserveOrderCardVo.java b/src/main/java/com/yxt/yyth/api/lpkreserveorder/LpkReserveOrderCardVo.java new file mode 100644 index 0000000..9b756ea --- /dev/null +++ b/src/main/java/com/yxt/yyth/api/lpkreserveorder/LpkReserveOrderCardVo.java @@ -0,0 +1,19 @@ +package com.yxt.yyth.api.lpkreserveorder; + +import com.yxt.common.core.vo.Vo; +import lombok.Data; + +/** + * @author Fan + * @description + * @date 2023/11/27 16:53 + */ +@Data +public class LpkReserveOrderCardVo implements Vo { + private String code; //卡号 + private String reserveDate; //预约时间 + private String store; //提货门店 + private String bagName; //礼包 + private String cardSid; // 提货卡sid + private String orderSid; //预约订单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 4088086..176b8da 100644 --- a/src/main/java/com/yxt/yyth/api/lpkreserveorder/LpkReserveOrderDto.java +++ b/src/main/java/com/yxt/yyth/api/lpkreserveorder/LpkReserveOrderDto.java @@ -18,5 +18,8 @@ public class LpkReserveOrderDto implements Dto { private String storeSid;//发放点 private String customerSid;//客户sid private String reserveDate;//发放时间 + private String userName;//用户名 + private String userPhone;//用户联系方式 private List goodsVos; + private String orderSid; } diff --git a/src/main/java/com/yxt/yyth/api/lpkreserveorder/LpkReserveOrderQuery.java b/src/main/java/com/yxt/yyth/api/lpkreserveorder/LpkReserveOrderQuery.java index dea2016..75985e3 100644 --- a/src/main/java/com/yxt/yyth/api/lpkreserveorder/LpkReserveOrderQuery.java +++ b/src/main/java/com/yxt/yyth/api/lpkreserveorder/LpkReserveOrderQuery.java @@ -1,8 +1,17 @@ package com.yxt.yyth.api.lpkreserveorder; +import com.yxt.common.core.query.Query; +import lombok.Data; + /** * @author wangpengfei * @date 2023/11/23 10:30 */ -public class LpkReserveOrderQuery { +@Data +public class LpkReserveOrderQuery implements Query { + private String userName; + private String store; + private String startDate; + private String endDate; + private String userSid; } diff --git a/src/main/java/com/yxt/yyth/api/lpkreserveorder/LpkReserveOrderVo.java b/src/main/java/com/yxt/yyth/api/lpkreserveorder/LpkReserveOrderVo.java new file mode 100644 index 0000000..bd5d9fc --- /dev/null +++ b/src/main/java/com/yxt/yyth/api/lpkreserveorder/LpkReserveOrderVo.java @@ -0,0 +1,18 @@ +package com.yxt.yyth.api.lpkreserveorder; + +import com.yxt.common.core.vo.Vo; +import lombok.Data; + +/** + * @author Fan + * @description + * @date 2023/11/27 15:11 + */ +@Data +public class LpkReserveOrderVo implements Vo { + private String sid; + private String userName; + private String userPhone; + private String store; + private String reserveDate; +} 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 8d2535a..e876d4e 100644 --- a/src/main/java/com/yxt/yyth/api/lpkreserveordergoods/LpkReserveOrderGoods.java +++ b/src/main/java/com/yxt/yyth/api/lpkreserveordergoods/LpkReserveOrderGoods.java @@ -3,6 +3,7 @@ package com.yxt.yyth.api.lpkreserveordergoods; import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; +import java.util.Date; import java.util.UUID; /** @@ -14,10 +15,10 @@ public class LpkReserveOrderGoods { private String id; private String sid= UUID.randomUUID().toString(); @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8") - private String createTime; + private Date createTime; private String remarks; private String cardSid; private String goodsSid; private double goodsNumber; - + 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 e4c93a5..a55e923 100644 --- a/src/main/java/com/yxt/yyth/biz/lpkgiftcard/LpkGiftCardService.java +++ b/src/main/java/com/yxt/yyth/biz/lpkgiftcard/LpkGiftCardService.java @@ -98,6 +98,7 @@ public class LpkGiftCardService extends MybatisBaseService list = LpkGiftBagGoodsService.getGoodsByBagSid(vo.getGiftbagSid()); List goodsVos = new ArrayList<>(); list.forEach(s -> { + LpkReserveOrderGoods goods = lpkReserveOrderGoodsService.getReserveByCardSid(vo.getSid(), s.getGoodsSid()).getData(); if (vo.getState().equals("失效")) { GoodsVo goodsVo = new GoodsVo(); goodsVo.setGoods(s.getGoodsName()); @@ -117,7 +118,15 @@ public class LpkGiftCardService extends MybatisBaseService { + IPage orderList(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); + + List orderByCardSid(String sid); + + IPage orderListByUserSid(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); } 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 8c2a1a8..f9841b5 100644 --- a/src/main/java/com/yxt/yyth/biz/lpkreserveorder/LpkReserveOrderMapper.xml +++ b/src/main/java/com/yxt/yyth/biz/lpkreserveorder/LpkReserveOrderMapper.xml @@ -18,4 +18,44 @@ ${ew.sqlSegment} + + + \ No newline at end of file diff --git a/src/main/java/com/yxt/yyth/biz/lpkreserveorder/LpkReserveOrderRest.java b/src/main/java/com/yxt/yyth/biz/lpkreserveorder/LpkReserveOrderRest.java index 2b9d363..8e293cb 100644 --- a/src/main/java/com/yxt/yyth/biz/lpkreserveorder/LpkReserveOrderRest.java +++ b/src/main/java/com/yxt/yyth/biz/lpkreserveorder/LpkReserveOrderRest.java @@ -1,15 +1,20 @@ package com.yxt.yyth.biz.lpkreserveorder; +import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; +import com.yxt.yyth.api.lpkcustomer.LpkCustomerQuery; +import com.yxt.yyth.api.lpkcustomer.LpkCustomerVo; +import com.yxt.yyth.api.lpkreserveorder.LpkReserveOrderCardVo; import com.yxt.yyth.api.lpkreserveorder.LpkReserveOrderDto; +import com.yxt.yyth.api.lpkreserveorder.LpkReserveOrderQuery; +import com.yxt.yyth.api.lpkreserveorder.LpkReserveOrderVo; +import com.yxt.yyth.api.lpkstore.LpkStoreDetailsVo; import io.swagger.annotations.Api; import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; /** * @author wangpengfei @@ -25,7 +30,31 @@ public class LpkReserveOrderRest { @ApiOperation("预约提交") @PostMapping("/submission") - public ResultBean submission(@RequestBody LpkReserveOrderDto dto){ + public ResultBean submission(@RequestBody LpkReserveOrderDto dto) { return lpkReserveOrderService.submission(dto); } + + @ApiOperation("订单列表") + @PostMapping("/orderList") + public ResultBean> orderList(@RequestBody PagerQuery pq) { + return lpkReserveOrderService.orderList(pq); + } + + @ApiOperation("根据提货卡查询预约记录") + @GetMapping("/orderByCardSid/{sid}") + public ResultBean orderByCardSid(@PathVariable("sid") String sid) { + return lpkReserveOrderService.orderByCardSid(sid); + } + + @ApiOperation("移动端预约订单列表") + @PostMapping("/orderListByUserSid") + public ResultBean> orderListByUserSid(@RequestBody PagerQuery pq) { + return lpkReserveOrderService.orderListByUserSid(pq); + } + + @ApiOperation("预约记录详情") + @GetMapping("/orderDetails/{orderSid}") + public ResultBean orderDetails(@PathVariable("orderSid") String orderSid) { + return lpkReserveOrderService.orderDetails(orderSid); + } } 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 5d74162..210602c 100644 --- a/src/main/java/com/yxt/yyth/biz/lpkreserveorder/LpkReserveOrderService.java +++ b/src/main/java/com/yxt/yyth/biz/lpkreserveorder/LpkReserveOrderService.java @@ -1,17 +1,44 @@ package com.yxt.yyth.biz.lpkreserveorder; 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.yxt.common.base.service.MybatisBaseService; +import com.yxt.common.base.utils.PagerUtil; +import com.yxt.common.base.utils.StringUtils; +import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; -import com.yxt.yyth.api.lpkreserveorder.Goods; -import com.yxt.yyth.api.lpkreserveorder.LpkReserveOrder; -import com.yxt.yyth.api.lpkreserveorder.LpkReserveOrderDto; +import com.yxt.common.core.vo.PagerVo; +import com.yxt.yyth.api.lpkcustomer.LpkCustomer; +import com.yxt.yyth.api.lpkcustomer.LpkCustomerQuery; +import com.yxt.yyth.api.lpkcustomer.LpkCustomerVo; +import com.yxt.yyth.api.lpkgiftbaggoods.LpkGiftBagGoodsVo; +import com.yxt.yyth.api.lpkgiftcard.AppletVo; +import com.yxt.yyth.api.lpkgiftcard.GoodsVo; +import com.yxt.yyth.api.lpkgiftcard.LpkGiftCard; +import com.yxt.yyth.api.lpkreserveorder.*; +import com.yxt.yyth.api.lpkreserveordergoods.LpkReserveOrderGoods; import com.yxt.yyth.api.lpkreserveordergoods.LpkReserveOrderGoodsDto; +import com.yxt.yyth.api.lpkstore.LpkStore; +import com.yxt.yyth.api.lpkstore.StoreSelect; +import com.yxt.yyth.biz.lpkgiftbaggoods.LpkGiftBagGoodsService; +import com.yxt.yyth.biz.lpkgiftcard.LpkGiftCardMapper; +import com.yxt.yyth.biz.lpkgiftcard.LpkGiftCardService; import com.yxt.yyth.biz.lpkreserveordergoods.LpkReserveOrderGoodsService; +import com.yxt.yyth.biz.lpkstore.LpkStoreService; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; import org.springframework.web.bind.annotation.RequestBody; +import java.text.ParseException; +import java.text.SimpleDateFormat; +import java.util.ArrayList; +import java.util.Collections; +import java.util.Date; +import java.util.List; + /** * @author wangpengfei * @date 2023/11/23 10:36 @@ -20,14 +47,121 @@ import org.springframework.web.bind.annotation.RequestBody; public class LpkReserveOrderService extends MybatisBaseService { @Autowired LpkReserveOrderGoodsService lpkReserveOrderGoodsService; - public ResultBean submission( LpkReserveOrderDto dto){ - ResultBean rb=new ResultBean(); - LpkReserveOrder order=new LpkReserveOrder(); + @Autowired + LpkGiftCardMapper lpkGiftCardMapper; + @Autowired + LpkGiftBagGoodsService lpkGiftBagGoodsService; + @Autowired + LpkStoreService lpkStoreService; + @Value("${image.url.prefix:http://127.0.0.1:8080/upload/}") + private String urlPrefix; + + public ResultBean submission(LpkReserveOrderDto dto) { + ResultBean rb = new ResultBean(); + LpkReserveOrder order = new LpkReserveOrder(); BeanUtil.copyProperties(dto, order, "id", "sid"); order.setStoreSid(dto.getValue()); + order.setCardSid(dto.getSid()); + order.setCreateTime(new DateTime()); baseMapper.insert(order); - + dto.setOrderSid(order.getSid()); lpkReserveOrderGoodsService.submissionDetail(dto); return rb.success().setData("预约成功"); } + + public ResultBean> orderList(PagerQuery pq) { + ResultBean rb = ResultBean.fireFail(); + LpkReserveOrderQuery query = pq.getParams(); + QueryWrapper qw = new QueryWrapper<>(); + qw.eq("1", "1"); + if (StringUtils.isNotBlank(query.getStore())) { + qw.like("s.name", query.getStore()); + } + if (StringUtils.isNotBlank(query.getUserName())) { + qw.like("o.userName", query.getUserName()); + } + String startDate = query.getStartDate(); + String endDate = query.getEndDate(); + qw.apply(org.apache.commons.lang3.StringUtils.isNotEmpty(startDate), "date_format (o.reserveDate,'%Y-%m-%d') >= date_format('" + startDate + "','%Y-%m-%d')"). + apply(org.apache.commons.lang3.StringUtils.isNotEmpty(endDate), "date_format (o.reserveDate,'%Y-%m-%d') <= date_format('" + endDate + "','%Y-%m-%d')" + ); + qw.orderByDesc("o.createTime"); + IPage page = PagerUtil.queryToPage(pq); + IPage pagging = baseMapper.orderList(page, qw); + PagerVo p = PagerUtil.pageToVo(pagging, null); + return rb.success().setData(p); + } + + public ResultBean orderByCardSid(String sid) { + ResultBean rb = ResultBean.fireFail(); + List list = baseMapper.orderByCardSid(sid); + return rb.success().setData(list); + } + + public ResultBean> orderListByUserSid(PagerQuery pq) { + ResultBean rb = ResultBean.fireFail(); + LpkReserveOrderQuery query = pq.getParams(); + QueryWrapper qw = new QueryWrapper<>(); + qw.eq("o.customerSid", query.getUserSid()); + qw.orderByDesc("o.createTime"); + IPage page = PagerUtil.queryToPage(pq); + IPage pagging = baseMapper.orderListByUserSid(page, qw); + PagerVo p = PagerUtil.pageToVo(pagging, null); + return rb.success().setData(p); + } + + public ResultBean orderDetails(String orderSid) { + ResultBean rb = new ResultBean().fail(); + LpkReserveOrder lpkReserveOrder = fetchBySid(orderSid); + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); + if (null != lpkReserveOrder) { + AppletVo vo = lpkGiftCardMapper.getGifCardBySid(lpkReserveOrder.getCardSid()); + if (StringUtils.isNotBlank(lpkReserveOrder.getStoreSid())) { + LpkStore lpkStore = lpkStoreService.fetchBySid(lpkReserveOrder.getStoreSid()); + if (null != lpkStore) { + if (StringUtils.isNotBlank(lpkStore.getName())) { + vo.setStore(lpkStore.getName()); + } + } + } + if (StringUtils.isNotBlank(lpkReserveOrder.getReserveDate())) { + try { + Date parse = sdf.parse(lpkReserveOrder.getReserveDate()); + vo.setReserveDate(sdf.format(parse)); + } catch (ParseException e) { + e.printStackTrace(); + } + } + List list = lpkGiftBagGoodsService.getGoodsByBagSid(vo.getGiftbagSid()); + List l = lpkStoreService.getAllStore().getData(); + List goodsVos = new ArrayList<>(); + list.forEach(s -> { + LpkReserveOrderGoods goods = lpkReserveOrderGoodsService.getReserveByCardSid(vo.getSid(), s.getGoodsSid()).getData(); + LpkReserveOrderGoods orderGoods = lpkReserveOrderGoodsService.selByOrderSidAndGoodSid(orderSid, s.getGoodsSid()); + GoodsVo goodsVo = new GoodsVo(); + goodsVo.setGoods(s.getGoodsName()); + goodsVo.setNum(s.getGoodsNumber()); + goodsVo.setGoodsSid(s.getGoodsSid()); + goodsVo.setPic(urlPrefix + s.getPicUrl()); + if (null != goods) { + if (goods.getGoodsNumber() != s.getGoodsNumber()) { + goodsVo.setLNum(s.getGoodsNumber() - goods.getGoodsNumber()); + goodsVo.setSelect(s.getGoodsNumber() - goods.getGoodsNumber()); + if (null != orderGoods) { + goodsVo.setOrderNum(orderGoods.getGoodsNumber()); + } + goodsVos.add(goodsVo); + } + } else { + goodsVo.setLNum(s.getGoodsNumber()); + goodsVo.setSelect(s.getGoodsNumber()); + goodsVos.add(goodsVo); + } + }); + vo.setGoodsVos(goodsVos); + vo.setSelect(l); + return rb.success().setData(vo); + } + return rb.success(); + } } 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 c970c70..612d189 100644 --- a/src/main/java/com/yxt/yyth/biz/lpkreserveordergoods/LpkReserveOrderGoodsMapper.java +++ b/src/main/java/com/yxt/yyth/biz/lpkreserveordergoods/LpkReserveOrderGoodsMapper.java @@ -15,4 +15,5 @@ public interface LpkReserveOrderGoodsMapper extends BaseMapper + \ No newline at end of file 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 16b7b2d..bca05ef 100644 --- a/src/main/java/com/yxt/yyth/biz/lpkreserveordergoods/LpkReserveOrderGoodsService.java +++ b/src/main/java/com/yxt/yyth/biz/lpkreserveordergoods/LpkReserveOrderGoodsService.java @@ -1,6 +1,7 @@ package com.yxt.yyth.biz.lpkreserveordergoods; 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; @@ -25,39 +26,46 @@ import java.util.List; public class LpkReserveOrderGoodsService extends MybatisBaseService { @Autowired LpkGiftCardService lpkGiftCardService; - public ResultBean getReserveByCardSid(String carSid,String goodsSid){ - ResultBean rb=new ResultBean(); - LpkReserveOrderGoods goods= baseMapper.getReserveByCardSid(carSid,goodsSid); + + public ResultBean getReserveByCardSid(String carSid, String goodsSid) { + ResultBean rb = new ResultBean(); + LpkReserveOrderGoods goods = baseMapper.getReserveByCardSid(carSid, goodsSid); return rb.success().setData(goods); } - public ResultBean submissionDetail(LpkReserveOrderDto dto){ - ResultBean rb=new ResultBean(); - LpkReserveOrderGoods goods=new LpkReserveOrderGoods(); + + 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){ + for (GoodsVo goods1 : dto.getGoodsVos()) { + if (goods1.getSelect() != 0) { goods.setCardSid(dto.getSid()); goods.setGoodsSid(goods1.getGoodsSid()); goods.setGoodsNumber(goods1.getSelect()); + goods.setCreateTime(new DateTime()); baseMapper.insert(goods); } } - AppletVo vo=lpkGiftCardService.getGifCardBySid(dto.getSid()).getData(); - int i=0; - for (GoodsVo vo1:vo.getGoodsVos()){ - LpkReserveOrderGoods goods1=baseMapper.getReserveByCardSid(dto.getCardSid(), vo1.getGoodsSid()); - if(null!=goods1){ - if(vo1.getNum()==goods1.getGoodsNumber()){ + AppletVo vo = lpkGiftCardService.getGifCardBySid(dto.getSid()).getData(); + int i = 0; + for (GoodsVo vo1 : vo.getGoodsVos()) { + LpkReserveOrderGoods goods1 = baseMapper.getReserveByCardSid(dto.getCardSid(), vo1.getGoodsSid()); + if (null != goods1) { + if (vo1.getNum() == goods1.getGoodsNumber()) { i++; } } - if(vo.getGoodsVos().size()==i){ - lpkGiftCardService.changState(dto.getSid(),"5"); - }else{ - lpkGiftCardService.changState(dto.getSid(),"4"); + if (vo.getGoodsVos().size() == i) { + lpkGiftCardService.changState(dto.getSid(), "5"); + } else { + lpkGiftCardService.changState(dto.getSid(), "4"); } } return rb.success().setData("预约成功"); } + + public LpkReserveOrderGoods selByOrderSidAndGoodSid(String orderSid, String goodsSid) { + return baseMapper.selByOrderSidAndGoodSid(orderSid,goodsSid); + } }