Merge branch 'dev' of wmtx/sdk into master

平台米充值 订单号pay_order_number

Application/Callback/Controller/BaseController.class.php

@@ -259,7 +259,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'], 2);
+                $valueDetailLogModel->addLog($d['user_id'], $data['out_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']);