添加被回退的代码

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

 package cn.freemud.management.adapter;
 
+import cn.freemud.management.entities.dto.request.order.OrderManagerRequest;
+import cn.freemud.management.enums.DeliveryStatus;
 import com.freemud.application.sdk.api.deliverycenter.dto.CreateDeliveryOrderRequestDto;
 import com.freemud.application.sdk.api.ordercenter.enums.OrderType;
+import com.freemud.application.sdk.api.ordercenter.request.OrderExpressReq;
 import com.freemud.application.sdk.api.storecenter.response.StoreResponse;
+import com.freemud.sdk.api.assortment.order.enums.QueryDeliveryType;
 import com.freemud.sdk.api.assortment.order.response.order.QueryOrdersResponse;
 import org.apache.commons.lang.math.NumberUtils;
 import org.springframework.stereotype.Component;
@@ -73,4 +77,35 @@ public class DeliverySdkAdapter {
                                 }).collect(Collectors.toCollection(LinkedList::new))));
         return deliveryOrderRequestDto;
     }
+
+    /**
+     * 构建配送状态和信息
+     *
+     * @param request
+     * @param deliveryStatus
+     * @return
+     */
+    public OrderExpressReq buildOrderExpressReq(OrderManagerRequest request, DeliveryStatus deliveryStatus) {
+        OrderExpressReq expressReq = new OrderExpressReq();
+        expressReq.setOrderCode(request.getOrderId());
+        //设置自配送--三方订单（美团、饿了么）使用订单表中 expressTyp， saas订单根据delivery_info表中 配送员 的 addressDetail字段为self
+        expressReq.setOrderSubState(deliveryStatus.getCode());
+        expressReq.setOperator(request.getOperator());
+        expressReq.setRemark(request.getReason());
+
+        //修改配送员  为infoType=0,address_detail为self，
+        switch (deliveryStatus) {
+            case RIDERSTARTDELIVERY:
+                expressReq.setOpType(1);
+                expressReq.setContactsName("");
+                expressReq.setMobile("");
+                expressReq.setAddressDetail(QueryDeliveryType.SELF.getCode());
+
+                break;
+            default:
+                break;
+        }
+
+        return expressReq;
+    }
 }

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

@@ -498,6 +498,25 @@ public class OrderVerifyHandle {
     }
 
     /**
+     * 校验切换自配送参数
+     * @param orderBean
+     * @param request
+     * @return
+     */
+    public BaseResponse orderSwitchSelfDelivery(QueryOrdersResponse.DataBean.OrderBean orderBean, OrderManagerRequest request) {
+
+        if (Objects.isNull(orderBean)) {
+            return ResponseUtil.error(ResponseResult.ORDER_NOT_EXIST);
+        }
+        //校验订单配送状态
+        if (DeliveryStatus.DELIVERYCANCEL.getCode()!=orderBean.getDeliverStatus()){
+            return ResponseUtil.error(ResponseResult.ORDER_STATUS_FAILED);
+        }
+
+        return ResponseUtil.success();
+    }
+
+    /**
      * 通用校验
      *
      * @param orderBean