Merge remote-tracking branch 'origin/qa' into qa

shopping-cart-application-service/src/main/java/cn/freemud/entities/dto/calculate/CalculationDiscountResult.java

@@ -82,6 +82,11 @@ public class CalculationDiscountResult {
      */
     private Long distributionFee;
 
+    /**
+     * 优惠后 夜间配送费
+     */
+    private Long nightDistributionFee = 0L;
+
 
     //积分商品活动购物车商品所需总积分")
     private Integer totalScore;

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

@@ -910,7 +910,7 @@ 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())));
+        //shoppingCartGoodsResponseVo.setDeliveryAmount(this.responseDataMaintain2DeliverAmount(shoppingCartGoodsResponseVo.getDeliveryAmount(),this.getNightDistributionFee(shoppingCartGoodsResponseVo.getDeliveryAmountList())));
     }
 
     /**
@@ -1308,7 +1308,7 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
                 shoppingCartGoodsDto.setSendPoint(calculationDiscountResult.getSendPointVo());
             }
         }
-        shoppingCartGoodsDto.setDeliveryAmount(this.responseDataMaintain2DeliverAmount(shoppingCartGoodsDto.getDeliveryAmount(), this.getNightDistributionFee(shoppingCartGoodsResponseVo.getDeliveryAmountList())));
+        //shoppingCartGoodsDto.setDeliveryAmount(this.responseDataMaintain2DeliverAmount(shoppingCartGoodsDto.getDeliveryAmount(), this.getNightDistributionFee(shoppingCartGoodsResponseVo.getDeliveryAmountList())));
         return ResponseUtil.success(shoppingCartGoodsDto);
     }
 
@@ -1700,8 +1700,11 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
 
             result.setValidCouponMap(validCouponMap);
             result.setSpqIdToCartUuid(spqIdToCartUuid);
-            result.setDeliveryAmount(distributionFee);
-            result.setDistributionFee(result.getDistributionFee());
+            // fisherman 配送费原价 + 夜间配送费逻辑  为了划线价展示
+            result.setDeliveryAmount(distributionFee + nightDistributionFee);
+            // fisherman 优惠后配送费,需要加上促销反馈夜间配送费的优惠价格
+            Long calculationNightDistributionFee = Objects.isNull(result.getNightDistributionFee()) ? 0L : result.getNightDistributionFee();
+            result.setDistributionFee(result.getDistributionFee() + calculationNightDistributionFee);
             return result;
         }
         // 支付宝华莱士紧急修改代码，当促销返回103错误码时，需要报券不适用于该门店，且清空购物车