update

app/service/trade/orderDetail.js

@@ -69,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')) {
             // 如果有优惠部分,那就得找,优惠里面有没有对应的商品规格
@@ -81,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);
         }