Merge branch 'dev'

app/service/user/cashBack.js

@@ -11,6 +11,7 @@ class CashBackService extends CrudService {
     this.model = this.ctx.model.User.CashBack;
     this.configModel = this.ctx.model.System.Config;
     this.orderDetailModel = this.ctx.model.Trade.OrderDetail;
+    this.userModel = this.ctx.model.User.User;
   }
 
   async computedTotal({ customer }) {
@@ -90,6 +91,9 @@ class CashBackService extends CrudService {
     }
     const { inviter, _id: order_detail } = orderDetail;
     if (!inviter) return;
+    // 查询用户是否是会员，若不是会员不返现
+    const leaderInfo = await this.userModel.findById(inviter, { is_leader });
+    if(leaderInfo.is_leader !=='0') return;
     const obj = { inviter: _.get(inviter, '_id'), source_id: order_detail, source: '0', money: rmoney, time: moment().format('YYYY-MM-DD HH:mm:ss') };
     // 检查是否已经返利
     const num = await this.model.count({ inviter: _.get(inviter, '_id'), source_id: order_detail, source: '0' });