|
@@ -2298,7 +2298,10 @@ public class OrderBaseLogic {
|
|
|
for (PgOrderBase pgOrderBase : pgOrderBases) {
|
|
|
PgOrderBaseDetail pgOrderBaseDetail = BeanUtil.toBean(pgOrderBase, PgOrderBaseDetail.class);
|
|
|
|
|
|
- List<PgOrderOperatorLog> pgOrderOperatorLogs = pgOrderOperatorLogService.lambdaQuery().eq(PgOrderOperatorLog::getOrderBaseId, pgOrderBase.getId()).list();
|
|
|
+ List<PgOrderOperatorLog> pgOrderOperatorLogs = pgOrderOperatorLogService.lambdaQuery()
|
|
|
+ .eq(PgOrderOperatorLog::getOrderBaseId, pgOrderBase.getId())
|
|
|
+ .orderByDesc(PgOrderOperatorLog::getId)
|
|
|
+ .list();
|
|
|
|
|
|
List<SettlementOrder> settlementOrderList = settlementOrderService.lambdaQuery().eq(SettlementOrder::getWorkerOrderId, pgOrderBase.getId()).list();
|
|
|
|