diff --git a/ordermall/src/main/java/com/yxt/ordermall/api/vegecallerreserveorder/VegeCellarReserveOrder.java b/ordermall/src/main/java/com/yxt/ordermall/api/vegecallerreserveorder/VegeCellarReserveOrder.java index 5cd0549..f407f5c 100644 --- a/ordermall/src/main/java/com/yxt/ordermall/api/vegecallerreserveorder/VegeCellarReserveOrder.java +++ b/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; } diff --git a/ordermall/src/main/java/com/yxt/ordermall/api/vegecallerreserveorder/VegeCellarReserveOrderDto.java b/ordermall/src/main/java/com/yxt/ordermall/api/vegecallerreserveorder/VegeCellarReserveOrderDto.java index 849e4b5..a2e94c6 100644 --- a/ordermall/src/main/java/com/yxt/ordermall/api/vegecallerreserveorder/VegeCellarReserveOrderDto.java +++ b/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; } diff --git a/ordermall/src/main/java/com/yxt/ordermall/api/vegecallerreserveorder/VegeCellarReserveOrderVo.java b/ordermall/src/main/java/com/yxt/ordermall/api/vegecallerreserveorder/VegeCellarReserveOrderVo.java index 181b77a..d8ebf4a 100644 --- a/ordermall/src/main/java/com/yxt/ordermall/api/vegecallerreserveorder/VegeCellarReserveOrderVo.java +++ b/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;//是否能取消 } diff --git a/ordermall/src/main/java/com/yxt/ordermall/biz/vegecallerreserveorder/VegeCellarReserveOrderRest.java b/ordermall/src/main/java/com/yxt/ordermall/biz/vegecallerreserveorder/VegeCellarReserveOrderRest.java index b0c8dfe..5ff24b5 100644 --- a/ordermall/src/main/java/com/yxt/ordermall/biz/vegecallerreserveorder/VegeCellarReserveOrderRest.java +++ b/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) { diff --git a/ordermall/src/main/java/com/yxt/ordermall/biz/vegecallerreserveorder/VegeCellarReserveOrderService.java b/ordermall/src/main/java/com/yxt/ordermall/biz/vegecallerreserveorder/VegeCellarReserveOrderService.java index 7f5b28e..a8d87a4 100644 --- a/ordermall/src/main/java/com/yxt/ordermall/biz/vegecallerreserveorder/VegeCellarReserveOrderService.java +++ b/ordermall/src/main/java/com/yxt/ordermall/biz/vegecallerreserveorder/VegeCellarReserveOrderService.java @@ -160,11 +160,28 @@ public class VegeCellarReserveOrderService extends MybatisBaseService().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().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();