Merge remote-tracking branch 'remotes/origin/feature-2020/2/10-1.9.15-免配送费二期-海波' into develop

# Conflicts:
#	order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java
#	order-application-service/src/main/java/cn/freemud/entities/vo/ShoppingCartInfoRequestVo.java
#	order-management/order-management.iml
#	shopping-cart-application-service/src/main/java/cn/freemud/service/impl/ShoppingCartNewServiceImpl.java

order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java

@@ -119,7 +119,6 @@ public class OrderAdapter {
     public BaseCreateOrderRequest convent2CreateOrderDto(CreateOrderVo createOrderVo, ShoppingCartGoodsDto shoppingCartGoodsDto,StoreResponse.BizVO storeResponseDto) {
         UserDeliveryInfoDto deliveryInfoDto = createOrderVo.getUserDeliveryInfoDto();
         BaseCreateOrderRequest createOrderDto = getCreateOrderDto(createOrderVo);
-        ArrayList<CreateOrderAccountRequest> orderAccountDtos = new ArrayList<>();
         OrderTaskReq orderTask = null;
         if(StringUtils.isNotEmpty(createOrderVo.getTakeMealTime())){
             Integer orderType = 0;
@@ -132,20 +131,14 @@ public class OrderAdapter {
         if(orderTask != null){
             createOrderDto.setOrderTask(orderTask);
         }
+        ArrayList<CreateOrderAccountRequest> orderAccountDtos = new ArrayList<>();
         long deliveryAmount = 0;
         long discountDeliveryAmount = 0;
         if (deliveryInfoDto != null) {
-            deliveryAmount = getUserRealDeliveryAmount(deliveryInfoDto.getStoreDeliveryInfoDto(), deliveryInfoDto.getUserLongitude(), deliveryInfoDto.getUserLatitude());
+            deliveryAmount = shoppingCartGoodsDto.getDeliveryAmount();
+            discountDeliveryAmount = shoppingCartGoodsDto.getDeliveryAmount();
             if(shoppingCartGoodsDto.getIsDiscountDelivery() && deliveryAmount>shoppingCartGoodsDto.getDiscountDeliveryAmount()){
                 discountDeliveryAmount = shoppingCartGoodsDto.getDiscountDeliveryAmount();
-
-                CreateOrderAccountRequest createOrderAccountDto = CreateOrderAccountRequest.builder()
-                        .name(OldOrderAccountType.FULL_DISTRIBUTION_FEE.getDesc())
-                        .price(deliveryAmount-discountDeliveryAmount)
-                        .accountType(QueryOrderAccountType.FULL_DISTRIBUTION_FEE)
-                        .build();
-                orderAccountDtos.add(createOrderAccountDto);
-
             }
         }
         Long packageAmount = shoppingCartGoodsDto.getPackageAmount() == null ? 0L : shoppingCartGoodsDto.getPackageAmount();
@@ -604,18 +597,10 @@ public class OrderAdapter {
         long deliveryAmount = 0;
         long discountDeliveryAmount = 0;
         if (userDeliveryInfoDto != null) {
-            deliveryAmount = getUserRealDeliveryAmount(userDeliveryInfoDto.getStoreDeliveryInfoDto(), userDeliveryInfoDto.getUserLongitude(), userDeliveryInfoDto.getUserLatitude());
-
+            deliveryAmount = shoppingCartGoodsDto.getDeliveryAmount();
+            discountDeliveryAmount = shoppingCartGoodsDto.getDeliveryAmount();
             if(shoppingCartGoodsDto.getIsDiscountDelivery() && deliveryAmount>shoppingCartGoodsDto.getDiscountDeliveryAmount()){
                 discountDeliveryAmount = shoppingCartGoodsDto.getDiscountDeliveryAmount();
-
-                CreateOrderAccountRequest createOrderAccountDto = CreateOrderAccountRequest.builder()
-                        .name(OldOrderAccountType.FULL_DISTRIBUTION_FEE.getDesc())
-                        .price(deliveryAmount-discountDeliveryAmount)
-                        .accountType(QueryOrderAccountType.FULL_DISTRIBUTION_FEE)
-                        .build();
-                orderAccountDtos.add(createOrderAccountDto);
-
             }
 
         }

order-application-service/src/main/java/cn/freemud/entities/dto/shoppingCart/ShoppingCartGoodsDto.java

@@ -89,6 +89,12 @@ public class ShoppingCartGoodsDto {
     @Builder.Default
     private Boolean isDiscountDelivery = false;
 
+    /**
+     * 配送费活动号
+     *
+     */
+    private String discountDeliveryActivityCode;
+
     @Data
     public static class CartGoodsDetailDto {
         /**

order-application-service/src/main/java/cn/freemud/entities/vo/ShoppingCartInfoRequestVo.java

@@ -94,6 +94,8 @@ public class ShoppingCartInfoRequestVo {
 
     private String menuType;
 
+    private String receiveId;
+
     @Data
     public final static class SendGoods {
         /**

order-application-service/src/main/java/cn/freemud/enums/ActivityTypeEnum.java

@@ -17,6 +17,7 @@ public enum ActivityTypeEnum {
     TYPE_11(11, "每满减"),
     TYPE_12(12, "阶梯满减"),
     TYPE_13(13, "新用户立减"),
+    TYPE_14(14, "满减配送费"),
     TYPE_104(104,"x件y折"),
     /**
      * 限时特价

order-application-service/src/main/java/cn/freemud/service/impl/CheckOrder.java

@@ -317,6 +317,7 @@ public class CheckOrder {
                 .orderType(createOrderVo.getOrderType())
                 .reachStoreType(createOrderVo.getReachStoreType())
                 .flag(CouponFlag.NO.getCode())
+                .receiveId(createOrderVo.getReceiveId())
                 .useCustomerScore(createOrderVo.getUseCustomerScore())
                 .buyMemberCard(buyMemberCard)
                 .menuType(createOrderVo.getMenuType())

order-management/order-management.iml

@@ -20,10 +20,6 @@
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" scope="PROVIDED" name="Maven: cn.freemud:assortment-ordercenter-sdk:1.1.5.RELEASE" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: cn.freemud:ordercenter-sdk:1.1.2.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: com.freemud.application.service.sdk:takeawaycenter-sdk:1.2.3-SNAPSHOT" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: com.freemud.sdk.api.assortment:assortment-messagepush-sdk:2.6.3.RELEASE" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: com.freemud.application.service.sdk:deliverycenter-sdk:1.5.RELEASE" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-starter-test:1.5.3.RELEASE" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-test:1.5.3.RELEASE" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-test-autoconfigure:1.5.3.RELEASE" level="project" />
@@ -145,7 +141,7 @@
     <orderEntry type="library" name="Maven: com.thoughtworks.xstream:xstream:1.4.10" level="project" />
     <orderEntry type="library" name="Maven: xmlpull:xmlpull:1.1.3.1" level="project" />
     <orderEntry type="library" name="Maven: xpp3:xpp3_min:1.1.4c" level="project" />
-    <orderEntry type="module" module-name="assortment-ordercenter-sdk" />
+    <orderEntry type="library" name="Maven: cn.freemud:assortment-ordercenter-sdk:1.3.0-SNAPSHOT" level="project" />
     <orderEntry type="module" module-name="ordercenter-sdk" />
     <orderEntry type="library" name="Maven: com.google.code.gson:gson:2.8.0" level="project" />
     <orderEntry type="library" name="Maven: org.apache.commons:commons-collections4:4.1" level="project" />

shopping-cart-application-service/src/main/java/cn/freemud/constant/ApplicationConstant.java

@@ -17,4 +17,8 @@ public class ApplicationConstant {
     public final static String CURRENT_VERSION = "1.5.2";
     
     public final static String BURYINGPOINT = "POINT";
+
+    public final static String DELIVERY_DISCOUNT_DESC1="订单满%d元 减%d配送费";
+    public final static String DELIVERY_DISCOUNT_DESC2="订单满%d元 免配送费";
+    public final static String DELIVERY_DISCOUNT_DESC3="另需配送费%d元";
 }

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

@@ -20,4 +20,9 @@ public class BenefitBeanDto {
      * 优惠等级（用于阶梯满减）
      */
     private Integer benefitSeq;
+
+    private Integer benefitType;
+
+
+
 }
\ No newline at end of file

shopping-cart-application-service/src/main/java/cn/freemud/entities/dto/activity/ActivityQueryDto.java

@@ -23,4 +23,6 @@ public class ActivityQueryDto {
      */
     private Integer orderType;
 
+    private ActivityQueryResponseDto activityQueryResponseDto;
+
 }

shopping-cart-application-service/src/main/java/cn/freemud/entities/dto/shoppingCart/ShoppingCartGoodsDto.java

@@ -115,6 +115,12 @@ public class ShoppingCartGoodsDto {
     @Builder.Default
     private Boolean isDiscountDelivery = false;
 
+    /**
+     * 配送费活动号
+     *
+     */
+    private String discountDeliveryActivityCode;
+
 
     @Data
     public static class CartGoodsDetailDto {

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

@@ -72,4 +72,9 @@ public class AddShoppingCartGoodsRequestVo extends BaseRequestVo{
      */
     private String menuType ;
 
+    /**
+     * 收货地址ID、svc卡支付外卖订单必传
+     */
+    private String receiveId;
+
 }

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

@@ -114,7 +114,15 @@ public class ShoppingCartGoodsResponseVo  extends ShoppingCartGoodsBaseResponseV
     @Builder.Default
     private Boolean isDiscountDelivery = false;
 
+    /**
+     * 满额减配送费描述
+     */
+    private String deliveryDiscountDesc;
 
+    /**
+     * 减免后配送费
+     */
+    private String discountDeliveryActivityCode;
 
 
 }

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

@@ -48,4 +48,9 @@ public class UpdateShoppingCartGoodsQtyRequestVo extends BaseRequestVo {
      */
     private String menuType ;
 
+    /**
+     * 收货地址ID、svc卡支付外卖订单必传
+     */
+    private String receiveId;
+
 }