Merge branch 'hotfix/paytime' of wmtx/sdk into master

spend_time

Application/Callback/Controller/BaseController.class.php

@@ -118,6 +118,7 @@ class BaseController extends Controller {
         			$data_save['pay_status'] = 1;
         			$data_save['order_number'] = $data['trade_no'];
         			$data_save['payed_time'] = time();
+        			$data_save['pay_time'] = $data_save['payed_time'];
         			$map_s['pay_order_number'] = $data['out_trade_no'];
         			$r = $spend->where($map_s)->save($data_save);
         			
@@ -135,6 +136,7 @@ class BaseController extends Controller {
         		$request['pay_status'] = 1;
         		$request["title"] = $d['props_name'];
         		$request['payed_time'] = time();
+        		$request['pay_time'] = $request['payed_time'];
         		
         		if ($d['deduction_amount'] > $bind_balance) 
         			$bb = 0;
@@ -185,6 +187,7 @@ class BaseController extends Controller {
             $data_save['pay_status'] = 1;
             $data_save['order_number'] = $data['trade_no'];
             $data_save['payed_time'] = time();
+            $data_save['pay_time'] = $data_save['payed_time'];
             $map_s['pay_order_number'] = $data['out_trade_no']; 
             $r = $spend->where($map_s)->save($data_save);
             // spend 记录传给通知cp 不直接读
@@ -192,6 +195,7 @@ class BaseController extends Controller {
             $pay_data['pay_status'] = $data_save['pay_status'];
             $pay_data['order_number'] = $data_save['order_number'];
             $pay_data['payed_time'] = $data_save['payed_time'];
+            $pay_data['pay_time'] = $pay_data['payed_time'];
             // 更新意向表支付成功记录
             $payChannelIntention = new PayChannelIntentionModel();
             $payChannelIntention->updatePaySuccess($data['out_trade_no']);
@@ -737,7 +741,8 @@ class BaseController extends Controller {
     	$data_spned['deduction_amount'] = $param["deduction_amount"];// 抵扣价格
     	$data_spned['discount_amount']  = $param["discount_amount"];// 折扣价格
     	$data_spned['pay_time']         = NOW_TIME;
-    	$data_spned['payed_time']         = isset($param["payed_time"])?$param["payed_time"]:0;
+    	$data_spned['spend_time']       = NOW_TIME;
+    	$data_spned['payed_time']       = $data_spned['pay_time'];// isset($param["payed_time"])?$param["payed_time"]:0;
     	$data_spned['pay_status']       = $param["pay_status"];
     	$data_spned['pay_game_status']  = 0;
     	$data_spned['extend']           = $param['extend'];

Application/Sdk/Controller/BaseController.class.php

@@ -533,13 +533,15 @@ class BaseController extends RestController{
         $data_spned['cost']       = $param["price"];//原价
         $data_spned['deduction_amount'] = $param["deduction_amount"];// 抵扣价格
         $data_spned['discount_amount']  = $param["discount_amount"];// 折扣价格
-        $data_spned['pay_time']         = NOW_TIME;
+        $data_spned['spend_time']         = NOW_TIME;
+//         $data_spned['pay_time']         = NOW_TIME;
         $data_spned['pay_status']       = $param["pay_status"];
         $data_spned['market_admin_id']  = $this->getMarketAdminId($user_entity["promote_id"]);
         if ($param["pay_status"] == 1)
             $data_spned['payed_time'] = time();
         else 
             $data_spned['payed_time'] = 0;
+        $data_spned['pay_time']         = $data_spned['payed_time'];
         $data_spned['pay_game_status']  = 0;
         $data_spned['extend']           = $param['extend'];
         $data_spned['pay_way']          = $param["pay_way"];

ThinkPHP/Library/Think/Pay.class.php

@@ -364,7 +364,8 @@ class Pay
         $vo->setFee($pay_amount);//构造表单 设置金额为折扣后的价格
         $spend_data['pay_amount'] = $pay_amount;
         $spend_data['pay_way'] = $vo->getPayWay();
-        $spend_data['pay_time'] = NOW_TIME;
+        $spend_data['pay_time'] = 0;
+        $spend_data['spend_time'] = NOW_TIME;
         $spend_data['pay_status'] = 0;
         $spend_data['pay_game_status'] = 0;
         $spend_data['extend'] = $vo->getExtend();