新算价添加日志

Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>

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

@@ -717,6 +717,7 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
                     , sendGoods
                     , deliveryAmount
                     , null);
+            ApiLog.info("fisherman 新算价 配送费字段数据 01 ",calculationSharingDiscountResult,shoppingCartGoodsResponseVo);
             sharingCartService.distribute(calculationSharingDiscountResult
                     , cartGoodsList
                     , shoppingCartGoodsResponseVo
@@ -731,7 +732,7 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
                     ,shoppingCartInfoRequestVo.getFlag()
                     , userId
                     , storeId);
-
+            ApiLog.info("fisherman 新算价 配送费字段数据 02 ",null,shoppingCartGoodsResponseVo);
             buildShoppingCartGoodsResponse(shoppingCartGoodsResponseVo,calculationSharingDiscountResult,shoppingCartInfoRequestVo.getFlag(),partnerId);
         }
         else {
@@ -814,7 +815,7 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
         }
         // 添加购物车商品总价和加价购商品总价,现在是自己计算,后面需要优化为促销计算, 这段要删除
 
-        ApiLog.info("校验入参券是否可用new ",shoppingCartGoodsResponseVo,shoppingCartInfoRequestVo.getCouponCodes());
+        ApiLog.info("fisherman 新算价 校验入参券是否可用new ",shoppingCartGoodsResponseVo,shoppingCartInfoRequestVo.getCouponCodes());
         // 校验入参券是否可用
         if (!checkAvailableCoupon(shoppingCartGoodsResponseVo, shoppingCartInfoRequestVo.getCouponCode())){
             return ResponseUtil.error(ResponseResult.SHOPPING_CART_COUPON_NOT_USE);

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

@@ -19,7 +19,6 @@ import com.alibaba.fastjson.JSON;
 import com.freemud.application.sdk.api.log.ApiLog;
 import lombok.Data;
 import lombok.NoArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
 import ma.glasnost.orika.MapperFacade;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang.ObjectUtils;
@@ -62,7 +61,7 @@ public class CalculationCommonService {
     private MapperFacade mapperFacade;
 
     /**
-     * 初始化价格
+     * 初始化价格  新算价走了
      */
     public void initShoppingCart(CalculationSharingDiscountResponseDto.CalculationDiscountResult discountResult
             , List<CartGoods> cartGoodsList

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

@@ -11,9 +11,6 @@ import cn.freemud.entities.vo.ShoppingCartInfoRequestVo;
 import cn.freemud.enums.OrderChannelType;
 import cn.freemud.service.impl.calculate.promotion.*;
 import com.freemud.sdk.api.assortment.shoppingcart.enums.BusinessTypeEnum;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.collections4.CollectionUtils;
-import org.apache.commons.lang.ObjectUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 

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

 package cn.freemud.service.impl.calculate;
 
 import cn.freemud.constant.ResponseCodeConstant;
-import cn.freemud.entities.dto.ActivityCalculationDiscountResponseDto;
 import cn.freemud.entities.dto.CheckSpqInfoRequestDto;
 import cn.freemud.entities.dto.CheckSpqInfoResponseDto;
 import cn.freemud.entities.dto.calculate.CalculationSharingDiscountRequestDto;
 import cn.freemud.entities.dto.calculate.CalculationSharingDiscountResponseDto;
 import cn.freemud.entities.dto.shoppingCart.SendPoint;
 import cn.freemud.entities.vo.CartGoods;
-import cn.freemud.entities.vo.ShoppingCartGoodsResponseVo;
 import cn.freemud.entities.vo.ShoppingCartInfoRequestVo;
-import cn.freemud.enums.*;
+import cn.freemud.enums.ActivityChannelEnum;
+import cn.freemud.enums.CreateOrderType;
+import cn.freemud.enums.GoodsTypeEnum;
+import cn.freemud.enums.ResponseResult;
 import cn.freemud.interceptor.BizServiceException;
 import cn.freemud.interceptor.ServiceException;
 import cn.freemud.service.CommonService;
@@ -18,8 +19,6 @@ import cn.freemud.service.CouponService;
 import cn.freemud.service.active.ActiveFactory;
 import cn.freemud.service.active.ActiveService;
 import cn.freemud.service.impl.AssortmentSdkService;
-import cn.freemud.service.impl.CouponServiceImpl;
-import cn.freemud.service.impl.calculate.promotion.GiftSharingService;
 import cn.freemud.service.thirdparty.CalculationClient;
 import cn.freemud.utils.PropertyConvertUtil;
 import com.alibaba.fastjson.JSON;
@@ -28,16 +27,15 @@ import com.freemud.application.sdk.api.log.ErrorLog;
 import com.freemud.sdk.api.assortment.shoppingcart.constant.CommonsConstant;
 import com.freemud.sdk.api.assortment.shoppingcart.enums.BusinessTypeEnum;
 import com.freemud.sdk.api.assortment.shoppingcart.service.impl.ShoppingCartBaseServiceImpl;
-import javafx.util.Pair;
-import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
-import org.apache.commons.collections4.MapUtils;
-import org.apache.commons.lang.ObjectUtils;
 import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Objects;
 import java.util.stream.Collectors;
 
 /**
@@ -67,6 +65,7 @@ public class CalculationSharingDiscountService {
     private ActiveFactory activeFactory;
 
 
+    // 新算价
     public CalculationSharingDiscountResponseDto.CalculationDiscountResult getCalculationSharingDiscountResult(String menuType
             , String partnerId
             , String storeId