重新呼叫骑手

order-management/src/main/java/cn/freemud/management/controller/OrderManagerController.java

@@ -66,6 +66,8 @@ public class OrderManagerController {
                 return orderManagerAdapter.orderRejectRefund(request);
             case ORDER_SWITCH_SELF_DELIVERY:
                 return orderManagerAdapter.orderSwitchSelfDelivery(request);
+            case ORDER_RECREATE_DELIVERY:
+                return orderManagerAdapter.orderRecreateDelivery(request);
             default:
                 return ResponseUtil.error(ResponseResult.ORDER_OPERATE_TYPE_NOT_VALIDATE);
         }

order-management/src/main/java/cn/freemud/management/enums/OperateType.java

@@ -11,7 +11,8 @@ public enum OperateType {
     ORDER_AFFIRM("orderAffirm","完成"),
     ORDER_AGREE_REFUND("orderAgreeRefund","同意退款"),
     ORDER_REJECT_REFUND("orderRejectRefund","拒绝退款"),
-    ORDER_SWITCH_SELF_DELIVERY("orderSwitchSelfDelivery","切换自配送");
+    ORDER_SWITCH_SELF_DELIVERY("orderSwitchSelfDelivery","切换自配送"),
+    ORDER_RECREATE_DELIVERY("orderRecreateDelivery","重新呼叫骑手");
 
 
     /**

order-management/src/main/java/cn/freemud/management/service/OrderManagerService.java

@@ -97,6 +97,15 @@ public interface OrderManagerService {
     default BaseResponse<OrderManagerResponse> orderSwitchSelfDelivery(OrderManagerRequest request, QueryOrdersResponse.DataBean.OrderBean orderBean){
         return ResponseUtil.success();
     }
+    /**
+     * 重新呼叫骑手
+     * @param request
+     * @param orderBean
+     * @return
+     */
+    default BaseResponse<OrderManagerResponse> orderRecreateDelivery(OrderManagerRequest request, QueryOrdersResponse.DataBean.OrderBean orderBean){
+        return ResponseUtil.success();
+    }
 
 
 }

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

@@ -282,4 +282,21 @@ public class OrderManagerAdapter {
         BaseResponse<OrderManagerResponse> orderManagerResponse = orderBeanFactory.getOrderManagerService(orderBean).orderSwitchSelfDelivery(request, orderBean);
         return handleResponse(request,orderBean,orderManagerResponse);
     }
+
+    /**
+     * 重新呼叫骑手
+     * @param request
+     * @return
+     */
+    public BaseResponse orderRecreateDelivery(OrderManagerRequest request){
+         //查询订单
+        QueryOrdersResponse.DataBean.OrderBean orderBean = orderBaseService.getByOrderCode(request.getOrderId());
+        //订单接单参数校验
+        BaseResponse verifyResponse = orderVerifyHandle.orderRecreateDelivery(orderBean, request);
+        if (ObjectUtils.notEqual(verifyResponse.getCode(), ResponseResult.SUCCESS.getCode())) {
+            return handleResponse(request,orderBean,verifyResponse);
+        }
+        BaseResponse<OrderManagerResponse> orderManagerResponse = orderBeanFactory.getOrderManagerService(orderBean).orderRecreateDelivery(request, orderBean);
+        return handleResponse(request,orderBean,orderManagerResponse);
+    }
 }

order-management/src/main/java/cn/freemud/management/service/handle/OrderVerifyHandle.java

@@ -509,6 +509,39 @@ public class OrderVerifyHandle {
     }
 
     /**
+     * 重新呼叫骑手数据校验
+     * @param orderBean
+     * @param request
+     * @return
+     */
+    public BaseResponse orderRecreateDelivery(QueryOrdersResponse.DataBean.OrderBean orderBean, OrderManagerRequest request) {
+
+        if (Objects.isNull(orderBean)) {
+            return ResponseUtil.error(ResponseResult.ORDER_NOT_EXIST);
+        }
+        //校验订单状态
+        if (OrderStatus.DISTRIBUTION.getCode()!=orderBean.getStatus()){
+            return ResponseUtil.error(ResponseResult.ORDER_STATUS_FAILED);
+        }
+        //校验订单配送状态
+        if (DeliveryStatus.DELIVERYCANCEL.getCode()!=orderBean.getDeliverStatus()){
+            return ResponseUtil.error(ResponseResult.ORDER_STATUS_FAILED);
+        }
+        DeliveryStatus deliveryStatus= DeliveryStatus.getDeliveryStatusByCode(orderBean.getDeliverStatus());
+        switch (deliveryStatus) {
+            case RIDERARRIVESTORE:
+            case RIDERGETMEAL:
+            case RIDERSTARTDELIVERY:
+            case DELIVERYARRIVED:
+                return ResponseUtil.error(ResponseResult.ORDER_STATUS_FAILED);
+            default:
+                break;
+        }
+
+        return ResponseUtil.success();
+    }
+
+    /**
      * 是否是外卖
      *
      * @param orderBean

order-management/src/main/java/cn/freemud/management/service/impl/SaasOrderMangerServiceImpl.java

 package cn.freemud.management.service.impl;
 
 import cn.freemud.base.entity.BaseResponse;
+import cn.freemud.base.log.LogTreadLocal;
 import cn.freemud.management.adapter.DeliverySdkAdapter;
 import cn.freemud.management.entities.dto.request.order.OrderManagerRequest;
 import cn.freemud.management.entities.dto.response.order.OrderManagerResponse;
@@ -226,4 +227,12 @@ public class SaasOrderMangerServiceImpl implements OrderManagerService {
         com.freemud.application.sdk.api.ordercenter.response.BaseResponse response= orderSdkService.updateDeliveryInfo(expressReq, "");
         return ResponseUtil.error(response.getCode(),response.getMessage());
     }
+
+    @Override
+    public BaseResponse<OrderManagerResponse> orderRecreateDelivery(OrderManagerRequest request, QueryOrdersResponse.DataBean.OrderBean orderBean) {
+        // 查询门店信息
+        StoreResponse storeInfo = storeCenterService.getStoreInfo(new StoreInfoRequest(orderBean.getCompanyId(), orderBean.getShopId()), LogTreadLocal.getTrackingNo());
+
+        return deliveryHandle.createDelivery(orderBean,request,storeInfo);
+    }
 }

ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/enums/OperateType.java

@@ -11,7 +11,8 @@ public enum OperateType {
     ORDER_AFFIRM("orderAffirm","完成"),
     ORDER_AGREE_REFUND("orderAgreeRefund","同意退款"),
     ORDER_REJECT_REFUND("orderRejectRefund","拒绝退款"),
-    ORDER_SWITCH_SELF_DELIVERY("orderSwitchSelfDelivery","切换自配送");
+    ORDER_SWITCH_SELF_DELIVERY("orderSwitchSelfDelivery","切换自配送"),
+    ORDER_RECREATE_DELIVERY("orderRecreateDelivery","重新呼叫骑手");
 
 
     /**