购物车日志修改

shopping-cart-application-service/src/main/java/cn/freemud/adapter/ShoppingCartConvertAdapter.java

@@ -1075,7 +1075,7 @@ public class ShoppingCartConvertAdapter {
             // todo 设置加料
             this.checkMaterialProductForMCoffee(cartGoods, spuProduct);
         } catch (Exception ex) {
-            ShoppingSdkLogUtil.errorLog("updateCartGoodsInfoForMCoffee_Error {}",ex, JSON.toJSONString(cartGoods));
+            ErrorLog.printErrorLog("updateCartGoodsInfoForMCoffee_Error","updateCartGoodsInfo",JSON.toJSONString(cartGoods),ex);
             cartGoods.setCartGoodsUid(null);
         }
     }

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

@@ -17,8 +17,8 @@ import cn.freemud.adapter.StoreItemAdapter;
 import cn.freemud.base.entity.BaseResponse;
 import cn.freemud.constant.ResponseCodeConstant;
 import cn.freemud.demo.entities.bo.goods.GetProductBySkuIdResponseBO;
-import cn.freemud.entities.dto.*;
 import cn.freemud.entities.dto.GetMenuResponseDto.DataBean.RootNodeBean.ChildrenBeanFirst.ChildrenBeanSecond.ProductBean;
+import cn.freemud.entities.dto.*;
 import cn.freemud.entities.vo.CartGoods;
 import cn.freemud.entities.vo.GetProductsVo;
 import cn.freemud.enums.ProductInfoType;
@@ -30,18 +30,14 @@ import cn.freemud.service.thirdparty.StockClient;
 import cn.freemud.service.thirdparty.StoreItemClient;
 import cn.freemud.utils.ResponseUtil;
 import cn.freemud.utils.Sha1Util;
-import com.freemud.sdk.api.assortment.shoppingcart.util.ShoppingSdkLogUtil;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 import com.google.gson.Gson;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang.StringUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.lang.reflect.Array;
 import java.util.*;
 import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
@@ -49,8 +45,6 @@ import java.util.stream.Collectors;
 @Service
 public class ItemServiceImpl implements ItemService {
 
-    private Logger log = LoggerFactory.getLogger(ShoppingSdkLogUtil.class);
-
     private final Integer RESPONSE_SUCCESS_CODE = 100;
     private static Gson gson = new Gson();
     @Autowired

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

@@ -239,7 +239,7 @@ public class ShoppingCartCollageServiceImpl extends AbstractShoppingCartImpl imp
                                             .build();
         List<CollageMemberState> collageMemberState = collageOrderBaseService.getCollageMemberState(collageOrderDto).getResult();
         if(collageMemberState == null || collageMemberState.isEmpty()){
-            ShoppingSdkLogUtil.printLog("splitByUser 参单人员为空，partnerId:{}，storeId：{}，createUserId:{}，currentUserId：{}"+partnerId,storeId,createUserId,currentUserId);
+            ShoppingSdkLogUtil.printLog("splitByUser 参单人员为空，createUserId:{}，currentUserId：{}",createUserId,currentUserId);
             return null;
         }
 
@@ -852,13 +852,13 @@ public class ShoppingCartCollageServiceImpl extends AbstractShoppingCartImpl imp
         activityCalculationDiscountRequestDto.setDistributionFee(distributionFee);
         activityCalculationDiscountRequestDto.setIsMember(isMember);
         ActivityCalculationDiscountResponseDto activityCalculationDiscountResponseDto;
-        try {
+//        try {
             // 调用老促销接口
             activityCalculationDiscountResponseDto = activityClient.calculationDiscount(activityCalculationDiscountRequestDto);
-        } catch (Exception ex) {
-            ShoppingSdkLogUtil.errorConvertJson(SDKCommonBaseContextWare.getAppName(), LogThreadLocal.getTrackingNo(), getClass(), "shoppingCartCollageServiceImpl getActivityCalculationDiscountResponse:" + ex.getMessage(), ex);
-            throw new ServiceException(ResponseResult.OPERATE_TOO_OFTEN);
-        }
+//        } catch (Exception ex) {
+//            ShoppingSdkLogUtil.errorConvertJson(SDKCommonBaseContextWare.getAppName(), LogThreadLocal.getTrackingNo(), getClass(), "shoppingCartCollageServiceImpl getActivityCalculationDiscountResponse:" + ex.getMessage(), ex);
+//            throw new ServiceException(ResponseResult.OPERATE_TOO_OFTEN);
+//        }
         // 返回成功
         if (activityCalculationDiscountResponseDto != null && StringUtils.equals(activityCalculationDiscountResponseDto.getStatusCode(), ResponseCodeConstant.RESPONSE_SUCCESS_STR)) {
             ActivityCalculationDiscountResponseDto.CalculationDiscountResult result = activityCalculationDiscountResponseDto.getResult();

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

@@ -572,12 +572,12 @@ public class ShoppingCartMealServiceImpl implements ShoppingCartNewService {
         activityCalculationDiscountRequestDto.setDistributionFee(distributionFee);
         activityCalculationDiscountRequestDto.setIsMember(isMember);
         ActivityCalculationDiscountResponseDto activityCalculationDiscountResponseDto;
-        try {
+//        try {
             activityCalculationDiscountResponseDto = activityClient.calculationDiscount(activityCalculationDiscountRequestDto);
-        } catch (Exception ex) {
-            ErrorLog.errorDev("500", "calculation_discount_error", ex, activityCalculationDiscountRequestDto);
-            throw new ServiceException(ResponseResult.OPERATE_TOO_OFTEN);
-        }
+//        } catch (Exception ex) {
+//            ErrorLog.errorDev("500", "calculation_discount_error", ex, activityCalculationDiscountRequestDto);
+//            throw new ServiceException(ResponseResult.OPERATE_TOO_OFTEN);
+//        }
         // 返回成功
         if (activityCalculationDiscountResponseDto != null && StringUtils.equals(activityCalculationDiscountResponseDto.getStatusCode(), ResponseCodeConstant.RESPONSE_SUCCESS_STR)) {
             ActivityCalculationDiscountResponseDto.CalculationDiscountResult result = activityCalculationDiscountResponseDto.getResult();

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

@@ -169,12 +169,12 @@ public class CalculationServiceImpl {
         discountRequest.setPayCardFee(payCardFee);
         discountRequest.setProductChannel(orderType == 1 ? "saasdelivery" : "saas");
         ActivityCalculationDiscountResponseDto activityCalculationDiscountResponseDto;
-        try {
+//        try {
             activityCalculationDiscountResponseDto = activityClient.calculationDiscountSharing(discountRequest);
-        } catch (Exception ex) {
-            ErrorLog.errorDev("500", "/calculation/discount/sharing_error", ex, discountRequest);
-            throw new ServiceException(ResponseResult.OPERATE_TOO_OFTEN);
-        }
+//        } catch (Exception ex) {
+//            ErrorLog.errorDev("500", "/calculation/discount/sharing_error", ex, discountRequest);
+//            throw new ServiceException(ResponseResult.OPERATE_TOO_OFTEN);
+//        }
         //优惠券互斥
         if (null != activityCalculationDiscountResponseDto && StringUtils.equals(activityCalculationDiscountResponseDto.getStatusCode(),ResponseCodeConstant.RESPONSE_CONFLICTS_STR)){
             throw new ServiceException(ResponseResult.COUPON_CONFLICTS_ERROR);