Merge branch 'dev' of 47.111.118.107:/srv/git/sdk into dev

Application/Sdk/Controller/AppleController.class.php

@@ -411,7 +411,7 @@ class AppleController extends BaseController{
                 if($request['code']==1){
                     $this->add_spend($request,1, 0);
                 }else{
-                    $this->add_deposit($request, 1);
+                    $this->add_deposit($request, 1, 0);
                 }
 
                 $json_data['url'] = $is_pay['mweb_url'].'&redirect_url='.(is_ssl()?'https%3A%2F%2F':'http%3A%2F%2F'). $_SERVER ['HTTP_HOST'] . "%2Fsdk.php%2FSpend%2Fpay_success%2Forderno%2F".$request['pay_order_number'].'%2Fgame_id%2F'.$request['game_id'] ;

Application/Sdk/Controller/BaseController.class.php

@@ -657,14 +657,20 @@ class BaseController extends RestController{
     /*
     *平台币充值记录
     */
-    public function add_deposit($data, $type=0){
+    public function add_deposit($data, $type=0,$api_ver=2){
         $deposit = M("deposit","tab_");
         $deposit_data  = $this->deposit_param($data);
         $ordercheck = $deposit->where(array('pay_order_number'=>$deposit_data["pay_order_number"]))->find();
         if($ordercheck) {
         	if ($type) {
-        		redirect(U('Spend/notice',array('user_id'=>$ordercheck['user_id'],'game_id'=>$ordercheck['game_id'],'msg'=>'订单已经存在，请刷新充值页面重新下单！')));
+        		if ($api_ver == 0) {
-        		exit;
+        			redirect(U('Spend/notice_v1',array('user_id'=>$ordercheck['user_id'],'game_id'=>$ordercheck['game_id'],'msg'=>'订单已经存在，请刷新充值页面重新下单！')));
+        			exit;
+        		} else {
+        			redirect(U('Spend/notice',array('user_id'=>$ordercheck['user_id'],'game_id'=>$ordercheck['game_id'],'msg'=>'订单已经存在，请刷新充值页面重新下单！')));
+        			exit;
+        		}
+        		
         	} else {
         		$this->set_message(0,'fail',"订单已经存在，请刷新充值页面重新下单！");
         	}