Merge branch 'feature/20200915_麦咖啡p2v3活动入机增加TENDERID字段' into develop

# Conflicts:
#	order-management/pom.xml

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

@@ -580,6 +580,9 @@ public class CheckMCCafeOrder {
                 });
             }
         }
+        if(shoppingCartGoodsDto.getDeliveryAmount().longValue() != shoppingCartGoodsDto.getDiscountDeliveryAmount().longValue()) {
+            shoppingCartGoodsDto.setIsDiscountDelivery(true);
+        }
         return shoppingCartGoodsDto;
     }
 

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

@@ -166,8 +166,9 @@ public class CouponClientServiceImpl implements CouponClientService {
         List<QueryOrdersResponseDto.DataBean.OrderBean.AccountBean> accountList = orderBean.getAccountList().stream().filter(
                 account -> (orderAdapter.getQueryOrderAccountType(OldOrderAccountType.getByCode(account.getType())).equals(QueryOrderAccountType.COUPON)
                         ||  orderAdapter.getQueryOrderAccountType(OldOrderAccountType.getByCode(account.getType())).equals(QueryOrderAccountType.PRODUCT_COUPON)
-                        ||  orderAdapter.getQueryOrderAccountType(OldOrderAccountType.getByCode(account.getType())).equals(QueryOrderAccountType.DISCOUNT_COUPON))
-                        && account.getPrice() != 0l).collect(Collectors.toList());
+                        ||  orderAdapter.getQueryOrderAccountType(OldOrderAccountType.getByCode(account.getType())).equals(QueryOrderAccountType.DISCOUNT_COUPON)
+                        ||  orderAdapter.getQueryOrderAccountType(OldOrderAccountType.getByCode(account.getType())).equals(QueryOrderAccountType.FREIGHT_COUPON))
+                        ).collect(Collectors.toList());
         if (CollectionUtils.isEmpty(accountList)) {
             return null;
         }
@@ -291,7 +292,9 @@ public class CouponClientServiceImpl implements CouponClientService {
         List<QueryOrdersResponseDto.DataBean.OrderBean.AccountBean> accountList = orderBean.getAccountList().stream().filter(
                 account -> (orderAdapter.getQueryOrderAccountType(OldOrderAccountType.getByCode(account.getType())).equals(QueryOrderAccountType.COUPON)
                         ||  orderAdapter.getQueryOrderAccountType(OldOrderAccountType.getByCode(account.getType())).equals(QueryOrderAccountType.PRODUCT_COUPON)
-                        ||  orderAdapter.getQueryOrderAccountType(OldOrderAccountType.getByCode(account.getType())).equals(QueryOrderAccountType.DISCOUNT_COUPON)) && account.getPrice() != 0l).collect(Collectors.toList());
+                        ||  orderAdapter.getQueryOrderAccountType(OldOrderAccountType.getByCode(account.getType())).equals(QueryOrderAccountType.DISCOUNT_COUPON)
+                        ||  orderAdapter.getQueryOrderAccountType(OldOrderAccountType.getByCode(account.getType())).equals(QueryOrderAccountType.FREIGHT_COUPON))
+        ).collect(Collectors.toList());
         if (CollectionUtils.isEmpty(accountList)) {
             return null;
         }

order-management/pom.xml

@@ -65,7 +65,7 @@
         <dependency>
             <groupId>cn.freemud</groupId>
             <artifactId>assortment-ordercenter-sdk</artifactId>
-            <version>2.0.12-SNAPSHOT</version>
+            <version>2.0.17-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
         <dependency>

order-management/src/main/java/cn/freemud/management/adapter/McCafeCouponAdapter.java

@@ -34,7 +34,9 @@ public class McCafeCouponAdapter {
         List<QueryOrdersResponse.DataBean.OrderBean.AccountBean> accountList = orderBean.getAccountList().stream().filter(
                 account -> (getQueryOrderAccountType(OldOrderAccountType.getByCode(account.getType())).equals(QueryOrderAccountType.COUPON)
                         ||  getQueryOrderAccountType(OldOrderAccountType.getByCode(account.getType())).equals(QueryOrderAccountType.PRODUCT_COUPON)
-                        ||  getQueryOrderAccountType(OldOrderAccountType.getByCode(account.getType())).equals(QueryOrderAccountType.DISCOUNT_COUPON)) && account.getPrice() != 0l).collect(Collectors.toList());
+                        ||  getQueryOrderAccountType(OldOrderAccountType.getByCode(account.getType())).equals(QueryOrderAccountType.DISCOUNT_COUPON)
+                        ||  getQueryOrderAccountType(OldOrderAccountType.getByCode(account.getType())).equals(QueryOrderAccountType.FREIGHT_COUPON))
+        ).collect(Collectors.toList());
         if (CollectionUtils.isEmpty(accountList) ) {
             return null;
         }
@@ -124,7 +126,8 @@ public class McCafeCouponAdapter {
         List<QueryOrdersResponse.DataBean.OrderBean.AccountBean> accountList = orderBean.getAccountList().stream().filter(
                 account -> (getQueryOrderAccountType(OldOrderAccountType.getByCode(account.getType())).equals(QueryOrderAccountType.COUPON)
                         ||  getQueryOrderAccountType(OldOrderAccountType.getByCode(account.getType())).equals(QueryOrderAccountType.PRODUCT_COUPON)
-                        ||  getQueryOrderAccountType(OldOrderAccountType.getByCode(account.getType())).equals(QueryOrderAccountType.DISCOUNT_COUPON)) && account.getPrice() != 0l).collect(Collectors.toList());
+                        ||  getQueryOrderAccountType(OldOrderAccountType.getByCode(account.getType())).equals(QueryOrderAccountType.DISCOUNT_COUPON)
+                        ||  getQueryOrderAccountType(OldOrderAccountType.getByCode(account.getType())).equals(QueryOrderAccountType.FREIGHT_COUPON))).collect(Collectors.toList());
         if (CollectionUtils.isEmpty(accountList) ) {
             return null;
         }

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

@@ -329,7 +329,7 @@ public class ShoppingCartMCoffeeServiceImpl {
         String storeId = shoppingCartInfoRequestVo.getShopId();
         String appId = shoppingCartInfoRequestVo.getAppId();
         String couponCode = shoppingCartInfoRequestVo.getCouponCode();
-        String freightCouponCode = shoppingCartInfoRequestVo.getCouponCode();
+        String freightCouponCode = shoppingCartInfoRequestVo.getFreightCouponCode();
 //        String activityCode = shoppingCartInfoRequestVo.getActivityCode();
         String menuType = shoppingCartInfoRequestVo.getMenuType();
         Integer orderType = shoppingCartInfoRequestVo.getOrderType();