| @@ -61,7 +61,7 @@ public class WxCouponOrderReservationController extends BaseController { | |||||
| if(reservation.getId() == null || reservation.getStatus() == null) { | if(reservation.getId() == null || reservation.getStatus() == null) { | ||||
| return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL); | return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL); | ||||
| } | } | ||||
| WxCouponOrderReservation sortReservation = wxCouponOrderReservationService.getSortByCouponOrder(reservation.getId(), getTenantInfo().getTenantId()); | |||||
| WxCouponOrderReservation sortReservation = wxCouponOrderReservationService.getSortById(reservation.getId(), getTenantInfo().getTenantId()); | |||||
| 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"); | ||||
| } | } | ||||
| @@ -72,7 +72,7 @@ public class WxCouponOrderReservationController extends BaseController { | |||||
| return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(),"endDate is null"); | return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(),"endDate is null"); | ||||
| } | } | ||||
| }else{ | }else{ | ||||
| WxCouponOrderReservation sortReservation = wxCouponOrderReservationService.getSortByCouponOrder(reservation.getId(), reservation.getTenantId()); | |||||
| WxCouponOrderReservation sortReservation = wxCouponOrderReservationService.getSortById(reservation.getId(), reservation.getTenantId()); | |||||
| 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"); | ||||
| } | } | ||||
| @@ -100,7 +100,7 @@ public class WxCouponOrderReservationController extends BaseController { | |||||
| if(reservation.getId() == null) { | if(reservation.getId() == null) { | ||||
| return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL); | return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL); | ||||
| } | } | ||||
| WxCouponOrderReservation sortReservation = wxCouponOrderReservationService.getSortByCouponOrder(reservation.getId(), getTenantInfo().getTenantId()); | |||||
| WxCouponOrderReservation sortReservation = wxCouponOrderReservationService.getSortById(reservation.getId(), getTenantInfo().getTenantId()); | |||||
| 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"); | ||||
| } | } | ||||
| @@ -26,4 +26,6 @@ public interface WxCouponOrderReservationMapper extends CommonMapper<WxCouponOrd | |||||
| Long getIdByCouponOrder(@Param("couponOrderId")Long couponOrderId,@Param("tenantId") String tenantId); | Long getIdByCouponOrder(@Param("couponOrderId")Long couponOrderId,@Param("tenantId") String tenantId); | ||||
| WxCouponOrderReservation getSortByCouponOrder(@Param("couponOrderId")Long couponOrderId,@Param("tenantId") String tenantId); | WxCouponOrderReservation getSortByCouponOrder(@Param("couponOrderId")Long couponOrderId,@Param("tenantId") String tenantId); | ||||
| WxCouponOrderReservation getSortById(@Param("id")Long id,@Param("tenantId")String tenantId); | |||||
| } | } | ||||
| @@ -26,8 +26,9 @@ public interface WxCouponOrderReservationService { | |||||
| */ | */ | ||||
| WxCouponOrderReservation getById(Long id,String tenantId); | WxCouponOrderReservation getById(Long id,String tenantId); | ||||
| WxCouponOrderReservation getSortById(Long id,String tenantId); | |||||
| WxCouponOrderReservation getSortByCouponOrder(Long id,String tenantId); | |||||
| WxCouponOrderReservation getSortByCouponOrder(Long couponOrderId,String tenantId); | |||||
| /** | /** | ||||
| * 保存或更新实体 | * 保存或更新实体 | ||||
| @@ -44,8 +44,13 @@ public class WxCouponOrderReservationServiceImpl implements WxCouponOrderReserva | |||||
| } | } | ||||
| @Override | @Override | ||||
| public WxCouponOrderReservation getSortByCouponOrder(Long id, String tenantId) { | |||||
| return wxCouponOrderReservationMapper.getSortByCouponOrder(id,tenantId); | |||||
| public WxCouponOrderReservation getSortById(Long id, String tenantId) { | |||||
| return wxCouponOrderReservationMapper.getSortById(id,tenantId); | |||||
| } | |||||
| @Override | |||||
| public WxCouponOrderReservation getSortByCouponOrder(Long couponOrderId, String tenantId) { | |||||
| return wxCouponOrderReservationMapper.getSortByCouponOrder(couponOrderId,tenantId); | |||||
| } | } | ||||
| @Override | @Override | ||||
| @@ -134,6 +134,11 @@ | |||||
| select id from wx_coupon_order_reservation where `coupon_order_id` = #{couponOrderId} and tenant_id=#{tenantId} | select id from wx_coupon_order_reservation where `coupon_order_id` = #{couponOrderId} and tenant_id=#{tenantId} | ||||
| </select> | </select> | ||||
| <select id="getSortById" parameterType="java.util.HashMap" resultMap="BaseResultMap"> | |||||
| select `id`,`tenant_id`,`parent_tenant_id`,`status` | |||||
| from wx_coupon_order_reservation | |||||
| where `id` = #{id} and tenant_id=#{tenantId} | |||||
| </select> | |||||
| <select id="getSortByCouponOrder" parameterType="java.util.HashMap" resultMap="BaseResultMap"> | <select id="getSortByCouponOrder" parameterType="java.util.HashMap" resultMap="BaseResultMap"> | ||||
| select `id`,`tenant_id`,`parent_tenant_id`,`status` | select `id`,`tenant_id`,`parent_tenant_id`,`status` | ||||