Merge branch 'feature/20200413_订单详情&下载'

# Conflicts:
#	assortment-ordercenter-sdk/pom.xml

assortment-ordercenter-sdk/pom.xml

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

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

@@ -606,6 +606,8 @@ public class OrderSdkAdapter {
                 accountBean.setSequence(orderSettlementResp.getProductSeq());
                 accountBean.setType(getOldOrderAccountType(orderSettlementResp.getSettlementType()));
                 accountBean.setAddInfo("");
+                accountBean.setPlatformDiscountAmount(orderSettlementResp.getPlatformDiscountAmount());
+                accountBean.setShopDiscountAmount(orderSettlementResp.getShopDiscountAmount());
                 accountList.add(accountBean);
             }
         }

assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/response/order/QueryOrdersResponse.java

@@ -572,6 +572,11 @@ public class QueryOrdersResponse {
                  * 自定义对象
                  */
                 private String addInfo;
+                //平台优惠
+                private Long platformDiscountAmount;
+
+                //商家优惠
+                private Long shopDiscountAmount;
             }
 
             @NoArgsConstructor