Merge remote-tracking branch 'remotes/origin/master' into feature/2020323_1.9.17_rocketmq

assortment-ordercenter-sdk/pom.xml

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

assortment-ordercenter-sdk/readme.md

@@ -32,3 +32,4 @@
 | 1.3.4.RELEASE | 记录真实配送费 | 海波 | 2020-04-27 |
 | 1.3.5.RELEASE | oms正向履单流程 | 侯书虎 | 2020-04-27 |
 | 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

@@ -1882,7 +1882,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 +1911,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 +2873,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;
+    }
 }

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

@@ -1315,7 +1315,7 @@ public class OrderAdapter {
                     orderViewStatusDto.setButtonRefund(checkRefundButton(orderBean, wxAppId));
                 }
                 if (refundBean == null || RefundStatus.REFUSE_REFUND.getCode().equals(refundBean.getStatus())) {
-                    orderViewStatusDto.setOrderStatus(OrderStatus.TAKE_ORDER.getCode());
+                    orderViewStatusDto.setOrderStatus(OrderStatus.COMPLETE_MAKE.getCode());
                     orderViewStatusDto.setOrderStatusDesc("待取餐");
                     orderViewStatusDto.setOrderStatusDescText("目前有" + orderBean.getQueueIndex() + "人在排队，凭此页到店领取哦~");
                     if (StringUtils.isBlank(orderBean.getQueueIndex()) || "0".equals(orderBean.getQueueIndex())) {
@@ -1426,7 +1426,7 @@ public class OrderAdapter {
             }
             //TODO 判断配送中的逻辑 如果是有第三方配送，要查询第三方配送信息，显示骑手信息 如果有骑手信息 显示 联系骑手
             if (OrderStatus.DISTRIBUTION.getCode().equals(orderBean.getStatus())) {
-                if (orderBean.getDeliverStatus() == null) {
+                if (orderBean.getDeliverStatus() == null || DeliverStatus.OTHER.getCode().equals(orderBean.getDeliverStatus())) {
                     orderViewStatusDto.setOrderStatus(OrderStatus.DISTRIBUTION.getCode());
                     orderViewStatusDto.setOrderStatusDesc("配送中");
                     orderViewStatusDto.setOrderStatusDescText("请稍等片刻，美味即将到达哦~");

order-application-service/src/main/java/cn/freemud/enums/DeliverStatus.java

@@ -14,6 +14,7 @@ package cn.freemud.enums;
  */
 public enum DeliverStatus {
 
+    OTHER(-2,"未处理"),
     WATINGORDER(0,"待接单"),
     SYSTEMGETORDER(1,"系统接单"),
     ALLOTRIDER(2,"分配骑手"),

order-management/src/main/java/cn/freemud/management/adapter/DeliverySdkAdapter.java

@@ -25,7 +25,7 @@ public class DeliverySdkAdapter {
 
         CreateDeliveryOrderRequestDto deliveryOrderRequestDto = new CreateDeliveryOrderRequestDto();
         deliveryOrderRequestDto.setDepatchWeight(new BigDecimal(1));
-        deliveryOrderRequestDto.setSerialNumber(order.getDaySeq().toString());
+        deliveryOrderRequestDto.setSerialNumber(order.getOtherCode());
         deliveryOrderRequestDto.setOrderId(order.getOid());
         deliveryOrderRequestDto.setOrderRemark(order.getRemark());
         deliveryOrderRequestDto.setOrderTotalAmount(order.getAmount().intValue());

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.2.3.RELEASE</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;
+
 
 }