| @@ -66,12 +66,15 @@ public class WxCouponOrderReservationController extends BaseController { | |||||
| if(sortReservation == null){ | if(sortReservation == null){ | ||||
| return new ResultData(ErrorCode.SYS_PARAMETER_ERROR.getCode(),"id is error"); | 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())){ | if(EnumCouponOrderReservationStatus.getReservationFinish().contains(sortReservation.getStatus())){ | ||||
| return new ResultData(ErrorCode.SYS_PARAMETER_ERROR.getCode(),"预约单已完成"); | return new ResultData(ErrorCode.SYS_PARAMETER_ERROR.getCode(),"预约单已完成"); | ||||
| } | } | ||||
| if(EnumCouponOrderReservationStatus.getReservationInit().contains(sortReservation.getStatus())){ | |||||
| sortReservation.setStatus(EnumCouponOrderReservationStatus.reservation.getCode()); | |||||
| } | |||||
| reservation.setRemark("A用户"+getUser().getUsername()+"修改信息"); | reservation.setRemark("A用户"+getUser().getUsername()+"修改信息"); | ||||
| return wxCouponOrderReservationService.saveOrUpdate(reservation); | return wxCouponOrderReservationService.saveOrUpdate(reservation); | ||||
| } | } | ||||
| @@ -90,12 +93,12 @@ public class WxCouponOrderReservationController extends BaseController { | |||||
| return new ResultData(ErrorCode.SYS_PARAMETER_ERROR.getCode(),"id is error"); | return new ResultData(ErrorCode.SYS_PARAMETER_ERROR.getCode(),"id is error"); | ||||
| } | } | ||||
| if(EnumCouponOrderReservationStatus.reservation_dispatch.getCode().equals(reservation.getStatus())){ | 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.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(),"预约单状态不支持取消"); | return new ResultData(ErrorCode.SYS_PARAMETER_ERROR.getCode(),"预约单状态不支持取消"); | ||||
| } | } | ||||
| } | } | ||||
| @@ -65,12 +65,15 @@ public class WxCouponOrderReservationController extends BaseController { | |||||
| if(sortReservation == null){ | if(sortReservation == null){ | ||||
| return new ResultData(ErrorCode.SYS_PARAMETER_ERROR.getCode(),"id is error"); | 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())){ | if(EnumCouponOrderReservationStatus.getReservationFinish().contains(sortReservation.getStatus())){ | ||||
| return new ResultData(ErrorCode.SYS_PARAMETER_ERROR.getCode(),"预约单已完成"); | return new ResultData(ErrorCode.SYS_PARAMETER_ERROR.getCode(),"预约单已完成"); | ||||
| } | } | ||||
| if(EnumCouponOrderReservationStatus.getReservationInit().contains(sortReservation.getStatus())){ | |||||
| sortReservation.setStatus(EnumCouponOrderReservationStatus.reservation.getCode()); | |||||
| } | |||||
| reservation.setRemark("B用户"+getLoginBUser().getPhone()+"修改信息"); | reservation.setRemark("B用户"+getLoginBUser().getPhone()+"修改信息"); | ||||
| return wxCouponOrderReservationService.saveOrUpdate(reservation); | return wxCouponOrderReservationService.saveOrUpdate(reservation); | ||||
| } | } | ||||
| @@ -92,12 +95,12 @@ public class WxCouponOrderReservationController extends BaseController { | |||||
| return new ResultData(ErrorCode.SYS_PARAMETER_ERROR.getCode(),"查询数据门店不匹配"); | return new ResultData(ErrorCode.SYS_PARAMETER_ERROR.getCode(),"查询数据门店不匹配"); | ||||
| } | } | ||||
| if(EnumCouponOrderReservationStatus.reservation_dispatch.getCode().equals(reservation.getStatus())){ | if(EnumCouponOrderReservationStatus.reservation_dispatch.getCode().equals(reservation.getStatus())){ | ||||
| if(!EnumCouponOrderReservationStatus.reservation.getCode().equals(sortReservation.getStatus())){ | |||||
| if(!EnumCouponOrderReservationStatus.getReservationInit().contains(sortReservation.getStatus())){ | |||||
| return new ResultData(ErrorCode.SYS_PARAMETER_ERROR.getCode(),"预约单状态不支持确认"); | return new ResultData(ErrorCode.SYS_PARAMETER_ERROR.getCode(),"预约单状态不支持确认"); | ||||
| } | } | ||||
| } | } | ||||
| if(EnumCouponOrderReservationStatus.reservation.getCode().equals(reservation.getStatus())){ | 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(),"预约单状态不支持取消"); | return new ResultData(ErrorCode.SYS_PARAMETER_ERROR.getCode(),"预约单状态不支持取消"); | ||||
| } | } | ||||
| } | } | ||||
| @@ -84,6 +84,9 @@ public class WxCouponOrderReservationController extends BaseController { | |||||
| if(EnumCouponOrderReservationStatus.getReservationFinish().contains(sortReservation.getStatus())){ | if(EnumCouponOrderReservationStatus.getReservationFinish().contains(sortReservation.getStatus())){ | ||||
| return new ResultData(ErrorCode.SYS_PARAMETER_ERROR.getCode(),"预约单已完成"); | return new ResultData(ErrorCode.SYS_PARAMETER_ERROR.getCode(),"预约单已完成"); | ||||
| } | } | ||||
| if(EnumCouponOrderReservationStatus.getReservationInit().contains(sortReservation.getStatus())){ | |||||
| sortReservation.setStatus(EnumCouponOrderReservationStatus.reservation.getCode()); | |||||
| } | |||||
| } | } | ||||
| if(reservation.getCouponOrderId() == null){ | if(reservation.getCouponOrderId() == null){ | ||||
| return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(),"couponOrderId is null"); | return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(),"couponOrderId is null"); | ||||
| @@ -47,6 +47,26 @@ public enum EnumCouponOrderReservationStatus { | |||||
| return message; | return message; | ||||
| } | } | ||||
| //预约单预约状态 | |||||
| public static List<Integer> getReservationInit(){ | |||||
| List<Integer> list = new ArrayList<>(); | |||||
| list.add(reservation_create_order.code); | |||||
| list.add(reservation.code); | |||||
| list.add(reservation_refuse_dispatch.code); | |||||
| return list; | |||||
| } | |||||
| //预约单取消状态 | |||||
| public static List<Integer> getReservationCancel(){ | |||||
| List<Integer> list = new ArrayList<>(); | |||||
| list.add(reservation_user_cancellation.code); | |||||
| list.add(reservation_expire_cancellation.code); | |||||
| list.add(reservation_refund_cancellation.code); | |||||
| list.add(reservation_refuse_cancellation.code); | |||||
| return list; | |||||
| } | |||||
| //预约单处理中 | |||||
| public static List<Integer> getReservationIng(){ | public static List<Integer> getReservationIng(){ | ||||
| List<Integer> list = new ArrayList<>(); | List<Integer> list = new ArrayList<>(); | ||||
| list.add(reservation_dispatch.code); | list.add(reservation_dispatch.code); | ||||
| @@ -54,6 +74,7 @@ public enum EnumCouponOrderReservationStatus { | |||||
| return list; | return list; | ||||
| } | } | ||||
| //预约单已完成 | |||||
| public static List<Integer> getReservationFinish(){ | public static List<Integer> getReservationFinish(){ | ||||
| List<Integer> list = new ArrayList<>(); | List<Integer> list = new ArrayList<>(); | ||||
| list.add(reservation_finish.code); | list.add(reservation_finish.code); | ||||
| @@ -183,10 +183,15 @@ public class WxCouponOrderReservationServiceImpl implements WxCouponOrderReserva | |||||
| if(reservation == null){ | if(reservation == null){ | ||||
| return; | return; | ||||
| } | } | ||||
| //预约状态下取消 | |||||
| if(!EnumCouponOrderReservationStatus.reservation.getCode().equals(reservation.getStatus())){ | |||||
| //取消状态 return | |||||
| if(EnumCouponOrderReservationStatus.getReservationCancel().contains(reservation.getStatus())){ | |||||
| return; | return; | ||||
| } | } | ||||
| //完成状态 return | |||||
| if(EnumCouponOrderReservationStatus.getReservationFinish().contains(reservation.getStatus())){ | |||||
| return; | |||||
| } | |||||
| WxCouponOrderReservation updReservation = new WxCouponOrderReservation(); | WxCouponOrderReservation updReservation = new WxCouponOrderReservation(); | ||||
| updReservation.setId(reservation.getId()); | updReservation.setId(reservation.getId()); | ||||
| updReservation.updateTenantInfo(couponOrder); | updReservation.updateTenantInfo(couponOrder); | ||||