edit

database/yspay_cash.php

@@ -3,7 +3,7 @@
 $status = array
 (
 	1 => '未确认',
-    2 => '已确认',
+    2 => '已入账',
 );
 
 $fenzhang_status = array
@@ -175,6 +175,18 @@ return array
             'list'		=> 'Dever::number({fz_cash}/100, 2)',
         ),
 
+        'fdate'     => array
+        (
+            'type'      => 'int-11',
+            'name'      => '入账时间',
+            'default'   => '',
+            'match'     => 'is_numeric',
+            'desc'      => '',
+            'search'    => 'date',
+            'list'      => '"{fdate}" ? date("Y-m-d H:i", \'{fdate}\') : "-"',
+            'list_order' => 100,
+        ),
+
         'rdate'     => array
         (
             'type'      => 'int-11',

yspay/Cash.php

@@ -52,6 +52,7 @@ class Cash
 	    			if ($amount && $amount > 0 && $info['ycash'] != $amount) {
 		        		$this->getCash($amount, $merchant, $update, $fenzhang);
 	    			}
+	    			$update['fdate'] = time();
 		        }
 	    		$state = Dever::db('pay/yspay_cash')->update($update);
 	    		if ($state) {
@@ -61,15 +62,20 @@ class Cash
 	    					Dever::db('pay/yspay_merchant')->update(array('where_id' => $info['merchant_id'], 'cash' => $total['cash'], 'hf_cash' => $total['hf_cash'], 'fz_cash' => $total['fz_cash']));
 	    				}
 	    				$info = Dever::db('pay/yspay_cash')->find(array('id' => $info['id'], 'clear' => true));
-	    				$state = $this->fenzhang_act($info);
-	    				$update = array();
-	    				$update['where_id'] = $info['id'];
-	    				if ($state == 1) {
-	    					$update['fenzhang_status'] = 2;
-	    				} else {
-	    					$update['fenzhang_status'] = 3;
+	    				if ($info['fz_cash'] && $info['fz_cash'] > 0) {
+	    					$state = $this->fenzhang_act($info);
+		    				if ($state == 1) {
+		    					$update = array();
+			    				$update['where_id'] = $info['id'];
+			    				if ($state == 1) {
+			    					$update['fenzhang_status'] = 2;
+			    				} else {
+			    					$update['fenzhang_status'] = 3;
+			    				}
+			    				$update['rdate'] = time();
+			    				Dever::db('pay/yspay_cash')->update($update);
+		    				}
 	    				}
-	    				Dever::db('pay/yspay_cash')->update($update);
 	    			}
 	    			return $state;
 	    		}