From 385a5f55950a8d4cf72dfc84662e219a45bc7ac6 Mon Sep 17 00:00:00 2001 From: wangpengfei <1928057482@qq.com> Date: Mon, 11 Mar 2024 17:47:01 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8F=96=E6=B6=88=E9=A2=84=E7=BA=A6=E5=8A=9F?= =?UTF-8?q?=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../VegeCellarReserveOrderRest.java | 6 ++- .../VegeCellarReserveOrderService.java | 42 +++++++++++++++++-- 2 files changed, 43 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/yxt/yythmall/biz/vegecallerreserveorder/VegeCellarReserveOrderRest.java b/src/main/java/com/yxt/yythmall/biz/vegecallerreserveorder/VegeCellarReserveOrderRest.java index 2bcea21..b795dfd 100644 --- a/src/main/java/com/yxt/yythmall/biz/vegecallerreserveorder/VegeCellarReserveOrderRest.java +++ b/src/main/java/com/yxt/yythmall/biz/vegecallerreserveorder/VegeCellarReserveOrderRest.java @@ -28,7 +28,11 @@ public class VegeCellarReserveOrderRest { public ResultBean submission(@RequestBody VegeCellarReserveOrderDto dto) { return vegeCellarReserveOrderService.submission(dto); } - + @ApiOperation("取消预约") + @PostMapping("/cancelReservation/{code}") + public ResultBean cancelReservation(@PathVariable("code") String code) { + return vegeCellarReserveOrderService.cancelReservation(code); + } @ApiOperation("移动端预约订单列表") @PostMapping("/orderListByUserSid") public ResultBean> orderListByUserSid(@RequestBody PagerQuery pq) { diff --git a/src/main/java/com/yxt/yythmall/biz/vegecallerreserveorder/VegeCellarReserveOrderService.java b/src/main/java/com/yxt/yythmall/biz/vegecallerreserveorder/VegeCellarReserveOrderService.java index ed9d710..c9cc182 100644 --- a/src/main/java/com/yxt/yythmall/biz/vegecallerreserveorder/VegeCellarReserveOrderService.java +++ b/src/main/java/com/yxt/yythmall/biz/vegecallerreserveorder/VegeCellarReserveOrderService.java @@ -18,11 +18,14 @@ import com.yxt.yythmall.api.lpkreserveorder.LpkReserveOrderQuery; import com.yxt.yythmall.api.lpkstore.LpkStore; import com.yxt.yythmall.api.vegecallerreservedetails.VegeCellarReserveDetails; import com.yxt.yythmall.api.vegecallerreserveorder.*; +import com.yxt.yythmall.api.vegetablecellar.VegetableCellarDto; +import com.yxt.yythmall.api.vegetablecellar.vegeVo; import com.yxt.yythmall.biz.cannotreservedictionary.CannotReserveDictionaryService; import com.yxt.yythmall.biz.lpkgiftcard.generateRule.UniqueIdGenerator; import com.yxt.yythmall.biz.lpkgoods.LpkGoodsService; import com.yxt.yythmall.biz.lpkstore.LpkStoreService; import com.yxt.yythmall.biz.vegecallerreservedetail.VegeCellarReserveDetailsService; +import com.yxt.yythmall.biz.vegetablecellar.VegetableCellarService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -50,6 +53,8 @@ public class VegeCellarReserveOrderService extends MybatisBaseService().eq("reserveCode", code)); + vegeCellarReserveOrder.setState("2"); + baseMapper.updateById(vegeCellarReserveOrder); + List list=vegeCellarReserveDetailsService.selByOrderSids(vegeCellarReserveOrder.getSid()); + VegetableCellarDto dto=new VegetableCellarDto(); + List vos=new ArrayList<>(); + for (VegeCellarReserveDetails details:list){ + String brandId=lpkGoodsService.getOne(new QueryWrapper().eq("sid",details.getGoodsSid())).getBrandId().toString(); + vegeVo vo=new vegeVo(); + vo.setBrandId(brandId); + vo.setGoodsSid(details.getGoodsSid()); + vo.setGoodsNumber(String.valueOf(details.getGoodsNumber())); + vos.add(vo); + } + dto.setVos(vos); + dto.setCustomerSid(vegeCellarReserveOrder.getCustomerSid()); + vegetableCellarService.save1Goods(dto); + return rb; + } // public boolean isSatAndSun(String date) { @@ -749,7 +776,7 @@ public class VegeCellarReserveOrderService extends MybatisBaseService qw = buildQuery(query); - + qw.ne("vo.state","2"); IPage page = PagerUtil.queryToPage(pq); IPage pagerVo = baseMapper.pageOfCustomer(page, qw); return rb.success().setData(pagerVo); @@ -757,6 +784,7 @@ public class VegeCellarReserveOrderService extends MybatisBaseService> mapForExcelCustomer(LpkReserveOrderQuery query) { QueryWrapper qw = buildQuery(query); + qw.ne("vo.state","2"); List list = baseMapper.pageOfCustomer(qw); Map> map = new HashMap<>(); list.forEach(vo -> { @@ -774,6 +802,7 @@ public class VegeCellarReserveOrderService extends MybatisBaseService listForExcelCustomer(LpkReserveOrderQuery query) { QueryWrapper qw = buildQuery(query); + qw.ne("vo.state","2"); List list = baseMapper.pageOfCustomer(qw); List volist = new ArrayList<>(); list.forEach(vo -> { @@ -788,7 +817,7 @@ public class VegeCellarReserveOrderService extends MybatisBaseService qw = buildQuery(query); - + qw.ne("vo.state","2"); IPage page = PagerUtil.queryToPage(pq); IPage pagerVo = baseMapper.pageOfStore(page, qw); return rb.success().setData(pagerVo); @@ -796,6 +825,7 @@ public class VegeCellarReserveOrderService extends MybatisBaseService> mapForExcelStore(LpkReserveOrderQuery query) { QueryWrapper qw = buildQuery(query); + qw.ne("vo.state","2"); List list = baseMapper.pageOfStore(qw); Map> map = new HashMap<>(); list.forEach(vo -> { @@ -813,6 +843,7 @@ public class VegeCellarReserveOrderService extends MybatisBaseService listForExcelStore(LpkReserveOrderQuery query) { QueryWrapper qw = buildQuery(query); + qw.ne("vo.state","2"); List list = baseMapper.pageOfStore(qw); List listRes = new ArrayList<>(); @@ -828,7 +859,7 @@ public class VegeCellarReserveOrderService extends MybatisBaseService qw = buildQuery(query); - + qw.ne("vo.state","2"); IPage page = PagerUtil.queryToPage(pq); IPage pagerVo = baseMapper.pageOfBank(page, qw); return rb.success().setData(pagerVo); @@ -836,6 +867,7 @@ public class VegeCellarReserveOrderService extends MybatisBaseService> mapForExcelBank(LpkReserveOrderQuery query) { QueryWrapper qw = buildQuery(query); + qw.ne("vo.state","2"); List list = baseMapper.pageOfBank(qw); Map> map = new HashMap<>(); list.forEach(vo -> { @@ -853,6 +885,7 @@ public class VegeCellarReserveOrderService extends MybatisBaseService listForExcelBank(LpkReserveOrderQuery query) { QueryWrapper qw = buildQuery(query); + qw.ne("vo.state","2"); List list = baseMapper.pageOfBank(qw); List volist = new ArrayList<>(); list.forEach(vo -> { @@ -867,7 +900,7 @@ public class VegeCellarReserveOrderService extends MybatisBaseService qw = buildQuery(query); - + qw.ne("vo.state","2"); IPage page = PagerUtil.queryToPage(pq); IPage pagerVo = baseMapper.pageOfAll(page, qw); return rb.success().setData(pagerVo); @@ -877,6 +910,7 @@ public class VegeCellarReserveOrderService extends MybatisBaseService qw = buildQuery(query); + qw.ne("vo.state","2"); List list = baseMapper.pageOfAll(qw); List listRes = new ArrayList<>();