Merge remote-tracking branch 'remotes/origin/feature/coco-payGift-刘鹏飞' into qa

# Conflicts:
#	shopping-cart-application-service/src/main/java/cn/freemud/entities/vo/ShoppingCartClearRequestVo.java

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

@@ -36,4 +36,10 @@ public class ShoppingCartClearRequestVo extends BaseRequestVo {
      * 拼单发起人userId（拼单）
      */
     private String createCollageUserId;
+
+
+    /**
+     * 收货地址ID、svc卡支付外卖订单必传
+     */
+    private String receiveId;
 }

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

@@ -745,6 +745,10 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
         shoppingCartGoodsResponseVo.setActivityTip(activityTip);
         shoppingCartGoodsResponseVo.setProducts(new ArrayList<>());
         shoppingCartGoodsResponseVo.setProductsCount(0);
+
+        ShoppingCartRelationService shoppingCartRelationService = shoppingCartRelationFactory.cleanAfter(shoppingCartClearRequestVo.getPartnerId());
+        shoppingCartRelationService.cleanAfter(shoppingCartGoodsResponseVo,shoppingCartClearRequestVo);
+
         return ResponseUtil.success(shoppingCartGoodsResponseVo);
     }
 
@@ -1890,7 +1894,7 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
         return calculationDiscountResult;
     }
 
-    private Long calculateDeliveryAmount(String receiveId, String partnerId, String storeId, String wxappid, ShoppingCartGoodsResponseVo shoppingCartGoodsResponseVo,Integer orderType) {
+    public Long calculateDeliveryAmount(String receiveId, String partnerId, String storeId, String wxappid, ShoppingCartGoodsResponseVo shoppingCartGoodsResponseVo,Integer orderType) {
         Long deliveryAmount = 0L;
         // 如果订单的收获地址为空，且订单是外卖单，返回运费
         // 主要是为了兼容coco不传收获地址，需要获取固定运费的情况

shopping-cart-application-service/src/main/java/cn/freemud/service/shoppingCart/ShoppingCartRelationFactory.java

@@ -20,4 +20,11 @@ public interface ShoppingCartRelationFactory {
      */
     ShoppingCartRelationService getBuildShoppingCartGoodsResponseService(String partnerId);
 
+    /**
+     * 获取购物车清空后的操作实现
+     * @param partnerId
+     * @return
+     */
+    ShoppingCartRelationService cleanAfter(String partnerId);
+
 }

shopping-cart-application-service/src/main/java/cn/freemud/service/shoppingCart/ShoppingCartRelationService.java

@@ -13,6 +13,7 @@
 package cn.freemud.service.shoppingCart;
 
 import cn.freemud.entities.dto.calculate.CalculationSharingDiscountResponseDto;
+import cn.freemud.entities.vo.ShoppingCartClearRequestVo;
 import cn.freemud.entities.vo.ShoppingCartGoodsResponseVo;
 
 public interface ShoppingCartRelationService {
@@ -24,5 +25,10 @@ public interface ShoppingCartRelationService {
                                         CalculationSharingDiscountResponseDto.CalculationDiscountResult discountResult,
                                         Integer flag);
 
+    /**
+     * 购物车清空后的扩展操作
+     */
+    void cleanAfter(ShoppingCartGoodsResponseVo shoppingCartGoodsResponseVo, ShoppingCartClearRequestVo shoppingCartClearRequestVo);
+
 
 }

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

@@ -13,16 +13,20 @@
 
 package cn.freemud.service.shoppingCart.impl;
 
+import cn.freemud.adapter.ActivityAdapter;
 import cn.freemud.entities.dto.calculate.CalculationSharingDiscountResponseDto;
 import cn.freemud.entities.vo.CartGoods;
+import cn.freemud.entities.vo.ShoppingCartClearRequestVo;
 import cn.freemud.entities.vo.ShoppingCartGoodsResponseVo;
 import cn.freemud.enums.ActivityTypeEnum;
+import cn.freemud.service.impl.ShoppingCartNewServiceImpl;
 import cn.freemud.service.shoppingCart.ShoppingCartRelationService;
 import com.freemud.application.sdk.api.log.ApiLog;
 import com.freemud.application.sdk.api.log.LogThreadLocal;
 import com.google.common.collect.Lists;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang.ObjectUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.*;
@@ -31,6 +35,9 @@ import java.util.stream.Collectors;
 @Service("cocoShoppingCartRelationService")
 public class CocoShoppingCartRelationServiceImpl implements ShoppingCartRelationService {
 
+    @Autowired
+    private ShoppingCartNewServiceImpl shoppingCartNewServiceImpl;
+
 
     @Override
     public void buildShoppingCartGoodsResponse(ShoppingCartGoodsResponseVo shoppingCartGoodsResponseVo,
@@ -158,6 +165,20 @@ public class CocoShoppingCartRelationServiceImpl implements ShoppingCartRelation
         }
     }
 
+    @Override
+    public void cleanAfter(ShoppingCartGoodsResponseVo shoppingCartGoodsResponseVo, ShoppingCartClearRequestVo shoppingCartClearRequestVo) {
+
+        String receiveId = shoppingCartClearRequestVo.getReceiveId();
+        String partnerId = shoppingCartClearRequestVo.getPartnerId();
+        String storeId = shoppingCartClearRequestVo.getShopId();
+
+        // 获取基础运费
+        Long deliveryAmount = shoppingCartNewServiceImpl.calculateDeliveryAmount(receiveId, partnerId, storeId, null, shoppingCartGoodsResponseVo,shoppingCartClearRequestVo.getOrderType());
+
+        shoppingCartGoodsResponseVo.setDeliveryAmount(deliveryAmount);
+        shoppingCartGoodsResponseVo.setDiscountDeliveryAmount(deliveryAmount);
+    }
+
 
     public CartGoods buildNewLine(CartGoods cgs,Integer activityType,Integer qty,Long newPrice){
         CartGoods newCartGoods = new CartGoods();

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

@@ -13,6 +13,7 @@
 package cn.freemud.service.shoppingCart.impl;
 
 import cn.freemud.entities.dto.calculate.CalculationSharingDiscountResponseDto;
+import cn.freemud.entities.vo.ShoppingCartClearRequestVo;
 import cn.freemud.entities.vo.ShoppingCartGoodsResponseVo;
 import cn.freemud.service.shoppingCart.ShoppingCartRelationService;
 import org.springframework.stereotype.Service;
@@ -26,4 +27,9 @@ public class PlatformShoppingCartRelationServiceImpl implements ShoppingCartRela
                                                Integer flag) {
 
     }
+
+    @Override
+    public void cleanAfter(ShoppingCartGoodsResponseVo shoppingCartGoodsResponseVo, ShoppingCartClearRequestVo shoppingCartClearRequestVo) {
+
+    }
 }

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

@@ -54,4 +54,13 @@ public class ShoppingCartRelationFactoryImpl implements ShoppingCartRelationFact
         }
     }
 
+    @Override
+    public ShoppingCartRelationService cleanAfter(String partnerId) {
+        if(cocoPartnerId.contains(partnerId)){
+            return cocoShoppingCartRelationService;
+        }else{
+            return platformShoppingCartRelationService;
+        }
+    }
+
 }