审核

ordermall/src/main/java/com/yxt/ordermall/api/vegecallerreserveorder/VegeCellarReserveOrder.java

@@ -30,5 +30,6 @@ public class VegeCellarReserveOrder {
     private String storeName;
     private String state;
     private String reason;
+    private String lastStatus;
 
 }

ordermall/src/main/java/com/yxt/ordermall/api/vegecallerreserveorder/VegeCellarReserveOrderDto.java

@@ -29,5 +29,6 @@ public class VegeCellarReserveOrderDto implements Dto {
     private String cardType;//提货类型，1=提货卡；2=福利卡
     private String orgPath;
     private String reason;
+    private String lastStatus;
 
 }

ordermall/src/main/java/com/yxt/ordermall/api/vegecallerreserveorder/VegeCellarReserveOrderVo.java

@@ -47,5 +47,6 @@ public class VegeCellarReserveOrderVo implements Vo {
     private boolean showLsit=false;
     private String state;
     private String reason;
+    private String lastStatus;
     private boolean isCancel=false;//是否能取消
 }

ordermall/src/main/java/com/yxt/ordermall/biz/vegecallerreserveorder/VegeCellarReserveOrderRest.java

@@ -35,6 +35,13 @@ public class VegeCellarReserveOrderRest {
     public ResultBean subCancelReservation( @RequestBody VegeCellarReserveOrderQuery query) {
         return vegeCellarReserveOrderService.subCancelReservation(query);
     }
+
+
+    @ApiOperation("审核取消预约申请")
+    @PostMapping("/examineCancelReservation")
+    public ResultBean examineCancelReservation( @RequestBody VegeCellarReserveOrderQuery query) {
+        return vegeCellarReserveOrderService.examineCancelReservation(query);
+    }
     @ApiOperation("取消预约")
     @GetMapping("/cancelReservation/{code}")
     public ResultBean cancelReservation(@PathVariable("code") String code) {

ordermall/src/main/java/com/yxt/ordermall/biz/vegecallerreserveorder/VegeCellarReserveOrderService.java

@@ -160,11 +160,28 @@ public class VegeCellarReserveOrderService extends MybatisBaseService<VegeCellar
     public ResultBean subCancelReservation(VegeCellarReserveOrderQuery query) {
         ResultBean rb = new ResultBean().fail();
         VegeCellarReserveOrder vegeCellarReserveOrder = baseMapper.selectOne(new QueryWrapper<VegeCellarReserveOrder>().eq("reserveCode", query.getCode()));
+        vegeCellarReserveOrder.setLastStatus(vegeCellarReserveOrder.getState());
         vegeCellarReserveOrder.setState("5");//0提交审核 1
         vegeCellarReserveOrder.setReason(query.getReason());
+
         baseMapper.updateById(vegeCellarReserveOrder);
         return rb.setMsg("提交审核成功");
     }
+    public ResultBean examineCancelReservation(VegeCellarReserveOrderQuery query) {
+        ResultBean rb = new ResultBean().fail();
+        //state 0 通过 1不通过
+        VegeCellarReserveOrder vegeCellarReserveOrder = baseMapper.selectOne(new QueryWrapper<VegeCellarReserveOrder>().eq("reserveCode", query.getCode()));
+        if(query.getState().equals("0")){
+            cancelReservation(vegeCellarReserveOrder.getReserveCode());
+            vegeCellarReserveOrder.setState("6");//0提交审核 1
+            baseMapper.updateById(vegeCellarReserveOrder);
+        }else{
+            vegeCellarReserveOrder.setState(vegeCellarReserveOrder.getLastStatus());//0提交审核 1
+            baseMapper.updateById(vegeCellarReserveOrder);
+        }
+        return rb.success().setMsg("提交审核成功");
+    }
+
     @Transactional(rollbackFor = Exception.class)
     public ResultBean cancelReservation(String code) {
         ResultBean rb = new ResultBean().fail();