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

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

@@ -893,7 +893,24 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
         // 设置 使用信息
         Long useCouponThreshold = this.getUseCouponThreshold(shoppingCartGoodsResponseVo.getProducts());
         shoppingCartGoodsResponseVo.setUseCouponThreshold(useCouponThreshold);
+        // 如果有夜间配送费 需要维护划线价  deliveryAmount 字段, ___> 注意, 配送费的优惠是 促销在算(又特么各算一半,这产品真是恶心)
+        shoppingCartGoodsResponseVo.setDeliveryAmount(this.responseDataMaintain2DeliverAmount(shoppingCartGoodsResponseVo.getDeliveryAmount(),this.getNightDistributionFee(shoppingCartGoodsResponseVo.getDeliveryAmountList())));
+    }
 
+    /**
+     * 如果有夜间配送费 需要维护划线价  deliveryAmount 字段, ___> 注意, 配送费的优惠是 促销在算(又特么各算一半,这产品真是恶心)
+     * @param deliveryAmount
+     * @param nightDistributionFee
+     * @return
+     */
+    private Long responseDataMaintain2DeliverAmount(Long deliveryAmount,long nightDistributionFee){
+        if (Objects.isNull(deliveryAmount)) {
+            deliveryAmount = 0L;
+        }
+        if (nightDistributionFee < 0){
+            return deliveryAmount;
+        }
+        return deliveryAmount + nightDistributionFee;
     }
 
     /**
@@ -1275,6 +1292,7 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
                 shoppingCartGoodsDto.setSendPoint(calculationDiscountResult.getSendPointVo());
             }
         }
+        shoppingCartGoodsDto.setDeliveryAmount(this.responseDataMaintain2DeliverAmount(shoppingCartGoodsDto.getDeliveryAmount(), this.getNightDistributionFee(shoppingCartGoodsResponseVo.getDeliveryAmountList())));
         return ResponseUtil.success(shoppingCartGoodsDto);
     }