|
@@ -2378,6 +2378,7 @@ public class OrderBaseLogic {
|
|
.and(item -> item.in(!CollectionUtil.isEmpty(jsmWorkerOrder.getWorkerOrderIds()),PgOrderBase::getId, jsmWorkerOrder.getWorkerOrderIds()).or(!StringUtil.isEmpty(jsmWorkerOrder.getMobile()))
|
|
.and(item -> item.in(!CollectionUtil.isEmpty(jsmWorkerOrder.getWorkerOrderIds()),PgOrderBase::getId, jsmWorkerOrder.getWorkerOrderIds()).or(!StringUtil.isEmpty(jsmWorkerOrder.getMobile()))
|
|
.eq(!StringUtil.isEmpty(jsmWorkerOrder.getMobile()),PgOrderBase::getUserMobile,jsmWorkerOrder.getMobile())
|
|
.eq(!StringUtil.isEmpty(jsmWorkerOrder.getMobile()),PgOrderBase::getUserMobile,jsmWorkerOrder.getMobile())
|
|
)
|
|
)
|
|
|
|
+ .orderByDesc(PgOrderBase::getCreateTime)
|
|
.page(new Page<>(jsmWorkerOrder.getPageNo(), jsmWorkerOrder.getPageSize()));
|
|
.page(new Page<>(jsmWorkerOrder.getPageNo(), jsmWorkerOrder.getPageSize()));
|
|
|
|
|
|
List<PgOrderBaseDetail> pgOrderBaseDetails = new ArrayList<>();
|
|
List<PgOrderBaseDetail> pgOrderBaseDetails = new ArrayList<>();
|
|
@@ -2388,6 +2389,7 @@ public class OrderBaseLogic {
|
|
PgOrderBaseDetail pgOrderBaseDetail = BeanUtil.toBean(pgOrderBase, PgOrderBaseDetail.class);
|
|
PgOrderBaseDetail pgOrderBaseDetail = BeanUtil.toBean(pgOrderBase, PgOrderBaseDetail.class);
|
|
|
|
|
|
List<PgOrderOperatorLog> pgOrderOperatorLogs = pgOrderOperatorLogService.lambdaQuery()
|
|
List<PgOrderOperatorLog> pgOrderOperatorLogs = pgOrderOperatorLogService.lambdaQuery()
|
|
|
|
+ .notIn(PgOrderOperatorLog::getType,"异常反馈")
|
|
.eq(PgOrderOperatorLog::getOrderBaseId, pgOrderBase.getId())
|
|
.eq(PgOrderOperatorLog::getOrderBaseId, pgOrderBase.getId())
|
|
.orderByDesc(PgOrderOperatorLog::getId)
|
|
.orderByDesc(PgOrderOperatorLog::getId)
|
|
.list();
|
|
.list();
|