Skip to content

O
order-group
Commit 7c29feb9 by chongfu.liang
Options

Merge branch 'feature/20201202-商品券换购券商品添加可售时间校验' into qa

parents 845d9115 543ca356
Showing with 2 additions and 2 deletions
shopping-cart-application-service/src/main/java/cn/freemud/service/impl/CouponServiceImpl.java
...@@ -679,7 +679,7 @@ public class CouponServiceImpl implements CouponService { ...@@ -679,7 +679,7 @@ public class CouponServiceImpl implements CouponService {
// 校验商品可用时间 // 校验商品可用时间
ValidateShopProductRequest request = getValidateShopProductRequest(productsVo, requestDto); ValidateShopProductRequest request = getValidateShopProductRequest(productsVo, requestDto);
ProductResponseDTO<ValiadShopProductResponse> valiadProductResponse = storeItemClient.validateShopProduct(request); ProductResponseDTO<ValiadShopProductResponse> valiadProductResponse = storeItemClient.validateShopProduct(request);
if (null == valiadProductResponse || Objects.equals(ResponseConstant.SUCCESS_RESPONSE_CODE, valiadProductResponse.getErrcode()) if (null == valiadProductResponse || !Objects.equals(ResponseConstant.SUCCESS_RESPONSE_CODE, valiadProductResponse.getErrcode())
|| valiadProductResponse.getData() == null || CollectionUtils.isEmpty(valiadProductResponse.getData().getSuccessList())) { || valiadProductResponse.getData() == null || CollectionUtils.isEmpty(valiadProductResponse.getData().getSuccessList())) {
return null; return null;
} }
...@@ -797,7 +797,7 @@ public class CouponServiceImpl implements CouponService { ...@@ -797,7 +797,7 @@ public class CouponServiceImpl implements CouponService {
// 校验商品可用时间 // 校验商品可用时间
ValidateShopProductRequest request = getValidateShopProductRequest(productsVo, requestDto); ValidateShopProductRequest request = getValidateShopProductRequest(productsVo, requestDto);
ProductResponseDTO<ValiadShopProductResponse> valiadProductResponse = storeItemClient.validateShopProduct(request); ProductResponseDTO<ValiadShopProductResponse> valiadProductResponse = storeItemClient.validateShopProduct(request);
if (null == valiadProductResponse || Objects.equals(ResponseConstant.SUCCESS_RESPONSE_CODE, valiadProductResponse.getErrcode()) if (null == valiadProductResponse || !Objects.equals(ResponseConstant.SUCCESS_RESPONSE_CODE, valiadProductResponse.getErrcode())
|| valiadProductResponse.getData() == null || CollectionUtils.isEmpty(valiadProductResponse.getData().getSuccessList())) { || valiadProductResponse.getData() == null || CollectionUtils.isEmpty(valiadProductResponse.getData().getSuccessList())) {
return null; return null;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment