lrf 2 년 전
부모
커밋
c66e377369
1개의 변경된 파일6개의 추가작업 그리고 3개의 파일을 삭제
  1. 6 3
      app/service/view/goods.js

+ 6 - 3
app/service/view/goods.js

@@ -213,6 +213,7 @@ class GoodsService extends CrudService {
         create_time: 1,
         sell_money: { $toDouble: '$specs.sell_money' },
         flow_money: { $toDouble: '$specs.flow_money' },
+        leader_price: { $toDouble: '$specs.leader_price' },
         num: '$specs.num',
         act_tags: 1,
       },
@@ -231,6 +232,7 @@ class GoodsService extends CrudService {
         file: '$data.file',
         sell_money: '$data.sell_money',
         flow_money: '$data.flow_money',
+        leader_price: '$data.leader_price',
         num: '$data.num',
         create_time: '$data.create_time',
         sort: '$data.sort',
@@ -245,7 +247,7 @@ class GoodsService extends CrudService {
     if (parseInt(limit)) qpipeline.push({ $limit: parseInt(limit) });
     let list = await this.goodsModel.aggregate(qpipeline);
     list = list.map(i => {
-      const obj = _.pick(i, [ 'name', 'file', 'num', 'flow_money', 'sell_money', 'view_num', '_id', 'actTagsShow', 'act_tags' ]);
+      const obj = _.pick(i, [ 'name', 'file', 'num', 'flow_money', 'sell_money', 'view_num', '_id', 'actTagsShow', 'act_tags', 'leader_price' ]);
       return obj;
     });
     // 处理活动标签
@@ -258,8 +260,8 @@ class GoodsService extends CrudService {
     const user = _.get(this.ctx, 'user');
     if (user) {
       const is_leader = _.get(user, 'is_leader', '1');
-      if (is_leader === '0') {
-        list = await this.searchLeaderPrice(list);
+      if (is_leader === '1') {
+        list = list.map(i => _.omit(i, [ 'leader_price' ]));
       }
     }
     const tpipeline = _.cloneDeep(pipeline);
@@ -351,6 +353,7 @@ class GoodsService extends CrudService {
     return list;
   }
 
+  // 弃用
   async searchLeaderPrice(list) {
     for (const i of list) {
       const { _id: goods } = i;