feat: 基本实现拆单收货--2

supplied-service/src/services/order-list.service.ts

@@ -58,7 +58,7 @@ export const orderListService = {
     }
 
     const mainOrders = await orderDao.findMainOrdersWithSubs(supplierId, userId)
-    const orders = mainOrders.map(mainOrder => {
+    const orderItems = mainOrders.flatMap(mainOrder => {
       const mainStatus = statusMap[mainOrder.orderState] || statusMap[ORDER_STATE.FINISH_PAY]
       const subOrders = mainOrder.subOrders.map(subOrder => {
         const status = statusMap[subOrder.orderState] || mainStatus
@@ -91,7 +91,7 @@ export const orderListService = {
       const products = subOrders.flatMap(subOrder => subOrder.products)
       const isMainOrderItem = mainOrder.orderState === ORDER_STATE.PENDING_PAY ||
         (mainOrder.orderState === ORDER_STATE.CANCELLED && mainOrder.isSplit !== ORDER_SPLIT_STATE.SPLIT)
-      const orderItems = isMainOrderItem
+      return isMainOrderItem
         ? [{
             id: mainOrder.orderId,
             viewId: `main-${mainOrder.orderId}`,
@@ -118,28 +118,9 @@ export const orderListService = {
             displayType: 'sub',
             mainOrderNumberId: mainOrder.orderNumberId || ''
           }))
-
-      return {
-        id: mainOrder.orderId,
-        mainOrderId: mainOrder.orderId,
-        mainOrderNumberId: mainOrder.orderNumberId || '',
-        supplierId: mainOrder.supplierId,
-        createTime: toDateTimeText(mainOrder.createTime || mainOrder.createAt),
-        status: mainStatus.text,
-        statusClass: mainStatus.statusClass,
-        orderState: mainOrder.orderState,
-        isSplit: mainOrder.isSplit,
-        splitTime: mainOrder.splitTime,
-        canCancel: mainOrder.orderState === ORDER_STATE.PENDING_PAY,
-        products,
-        amount: toYuanText(mainOrder.totalPrice),
-        count: sumProductsCount(subOrders),
-        orderItems,
-        subOrders
-      }
     })
 
-    logger.info('order list result', { supplierId, userId, count: orders.length })
-    return serviceOk({ orders, orderItems: orders.flatMap(order => order.orderItems) })
+    logger.info('order list result', { supplierId, userId, count: orderItems.length })
+    return serviceOk({ orderItems })
   }
 }