Merge remote-tracking branch 'origin/dev' into dev

Application/Callback/Controller/BaseController.class.php

@@ -258,7 +258,7 @@ class BaseController extends Controller {
                 $before = $userInfo['balance'];
                 $after = $before + $d['pay_amount'];
                 $valueDetailLogModel = new \Sdk\Model\ValueDetailLogModel();
-                $valueDetailLogModel->addLog($d['user_id'], $data['trade_no'], $before, $d['pay_amount'], $after, $valueDetailLogModel::BALANCE, "平台币抵扣".$d['pay_amount']);
+                $valueDetailLogModel->addLog($d['user_id'], $data['trade_no'], $before, $d['pay_amount'], $after, $valueDetailLogModel::BALANCE, "平台币充值".$d['pay_amount'], 2);
                 
                 $user->where("id=".$d['user_id'])->setInc("balance",$d['pay_amount']);
                 $user->where("id=".$d['user_id'])->setInc("cumulative",$d['pay_amount']);

Application/Sdk/Controller/ExchangeController.class.php

@@ -753,7 +753,7 @@ class ExchangeController extends BaseController{
                 }
 
                 $field = array("pay_status"=>1,"pay_amount"=>$request['price'],"receipt"=>$data,"order_number"=>$info['receipt']['transaction_id']);
-
+                $field['payed_time'] = time();
                 switch ($pay_where) {
 
                     case 'SP':