取消预约功能

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<PagerVo<VegeCellarReserveOrderVo>> orderListByUserSid(@RequestBody PagerQuery<VegeCellarReserveOrderQuery> pq) {

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<VegeCellar
     private LpkGoodsService lpkGoodsService;
     @Autowired
     CannotReserveDictionaryService cannotReserveDictionaryService;
+    @Autowired
+    VegetableCellarService vegetableCellarService;
 
     @Transactional(rollbackFor = Exception.class)
     public ResultBean submission(VegeCellarReserveOrderDto dto) {
@@ -86,6 +91,28 @@ public class VegeCellarReserveOrderService extends MybatisBaseService<VegeCellar
         rb = vegeCellarReserveDetailsService.submissionDetail(dto);
         return rb;
     }
+    @Transactional(rollbackFor = Exception.class)
+    public ResultBean cancelReservation(String code) {
+        ResultBean rb = new ResultBean().fail();
+        VegeCellarReserveOrder vegeCellarReserveOrder = baseMapper.selectOne(new QueryWrapper<VegeCellarReserveOrder>().eq("reserveCode", code));
+        vegeCellarReserveOrder.setState("2");
+        baseMapper.updateById(vegeCellarReserveOrder);
+        List<VegeCellarReserveDetails> list=vegeCellarReserveDetailsService.selByOrderSids(vegeCellarReserveOrder.getSid());
+        VegetableCellarDto dto=new VegetableCellarDto();
+        List<vegeVo> vos=new ArrayList<>();
+        for (VegeCellarReserveDetails details:list){
+            String brandId=lpkGoodsService.getOne(new QueryWrapper<LpkGoods>().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<VegeCellar
         ResultBean rb = ResultBean.fireFail();
         LpkReserveOrderQuery query = pq.getParams();
         QueryWrapper<VegeCellarReserveOrder> qw = buildQuery(query);
-
+        qw.ne("vo.state","2");
         IPage<VegeCellarReserveOrder> page = PagerUtil.queryToPage(pq);
         IPage<ReserveOrderVo> pagerVo = baseMapper.pageOfCustomer(page, qw);
         return rb.success().setData(pagerVo);
@@ -757,6 +784,7 @@ public class VegeCellarReserveOrderService extends MybatisBaseService<VegeCellar
 
     public Map<String, List<ReserveCustomerExcel>> mapForExcelCustomer(LpkReserveOrderQuery query) {
         QueryWrapper<VegeCellarReserveOrder> qw = buildQuery(query);
+        qw.ne("vo.state","2");
         List<ReserveOrderVo> list = baseMapper.pageOfCustomer(qw);
         Map<String, List<ReserveCustomerExcel>> map = new HashMap<>();
         list.forEach(vo -> {
@@ -774,6 +802,7 @@ public class VegeCellarReserveOrderService extends MybatisBaseService<VegeCellar
 
     public List<ReserveCustomerExcel> listForExcelCustomer(LpkReserveOrderQuery query) {
         QueryWrapper<VegeCellarReserveOrder> qw = buildQuery(query);
+        qw.ne("vo.state","2");
         List<ReserveOrderVo> list = baseMapper.pageOfCustomer(qw);
         List<ReserveCustomerExcel> volist = new ArrayList<>();
         list.forEach(vo -> {
@@ -788,7 +817,7 @@ public class VegeCellarReserveOrderService extends MybatisBaseService<VegeCellar
         ResultBean rb = ResultBean.fireFail();
         LpkReserveOrderQuery query = pq.getParams();
         QueryWrapper<VegeCellarReserveOrder> qw = buildQuery(query);
-
+        qw.ne("vo.state","2");
         IPage<VegeCellarReserveOrder> page = PagerUtil.queryToPage(pq);
         IPage<ReserveOrderVo> pagerVo = baseMapper.pageOfStore(page, qw);
         return rb.success().setData(pagerVo);
@@ -796,6 +825,7 @@ public class VegeCellarReserveOrderService extends MybatisBaseService<VegeCellar
 
     public Map<String, List<ReserveStoreExcel>> mapForExcelStore(LpkReserveOrderQuery query) {
         QueryWrapper<VegeCellarReserveOrder> qw = buildQuery(query);
+        qw.ne("vo.state","2");
         List<ReserveOrderVo> list = baseMapper.pageOfStore(qw);
         Map<String, List<ReserveStoreExcel>> map = new HashMap<>();
         list.forEach(vo -> {
@@ -813,6 +843,7 @@ public class VegeCellarReserveOrderService extends MybatisBaseService<VegeCellar
 
     public List<ReserveStoreExcel> listForExcelStore(LpkReserveOrderQuery query) {
         QueryWrapper<VegeCellarReserveOrder> qw = buildQuery(query);
+        qw.ne("vo.state","2");
         List<ReserveOrderVo> list = baseMapper.pageOfStore(qw);
         List<ReserveStoreExcel> listRes = new ArrayList<>();
 
@@ -828,7 +859,7 @@ public class VegeCellarReserveOrderService extends MybatisBaseService<VegeCellar
         ResultBean rb = ResultBean.fireFail();
         LpkReserveOrderQuery query = pq.getParams();
         QueryWrapper<VegeCellarReserveOrder> qw = buildQuery(query);
-
+        qw.ne("vo.state","2");
         IPage<VegeCellarReserveOrder> page = PagerUtil.queryToPage(pq);
         IPage<ReserveOrderVo> pagerVo = baseMapper.pageOfBank(page, qw);
         return rb.success().setData(pagerVo);
@@ -836,6 +867,7 @@ public class VegeCellarReserveOrderService extends MybatisBaseService<VegeCellar
 
     public Map<String, List<ReserveBankExcel>> mapForExcelBank(LpkReserveOrderQuery query) {
         QueryWrapper<VegeCellarReserveOrder> qw = buildQuery(query);
+        qw.ne("vo.state","2");
         List<ReserveOrderVo> list = baseMapper.pageOfBank(qw);
         Map<String, List<ReserveBankExcel>> map = new HashMap<>();
         list.forEach(vo -> {
@@ -853,6 +885,7 @@ public class VegeCellarReserveOrderService extends MybatisBaseService<VegeCellar
 
     public List<ReserveBankExcel> listForExcelBank(LpkReserveOrderQuery query) {
         QueryWrapper<VegeCellarReserveOrder> qw = buildQuery(query);
+        qw.ne("vo.state","2");
         List<ReserveOrderVo> list = baseMapper.pageOfBank(qw);
         List<ReserveBankExcel> volist = new ArrayList<>();
         list.forEach(vo -> {
@@ -867,7 +900,7 @@ public class VegeCellarReserveOrderService extends MybatisBaseService<VegeCellar
         ResultBean rb = ResultBean.fireFail();
         LpkReserveOrderQuery query = pq.getParams();
         QueryWrapper<VegeCellarReserveOrder> qw = buildQuery(query);
-
+        qw.ne("vo.state","2");
         IPage<VegeCellarReserveOrder> page = PagerUtil.queryToPage(pq);
         IPage<ReserveOrderVo> pagerVo = baseMapper.pageOfAll(page, qw);
         return rb.success().setData(pagerVo);
@@ -877,6 +910,7 @@ public class VegeCellarReserveOrderService extends MybatisBaseService<VegeCellar
 
 
         QueryWrapper<VegeCellarReserveOrder> qw = buildQuery(query);
+        qw.ne("vo.state","2");
         List<ReserveOrderVo> list = baseMapper.pageOfAll(qw);
         List<ReserveAllExcel> listRes = new ArrayList<>();