入机流程问题

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

@@ -122,7 +122,12 @@ public class OrderManagerAdapter {
         //查询订单
         QueryOrdersResponse.DataBean.OrderBean orderBean = orderBaseService.getByOrderCode(request.getOrderId());
         //订单接单参数校验
-        BaseResponse verifyResponse = orderVerifyHandle.orderRejectVerify(orderBean, request);
+        BaseResponse verifyResponse;
+        if (!macCafePartnerId.equals(orderBean.getCompanyId())) {
+            verifyResponse = orderVerifyHandle.orderRejectVerify(orderBean, request);
+        } else {
+            verifyResponse = orderVerifyHandle.mcCafeOrderRejectVerify(orderBean, request);
+        }
         if (ObjectUtils.notEqual(verifyResponse.getCode(), ResponseResult.SUCCESS.getCode())) {
             return handleResponse(request,orderBean,verifyResponse);
         }

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

@@ -210,6 +210,40 @@ public class OrderVerifyHandle {
         if (OrderStatus.COMPLETE.getCode().equals(status)) {
             return ResponseUtil.error(ResponseResult.REJECT_FAIL_ORDER_IS_COMPLETE, getOrderManagerResponse(orderBean));
         }
+        if (!OrderStatus.TAKE_ORDER.getCode().equals(status)) {
+            return ResponseUtil.error(ResponseResult.REJECT_FAIL_ORDER_IS_NOT_NEW, getOrderManagerResponse(orderBean));
+        }
+        return ResponseUtil.success();
+    }
+
+    /**
+     * 拒单
+     *
+     * @param orderBean
+     * @param request
+     * @return
+     */
+    public BaseResponse mcCafeOrderRejectVerify(QueryOrdersResponse.DataBean.OrderBean orderBean, OrderManagerRequest request) {
+        if (orderBean == null) {
+            return ResponseUtil.error(ResponseResult.ORDER_NOT_EXIST);
+        }
+        Integer status = orderBean.getStatus();
+        //判断订单是否已经被拒单
+        if (OrderStatus.REFUSE.getCode().equals(status)) {
+            return ResponseUtil.error(ResponseResult.REJECT_FAIL_REPETITION, getOrderManagerResponse(orderBean));
+        }
+        //判断订单是否已经取消
+        if (OrderStatus.CANCEL.getCode().equals(status)) {
+            return ResponseUtil.error(ResponseResult.ORDER_HAS_CANCELED, getOrderManagerResponse(orderBean));
+        }
+        //判断订单是否在配送中
+        if (OrderStatus.DISTRIBUTION.getCode().equals(status)) {
+            return ResponseUtil.error(ResponseResult.REJECT_FAIL_ORDER_IS_DELIVERY, getOrderManagerResponse(orderBean));
+        }
+        //判断订单是否已送达
+        if (OrderStatus.COMPLETE.getCode().equals(status)) {
+            return ResponseUtil.error(ResponseResult.REJECT_FAIL_ORDER_IS_COMPLETE, getOrderManagerResponse(orderBean));
+        }
         if (!OrderStatus.TAKE_ORDER.getCode().equals(status) && !OldOrderType.TAKE_OUT.getCode().equals(orderBean.getOrderType())) {
             return ResponseUtil.error(ResponseResult.REJECT_FAIL_ORDER_IS_NOT_NEW, getOrderManagerResponse(orderBean));
         }