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

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

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

@@ -608,6 +608,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

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

ordercenter-sdk/pom.xml

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

ordercenter-sdk/readme.md

@@ -16,3 +16,4 @@
 | 1.1.9.RELEASE | 满额减配送费RELEASE | dingkai | 2020-03-26 |
 | 1.1.9-SNAPSHOT | 新增manager基础类 | 侯书虎 | 2020-04-2 |
 | 1.2.0-SNAPSHOT | 新增订单商品汇总下载接口 | 侯书虎 | 2020-04-07 |
+| 1.2.0.RELEASE | 新增订单商品汇总下载接口 | 侯书虎 | 2020-04-07 |