Merge branch 'master' of ssh://git.dever.cc:10022/dever-product/churen

service/agent/lib/Member.php

@@ -675,8 +675,11 @@ class Member
             $temp[] = $val['group_sell']; // 用一个空数组来承接字段
             $sell += $val['group_sell'];
         }
-        if($temp){
-            $total = sprintf ('%01.2f',$sell - max($temp));
+        if($temp && isset($info['title_id'])){
+            if($info['title_id'] == 4 || $info['title_id'] == 5){
+                $total = sprintf ('%01.2f',$sell - max($temp));
+            }
+            
         }else{
             $total = sprintf ('%01.2f',$sell);
         }

service/mail/assets/pc/html/option_grant.html

@@ -50,6 +50,7 @@ td {
                 <th data-priority="1">完成团队业绩</th>
                 <th data-priority="1">完成直推创V</th>
                 <th data-priority="1">完成直推创客</th>
+                <th data-priority="1">总收入</th>
               </tr>
           </thead>
             <tbody>
@@ -63,6 +64,7 @@ td {
                   <td><{$v['group_sell']}></td>
                   <td><{$v['cv_num']}></td>
                   <td><{$v['ck_num']}></td>
+                  <td><{$v['cash']['total']}></td>
                 </tr>
                   <{endforeach}>
                   <{endif}>

service/mail/lib/Manage.php

@@ -454,6 +454,7 @@ class Manage
             $res[$k]['role_name'] = $role['name'];
             $res[$k]['cv_num'] = Dever::db('agent/member')->getNum(array('parent_mid'=>$v['id'],'fstart'=>$start,'fend'=>$end,'role'=>8,'state'=>1));
             $res[$k]['ck_num'] = Dever::db('agent/member')->getNum(array('parent_mid'=>$v['id'],'fstart'=>$start,'fend'=>$end,'role'=>6,'state'=>1));
+            $res[$k]['cash'] = Dever::db('bill/cash')->getCash(array('mid'=>$v['id'],'type'=>'1,2','state'=>1));
         }
         $data['page'] = Dever::page("current");
         $data['data'] = $res;