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

Application/Callback/Controller/BaseController.class.php

@@ -247,7 +247,7 @@ class BaseController extends Controller {
                 $before = $userInfo['balance'];
                 $after = $before + $d['pay_amount'];
                 $valueDetailLogModel = new \Sdk\Model\ValueDetailLogModel();
-                $valueDetailLogModel->add($d['user_id'], $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']);
                 
                 $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/PayH5Controller.class.php

@@ -1080,14 +1080,14 @@ ADD COLUMN `pay_url`  text NULL AFTER `check_sign`;
         		$user_play->where($user_play_map)->save(array('bind_balance' => 0)); // 扣绑定币
             	$request['price'] = $user_play_data['bind_balance'];
             	$result = $this->add_spend($request);
-            	$valueDetailLogModel->add($request['user_id'], $user_play_data['bind_balance'], -$user_play_data['bind_balance'], 0, $valueDetailLogModel::BANDBI, "绑定币消费：".$user_play_data['pay_amount']);
+            	$valueDetailLogModel->addLog($request['user_id'], $request['pay_order_number'], $user_play_data['bind_balance'], -$user_play_data['bind_balance'], 0, $valueDetailLogModel::BANDBI, "绑定币消费：".$user_play_data['pay_amount']);
             	$this->set_ratio($request['pay_order_number'], 2); // 游戏返利
             	$notice_order[] = $request['pay_order_number'];
             }
             $request['pay_order_number'] = $pay_order_number;
        		$request['pay_way'] = 0;  // 扣平台币
        		$real_price = $price - $user_play_data['bind_balance'];
-       		$valueDetailLogModel->add($request['user_id'], $balance, -$real_price, 0, $valueDetailLogModel::BALANCE, "平台币消费：".$real_price);
+       		$valueDetailLogModel->addLog($request['user_id'], $request['pay_order_number'], $balance, -$real_price, 0, $valueDetailLogModel::BALANCE, "平台币消费：".$real_price);
        		$user->where(array('id' => $request["user_id"]))->setDec("balance", $real_price);
 			//$this->set_message(0,"fail", $request['pay_order_number']);
         
@@ -1096,7 +1096,7 @@ ADD COLUMN `pay_url`  text NULL AFTER `check_sign`;
         	$this->set_ratio($request['pay_order_number'], 1); // 游戏返利
         	$notice_order[] = $request['pay_order_number'];
        	} else { // 绑定币足够扣
-       	    $valueDetailLogModel->add($request['user_id'], $user_play_data['bind_balance'], -$request['price'], $user_play_data['bind_balance'] - $request['price'], $valueDetailLogModel::BANDBI, "绑定币消费.：".$request['price']);
+       	    $valueDetailLogModel->addLog($request['user_id'], $request['pay_order_number'], $user_play_data['bind_balance'], -$request['price'], $user_play_data['bind_balance'] - $request['price'], $valueDetailLogModel::BANDBI, "绑定币消费.：".$request['price']);
        	    
         	$user_play->where($user_play_map)->setDec('bind_balance', $request['price']); // 扣绑定币
         	$result = $this->add_spend($request);

Application/Sdk/Controller/ShortcutController.class.php

@@ -576,6 +576,8 @@ class ShortcutController extends BaseController{
         $data['orderAmount'] = $request['price'];
         $data['notifyUrl'] = C('PAY_DOMAIN')."/callback.php/Notify/yeepay_callback";
         $data['goodsParamExt'] = '{"goodsName":"游戏充值","goodsDesc":"充值"}';
+        $data['userNo'] = $request['user_id'];
+        $data['userType'] = "USER_ID";
         $data['memo'] = "游戏充值-{$request['pay_order_number']}";
         if ($is_platform) {
             $data['redirectUrl'] = C('PAY_DOMAIN').U('Spend/shortcut_payed',array('status'=> 1, 'orderno' => $payInfo['order_id'], 'user_id'=>I('user_id'),'game_id'=>I('game_id'), 'user_token' => I('request.user_token')));

Application/Sdk/Model/ValueDetailLogModel.class.php

@@ -30,8 +30,9 @@ class ValueDetailLogModel extends Model {
     }
     
     // 新增数值变动记录
-    public function add($uid, $before, $value, $after, $type, $remark='', $payType=1) {
+    public function addLog($uid, $orderNumber, $before, $value, $after, $type, $remark='', $payType=1) {
         $this->add(array(
+            'order_number' => $orderNumber,
             'user_id' => $uid,
             'before_value' => $before,
             'value' => $value,