Просмотр исходного кода

//预约

release_toaliyun_real
xhxu 3 лет назад
Родитель
Сommit
5ec51fc390
6 измененных файлов: 19 добавлений и 6 удалений
  1. +1
    -1
      mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponOrderReservationController.java
  2. +2
    -2
      mallinkCApi/src/main/java/com/iformall/controller/WxCouponOrderReservationController.java
  3. +2
    -0
      mallinkService/src/main/java/com/iformall/mapper/WxCouponOrderReservationMapper.java
  4. +2
    -1
      mallinkService/src/main/java/com/iformall/service/WxCouponOrderReservationService.java
  5. +7
    -2
      mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderReservationServiceImpl.java
  6. +5
    -0
      mallinkService/src/main/resources/mapper/WxCouponOrderReservationMapper.xml

+ 1
- 1
mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponOrderReservationController.java Просмотреть файл

@@ -61,7 +61,7 @@ public class WxCouponOrderReservationController extends BaseController {
if(reservation.getId() == null || reservation.getStatus() == 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){
return new ResultData(ErrorCode.SYS_PARAMETER_ERROR.getCode(),"id is error");
}


+ 2
- 2
mallinkCApi/src/main/java/com/iformall/controller/WxCouponOrderReservationController.java Просмотреть файл

@@ -72,7 +72,7 @@ public class WxCouponOrderReservationController extends BaseController {
return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(),"endDate is null");
}
}else{
WxCouponOrderReservation sortReservation = wxCouponOrderReservationService.getSortByCouponOrder(reservation.getId(), reservation.getTenantId());
WxCouponOrderReservation sortReservation = wxCouponOrderReservationService.getSortById(reservation.getId(), reservation.getTenantId());
if(sortReservation == null){
return new ResultData(ErrorCode.SYS_PARAMETER_ERROR.getCode(),"id is error");
}
@@ -100,7 +100,7 @@ public class WxCouponOrderReservationController extends BaseController {
if(reservation.getId() == 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){
return new ResultData(ErrorCode.SYS_PARAMETER_ERROR.getCode(),"id is error");
}


+ 2
- 0
mallinkService/src/main/java/com/iformall/mapper/WxCouponOrderReservationMapper.java Просмотреть файл

@@ -26,4 +26,6 @@ public interface WxCouponOrderReservationMapper extends CommonMapper<WxCouponOrd
Long getIdByCouponOrder(@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);
}

+ 2
- 1
mallinkService/src/main/java/com/iformall/service/WxCouponOrderReservationService.java Просмотреть файл

@@ -26,8 +26,9 @@ public interface WxCouponOrderReservationService {
*/
WxCouponOrderReservation getById(Long id,String tenantId);

WxCouponOrderReservation getSortById(Long id,String tenantId);

WxCouponOrderReservation getSortByCouponOrder(Long id,String tenantId);
WxCouponOrderReservation getSortByCouponOrder(Long couponOrderId,String tenantId);
/**
* 保存或更新实体


+ 7
- 2
mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderReservationServiceImpl.java Просмотреть файл

@@ -44,8 +44,13 @@ public class WxCouponOrderReservationServiceImpl implements WxCouponOrderReserva
}

@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


+ 5
- 0
mallinkService/src/main/resources/mapper/WxCouponOrderReservationMapper.xml Просмотреть файл

@@ -134,6 +134,11 @@
select id from wx_coupon_order_reservation where `coupon_order_id` = #{couponOrderId} and tenant_id=#{tenantId}
</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`,`tenant_id`,`parent_tenant_id`,`status`


Загрузка…
Отмена
Сохранить