FengChaoYu 2 ヶ月 前
コミット
19e028590b

+ 13 - 6
mall-server-api/src/main/java/com/gree/mall/manager/logic/workorder/OrderBaseLogic.java

@@ -2523,12 +2523,19 @@ public class OrderBaseLogic {
     }
 
     public IPage<PgOrderBaseDetail> orderDetailJsmMiniOne(JsmWorkerOrder jsmWorkerOrder) {
-
-
-        IPage pgOrderBases = pgOrderBaseService.lambdaQuery()
-                 .in(PgOrderBase::getId,jsmWorkerOrder.getWorkerOrderIds())
-                .orderByDesc(PgOrderBase::getCreateTime)
-                .page(new Page<>(jsmWorkerOrder.getPageNo(), jsmWorkerOrder.getPageSize()));
+        IPage pgOrderBases;
+        if (CollectionUtil.isEmpty(jsmWorkerOrder.getWorkerOrderIds())
+                && StringUtils.isBlank(jsmWorkerOrder.getOrderId())) {
+            pgOrderBases = pgOrderBaseService.lambdaQuery()
+                    .eq(PgOrderBase::getSaleOrderId, jsmWorkerOrder.getOrderId())
+                    .orderByDesc(PgOrderBase::getCreateTime)
+                    .page(new Page<>(jsmWorkerOrder.getPageNo(), jsmWorkerOrder.getPageSize()));
+        } else {
+            pgOrderBases = pgOrderBaseService.lambdaQuery()
+                    .in(PgOrderBase::getId, jsmWorkerOrder.getWorkerOrderIds())
+                    .orderByDesc(PgOrderBase::getCreateTime)
+                    .page(new Page<>(jsmWorkerOrder.getPageNo(), jsmWorkerOrder.getPageSize()));
+        }
 
         List<PgOrderBaseDetail>  pgOrderBaseDetails = new ArrayList<>();