Rental(update)

src/main/java/com/mmc/oms/common/ResultEnum.java

@@ -399,7 +399,8 @@ public enum ResultEnum implements BaseErrorInfoInterface {
     THE_REQUEST_IS_NOT_AUTHENTICATED("2013", "请求未经过鉴权"),
     THE_TOKEN_IS_INVALID("2014", "token失效"),
     REFUND_FAILED("2015", "退款失败，请联系客服"),
-    NO_PERMISSION_TEMPORARILY("2016", "当前账号没有权限，只有后台账号拥有权限");
+    NO_PERMISSION_TEMPORARILY("2016", "当前账号没有权限，只有后台账号拥有权限"),
+    THERE_IS_NO_SUCH_ORDER("2017", "没有当前订单,请输入正确的订单编号");
 
     /**
      * 错误码

src/main/java/com/mmc/oms/controller/RentalOrdersController.java

@@ -58,7 +58,7 @@ public class RentalOrdersController extends BaseController {
     @GetMapping("orderDetail")
     public ResultBody<OrderInfoDTO> orderDetail(
             @ApiParam(value = "订单编号") @RequestParam(required = true) String orderNo) {
-        return ResultBody.success(rentalOrdersService.getOrderDetail(orderNo));
+        return rentalOrdersService.getOrderDetail(orderNo);
     }
 
 
@@ -110,6 +110,6 @@ public class RentalOrdersController extends BaseController {
     public ResultBody pfConfirmOrderWare(HttpServletRequest request, @RequestBody OrderVcuVO param) {
         return rentalOrdersService.pfConfirmOrderWare(this.getCurrentAccount(request), param);
     }
-    
+
 
 }

src/main/java/com/mmc/oms/service/Impl/RentalOrdersServiceImpl.java

@@ -261,8 +261,11 @@ public class RentalOrdersServiceImpl implements RentalOrdersService {
     }
 
     @Override
-    public OrderInfoDTO getOrderDetail(String orderNo) {
+    public ResultBody getOrderDetail(String orderNo) {
         OrderInfoDO order = rentalOrdersDao.getOrderDetail(orderNo);
+        if (order == null) {
+            return ResultBody.error(ResultEnum.THERE_IS_NO_SUCH_ORDER);
+        }
         OrderInfoDTO orderInfo = order.buildOrderInfoDTO();
         OrderReceiptDO rd = rentalOrdersDao.getOrderReceiptInfo(order.getId());
         OrderReceiptDTO receipt = rd.buildOrderReceiptDTO();
@@ -273,7 +276,7 @@ public class RentalOrdersServiceImpl implements RentalOrdersService {
             OrderRefundDTO refund = orderRefund.buildOrderRefundDTO();
             orderInfo.setOrderRefund(refund);
         }
-        return orderInfo;
+        return ResultBody.success(orderInfo);
     }
 
     @Override

src/main/java/com/mmc/oms/service/RentalOrdersService.java

@@ -16,7 +16,7 @@ import com.mmc.oms.model.vo.ReturnWareVO;
 public interface RentalOrdersService {
 
 
-    OrderInfoDTO getOrderDetail(String orderNo);
+    ResultBody getOrderDetail(String orderNo);
 
     OrderInfoDTO feignAddLease(BaseAccountDTO user, LeaseOrderVO param);