新算价支持夜间配送费计算

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

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

@@ -95,7 +95,7 @@ public class CalculationSharingDiscountService {
             , List<CartGoods> cartGoodsList, List<ActivityCalculationDiscountRequestDto.CalculationDiscountCoupon> coupons
             , List<ShoppingCartInfoRequestVo.SendGoods> sendGoodsList, Long deliveryAmount
             , ShoppingCartInfoRequestVo shoppingCartInfoRequestVo, Integer bizType, Integer accountFlag, DiscountSharingDto sharingDto, long nightDistributionFee) {
-
+        deliveryAmount = Objects.isNull(deliveryAmount) ? 0L : deliveryAmount;
         ActivityCalculationDiscountRequestDto calculationSharingDiscountRequestDto = this.commonSharingDto(partnerId, storeId, userId, appId, orderType);
         // 是否有夜间配送费 设置
         calculationSharingDiscountRequestDto.setNightDistributionFee(nightDistributionFee);
@@ -251,8 +251,8 @@ public class CalculationSharingDiscountService {
             result.setValidCouponMap(validCouponMap);
             result.setSpqIdToCartUuid(spqIdToCartUuid);
             // fisherman  这里传递过来的 配送费 是否要计算一下 配送券的逻辑
-            result.setDeliveryAmount(deliveryAmount);
-            result.setDistributionFee(result.getDistributionFee());
+            result.setDeliveryAmount(deliveryAmount + nightDistributionFee);
+            result.setDistributionFee(result.getDistributionFee() + result.getNightDistributionFee());
             return result;
         }