From 5a865daae7ecb504f71b7db4fe098e3c8807ed44 Mon Sep 17 00:00:00 2001 From: xhxu Date: Thu, 29 Jun 2023 14:50:57 +0800 Subject: [PATCH] //yuyue --- .../WxCouponOrderReservationController.java | 15 +++++++------ .../WxCouponOrderReservationController.java | 13 +++++++----- .../WxCouponOrderReservationController.java | 3 +++ .../EnumCouponOrderReservationStatus.java | 21 +++++++++++++++++++ .../WxCouponOrderReservationServiceImpl.java | 9 ++++++-- 5 files changed, 48 insertions(+), 13 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponOrderReservationController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponOrderReservationController.java index 361b2eae7..7c4109ac1 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponOrderReservationController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponOrderReservationController.java @@ -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(),"预约单状态不支持取消"); } } diff --git a/mallinkBApi/src/main/java/com/iformall/controller/WxCouponOrderReservationController.java b/mallinkBApi/src/main/java/com/iformall/controller/WxCouponOrderReservationController.java index 454b0613a..fcee84d19 100644 --- a/mallinkBApi/src/main/java/com/iformall/controller/WxCouponOrderReservationController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/WxCouponOrderReservationController.java @@ -65,12 +65,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("B用户"+getLoginBUser().getPhone()+"修改信息"); return wxCouponOrderReservationService.saveOrUpdate(reservation); } @@ -92,12 +95,12 @@ public class WxCouponOrderReservationController extends BaseController { return new ResultData(ErrorCode.SYS_PARAMETER_ERROR.getCode(),"查询数据门店不匹配"); } 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(),"预约单状态不支持确认"); } } 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(),"预约单状态不支持取消"); } } diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxCouponOrderReservationController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxCouponOrderReservationController.java index 29534abcd..ed7b4e930 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxCouponOrderReservationController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxCouponOrderReservationController.java @@ -84,6 +84,9 @@ public class WxCouponOrderReservationController extends BaseController { 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()); + } } if(reservation.getCouponOrderId() == null){ return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(),"couponOrderId is null"); diff --git a/mallinkService/src/main/java/com/iformall/enums/EnumCouponOrderReservationStatus.java b/mallinkService/src/main/java/com/iformall/enums/EnumCouponOrderReservationStatus.java index 1dd36f1ec..2251de1f9 100644 --- a/mallinkService/src/main/java/com/iformall/enums/EnumCouponOrderReservationStatus.java +++ b/mallinkService/src/main/java/com/iformall/enums/EnumCouponOrderReservationStatus.java @@ -47,6 +47,26 @@ public enum EnumCouponOrderReservationStatus { return message; } + //预约单预约状态 + public static List getReservationInit(){ + List list = new ArrayList<>(); + list.add(reservation_create_order.code); + list.add(reservation.code); + list.add(reservation_refuse_dispatch.code); + return list; + } + + //预约单取消状态 + public static List getReservationCancel(){ + List 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 getReservationIng(){ List list = new ArrayList<>(); list.add(reservation_dispatch.code); @@ -54,6 +74,7 @@ public enum EnumCouponOrderReservationStatus { return list; } + //预约单已完成 public static List getReservationFinish(){ List list = new ArrayList<>(); list.add(reservation_finish.code); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderReservationServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderReservationServiceImpl.java index 9186f6377..d25a4c30c 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderReservationServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderReservationServiceImpl.java @@ -183,10 +183,15 @@ public class WxCouponOrderReservationServiceImpl implements WxCouponOrderReserva if(reservation == null){ return; } - //预约状态下取消 - if(!EnumCouponOrderReservationStatus.reservation.getCode().equals(reservation.getStatus())){ + //取消状态 return + if(EnumCouponOrderReservationStatus.getReservationCancel().contains(reservation.getStatus())){ return; } + //完成状态 return + if(EnumCouponOrderReservationStatus.getReservationFinish().contains(reservation.getStatus())){ + return; + } + WxCouponOrderReservation updReservation = new WxCouponOrderReservation(); updReservation.setId(reservation.getId()); updReservation.updateTenantInfo(couponOrder);