未查询到订单数据返回订单不存在

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

@@ -83,6 +83,9 @@ public class OrderManagerAdapter {
     public BaseResponse<OrderManagerResponse> orderDelivery(OrderManagerRequest request) {
         //查询订单
         OrderBeanV1 orderBean = orderBaseService.getByOrderCode(request.getOrderId());
+        if (null == orderBean) {
+            return ResponseUtil.error(ResponseResult.ORDER_NOT_EXIST);
+        }
         /*****兼容爱马哥，送出即完成start******/
         if (!OldOrderType.TAKE_OUT.getCode().equals(orderBean.getType())) {
             request.setOperateType(OperateType.ORDER_AFFIRM.getOpType());
@@ -107,6 +110,9 @@ public class OrderManagerAdapter {
         if (orderBean==null){
             //查询订单
             orderBean = orderBaseService.getByOrderCode(request.getOrderId());
+            if (null == orderBean) {
+                return ResponseUtil.error(ResponseResult.ORDER_NOT_EXIST);
+            }
         }
         //订单接单参数校验
         BaseResponse verifyResponse = orderVerifyHandle.orderAffirmVerify(orderBean, request);
@@ -126,6 +132,9 @@ public class OrderManagerAdapter {
     public BaseResponse orderReject(OrderManagerRequest request) {
         //查询订单
         OrderBeanV1 orderBean = orderBaseService.getByOrderCode(request.getOrderId());
+        if (null == orderBean) {
+            return ResponseUtil.error(ResponseResult.ORDER_NOT_EXIST);
+        }
         //订单接单参数校验
         BaseResponse verifyResponse;
         if(OrderClientType.SAASMALL.getIndex().toString().equalsIgnoreCase(orderBean.getOrderClient())){
@@ -152,6 +161,9 @@ public class OrderManagerAdapter {
     public BaseResponse orderAgreeRefund(OrderManagerRequest request) {
         //查询订单
         OrderBeanV1 orderBean = orderBaseService.getByOrderCode(request.getOrderId());
+        if (null == orderBean) {
+            return ResponseUtil.error(ResponseResult.ORDER_NOT_EXIST);
+        }
         //订单接单参数校验
         BaseResponse verifyResponse;
         if(OrderClientType.SAASMALL.getIndex().toString().equalsIgnoreCase(orderBean.getOrderClient())){
@@ -172,6 +184,9 @@ public class OrderManagerAdapter {
     public BaseResponse orderPayRefund(OrderManagerRequest request) {
         //查询订单
         OrderBeanV1 orderBean = orderBaseService.getByOrderCode(request.getOrderId());
+        if (null == orderBean) {
+            return ResponseUtil.error(ResponseResult.ORDER_NOT_EXIST);
+        }
         if(CollectionUtils.isNotEmpty(orderBean.getRefundList())){
             //订单接单参数校验
             BaseResponse verifyResponse = orderVerifyHandle.orderAgreeRefundMCCafe(orderBean, request);
@@ -194,6 +209,9 @@ public class OrderManagerAdapter {
     public BaseResponse orderRejectRefund(OrderManagerRequest request) {
         //查询订单
         OrderBeanV1 orderBean = orderBaseService.getByOrderCode(request.getOrderId());
+        if (null == orderBean) {
+            return ResponseUtil.error(ResponseResult.ORDER_NOT_EXIST);
+        }
         //订单接单参数校验
         BaseResponse verifyResponse;
         if(OrderClientType.SAASMALL.getIndex().toString().equalsIgnoreCase(orderBean.getOrderClient())){
@@ -218,6 +236,9 @@ public class OrderManagerAdapter {
     public BaseResponse orderCancel(OrderManagerRequest request) {
         //查询订单
         OrderBeanV1 orderBean = orderBaseService.getByOrderCode(request.getOrderId());
+        if (null == orderBean) {
+            return ResponseUtil.error(ResponseResult.ORDER_NOT_EXIST);
+        }
         BaseResponse<OrderManagerResponse> orderManagerResponse = orderBeanFactory.getOrderManagerService(orderBean).orderCancel(request, orderBean);
         return handleResponse(request,orderBean,orderManagerResponse);
     }
@@ -230,6 +251,9 @@ public class OrderManagerAdapter {
     public BaseResponse mcCafeOrderRejectRefund(OrderManagerRequest request) {
         //查询订单
         OrderBeanV1 orderBean = orderBaseService.getByOrderCode(request.getOrderId());
+        if (null == orderBean) {
+            return ResponseUtil.error(ResponseResult.ORDER_NOT_EXIST);
+        }
         //订单接单参数校验
         BaseResponse verifyResponse = orderVerifyHandle.mcCafeOrderRejectRefund(orderBean, request);
         if (ObjectUtils.notEqual(verifyResponse.getCode(), ResponseResult.SUCCESS.getCode())) {