Browse Source

//yuyue

release_toaliyun_real
xhxu 2 years ago
parent
commit
3808ca216c
2 changed files with 6 additions and 2 deletions
  1. +3
    -1
      mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponOrderReservationController.java
  2. +3
    -1
      mallinkBApi/src/main/java/com/iformall/controller/WxCouponOrderReservationController.java

+ 3
- 1
mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponOrderReservationController.java View File

@@ -73,7 +73,9 @@ public class WxCouponOrderReservationController extends BaseController {
return new ResultData(ErrorCode.SYS_PARAMETER_ERROR.getCode(),"预约单已完成");
}
if(EnumCouponOrderReservationStatus.getReservationInit().contains(sortReservation.getStatus())){
sortReservation.setStatus(EnumCouponOrderReservationStatus.reservation.getCode());
if(reservation.getStartDate() != null ){
reservation.setStatus(EnumCouponOrderReservationStatus.reservation.getCode());
}
}
reservation.setRemark("A用户"+getUser().getUsername()+"修改信息");
return wxCouponOrderReservationService.saveOrUpdate(reservation);


+ 3
- 1
mallinkBApi/src/main/java/com/iformall/controller/WxCouponOrderReservationController.java View File

@@ -72,7 +72,9 @@ public class WxCouponOrderReservationController extends BaseController {
return new ResultData(ErrorCode.SYS_PARAMETER_ERROR.getCode(),"预约单已完成");
}
if(EnumCouponOrderReservationStatus.getReservationInit().contains(sortReservation.getStatus())){
sortReservation.setStatus(EnumCouponOrderReservationStatus.reservation.getCode());
if(reservation.getStartDate() != null ){
reservation.setStatus(EnumCouponOrderReservationStatus.reservation.getCode());
}
}
reservation.setRemark("B用户"+getLoginBUser().getPhone()+"修改信息");
return wxCouponOrderReservationService.saveOrUpdate(reservation);


Loading…
Cancel
Save