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

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

@@ -139,15 +139,6 @@ public class OrderAdapter {
             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)
-                        .accountId(shoppingCartGoodsDto.getDiscountDeliveryActivityCode())
-                        .build();
-                orderAccountDtos.add(createOrderAccountDto);
-
             }
         }
         Long packageAmount = shoppingCartGoodsDto.getPackageAmount() == null ? 0L : shoppingCartGoodsDto.getPackageAmount();
@@ -610,15 +601,6 @@ public class OrderAdapter {
             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)
-                        .accountId(shoppingCartGoodsDto.getDiscountDeliveryActivityCode())
-                        .build();
-                orderAccountDtos.add(createOrderAccountDto);
-
             }
 
         }
@@ -1998,6 +1980,9 @@ public class OrderAdapter {
         if (ActivityTypeEnum.TYPE_104.getCode().equals(activityType)) {
             return OldOrderAccountType.XY_DISCOUNT;
         }
+        if (ActivityTypeEnum.TYPE_14.getCode().equals(activityType)) {
+            return OldOrderAccountType.FULL_DISTRIBUTION_FEE;
+        }
         return OldOrderAccountType.BUYM_SENDN;
     }
 

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-management/order-management.iml

@@ -14,6 +14,7 @@
     </content>
     <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="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" name="Maven: org.springframework.boot:spring-boot:1.5.3.RELEASE" level="project" />