Skip to content

haishi
haishi
Commit 8712df7a by 冷斌
Options

fix bug

parent 3c824971
Showing with 6 additions and 6 deletions
api/Appapi/Api/Charge.php
...@@ -7,25 +7,25 @@ class Api_Charge extends PhalApi_Api { ...@@ -7,25 +7,25 @@ class Api_Charge extends PhalApi_Api {
'getAliOrder' => array( 'getAliOrder' => array(
'uid' => array('name' => 'uid', 'type' => 'int', 'min' => 1, 'require' => true, 'desc' => '用户ID'), 'uid' => array('name' => 'uid', 'type' => 'int', 'min' => 1, 'require' => true, 'desc' => '用户ID'),
'changeid' => array('name' => 'changeid', 'type' => 'int', 'require' => true, 'desc' => '充值规则ID'), 'changeid' => array('name' => 'changeid', 'type' => 'int', 'require' => true, 'desc' => '充值规则ID'),
'coin' => array('name' => 'coin', 'type' => 'string', 'require' => true, 'desc' => '萌豆'), 'coin' => array('name' => 'coin', 'type' => 'string', 'require' => true, 'desc' => '钻石'),
'money' => array('name' => 'money', 'type' => 'string', 'require' => true, 'desc' => '充值金额'), 'money' => array('name' => 'money', 'type' => 'string', 'require' => true, 'desc' => '充值金额'),
), ),
'getWxOrder' => array( 'getWxOrder' => array(
'uid' => array('name' => 'uid', 'type' => 'int', 'min' => 1, 'require' => true, 'desc' => '用户ID'), 'uid' => array('name' => 'uid', 'type' => 'int', 'min' => 1, 'require' => true, 'desc' => '用户ID'),
'changeid' => array('name' => 'changeid', 'type' => 'string', 'require' => true, 'desc' => '充值规则ID'), 'changeid' => array('name' => 'changeid', 'type' => 'string', 'require' => true, 'desc' => '充值规则ID'),
'coin' => array('name' => 'coin', 'type' => 'string', 'require' => true, 'desc' => '萌豆'), 'coin' => array('name' => 'coin', 'type' => 'string', 'require' => true, 'desc' => '钻石'),
'money' => array('name' => 'money', 'type' => 'string', 'require' => true, 'desc' => '充值金额'), 'money' => array('name' => 'money', 'type' => 'string', 'require' => true, 'desc' => '充值金额'),
), ),
'getIosOrder' => array( 'getIosOrder' => array(
'uid' => array('name' => 'uid', 'type' => 'int', 'min' => 1, 'require' => true, 'desc' => '用户ID'), 'uid' => array('name' => 'uid', 'type' => 'int', 'min' => 1, 'require' => true, 'desc' => '用户ID'),
'changeid' => array('name' => 'changeid', 'type' => 'string', 'require' => true, 'desc' => '充值规则ID'), 'changeid' => array('name' => 'changeid', 'type' => 'string', 'require' => true, 'desc' => '充值规则ID'),
'coin' => array('name' => 'coin', 'type' => 'string', 'require' => true, 'desc' => '萌豆'), 'coin' => array('name' => 'coin', 'type' => 'string', 'require' => true, 'desc' => '钻石'),
'money' => array('name' => 'money', 'type' => 'string', 'require' => true, 'desc' => '充值金额'), 'money' => array('name' => 'money', 'type' => 'string', 'require' => true, 'desc' => '充值金额'),
), ),
'update' => array( 'update' => array(
'uid' => array('name' => 'uid', 'type' => 'int', 'min' => 1, 'require' => true, 'desc' => '用户ID'), 'uid' => array('name' => 'uid', 'type' => 'int', 'min' => 1, 'require' => true, 'desc' => '用户ID'),
'changeid' => array('name' => 'changeid', 'type' => 'string', 'require' => true, 'desc' => '充值规则ID'), 'changeid' => array('name' => 'changeid', 'type' => 'string', 'require' => true, 'desc' => '充值规则ID'),
'coin' => array('name' => 'coin', 'type' => 'string', 'require' => true, 'desc' => '萌豆'), 'coin' => array('name' => 'coin', 'type' => 'string', 'require' => true, 'desc' => '钻石'),
'money' => array('name' => 'money', 'type' => 'string', 'require' => true, 'desc' => '充值金额'), 'money' => array('name' => 'money', 'type' => 'string', 'require' => true, 'desc' => '充值金额'),
'touid' => array('name' => 'touid', 'type' => 'int', 'default' => 0, 'desc' => '上麦会员ID'), 'touid' => array('name' => 'touid', 'type' => 'int', 'default' => 0, 'desc' => '上麦会员ID'),
), ),
......
api/Appapi/Model/Live.php
...@@ -309,7 +309,7 @@ class Model_Live extends PhalApi_Model_NotORM { ...@@ -309,7 +309,7 @@ class Model_Live extends PhalApi_Model_NotORM {
if($islive['type']==1){ if($islive['type']==1){
$rs['type_msg']=md5($islive['type_val']); $rs['type_msg']=md5($islive['type_val']);
}else if($islive['type']==2){ }else if($islive['type']==2){
$rs['type_msg']='本房间为收费房间，需支付'.$islive['type_val'].'萌豆'; $rs['type_msg']='本房间为收费房间，需支付'.$islive['type_val'].'钻石';
$rs['type_val']=$islive['type_val']; $rs['type_val']=$islive['type_val'];
$isexist=DI()->notorm->users_coinrecord $isexist=DI()->notorm->users_coinrecord
->select('id') ->select('id')
...@@ -322,7 +322,7 @@ class Model_Live extends PhalApi_Model_NotORM { ...@@ -322,7 +322,7 @@ class Model_Live extends PhalApi_Model_NotORM {
} }
}else if($islive['type']==3){ }else if($islive['type']==3){
$rs['type_val']=$islive['type_val']; $rs['type_val']=$islive['type_val'];
$rs['type_msg']='本房间为计时房间，每分钟需支付'.$islive['type_val'].'萌豆'; $rs['type_msg']='本房间为计时房间，每分钟需支付'.$islive['type_val'].'钻石';
} }
return $rs; return $rs;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment