1.门卫按照内存分页

2.订单余量修复

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/handler/TakingOrderHandler.java

@@ -389,7 +389,7 @@ public class TakingOrderHandler extends AbstractWaybillOrderHandler<OrderCircula
         }
 
         //订单余量:区分正常流程和原矿运输
-        BigDecimal remainingAmount = Objects.equals(1, logOrder.getOrderType()) ? getRawOreSupAmount(logOrder) : getRemainingAmount(tradeOrder);
+        BigDecimal remainingAmount = getRawOreSupAmount(logOrder);
 
         // 最终接取的任务量
         BigDecimal taskAmount;

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/service/app/GatekeeperOrderService.java

@@ -109,8 +109,7 @@ public class GatekeeperOrderService {
         LambdaQueryWrapper<KwtGatekeeperWaybillOrder> wrapper = buildAndExecuteQuery(param);
 
         //查询门卫订单
-        Page<KwtGatekeeperWaybillOrder> pageByStatus = gatekeeperWaybillOrderRepository.page(new Page<>(param.getPageNum(), param.getPageSize()), wrapper);
-        List<KwtGatekeeperWaybillOrder> records = pageByStatus.getRecords();
+        List<KwtGatekeeperWaybillOrder> records = gatekeeperWaybillOrderRepository.list(wrapper);
         if (CollectionUtils.isEmpty(records)) {
             log.info("当前无运单订单信息");
             return PageDataResult.empty(param.getPageNum(), param.getPageSize());
@@ -121,7 +120,10 @@ public class GatekeeperOrderService {
 
         //排序
         sort(param, gatekeeperOrderPageResult);
-        return PageDataResult.success(param.getPageNum(), param.getPageSize(), pageByStatus.getTotal(), gatekeeperOrderPageResult);
+        List<List<GatekeeperOrderResp>> pageList = Lists.partition(gatekeeperOrderPageResult, param.getPageSize());
+        List<GatekeeperOrderResp> walletPageList = pageList.size() >= param.getPageNum() ?
+                pageList.get(param.getPageNum() - 1) : Collections.emptyList();
+        return PageDataResult.success(param.getPageNum(), param.getPageSize(), (long) walletPageList.size(), gatekeeperOrderPageResult);
     }
 
     /**