edit

service/agent/database/soft_cash.php

@@ -161,7 +161,7 @@ return array
             // 'update'    => 'radio',
             'option'    => $status,
             'search'    => 'select',
-            'list_name' =>'订单状态<br/>合同签署状态<br/>终审时间',
+            'list_name' =>'订单状态<br/>合同签署状态<br/>终审时间<br>签署时间',
             'list'      => 'Dever::load("agent/lib/soft_cash.list",{id})',
 
         ),
@@ -224,6 +224,7 @@ return array
             'desc'      => '',
             'match'     => 'is_numeric',
             'update'    => 'day',
+            'search'    => 'date',
             'callback'  => 'maketime',
             // 'list'        => '{buy_date} > 0 ? date("Y-m-d H:i", {buy_date}) : "无"',
         ),
@@ -234,10 +235,22 @@ return array
             'name'      => '终审时间',
             'default'   => '',
             'match'     => 'is_numeric',
-            // 'search'    => 'date',
+            'search'    => 'date',
+            'desc'      => '',
+            // 'list'      => 'date("Y-m-d H:i:s", {zdate})',
+        ),
+
+        'fdate'     => array
+        (
+            'type'      => 'int-11',
+            'name'      => '签署时间',
+            'default'   => '',
+            'match'     => 'is_numeric',
+            'search'    => 'date',
             'desc'      => '',
             // 'list'      => 'date("Y-m-d H:i:s", {zdate})',
         ),
+
         'state'     => array
         (
             'type'      => 'tinyint-1',
@@ -255,7 +268,7 @@ return array
             'desc'      => '',
             # 只有insert时才生效
             'insert'    => true,
-            'search'    => 'date',
+            // 'search'    => 'date',
             // 'list'      => 'date("Y-m-d H:i:s", {cdate})',
         ),
     ),
@@ -297,5 +310,19 @@ return array
             'col' => '*',
         ),
 
+        'getTotal' => array
+        (
+            # 匹配的正则或函数 选填项
+            'option' => array
+            (
+                'fstart' => array('yes-zdate', '>='),
+                'fend' => array('yes-zdate', '<='),
+                'status' => array('yes', 'in'),
+                'state' => 1,
+            ),
+            'type' => 'one',
+            'col' => 'sum(cash) as total',
+        ),
+
     ),
 );

service/agent/lib/Soft_cash.php

@@ -172,7 +172,7 @@ Class Soft_cash
                 array
                 (
                     array('软件服务费', $info['cash']),
-                    array('期权价值', $info['price']),
+                    array('原始期权价值', $info['price']),
                 ),
                  array
                 (
@@ -350,9 +350,15 @@ Class Soft_cash
         }else{
             $data['zdate'] = '-';
         }
+        if($info['fdate']){
+            $data['fdate'] = date('Y-m-d H:i',$info['fdate']);
+        }else{
+            $data['fdate'] = '-';
+        }
         $html = $data['status'];
         $html .= '<br />' . $data['type'];
         $html .= '<br />' . $data['zdate'];
+        $html .= '<br />' . $data['fdate'];
         return $html; 
     }
 }

service/agent/src/My.php

@@ -968,6 +968,13 @@ class My extends Core
                     $role = Dever::db('setting/role')->find($info['role']);
                     $info['sign'] = $sign;
                     $name = Dever::load('agent/lib/agreement')->name($info['agreement_id'], $info, $role, 2, 2);
+
+                    $soft_cash = Dever::db('agent/soft_cash')->find(array('agreement_id'=>$where['id'],'mid'=>$where['mid']));
+                    if($soft_cash){
+                        $update['where_id'] = $soft_cash['id'];
+                        $update['set_qdate'] = $state['qdate'];
+                        Dever::db('agent/soft_cash')->update($update);
+                    }
                     return array('link' => $name[1]);
                 }
             }