日志打印去掉个人开发监控日志,加上Feign标示，合并QA跟进日志信息.解决冲突文件

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

@@ -15,10 +15,8 @@ package cn.freemud.service.impl;
 import cn.freemud.adapter.ActivityAdapter;
 import cn.freemud.adapter.CouponAdapter;
 import cn.freemud.adapter.ShoppingCartConvertAdapter;
-import cn.freemud.base.constant.Version;
 import cn.freemud.base.entity.BaseResponse;
 import cn.freemud.base.util.DateUtil;
-import cn.freemud.constant.CustomerScoreConstant;
 import cn.freemud.constant.ResponseCodeConstant;
 import cn.freemud.constant.ShoppingCartConstant;
 import cn.freemud.entities.dto.*;
@@ -35,8 +33,8 @@ import cn.freemud.entities.dto.user.GetUserScoreUseDetailRequest;
 import cn.freemud.entities.dto.user.GetUserScoreUserDetailResponse;
 import cn.freemud.entities.vo.*;
 import cn.freemud.enums.*;
-import cn.freemud.interceptor.ServiceException;
 import cn.freemud.interceptor.BizServiceException;
+import cn.freemud.interceptor.ServiceException;
 import cn.freemud.redis.RedisCache;
 import cn.freemud.service.*;
 import cn.freemud.service.delivery.DeliveryFactory;
@@ -45,23 +43,22 @@ import cn.freemud.service.impl.calculate.*;
 import cn.freemud.service.shoppingCart.ShoppingCartRelationFactory;
 import cn.freemud.service.shoppingCart.ShoppingCartRelationService;
 import cn.freemud.service.thirdparty.*;
-import cn.freemud.utils.*;
+import cn.freemud.utils.BeanUtil;
+import cn.freemud.utils.PromotionFactory;
+import cn.freemud.utils.PropertyConvertUtil;
+import cn.freemud.utils.ResponseUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.freemud.api.assortment.datamanager.entity.db.AssortmentOpenPlatformPartnerStoreDeliveryConfig;
-import com.freemud.api.assortment.datamanager.entity.db.AssortmentOpenPlatformPartnerWxappConfig;
 import com.freemud.api.assortment.datamanager.manager.AssortmentOpenPlatformPartnerStoreDeliveryConfigManager;
 import com.freemud.api.assortment.datamanager.manager.customer.AssortmentCustomerInfoManager;
-import com.freemud.application.sdk.api.constant.FMStatusCode;
 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.GetMemberByMobileRequest;
 import com.freemud.application.sdk.api.membercenter.request.QueryReceiveAddressRequest;
 import com.freemud.application.sdk.api.membercenter.request.StatisticalPropertyRequest;
 import com.freemud.application.sdk.api.membercenter.request.StatisticalScoreRequest;
-import com.freemud.application.sdk.api.membercenter.response.GetMemberByMobileResponse;
 import com.freemud.application.sdk.api.membercenter.response.GetSvcInfoByMemberIdResponse;
 import com.freemud.application.sdk.api.membercenter.response.QueryReceiveAddressResponse;
 import com.freemud.application.sdk.api.membercenter.response.StatisticalScoreResponse;
@@ -80,7 +77,6 @@ import com.freemud.sdk.api.assortment.shoppingcart.request.CheckCartRequest;
 import com.freemud.sdk.api.assortment.shoppingcart.service.ShoppingCartBaseService;
 import com.freemud.sdk.api.assortment.shoppingcart.service.impl.ShoppingCartBaseServiceImpl;
 import com.google.common.collect.Lists;
-import lombok.Data;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang.ObjectUtils;
@@ -2343,20 +2339,6 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
 
     }
 
-    /**
-     * 设置总的优惠信息和商品优惠信息
-     * @param shoppingCartGoodsResponseVo
-     * @param discountResult
-     */
-    private void buildShoppingCartGoodsResponse(ShoppingCartGoodsResponseVo shoppingCartGoodsResponseVo,
-                                                CalculationSharingDiscountResponseDto.CalculationDiscountResult discountResult,
-                                                Integer flag,
-                                                String partnerId) {
-
-        ShoppingCartRelationService shoppingCartRelationService = shoppingCartRelationFactory.getBuildShoppingCartGoodsResponseService(partnerId);
-        shoppingCartRelationService.buildShoppingCartGoodsResponse(shoppingCartGoodsResponseVo,discountResult,flag);
-
-    }
 
     /**
      * 获取混合支付是否开启