Merge branch 'feature-ka半自动派单ID1040800-20211222-zxh' into qa

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

@@ -245,7 +245,7 @@ public class CalculationSharingDiscountService {
             throw new ServiceException(ResponseResult.OPERATE_TOO_OFTEN);
         }
         // 返回成功
-        if (sharingDiscountResponseDto != null && StringUtils.equals(sharingDiscountResponseDto.getStatusCode(), ResponseCodeConstant.RESPONSE_SUCCESS_STR)) {
+        if (StringUtils.equals(sharingDiscountResponseDto.getStatusCode(), ResponseCodeConstant.RESPONSE_SUCCESS_STR)) {
             CalculationDiscountResult result = sharingDiscountResponseDto.getResult();
 
             List<Integer> activityTypes = result.getDiscounts().stream().map(Discount::getType).collect(Collectors.toList());
@@ -263,9 +263,13 @@ public class CalculationSharingDiscountService {
         }
 
         // 这个是专门给coco使用的券验证错误的异常，message要抛出去
-        if (sharingDiscountResponseDto != null && StringUtils.equals(sharingDiscountResponseDto.getStatusCode(), ResponseCodeConstant.COCO_RESPONSE_COUPON_ERR_STR)) {
+        if (StringUtils.equals(sharingDiscountResponseDto.getStatusCode(), ResponseCodeConstant.COCO_RESPONSE_COUPON_ERR_STR)) {
             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());
+        }
 
         // 支付宝华莱士紧急修改代码，当促销返回103错误码时，需要报券不适用于该门店，且清空购物车
         //throw new ServiceException(ResponseResult.OPERATE_TOO_OFTEN);