Merge branch 'dev'

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;
   }
@@ -70,9 +69,10 @@ class OrderDetailService extends CrudService {
       const total_detail = shopMoneyDetail[shop];
       const newGoodsList = [];
       for (const s of list) {
-        const { is_set = '1' } = s;
+        const { is_set = '1', remarks } = s;
         if (is_set === '1') {
-          const goodsList = _.get(s, 'goods', []);
+          let goodsList = _.get(s, 'goods', []);
+          goodsList = goodsList.map(i => ({ ...i, remarks }));
           // 优惠部分分割
           if (_.get(otd, 'discount_detail')) {
             // 如果有优惠部分,那就得找,优惠里面有没有对应的商品规格
@@ -82,7 +82,7 @@ class OrderDetailService extends CrudService {
           noTimes++;
           newGoodsList.push(...goodsList);
         } else {
-          const g = _.pick(s, [ 'name', 'buy_num', 'freight', 'is_set', 'is_use', 'meta', 'sell_money', 'set_id', 'goods' ]);
+          const g = _.pick(s, [ 'name', 'buy_num', 'freight', 'is_set', 'is_use', 'meta', 'sell_money', 'set_id', 'goods', 'remarks' ]);
           g._id = g.set_id;
           newGoodsList.push(g);
         }
@@ -194,7 +194,6 @@ class OrderDetailService extends CrudService {
           } else i.is_rate = false;
         }
       }
-
     }
     res.goods = goods;
     // 整理total_detail为列表:让前端显示更方便

app/service/util/order.js

@@ -278,6 +278,7 @@ class OrderService extends CrudService {
         data.buy_num = i.num;
         data.is_set = '0';
         data.set_id = i.set_id;
+        data.remarks = i.remarks;
         goodsData.push(data);
       }
     }