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

[BUG][修复]:c端卡券详情接口修改

release_toaliyun_real
hupeng 7 лет назад
Родитель
Сommit
f36e331343
4 измененных файлов: 13 добавлений и 12 удалений
  1. +1
    -1
      mallinkBApi/src/main/java/com/iformall/controller/WxCouponOrderController.java
  2. +10
    -1
      mallinkCApi/src/main/java/com/iformall/controller/WxCouponOrderController.java
  3. +1
    -2
      mallinkService/src/main/java/com/iformall/service/WxCouponOrderService.java
  4. +1
    -8
      mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java

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

@@ -118,7 +118,7 @@ public class WxCouponOrderController extends BaseController {
return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL);
}

WxCouponOrderCVo wxCouponOrderCVo = wxCouponOrderService.detailCUserVo(null, couponOrderIdStr);
WxCouponOrderCVo wxCouponOrderCVo = wxCouponOrderService.detailCUserVo(couponOrderIdStr);

if (wxCouponOrderCVo == null)
return new ResultData(ErrorCode.COUPON_ORDER_IS_NULL);


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

@@ -10,6 +10,7 @@ import com.iformall.domain.vo.WxCouponOrderCVo;
import com.iformall.enums.EnumCouponChannelActivityStatus;
import com.iformall.enums.EnumCouponOrderStatus;
import com.iformall.enums.EnumCouponOrderValidStatus;
import com.iformall.exception.MallinkException;
import com.iformall.service.WxCouponOrderService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
@@ -84,7 +85,15 @@ public class WxCouponOrderController extends BaseController {
if (couponOrderId == null) {
return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL);
}
WxCouponOrderCVo wxCouponOrderCVo = wxCouponOrderService.detailCUserVo(getUser().getId(), couponOrderId);
WxCouponOrderCVo wxCouponOrderCVo = wxCouponOrderService.detailCUserVo(couponOrderId);

if (wxCouponOrderCVo == null) {
return new ResultData(ErrorCode.COUPON_ORDER_IS_NULL);
}

if (!wxCouponOrderCVo.getCUserId().equals(getUserId())) {
return new ResultData(ErrorCode.COUPON_ORDER_IS_NULL);
}
Date now = new Date();
if (wxCouponOrderCVo.getValidStartDate() != null && wxCouponOrderCVo.getValidEndDate() != null ) {
if (wxCouponOrderCVo.getValidStartDate().getTime() > now.getTime()) {


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

@@ -105,9 +105,8 @@ public interface WxCouponOrderService {
/**
* C用户查券详情
*
* @param cUserId C端用户
*/
WxCouponOrderCVo detailCUserVo(Long cUserId, String couponOrderId);
WxCouponOrderCVo detailCUserVo(String couponOrderId);

/**
* C用户查券carlist


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

@@ -203,14 +203,7 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService {
}

@Override
public WxCouponOrderCVo detailCUserVo(Long cUserId, String couponOrderId) {
if(cUserId != null) {
WxCUser wxCuser = wxCUserMapper.selectByPrimaryKey(cUserId);
if (wxCuser == null) {
logger.error("用户不存在:" + cUserId);
throw new MallinkException(ErrorCode.USER_IS_EMPTY);
}
}
public WxCouponOrderCVo detailCUserVo(String couponOrderId) {

WxCouponOrderCVo wxCouponOrderCVo = wxCouponOrderMapper.findDetailOfCUser(Long.valueOf(couponOrderId));
if (wxCouponOrderCVo == null)


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