edit

service/agent/database/order.php

@@ -851,6 +851,7 @@ return array
                 'fstart' => array('yes-fdate', '>='),
                 'fend' => array('yes-fdate', '<='),
                 'status' => array('yes', 'in'),
+                'role' => 'yes',
                 'state' => 1,
             ),
             'type' => 'one',

service/mail/assets/pc/html/census.html

@@ -37,7 +37,7 @@ td {
   <div class="layui-card-header" style="font-size: 20px"><{$day['time']}></div>
   
   <div class="layui-card-body">
-      <h5>已确认代理商数据：<br/>代理商：<{$day['num']}>，总金额：￥<{$day['money']}><br/>代理费：<{$day['dl_money']}>，软件服务费：￥<{$day['cash']}>，期权价值：￥<{$day['option_money']}></h5>
+      <h5>已确认代理商数据：<br/>代理商：<{$day['num']}>，总金额：￥<{$day['money']}><br/>代理费：<{$day['dl_money']}>，软件服务费：￥<{$day['soft_money']}>，期权价值：￥<{$day['option_money']}>，今日销售软件服务费：（￥<{$day['cash']}>）</h5>
      
      
     <table class="table layui-table layui-table-body" id="table">
@@ -67,7 +67,7 @@ td {
 <div class="layui-card">
       <div class="layui-card-header" style="font-size: 20px"><{$week['week']}></div>
   <div class="layui-card-body">
-      <h5>已确认代理商数据：<br/>代理商：<{$week['all']['num']}>，总金额：￥<{$week['all']['money']}><br/>代理费：<{$week['all']['dl_money']}>，软件服务费：￥<{$week['all']['cash']}>，期权价值：￥<{$week['all']['option_money']}></h5>
+      <h5>已确认代理商数据：<br/>代理商：<{$week['all']['num']}>，总金额：￥<{$week['all']['money']}><br/>代理费：<{$week['all']['dl_money']}>，软件服务费：￥<{$week['all']['soft_money']}>，期权价值：￥<{$week['all']['option_money']}>，本周销售软件服务费：（￥<{$week['all']['cash']}>）</h5>
     <table class="table layui-table layui-table-body" id="table">
           <thead id="list-thead">
               <tr>
@@ -84,7 +84,7 @@ td {
                   <td><{$v['name']}></td>
                   <td><{$v['num']}></td>
                   <td><{$v['money']}></td>
-                  <td><{$v['cash']}></td>
+                  <td><{$v['soft_money']}></td>
                   <td><{$v['option_money']}></td>
                 </tr>
                   <{endforeach}>
@@ -95,7 +95,7 @@ td {
 <div class="layui-card">
       <div class="layui-card-header" style="font-size: 20px"><{$all['time']}></div>
   <div class="layui-card-body">
-      <h5>已确认代理商数据：<br/>代理商：<{$all['num']}>，总金额：￥<{$all['money']}><br/>代理费：<{$all['dl_money']}>，软件服务费：￥<{$all['cash']}>，期权价值：￥<{$all['option_money']}></h5>
+      <h5>已确认代理商数据：<br/>代理商：<{$all['num']}>，总金额：￥<{$all['money']}><br/>代理费：<{$all['dl_money']}>，软件服务费：￥<{$all['soft_money']}>，期权价值：￥<{$all['option_money']}>，销售软件服务费：（￥<{$all['cash']}>）</h5>
     <table class="table layui-table layui-table-body" id="table">
           <thead id="list-thead">
               <tr>

service/mail/lib/Manage.php

@@ -20,9 +20,8 @@ class Manage
         $where = array();
         $where['fstart'] = $start;
         $where['fend'] = $end;
-        // print_R($where);die;
         $w = array();
-        $fstart = Dever::input('start', date('Y-m-01', strtotime('-0 month')));
+        $fstart = Dever::input('start', date('Y-m-01', $start));
         $w['fstart'] = Dever::maketime($fstart . ' 00:00:00');
         $w['fend'] = $end;
         $data = array();
@@ -63,13 +62,11 @@ class Manage
     #按时间统计
 	public function content_api($where,$type){
 		$data = array();
-        // print_R($where);die;
         if($type == 2){
             $data['time'] = date('Y.m',$where['fstart']);
-        }else{
+        }elseif($type == 1){
             $data['time'] = date('Y.m.d',$where['fstart']);
         }
-        
         #确认代理商订单数
         $where['status'] = 4;
         $data['num'] = Dever::db('agent/order')->getNum($where);
@@ -118,7 +115,6 @@ class Manage
     public function c_api($where){
         $role = Dever::db('setting/role')->getAll(array('id'=>1,'state'=>1));
         foreach($role as $k => $v){
-            // print_R($where);die;
             $where['role'] = $v['id'];
             $data[$k]['name'] = $v['name'];
             $where['status'] = 2;
@@ -138,6 +134,12 @@ class Manage
                 $data[$k]['option_money'] = 0;
             }
             #软件服务费
+            $soft_money = Dever::db('agent/order')->getSoftCash($where);
+            if($soft_money['total']){
+                $data[$k]['soft_money'] = $soft_money['total'];
+            }else{
+                $data[$k]['soft_money'] = 0;
+            }
             $wh['role'] = $v['id'];
             $wh['status'] = 3;
             $wh['fstart'] = $where['fstart'];