Merge pull request 'dev' (#8) from dev into master

Reviewed-on: http://8.136.139.249:3000/wmtx/sdk/pulls/8
master
廖金灵 4 years ago
commit a5705a1c61

@ -142,6 +142,7 @@ class FengHuoApi2Controller extends GetInfoBaseController{
// 默认排序id降序 // 默认排序id降序
$order = 'pay_time asc'; $order = 'pay_time asc';
$where['pay_status'] = array('neq',0); $where['pay_status'] = array('neq',0);
$where['is_check'] = 1;
$data = M('spend','tab_') $data = M('spend','tab_')
->field('pay_order_number,promote_account,user_id,game_name,game_player_name,server_name,pay_time,cost,user_account') ->field('pay_order_number,promote_account,user_id,game_name,game_player_name,server_name,pay_time,cost,user_account')

@ -14,9 +14,12 @@ class LoginNotifyController extends Controller {
*/ */
public function login_verify(){ public function login_verify(){
$request = json_decode(file_get_contents("php://input"),true); $request = json_decode(file_get_contents("php://input"),true);
if (empty($request)) {
$request = I("post.");
if (empty($request)) { if (empty($request)) {
echo json_encode(array('status'=>1066,'msg'=>'数据异常'));exit(); echo json_encode(array('status'=>1066,'msg'=>'数据异常'));exit();
} }
}
$user = M("user","tab_")->find($request['user_id']); $user = M("user","tab_")->find($request['user_id']);
if($request['token'] == $user['token']){ if($request['token'] == $user['token']){
echo json_encode(array('status'=>200,'user_id'=>$user['id'],"user_account"=>$user['account']));exit(); echo json_encode(array('status'=>200,'user_id'=>$user['id'],"user_account"=>$user['account']));exit();

Loading…
Cancel
Save