bug修复

ruoyi-common/ruoyi-common-ys/src/main/java/org/dromara/common/ys/service/IHotelService.java

@@ -35,7 +35,7 @@ public interface IHotelService {
      * @param model  model
      * @return 酒店列表
      */
-    PageInfo<HotelOrderQueryListModel> hotelList(String userId, org.dromara.common.ys.model.req.hotel.HotelOrderQueryListModel model);
+    PageInfo<HotelShoppingBaseListModel> hotelList(String userId, org.dromara.common.ys.model.req.hotel.HotelShoppingBaseListModel model);
 
     /**
      * 酒店下单

ruoyi-common/ruoyi-common-ys/src/main/java/org/dromara/common/ys/service/impl/AirPortServiceImpl.java

@@ -16,6 +16,7 @@ import org.dromara.common.ys.model.res.airport.QueryFlightStopVOModel;
 import org.dromara.common.ys.service.IAirportService;
 import org.springframework.stereotype.Service;
 
+import java.util.Collections;
 import java.util.List;
 
 /**
@@ -87,8 +88,17 @@ public class AirPortServiceImpl implements IAirportService {
         if (!CharSequenceUtil.equals(res.getErrCode(), Code.SUCCESS.getCode())) {
             throw new RuntimeException(res.getTips());
         }
+        if (res.getData() == null) {
+            return PageInfo.<org.dromara.common.ys.model.res.airport.OrderListModel>builder().build()
+                .setCount(model.getCount())
+                .setMap(Collections.emptyMap())
+                .setPageNum(model.getPageNum())
+                .setPages(0)
+                .setTotal(0)
+                .setList(Collections.emptyList());
+        }
         PageInfo pageInfo = JSON.parseObject(JSON.parseObject(res.getData()).getString("orderList"), PageInfo.class);
-        return PageInfo.builder().build()
+        return PageInfo.<org.dromara.common.ys.model.res.airport.OrderListModel>builder().build()
             .setCount(pageInfo.getCount())
             .setMap(pageInfo.getMap())
             .setPageNum(pageInfo.getPageNum())

ruoyi-common/ruoyi-common-ys/src/main/java/org/dromara/common/ys/service/impl/HotelServiceImpl.java

@@ -15,6 +15,7 @@ import org.dromara.common.ys.model.res.hotel.*;
 import org.dromara.common.ys.service.IHotelService;
 import org.springframework.stereotype.Service;
 
+import java.util.Collections;
 import java.util.List;
 
 /**
@@ -56,7 +57,7 @@ public class HotelServiceImpl implements IHotelService {
     }
 
     @Override
-    public PageInfo<HotelOrderQueryListModel> hotelList(String userId, org.dromara.common.ys.model.req.hotel.HotelOrderQueryListModel model) {
+    public PageInfo<HotelShoppingBaseListModel> hotelList(String userId, org.dromara.common.ys.model.req.hotel.HotelShoppingBaseListModel model) {
         ApiHttpResponse res = Api.v1(
             com.wenhe.base.base.RequestMethodEnum.POST,
             DomainEnum.TEST.getDomain(),
@@ -67,14 +68,23 @@ public class HotelServiceImpl implements IHotelService {
         if (!CharSequenceUtil.equals(res.getErrCode(), Code.SUCCESS.getCode())) {
             throw new RuntimeException(res.getTips());
         }
+        if (res.getData() == null) {
+            return PageInfo.<HotelShoppingBaseListModel>builder().build()
+                .setCount(model.getCount())
+                .setMap(Collections.emptyMap())
+                .setPageNum(model.getPageNum())
+                .setPages(0)
+                .setTotal(0)
+                .setList(Collections.emptyList());
+        }
         PageInfo pageInfo = JSON.parseObject(JSON.parseObject(res.getData()).getString("dataList"), PageInfo.class);
-        return PageInfo.builder().build()
+        return PageInfo.<HotelShoppingBaseListModel>builder().build()
             .setCount(pageInfo.getCount())
             .setMap(pageInfo.getMap())
             .setPageNum(pageInfo.getPageNum())
             .setPages(pageInfo.getPages())
             .setTotal(pageInfo.getTotal())
-            .setList(JSON.parseArray(JSON.toJSONString(pageInfo.getList()), HotelOrderQueryListModel.class));
+            .setList(JSON.parseArray(JSON.toJSONString(pageInfo.getList()), HotelShoppingBaseListModel.class));
     }
 
     @Override
@@ -149,6 +159,15 @@ public class HotelServiceImpl implements IHotelService {
         if (!CharSequenceUtil.equals(res.getErrCode(), Code.SUCCESS.getCode())) {
             throw new RuntimeException(res.getTips());
         }
+        if (res.getData() == null) {
+            return PageInfo.<HotelOrderQueryListModel>builder().build()
+                .setCount(model.getCount())
+                .setMap(Collections.emptyMap())
+                .setPageNum(model.getPageNum())
+                .setPages(0)
+                .setTotal(0)
+                .setList(Collections.emptyList());
+        }
         PageInfo pageInfo = JSON.parseObject(JSON.parseObject(res.getData()).getString("orderList"), PageInfo.class);
         return PageInfo.builder().build()
             .setCount(pageInfo.getCount())

ruoyi-common/ruoyi-common-ys/src/main/java/org/dromara/common/ys/service/impl/TrainServiceImpl.java

@@ -102,8 +102,17 @@ public class TrainServiceImpl implements ITrainService {
         if (!CharSequenceUtil.equals(res.getErrCode(), Code.SUCCESS.getCode())) {
             throw new RuntimeException(res.getTips());
         }
+        if (res.getData() == null) {
+            return PageInfo.<OrderListQueryResModel>builder().build()
+                .setCount(model.getCount())
+                .setMap(Collections.emptyMap())
+                .setPageNum(model.getPageNum())
+                .setPages(0)
+                .setTotal(0)
+                .setList(Collections.emptyList());
+        }
         PageInfo pageInfo = JSON.parseObject(JSON.parseObject(res.getData()).getString("orderQueryListBeanPageInfo"), PageInfo.class);
-        return PageInfo.builder().build()
+        return PageInfo.<OrderListQueryResModel>builder().build()
             .setCount(pageInfo.getCount())
             .setMap(pageInfo.getMap())
             .setPageNum(pageInfo.getPageNum())

ruoyi-common/ruoyi-common-ys/src/main/java/org/dromara/common/ys/service/impl/VehiclesServiceImpl.java

@@ -14,6 +14,7 @@ import org.dromara.common.ys.model.res.vehicles.*;
 import org.dromara.common.ys.service.IVehiclesService;
 import org.springframework.stereotype.Service;
 
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 
@@ -85,8 +86,17 @@ public class VehiclesServiceImpl implements IVehiclesService {
         if (!CharSequenceUtil.equals(res.getErrCode(), Code.SUCCESS.getCode())) {
             throw new RuntimeException(res.getTips());
         }
+        if (res.getData() == null) {
+            return PageInfo.<OrderListModel>builder().build()
+                .setCount(model.getCount())
+                .setMap(Collections.emptyMap())
+                .setPageNum(model.getPageNum())
+                .setPages(0)
+                .setTotal(0)
+                .setList(Collections.emptyList());
+        }
         PageInfo pageInfo = JSON.parseObject(JSON.parseObject(res.getData()).getString("orderList"), PageInfo.class);
-        return PageInfo.builder().build()
+        return PageInfo.<OrderListModel>builder().build()
             .setCount(pageInfo.getCount())
             .setMap(pageInfo.getMap())
             .setPageNum(pageInfo.getPageNum())

ruoyi-modules/ruoyi-server/src/main/java/org/dromara/server/controller/hotel/HotelController.java

@@ -58,7 +58,7 @@ public class HotelController extends BaseController {
      */
     @GlobalTransactional(timeoutMills = 600000)
     @GetMapping("/hotel/list")
-    public R<PageInfo<HotelOrderQueryListModel>> hotelList(org.dromara.common.ys.model.req.hotel.HotelOrderQueryListModel model) {
+    public R<PageInfo<HotelShoppingBaseListModel>> hotelList(org.dromara.common.ys.model.req.hotel.HotelShoppingBaseListModel model) {
         return R.ok(hotelService.hotelList(getUserId(), model));
     }