Merge branch 'feature/20210609-v2.0.34-购物车支持配送券ID1030707-周晓航' into qa

shopping-cart-application-service/src/main/java/cn/freemud/entities/vo/ShoppingCartGoodsResponseVo.java

@@ -12,15 +12,11 @@
  */
 package cn.freemud.entities.vo;
 
-import cn.freemud.entities.dto.ActivityCalculationDiscountResponseDto;
 import cn.freemud.entities.dto.calculate.CalculationSharingDiscountResponseDto;
 import lombok.Builder;
 import lombok.Data;
 
-import java.math.BigDecimal;
 import java.util.List;
-import java.util.UUID;
-import java.math.BigDecimal;
 
 @Data
 public class ShoppingCartGoodsResponseVo  extends ShoppingCartGoodsBaseResponseVo{
@@ -181,6 +177,12 @@ public class ShoppingCartGoodsResponseVo  extends ShoppingCartGoodsBaseResponseV
      */
     private Long sendGoodsAmount;
 
+    /**
+     *  fisherman 该字段用于兼容 配送券逻辑使用
+     *  场景: 新算价  活动和配送券共享情况下 前端结算页 小结计算展示有问题
+     *  目的: 兼容 订单结算页 小结展示问题
+     */
+    private Integer verCompat = 0;
 
     @Data
     public static class chooseGood {

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

@@ -78,6 +78,10 @@ public class DeliverySharingService {
             if (isType34) {
                 String desc = shoppingCartGoodsResponseVo.getDeliveryDiscountDesc();
                 shoppingCartGoodsResponseVo.setDeliveryDiscountDesc(desc+ ","+ DELIVERY_DISCOUNT_DESC4);
+                // 证明使用了配送券 又有活动优惠
+                if (discount.getDiscount().compareTo(0) > 0) {
+                    shoppingCartGoodsResponseVo.setVerCompat(discount.getDiscount());
+                }
             }
             shoppingCartGoodsResponseVo.setDeliveryAmount(discountResult.getDeliveryAmount());
             shoppingCartGoodsResponseVo.setDiscountDeliveryAmount(discountResult.getDistributionFee());
@@ -86,6 +90,7 @@ public class DeliverySharingService {
         }
         else {
             if (activityResponse!=null) {
+                // 这里表示有活动, 但是没有参加上
                 if(beanDto.getBenefitType() == 1) {
                     String desc = DELIVERY_DISCOUNT_DESC2;
                     shoppingCartGoodsResponseVo.setDeliveryDiscountDesc(String.format(desc, df.format(beanDto.getThresholdAmount().doubleValue() /100) ));