Merge branch 'ka-购物车加车数量限制' into develop

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

@@ -474,6 +474,10 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
             return ResponseUtil.error(ResponseResult.SHOPPING_CART_SHOP_ID_NOT_EMPTY);
 //            throw new ServiceException(ResponseResult.SHOPPING_CART_SHOP_ID_NOT_EMPTY);
         }
+        // fisherman 购物车加车数量限制
+        if (updateShoppingCartGoodsQtyRequestVo.getQty().compareTo(500) > 0 || updateShoppingCartGoodsQtyRequestVo.getQty().compareTo(0) <= 0 ) {
+            return ResponseUtil.error(ResponseResult.SHOPPING_CART_LIMIT_ADD);
+        }
         ShoppingCartGoodsResponseVo shoppingCartGoodsResponseVo = new ShoppingCartGoodsResponseVo();
         CustomerInfoVo assortmentCustomerInfoVo = getCustomerInfoVo(updateShoppingCartGoodsQtyRequestVo.getSessionId());
         UserLoginInfoDto userLoginInfoDto = convert2UserLoginInfoDto(assortmentCustomerInfoVo);

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

@@ -21,7 +21,6 @@ import cn.freemud.service.active.ActiveService;
 import cn.freemud.service.impl.AssortmentSdkService;
 import cn.freemud.service.thirdparty.ActivityClient;
 import cn.freemud.utils.PropertyConvertUtil;
-import cn.freemud.entities.dto.activity.DiscountSharingDto;
 import com.freemud.application.sdk.api.log.LogThreadLocal;
 import com.freemud.sdk.api.assortment.shoppingcart.constant.CommonsConstant;
 import com.freemud.sdk.api.assortment.shoppingcart.enums.BusinessTypeEnum;
@@ -266,8 +265,8 @@ public class CalculationSharingDiscountService {
             throw new BizServiceException(ResponseResult.COCO_COUPON_VALIDATOR_FAIL, sharingDiscountResponseDto.getMsg());
         }
         // 80000 促销校验业务错误,直接抛给前端
-        if (sharingDiscountResponseDto != null && StringUtils.equals(sharingDiscountResponseDto.getStatusCode(), "80000")) {
-            throw new ServiceException(ResponseResult.SYSTEM_BUSINESS_ERROR,sharingDiscountResponseDto.getMsg());
+        if (StringUtils.equals(sharingDiscountResponseDto.getStatusCode(), "80000")) {
+            throw new ServiceException(ResponseResult.SYSTEM_BUSINESS_ERROR, sharingDiscountResponseDto.getMsg());
         }
 
         // 支付宝华莱士紧急修改代码，当促销返回103错误码时，需要报券不适用于该门店，且清空购物车