Merge branch 'dev'

app/service/user/cashBack.js

@@ -15,10 +15,11 @@ class CashBackService extends CrudService {
   async computedTotal({ customer }) {
     assert(customer, '缺少用户信息');
     const res = await this.model.find({ inviter: customer });
+    console.log(res);
     const total = res.reduce((p, n) => {
-      let point = n.point;
-      if (!(n.source === '0' || n.source === '1')) point = -point;
-      return this.ctx.plus(p, point);
+      let money = n.money;
+      if (!(n.source === '0' || n.source === '1')) money = -money;
+      return this.ctx.plus(p, money);
     }, 0);
     return total;
   }

app/z_router/user/index.js

@@ -9,4 +9,5 @@ module.exports = app => {
   require('./userCoupon')(app); // 用户优惠券
   require('./storeShop')(app); // 收藏店铺
   require('./storeGoods')(app); // 收藏商品
+  require('./cashBack')(app); // 返现
 };