Merge remote-tracking branch 'remotes/origin/feature_20200426_1.9.21_refundDeliveryFee' into qa

# 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.4.4-SNAPSHOT</version>
+    <version>1.5.7-SNAPSHOT</version>
     <dependencies>
         <dependency>
             <groupId>org.springframework.boot</groupId>
@@ -38,7 +38,7 @@
         <dependency>
             <groupId>cn.freemud</groupId>
             <artifactId>ordercenter-sdk</artifactId>
-            <version>1.3.1-SNAPSHOT</version>
+            <version>1.3.5-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>com.freemud.application.service.sdk</groupId>

assortment-ordercenter-sdk/readme.md

@@ -31,4 +31,5 @@
 | 1.3.3.RELEASE | 第三方外卖单配送费类型与新用户立减类型重复区分 | wuping | 2020-04-21 |
 | 1.3.4.RELEASE | 记录真实配送费 | 海波 | 2020-04-27 |
 | 1.3.5.RELEASE | oms正向履单流程 | 侯书虎 | 2020-04-27 |
-| 1.3.6.RELEASE | 蜜雪 | 丁凯 | 2020-04-27 |
\ No newline at end of file
+| 1.3.6.RELEASE | 蜜雪 | 丁凯 | 2020-04-27 |
+| 1.3.7.RELEASE | 放开常用方法修饰符 | 李小二 | 2020-04-27 |
\ No newline at end of file

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

@@ -653,6 +653,7 @@ public class OrderSdkAdapter {
             accountBean.setName(orderCostResp.getCostName());
             accountBean.setNumber(1);
             accountBean.setPrice(orderCostResp.getCostAmount().longValue());
+            accountBean.setActualCostAmount(null != orderCostResp.getActualCostAmount() ? orderCostResp.getActualCostAmount().longValue() : 0);
             accountBean.setSequence(orderCostResp.getProductSeq());
             //新订单服务  1=包装费，2=运费，5=会员卡费用
             if (orderCostResp.getCostType() == 2) {
@@ -1882,7 +1883,7 @@ public class OrderSdkAdapter {
         return newOrderAfterSalesStatus;
     }
 
-    private String getNewOrderTypeDesc(Integer orderType) {
+    public String getNewOrderTypeDesc(Integer orderType) {
         String name = "";
         //外卖平台订单类型 1=常规堂食，2=预约堂食，3=常规外送，4=预约外送，5=常规自取，6=预约自取
         switch (orderType) {
@@ -1911,7 +1912,7 @@ public class OrderSdkAdapter {
     }
 
 
-    private String getNewOrderStatusDesc(Integer orderStatus) {
+    public String getNewOrderStatusDesc(Integer orderStatus) {
         String name = "";
         //新订单服务 订单状态 1:待支付 2:下单 3:已接单 4:制作完成(待发货) 5:配送中 6:已完 7:已关闭
         switch (orderStatus) {
@@ -2873,4 +2874,31 @@ public class OrderSdkAdapter {
         }
     }
 
+    /**
+     *  异常单转换
+     * @param abnormalState
+     * @return
+     */
+    public String getAbnormalName(Integer abnormalState) {
+        String name = "";
+        switch (abnormalState) {
+            case 0: {
+                name = "正常";
+                break;
+            }
+            case 1: {
+                name ="系统接单异常";
+                break;
+            }
+            case 2: {
+                name="骑手上报异常";
+                break;
+            }
+            case 3: {
+                name ="系统退单异常";
+                break;
+            }
+        }
+        return name;
+    }
 }

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

@@ -563,6 +563,11 @@ public class QueryOrdersResponse {
                  * 优惠金额
                  */
                 private Long price;
+
+                // 实际金额
+                private Long actualCostAmount;
+
+
                 private Integer sequence;
                 /**
                  * 结算对象类型  1 运费 2折扣 3包装费 4积分 5 优惠券 6线下支付 7 微信 8 支付宝 9 商户金额

ordercenter-sdk/pom.xml

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

ordercenter-sdk/readme.md

@@ -17,3 +17,4 @@
 | 1.2.0.RELEASE | 新增订单商品汇总下载接口 | 侯书虎 | 2020-04-07 |
 | 1.2.1.RELEASE | oms接单 | 侯书虎 | 2020-04-13 |
 | 1.2.2.RELEASE | 新增真实配送费 | 海波 | 2020-04-27 |
+| 1.2.2.RELEASE | ES查询增加异常单状态 | 李小二 | 2020-04-27 |

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

@@ -110,5 +110,8 @@ public class OrderConditionsReq {
     private List<String> externalObjectIds;
     // 外部对象ID 如:活动类型
     private List<Integer> settlementTypes;
+    //异常单状态
+    private List<Integer> abnormalStatuses;
+
 
 }

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

@@ -39,6 +39,9 @@ public class OrderCostResp {
     //费用金额
     private BigDecimal costAmount;
 
+    //实际金额
+    private BigDecimal actualCostAmount;
+
     //备注
     private String note;