lrf 2 gadi atpakaļ
vecāks
revīzija
ed0adf5c92
1 mainītis faili ar 2 papildinājumiem un 4 dzēšanām
  1. 2 4
      app/service/trade/orderDetail.js

+ 2 - 4
app/service/trade/orderDetail.js

@@ -27,7 +27,6 @@ class OrderDetailService extends CrudService {
       // 传来指定商品,查有该商品的订单,但是如果没有,就查每一项中是否有 shop_transport_no 和 shop_transport_type
       // 如果有这俩属性,说明也有单子,也查出来
       toSearch = transport.filter(f => _.isArray(f.goods) && f.goods.find(fg => fg.goods_id === goods_id));
-      console.log(toSearch);
       if (toSearch.length <= 0) {
         toSearch = transport.filter(f => f.shop_transport_no && f.shop_transport_type);
       }
@@ -36,10 +35,10 @@ class OrderDetailService extends CrudService {
     }
     const result = [];
     for (const t of toSearch) {
-      const { shop_transport_no: no, shop_transport_type: type } = t;
+      const { shop_transport_no: no, shop_transport_type: type, goods } = t;
       if (!no || !type) throw new BusinessError(ErrorCode.DATA_NOT_EXIST, '缺少快递信息');
       const res = await this.ctx.service.util.kd100.search({ no, type });
-      result.push(res);
+      result.push({ ...res, goods });
     }
     return result;
   }
@@ -194,7 +193,6 @@ class OrderDetailService extends CrudService {
           } else i.is_rate = false;
         }
       }
-
     }
     res.goods = goods;
     // 整理total_detail为列表:让前端显示更方便