This commit is contained in:
2025-01-15 16:53:33 +08:00
parent 2330ddf906
commit 01d9109461
5 changed files with 27 additions and 0 deletions

View File

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

View File

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

View File

@@ -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;//是否能取消
}

View File

@@ -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) {

View File

@@ -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();