Merge branch 'feature_夜间配送ID1040499_zxh20211208' into qa

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

@@ -81,6 +81,7 @@ 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.ShoppingCartBaseService;
 import com.freemud.sdk.api.assortment.shoppingcart.service.impl.ShoppingCartBaseServiceImpl;
+import com.freemud.sdk.api.assortment.shoppingcart.util.ShoppingSdkLogUtil;
 import com.google.common.collect.Lists;
 import ma.glasnost.orika.MapperFacade;
 import org.apache.commons.collections4.CollectionUtils;
@@ -2005,6 +2006,7 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
          * 满额减配送费   优选活动 再配送券
          */
         if (BusinessTypeEnum.SAAS_DELIVERY.getCode().equals(menuType)) {
+            ShoppingSdkLogUtil.printLog("fisherman 夜间配送费设置",JSON.toJSONString(calculationDiscountResult), "");
             DecimalFormat df = new DecimalFormat("###.##");
             List<ActivityTypeEnum> activityTypeEnums = new LinkedList<>();
             activityTypeEnums.add(ActivityTypeEnum.TYPE_14);