完善接口

application-webadmin/src/main/java/com/tourism/webadmin/app/website/controller/TourismOrderController.java

@@ -1,10 +1,7 @@
 package com.tourism.webadmin.app.website.controller;
 
 import cn.dev33.satoken.annotation.SaIgnore;
-import com.tourism.common.core.object.MyOrderParam;
-import com.tourism.common.core.object.MyPageData;
-import com.tourism.common.core.object.ResponseResult;
-import com.tourism.common.core.object.TokenData;
+import com.tourism.common.core.object.*;
 import com.tourism.common.core.util.MyModelUtil;
 import com.tourism.common.core.util.MyPageUtil;
 import com.tourism.webadmin.back.dto.TourOderDto;
@@ -73,12 +70,10 @@ public class TourismOrderController {
      */
     @GetMapping("/detail")
     public ResponseResult<TourOderVo> detail(@RequestParam Long orderId){
-        TourOder tourOder = new TourOder();
-        tourOder.setId(orderId);
-        TourOder tourOder1 = tourOderService.getOne(tourOder);
+        TourOder tourOder1 = tourOderService.getByIdWithRelation(orderId,MyRelationParam.normal());
         TourOrderPassenage tourOrderPassenage = new TourOrderPassenage();
         tourOrderPassenage.setOrderId(orderId);
-        List<TourOrderPassenage> tourOrderPassenageList = tourOrderPassenageService.getTourOrderPassenageList(tourOrderPassenage, "");
+        List<TourOrderPassenage> tourOrderPassenageList = tourOrderPassenageService.getTourOrderPassenageListWithRelation(tourOrderPassenage, "");
         TourOderVo tourOderVo = MyModelUtil.copyTo(tourOder1, TourOderVo.class);
         List<TourOrderPassenageVo> tourOrderPassenageVoList = MyModelUtil.copyCollectionTo(tourOrderPassenageList, TourOrderPassenageVo.class);
         tourOderVo.setDetailList(tourOrderPassenageVoList);