Merge branch 'master' into feature/20200423_订单oms逆向流程

# Conflicts:
#	assortment-ordercenter-sdk/pom.xml
#	order-application-service/pom.xml
#	order-management/pom.xml
#	order-management/src/main/java/cn/freemud/management/service/adapter/OrderManagerAdapter.java
#	order-management/src/main/java/cn/freemud/management/service/impl/OrderDeliveryService.java
#	order-management/src/main/java/cn/freemud/management/service/impl/SaasOrderMangerServiceImpl.java

assortment-ordercenter-sdk/pom.xml

@@ -10,7 +10,7 @@
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>assortment-ordercenter-sdk</artifactId>
-    <version>1.3.4.RELEASE</version>
+    <version>1.3.5.RELEASE</version>
     <dependencies>
         <dependency>
             <groupId>org.springframework.boot</groupId>
@@ -38,7 +38,7 @@
         <dependency>
             <groupId>cn.freemud</groupId>
             <artifactId>ordercenter-sdk</artifactId>
-            <version>1.2.1.RELEASE</version>
+            <version>1.2.2.RELEASE</version>
         </dependency>
         <dependency>
             <groupId>com.freemud.application.service.sdk</groupId>

assortment-ordercenter-sdk/readme.md

@@ -27,4 +27,6 @@
 | 1.3.0.RELEASE | app订单 | 丁凯 | 2020-04-20 |
 | 1.3.1.RELEASE | queryOrderById返回新增商家、平台优惠 | 侯书虎 | 2020-04-20 |
 | 1.3.2.RELEASE | ext_info 增加stapleFood主食设置 | 李小二 | 2020-04-20 |
-| 1.3.3.RELEASE | 第三方外卖单配送费类型与新用户立减类型重复区分 | wuping | 2020-04-21 |
\ No newline at end of file
+| 1.3.3.RELEASE | 第三方外卖单配送费类型与新用户立减类型重复区分 | wuping | 2020-04-21 |
+| 1.3.4.RELEASE | 记录真实配送费 | 海波 | 2020-04-27 |
+| 1.3.5.RELEASE | oms正向履单流程 | 侯书虎 | 2020-04-27 |
\ No newline at end of file

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

@@ -377,6 +377,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/enums/OrderSourceType.java

@@ -34,6 +34,8 @@ public enum OrderSourceType {
 
     MEAL("meal", "i围餐"),
 
+    ALIPAY("alipay", "支付宝"),
+
     SAASMALL("saasmall", "微商城"),
     ;
 

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.3.4.RELEASE</version>
+            <version>1.3.5.RELEASE</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

@@ -52,7 +52,7 @@
         <dependency>
             <groupId>cn.freemud</groupId>
             <artifactId>assortment-ordercenter-sdk</artifactId>
-            <version>1.3.4.RELEASE</version>
+            <version>1.3.5.RELEASE</version>
             <scope>provided</scope>
         </dependency>
         <dependency>

order-management/src/main/java/cn/freemud/management/service/adapter/OrderManagerAdapter.java

@@ -72,8 +72,8 @@ public class OrderManagerAdapter {
         //查询订单
         QueryOrdersResponse.DataBean.OrderBean orderBean = orderBaseService.getByOrderCode(request.getOrderId());
         /*****兼容爱马哥，送出即完成start******/
-        if (orderBean.getType().equals(OldOrderType.TAKE_OUT.getCode())){
-            orderAffirm(request,orderBean);
+        if (!OldOrderType.TAKE_OUT.getCode().equals(orderBean.getType())) {
+            return orderAffirm(request, orderBean);
         }
         /*****容爱马哥，送出即完成end******/
         //订单接单参数校验

ordercenter-sdk/pom.xml

@@ -8,7 +8,7 @@
         <version>1.0.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
-    <version>1.2.1.RELEASE</version>
+    <version>1.2.2.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.2.0.RELEASE | 新增订单商品汇总下载接口 | 侯书虎 | 2020-04-07 |
 | 1.2.1.RELEASE | oms接单 | 侯书虎 | 2020-04-13 |
+| 1.2.2.RELEASE | 新增真实配送费 | 海波 | 2020-04-27 |

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;
+
 }