Merge branch 'qa' of gitlab.freemud.com:order-group-application/order-group into qa

assortment-ordercenter-sdk/pom.xml

@@ -38,7 +38,7 @@
         <dependency>
             <groupId>cn.freemud</groupId>
             <artifactId>ordercenter-sdk</artifactId>
-            <version>1.1.9.RELEASE</version>
+            <version>1.3.1-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>com.freemud.application.service.sdk</groupId>

assortment-ordercenter-sdk/readme.md

@@ -23,4 +23,5 @@
 | 1.2.5.RELEASE | 满额减配送费 | dingkai | 2020-03-26 |
 | 1.2.5.RELEASE | 满额减配送费 | 海波 | 2020-03-26 |
 | 1.2.7.RELEASE | 判断优化 | 丁凯 | 2020-04-03 |
-| 1.2.8.RELEASE | 增加延时队列 | 海波 | 2020-04-13 |
\ No newline at end of file
+| 1.2.8.RELEASE | 增加延时队列 | 海波 | 2020-04-13 |
+| 1.2.9.RELEASE | oms接单 | 侯书虎 | 2020-04-13 |
\ No newline at end of file

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

@@ -301,6 +301,7 @@ public class OrderSdkAdapter {
                     orderCostCreateReq.setCostName(accountRequest.getName());
                     //新订单服务  1=包装费,2=运费,3=餐盒单价,4=餐盒数量
                     orderCostCreateReq.setCostType(getCostType(accountRequest.getAccountType()));
+                    orderCostCreateReq.setActualCostAmount(accountRequest.getActualPrice()!=null?accountRequest.getActualPrice():accountRequest.getPrice());
                     orderCostCreateReq.setCostAmount(accountRequest.getPrice());
                     originalAmount += accountRequest.getPrice();
                     orderCostCreateReq.setProductSeq(accountRequest.getSequence());

assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/request/order/CreateOrderAccountRequest.java

@@ -43,4 +43,9 @@ public class CreateOrderAccountRequest extends BaseConfig {
     private String productId;
 
     private Integer discountQty;
+
+    /**
+     * 真实费用 满减配送费 计算实际产生的配送费用
+     */
+    private Long actualPrice;
 }

order-application-service/pom.xml

@@ -40,7 +40,7 @@
         <dependency>
             <groupId>cn.freemud</groupId>
             <artifactId>assortment-ordercenter-sdk</artifactId>
-            <version>1.4.5-SNAPSHOT</version>
+            <version>1.4.8-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>com.freemud.application.service.sdk</groupId>

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

@@ -180,6 +180,7 @@ public class OrderAdapter {
                     .price(deliveryAmount)
                     .accountType(getQueryOrderAccountType(OldOrderAccountType.getByCode(OrderAccountType.DELIVERY_AMOUNT.getCode())))
                     .sequence(orderAccountIndex++)
+                    .actualPrice(discountDeliveryAmount)
                     .build();
             orderAccountDtos.add(createOrderAccountDto);
         }
@@ -645,6 +646,7 @@ public class OrderAdapter {
                     .price(deliveryAmount)
                     .accountType(QueryOrderAccountType.DELIVERY_AMOUNT)
                     .sequence(orderAccountIndex++)
+                    .actualPrice(discountDeliveryAmount)
                     .build();
             orderAccountDtos.add(createOrderAccountDto);
         }

order-management/pom.xml

@@ -46,7 +46,7 @@
         <dependency>
             <groupId>cn.freemud</groupId>
             <artifactId>assortment-ordercenter-sdk</artifactId>
-            <version>1.3.0-SNAPSHOT</version>
+            <version>1.2.9.RELEASE</version>
             <scope>provided</scope>
         </dependency>
         <dependency>

ordercenter-sdk/pom.xml

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

ordercenter-sdk/readme.md

@@ -15,3 +15,4 @@
 | 1.1.8.RELEASE | 预约单升级RELEASE | wuping | 2020-03-18 |
 | 1.1.9.RELEASE | 满额减配送费RELEASE | dingkai | 2020-03-26 |
 | 1.2.0.RELEASE | 新增订单商品汇总下载接口 | 侯书虎 | 2020-04-07 |
+| 1.2.1.RELEASE | oms接单 | 侯书虎 | 2020-04-13 |

ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/request/create/OrderCostCreateReq.java

@@ -38,4 +38,7 @@ public class OrderCostCreateReq {
     //备注
     private String note;
 
+
+    private Long actualCostAmount;
+
 }