Merge remote-tracking branch 'origin/main'

ship-module-trade/ship-module-trade-biz/src/main/java/com/yc/ship/module/trade/controller/admin/order/vo/order/TradeOrderRespNewVO.java

@@ -111,6 +111,9 @@ public class TradeOrderRespNewVO {
     @Schema(description = "航次ID")
     private Long voyageId;
 
+    @Schema(description = "拼房描述")
+    private String shareDesc;
+
     @Schema(description = "游轮航次信息")
     private VoyageRespVO voyage;
     private ResourceRouteDO resourceRouteDO;

ship-module-trade/ship-module-trade-biz/src/main/java/com/yc/ship/module/trade/dal/mysql/order/TradeOrderMapper.java

@@ -202,7 +202,7 @@ public interface TradeOrderMapper extends BaseMapperX<TradeOrderDO> {
      * @param pageReqVO
      * @return
      */
-    PageResult<AppTradeOrderRespNewVO> selectAppPage(IPage<TradeOrderDO> iPage, @Param("pageReqVO") AppTradeOrderPageReqNewVO pageReqVO);
+    IPage<AppTradeOrderRespNewVO> selectAppPage(IPage<AppTradeOrderRespNewVO> iPage, @Param("pageReqVO") AppTradeOrderPageReqNewVO pageReqVO);
     /**
      * 我的行程
      * @param loginUserId

ship-module-trade/ship-module-trade-biz/src/main/java/com/yc/ship/module/trade/service/order/impl/TradeOrderServiceImpl.java

@@ -1389,9 +1389,9 @@ public class TradeOrderServiceImpl implements TradeOrderService {
 
     @Override
     public PageResult<AppTradeOrderRespNewVO> getAppOrderPage(AppTradeOrderPageReqNewVO pageReqVO) {
-        IPage<TradeOrderDO> iPage = MyBatisUtils.buildPage(pageReqVO);
-        PageResult<AppTradeOrderRespNewVO> pageResult = tradeOrderMapper.selectAppPage(iPage, pageReqVO);
-        return pageResult;
+        IPage<AppTradeOrderRespNewVO> iPage = MyBatisUtils.buildPage(pageReqVO);
+        IPage<AppTradeOrderRespNewVO> pageResult = tradeOrderMapper.selectAppPage(iPage, pageReqVO);
+        return new PageResult<>(pageResult.getRecords(), pageResult.getTotal());
     }
 
     @Override