Merge branch 'feature/20210608-修复频次券可用门店判断' into qa

shopping-cart-application-service/src/main/java/cn/freemud/service/impl/CouponServiceImpl.java

@@ -766,7 +766,8 @@ public class CouponServiceImpl implements CouponService {
             return null;
         }
         //校验商品券是否可用
-        if (!Objects.equals(couponDetailResponseDto.getDetails().get(0).getStatus(), CouponStatus.STATUS_0.getCode())) {
+        if (!Objects.equals(couponDetailResponseDto.getDetails().get(0).getStatus(), CouponStatus.STATUS_0.getCode())
+                && !Objects.equals(couponDetailResponseDto.getDetails().get(0).getStatus(), CouponStatus.STATUS_2.getCode())) {
             return null;
         }
         List<String> couPonstoreIds = Lists.newArrayList();
@@ -940,14 +941,14 @@ public class CouponServiceImpl implements CouponService {
             return null;
         }
         //TODO 判断该券是否在这个门店下(一个券可以在多个门店下使用)
-        List<String> couPonstoreIds = Lists.newArrayList();
+        List<String> couponStoreIds = Lists.newArrayList();
         for (GetCouponDetailResponseDto.Details detail : couponDetailResponseDto.getDetails()) {
-            if (!CouponStatus.STATUS_0.getCode().equals(detail.getStatus())) continue;
+            if (!CouponStatus.STATUS_0.getCode().equals(detail.getStatus()) && !CouponStatus.STATUS_2.getCode().equals(detail.getStatus())) continue;
             for (GetCouponDetailResponseDto.ActiveRestrictionVOS activeRestrictionVO : detail.getActiveRestrictionVOS()) {
-                couPonstoreIds.add(activeRestrictionVO.getStoreIdPartner());
+                couponStoreIds.add(activeRestrictionVO.getStoreIdPartner());
             }
         }
-        if (CollectionUtils.isNotEmpty(couPonstoreIds) && !couPonstoreIds.contains(storeId)) {
+        if (CollectionUtils.isNotEmpty(couponStoreIds) && !couponStoreIds.contains(storeId)) {
              return null;
         }
 

shopping-cart-application-service/src/main/java/cn/freemud/service/impl/ShoppingCartNewServiceImpl.java

@@ -589,15 +589,15 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
         requestDto.setStoreId(storeId);
         requestDto.setProductIds(Collections.singletonList(Long.parseLong(cartGoods.getGoodsId())));
         GetProductStockResponseDto availableStocks = stockClient.getAvailableStocks(requestDto);
-        if ((availableStocks != null) && (ResponseCodeConstant.RESPONSE_SUCCESS_STR.equals(availableStocks.getCode()))) {
-            if ((CollectionUtils.isEmpty(availableStocks.getResult())) || (availableStocks.getResult().get(0).getQty() != null &&
-                    qty > availableStocks.getResult().get(0).getQty())) {
-                Integer stock = 0;
-                if (!CollectionUtils.isEmpty(availableStocks.getResult()) && (stock = availableStocks.getResult().get(0).getQty()) > 0) {
-                    throw new BizServiceException(ResponseResult.SHOPPING_CART_STOCK_NOT_HAVE, "仅剩" + stock + "件库存了");
-                }
-                throw new ServiceException(ResponseResult.SHOPPING_CART_STOCK_NOT_HAVE);
-            }
+        if (availableStocks == null || !ResponseCodeConstant.RESPONSE_SUCCESS_STR.equals(availableStocks.getCode())) {
+            throw new ServiceException(ResponseResult.SHOPPING_CART_STOCK_NOT_HAVE);
+        }
+        int stock = CollectionUtils.isEmpty(availableStocks.getResult()) || availableStocks.getResult().get(0).getQty() == null ? 0 :
+                availableStocks.getResult().get(0).getQty();
+        if (stock <= 0) {
+            throw new ServiceException(ResponseResult.SHOPPING_CART_STOCK_NOT_HAVE);
+        } else if (stock < qty) {
+            throw new BizServiceException(ResponseResult.SHOPPING_CART_STOCK_NOT_HAVE, "仅剩" + stock + "件库存了");
         }
     }
 
@@ -1967,35 +1967,39 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
      */
     private void queryManyGoodsStocks(AddShoppingCartGoodsRequestVo addShoppingCartGoodsRequestVo, List<Long> productIds
             , List<ProductBean> productBeanListSpuClass, String skuId, Integer qty) {
-        GetProductStockRequestDto requestDto = new GetProductStockRequestDto();
-        requestDto.setChannel(BusinessTypeEnum.getByType(addShoppingCartGoodsRequestVo.getMenuType()).getCode());
-        requestDto.setPartnerId(addShoppingCartGoodsRequestVo.getPartnerId());
-        requestDto.setStoreId(addShoppingCartGoodsRequestVo.getShopId());
-        requestDto.setProductIds(productIds);
-        GetProductStockResponseDto availableStocks = null;
+        boolean isLimit = false;
         if (productBeanListSpuClass.get(0).getType() == ProductType.NOSPEC.getCode()
                 && productBeanListSpuClass.get(0).getStockLimit() == 1) {
-            availableStocks = stockClient.getAvailableStocks(requestDto);
+            isLimit = true;
         } else {
             for (ProductBean.SkuProductBean skuProductBean : productBeanListSpuClass.get(0).getSkuList()) {
                 if (skuId.equals(skuProductBean.getSkuId()) && skuProductBean.getStockLimit() == 1) {
-                    availableStocks = stockClient.getAvailableStocks(requestDto);
+                    isLimit = true;
                     break;
                 }
             }
         }
-        if (availableStocks != null && !ResponseCodeConstant.RESPONSE_SUCCESS_STR.equals(availableStocks.getCode())) {
+        // 不限制库存
+        if (!isLimit){
+            return;
+        }
+        GetProductStockRequestDto requestDto = new GetProductStockRequestDto();
+        requestDto.setChannel(BusinessTypeEnum.getByType(addShoppingCartGoodsRequestVo.getMenuType()).getCode());
+        requestDto.setPartnerId(addShoppingCartGoodsRequestVo.getPartnerId());
+        requestDto.setStoreId(addShoppingCartGoodsRequestVo.getShopId());
+        requestDto.setProductIds(productIds);
+        GetProductStockResponseDto availableStocks = stockClient.getAvailableStocks(requestDto);
+        if (availableStocks == null || !ResponseCodeConstant.RESPONSE_SUCCESS_STR.equals(availableStocks.getCode())) {
             throw new ServiceException(ResponseResult.SHOPPING_CART_STOCK_NOT_HAVE);
         }
-        if (availableStocks != null && ResponseCodeConstant.RESPONSE_SUCCESS_STR.equals(availableStocks.getCode()) &&
-                (CollectionUtils.isEmpty(availableStocks.getResult()) || availableStocks.getResult().get(0).getQty() == null
-                        || availableStocks.getResult().get(0).getQty() < qty)) {
-            Integer stock = 0;
-            if (!CollectionUtils.isEmpty(availableStocks.getResult()) && (stock = availableStocks.getResult().get(0).getQty()) > 0) {
-                throw new BizServiceException(ResponseResult.SHOPPING_CART_STOCK_NOT_HAVE, "仅剩" + stock + "件库存了");
-            }
+        int stock = CollectionUtils.isEmpty(availableStocks.getResult()) || availableStocks.getResult().get(0).getQty() == null ? 0 :
+                availableStocks.getResult().get(0).getQty();
+        if (stock <= 0) {
             throw new ServiceException(ResponseResult.SHOPPING_CART_STOCK_NOT_HAVE);
+        } else if (stock < qty) {
+            throw new BizServiceException(ResponseResult.SHOPPING_CART_STOCK_NOT_HAVE, "仅剩" + stock + "件库存了");
         }
+
     }
 
     /**