Merge branch 'KA-20210714-线上购物车异常修复'

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

@@ -575,7 +575,8 @@ public class ShoppingCartMealServiceImpl implements ShoppingCartNewService {
         try {
             activityCalculationDiscountResponseDto = activityClient.calculationDiscount(activityCalculationDiscountRequestDto);
         } catch (Exception ex) {
-            com.freemud.application.sdk.api.log.ErrorLog.printErrorLog("calculation_discount_error", "/calculation/discount", activityCalculationDiscountRequestDto, ex);
+//            com.freemud.application.sdk.api.log.ErrorLog.printErrorLog("calculation_discount_error", "/calculation/discount", activityCalculationDiscountRequestDto, ex);
+            ErrorLog.errorDev("500", "calculation_discount_error", ex, activityCalculationDiscountRequestDto);
             throw new ServiceException(ResponseResult.OPERATE_TOO_OFTEN);
         }
         // 返回成功

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

@@ -1492,7 +1492,8 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
                 ApiLog.printLog("activityClient discount :{}", JSON.toJSONString(activityCalculationDiscountRequestDto),null,null);
             activityCalculationDiscountResponseDto = activityClient.calculationDiscount(activityCalculationDiscountRequestDto);
         } catch (Exception ex) {
-            ErrorLog.printErrorLog("calculation_discount_error", "/calculation/discount", activityCalculationDiscountRequestDto, ex);
+//            ErrorLog.printErrorLog("calculation_discount_error", "/calculation/discount", activityCalculationDiscountRequestDto, ex);
+            ErrorLog.errorDev("500", "calculation_discount_error", ex, activityCalculationDiscountRequestDto);
             throw new ServiceException(ResponseResult.OPERATE_TOO_OFTEN);
         }
         // 返回成功

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

@@ -119,11 +119,13 @@ public class CalculationCommonService {
     }
 
     private void rowRealAmount(List<CalculationSharingDiscountResponseDto.CalculationDiscountResult.Goods> goods, CartGoods cartGoods, String couponCode) {
-
+        // 防止前置 goods 空指针
+        if (CollectionUtils.isEmpty(goods)) {
+            return;
+        }
         CalculationSharingDiscountResponseDto.CalculationDiscountResult.Goods find = goods
                 .stream().filter((k) -> k.getCartGoodsUid().equals(cartGoods.getCartGoodsUid()))
-                .findFirst()
-                .get();
+                .findFirst().orElse(null);
 
         if (find == null) return;
         cartGoods.setAmount(find.getRealAmount());

shopping-cart-application-service/src/main/java/cn/freemud/service/impl/mcoffee/calculation/CalculationServiceImpl.java

@@ -24,6 +24,7 @@ import cn.freemud.utils.LogUtil;
 import cn.freemud.utils.PropertyConvertUtil;
 import com.alibaba.fastjson.JSON;
 import com.freemud.application.sdk.api.log.ApiLog;
+import com.freemud.application.sdk.api.log.ErrorLog;
 import com.freemud.application.sdk.api.log.LogThreadLocal;
 import com.freemud.application.sdk.api.membercenter.request.QueryReceiveAddressRequest;
 import com.freemud.application.sdk.api.membercenter.response.QueryReceiveAddressResponse;
@@ -170,7 +171,8 @@ public class CalculationServiceImpl {
         try {
             activityCalculationDiscountResponseDto = activityClient.calculationDiscountSharing(discountRequest);
         } catch (Exception ex) {
-            log.error("calculation_discount_error  " + "/calculation/discount/sharding   " + JSON.toJSONString(discountRequest) + "  " + ExceptionUtils.getExceptionInfo(ex));
+//            log.error("calculation_discount_error  " + "/calculation/discount/sharding   " + JSON.toJSONString(discountRequest) + "  " + ExceptionUtils.getExceptionInfo(ex));
+            ErrorLog.errorDev("500", "/calculation/discount/sharing_error", ex, discountRequest);
             throw new ServiceException(ResponseResult.OPERATE_TOO_OFTEN);
         }
         //优惠券互斥