Merge branch 'dev'

app/service/user/cashBack.js

@@ -92,7 +92,8 @@ class CashBackService extends CrudService {
     const { inviter, _id: order_detail } = orderDetail;
     if (!inviter) return;
     // 查询用户是否是会员，若不是会员不返现
-    const leaderInfo = await this.userModel.findById(inviter, { is_leader });
+    const inviter_id = _.get(inviter, "_id");
+    const leaderInfo = await this.userModel.findById(inviter_id, { 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') };
     // 检查是否已经返利