|
|
|
@@ -66,12 +66,15 @@ public class WxCouponOrderReservationController extends BaseController { |
|
|
|
if(sortReservation == null){ |
|
|
|
return new ResultData(ErrorCode.SYS_PARAMETER_ERROR.getCode(),"id is error"); |
|
|
|
} |
|
|
|
if(EnumCouponOrderReservationStatus.getReservationIng().contains(sortReservation.getStatus())){ |
|
|
|
return new ResultData(ErrorCode.SYS_PARAMETER_ERROR.getCode(),"预约单进行中"); |
|
|
|
} |
|
|
|
// if(EnumCouponOrderReservationStatus.getReservationIng().contains(sortReservation.getStatus())){ |
|
|
|
// return new ResultData(ErrorCode.SYS_PARAMETER_ERROR.getCode(),"预约单进行中"); |
|
|
|
// } |
|
|
|
if(EnumCouponOrderReservationStatus.getReservationFinish().contains(sortReservation.getStatus())){ |
|
|
|
return new ResultData(ErrorCode.SYS_PARAMETER_ERROR.getCode(),"预约单已完成"); |
|
|
|
} |
|
|
|
if(EnumCouponOrderReservationStatus.getReservationInit().contains(sortReservation.getStatus())){ |
|
|
|
sortReservation.setStatus(EnumCouponOrderReservationStatus.reservation.getCode()); |
|
|
|
} |
|
|
|
reservation.setRemark("A用户"+getUser().getUsername()+"修改信息"); |
|
|
|
return wxCouponOrderReservationService.saveOrUpdate(reservation); |
|
|
|
} |
|
|
|
@@ -90,12 +93,12 @@ public class WxCouponOrderReservationController extends BaseController { |
|
|
|
return new ResultData(ErrorCode.SYS_PARAMETER_ERROR.getCode(),"id is error"); |
|
|
|
} |
|
|
|
if(EnumCouponOrderReservationStatus.reservation_dispatch.getCode().equals(reservation.getStatus())){ |
|
|
|
if(!EnumCouponOrderReservationStatus.reservation.getCode().equals(sortReservation.getStatus())){ |
|
|
|
return new ResultData(ErrorCode.SYS_PARAMETER_ERROR.getCode(),"预约单状态不支持派单"); |
|
|
|
if(!EnumCouponOrderReservationStatus.getReservationInit().contains(sortReservation.getStatus())){ |
|
|
|
return new ResultData(ErrorCode.SYS_PARAMETER_ERROR.getCode(),"预约单状态不支持确认"); |
|
|
|
} |
|
|
|
} |
|
|
|
if(EnumCouponOrderReservationStatus.reservation.getCode().equals(reservation.getStatus())){ |
|
|
|
if(!EnumCouponOrderReservationStatus.reservation_dispatch.getCode().equals(sortReservation.getStatus())){ |
|
|
|
if(!EnumCouponOrderReservationStatus.getReservationInit().contains(sortReservation.getStatus())){ |
|
|
|
return new ResultData(ErrorCode.SYS_PARAMETER_ERROR.getCode(),"预约单状态不支持取消"); |
|
|
|
} |
|
|
|
} |
|
|
|
|