commit

app/admin/model/user/User.php

@@ -649,9 +649,9 @@ class User extends BaseModel
     public static function setCommissionWhere($where)
     {
         $models = self::setWherePage(self::alias('A'), $where, [], ['A.nickname', 'A.uid'])
-            ->join('user_bill B', 'B.uid=A.uid')
+            ->leftjoin('user_bill B', 'B.uid=A.uid')
             ->group('A.uid')
-            ->where('B.type', 'brokerage')
+            ->where('B.type', 'in','brokerage,push,sale,jt_push,zt_sale')
             ->where('B.category', 'now_money')
             ->field('sum(B.number) as sum_number,A.nickname,A.uid,A.now_money,A.brokerage_price');
         if ($where['order'] == '') {
@@ -679,7 +679,7 @@ class User extends BaseModel
     //获取某人用户推广信息
     public static function getUserinfo($uid)
     {
-        $userinfo = self::where('uid', $uid)->field('nickname,spread_uid,now_money,add_time')->find()->toArray();
+        $userinfo = self::where('uid', $uid)->field('nickname,spread_uid,now_money,add_time,brokerage_price')->find()->toArray();
         $userinfo['number'] = (float)UserBill::where('category', 'now_money')->where('uid', $uid)->where('type', 'brokerage')->sum('number');
         $userinfo['spread_name'] = $userinfo['spread_uid'] ? self::where('uid', $userinfo['spread_uid'])->value('nickname') : '';
         return $userinfo;

app/admin/model/user/UserBill.php

@@ -127,7 +127,7 @@ class UserBill extends BaseModel
     public static function getFanList($where){
         $list=self::alias('a')->join('user r','a.uid=r.uid')
             ->where('a.category','now_money')
-            ->where('a.type', 'brokerage')
+            ->where('a.type', 'in','brokerage,push,sale,jt_push,zt_sale')
             ->where('a.pm', 1)
             ->order('a.number desc')
             ->join('store_order o','o.id=a.link_id')
@@ -179,7 +179,7 @@ class UserBill extends BaseModel
     }
     //设置单个用户查询
     public static function setOneWhere($where,$uid){
-        $model=self::where('uid', $uid)->where('category', 'now_money')->where('type', 'brokerage');
+        $model=self::where('uid', $uid)->where('category', 'now_money')->where('type', 'in', 'brokerage,push,sale,jt_push,zt_sale');
         $time['data'] = '';
         if(strlen(trim($where['start_time'])) && strlen(trim($where['end_time']))){
             $time['data'] = $where['start_time'].' - '.$where['end_time'];

app/admin/view/finance/finance/content_info.php

@@ -106,7 +106,7 @@
                         <li class="layui-col-xs4">
                             <div class="backlog-body">
                                 <h3>佣金余额</h3>
-                                <p><cite>{$userinfo.now_money}</cite></p>
+                                <p><cite>{$userinfo.brokerage_price}</cite></p>
                             </div>
                         </li>
                         <li class="layui-col-xs4">