Merge branch 'feature/20210313-三方展示活动信息-张志恒'

# Conflicts:
#	order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java

assortment-ordercenter-sdk/pom.xml

@@ -10,7 +10,7 @@
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>assortment-ordercenter-sdk</artifactId>
-    <version>2.1.39-RELEASE</version>
+    <version>2.2.78-SNAPSHOT</version>
     <dependencies>
         <dependency>
             <groupId>org.springframework.boot</groupId>

assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/adapter/OrderSdkAdapter.java

@@ -3091,7 +3091,7 @@ public class OrderSdkAdapter {
                 orderSettlement.setExternalObjectId(orderSettlementResp.getExternalObjectId());
                 orderSettlement.setExternalObjectName(orderSettlementResp.getExternalObjectName());
                 orderSettlement.setExternalObjectSubId(null);
-                orderSettlement.setIgnoreInDiscountAmount(null);
+                orderSettlement.setIgnoreInDiscountAmount(orderSettlementResp.getIgnoreInDiscountAmount());
                 orderSettlement.setSettlementType(orderSettlementResp.getSettlementType());
                 if (orderSettlementResp.getSettlementType() != null && orderSettlementResp.getSettlementType().intValue() == 23
                         && "setMeal".equals(orderSettlementResp.getExternalObjectId())) {

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

@@ -932,6 +932,7 @@ public class OrderServiceImpl implements Orderservice {
                     Integer totalSumTime = 0;
                     String progress = "0" ; //进度
                     Integer orderProgressBarStatus = 2;
+                    if(null != storeResponseDto){
                         String configurationStr = storeResponseDto.getConfiguration();
                         if(StringUtils.isNotEmpty(configurationStr)) {
                             try{
@@ -981,6 +982,7 @@ public class OrderServiceImpl implements Orderservice {
                                 log.error("get returnWords error :{}，StoreResponse.Configuration:{}", e.getMessage(), configurationStr);
                             }
                         }
+                    }
                     orderBean.setProgress(String.valueOf(progress));
                     orderBean.setReturnWords(returnWords);
                     orderBean.setOrderProgressBarStatus(orderProgressBarStatus);

ordercenter-sdk/pom.xml

@@ -8,7 +8,7 @@
         <version>1.0.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
-    <version>1.3.41.RELEASE</version>
+    <version>2.8.5-SNAPSHOT</version>
     <artifactId>ordercenter-sdk</artifactId>
 
     <dependencies>

ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/enums/OrderSettlementType.java

 package com.freemud.application.sdk.api.ordercenter.enums;
 
+import java.util.Arrays;
+
 /**
  * All rights Reserved, Designed By www.freemud.cn
  *
@@ -44,6 +46,14 @@ public enum OrderSettlementType {
     DISCOUNT_COUPON(208, "折扣券"),
     FULL_DISTRIBUTION_FEE(1014, "满减配送费"),
     ;
+
+    public static OrderSettlementType getByIndex(Integer index) {
+        return Arrays.stream(OrderSettlementType.values())
+                .filter(e -> e.index == index)
+                .findFirst()
+                .orElseThrow(() -> new RuntimeException("活动类型不存在,请检查是否活动类型有修改"));
+    }
+
     private int index;
     private String name;
 

ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/response/orderInfo/OrderSettlementResp.java

@@ -68,4 +68,6 @@ public class OrderSettlementResp {
     private String extInfo;
     //商家预计收入
     private BigDecimal prospectiveAmount;
+    //是否忽略金额计算
+    private Boolean ignoreInDiscountAmount;
 }