Skip to content

xiaozhan
xiaozhan
Commit 391eafab by liuhailong
Options

Merge branch 'master' of http://132.232.91.252:9999/ice/xiaozhan

parents 086fbf11 239a1184
Showing with 147 additions and 131 deletions
api/Appapi/Api/Charge.php
......@@ -7,24 +7,24 @@ class Api_Charge extends PhalApi_Api {
'getAliOrder' => array(
'uid' => array('name' => 'uid', 'type' => 'int', 'min' => 1, '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' => '充值金额'),
),
'getWxOrder' => array(
'getWxOrder' => array(
'uid' => array('name' => 'uid', 'type' => 'int', 'min' => 1, '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' => '充值金额'),
),
'getIosOrder' => array(
'uid' => array('name' => 'uid', 'type' => 'int', 'min' => 1, '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' => '充值金额'),
),
);
}
/* 获取订单号 */
protected function getOrderid($uid){
$orderid=$uid.'_'.date('YmdHis').rand(100,999);
......@@ -35,13 +35,13 @@ class Api_Charge extends PhalApi_Api {
* 微信支付
* @desc 用于 微信支付 获取订单号
* @return int code 操作码，0表示成功
* @return array info
* @return array info
* @return string info[0] 支付信息
* @return string msg 提示信息
*/
public function getWxOrder() {
$rs = array('code' => 0, 'msg' => '', 'info' => array());
$uid=$this->uid;
$changeid=$this->changeid;
$coin=checkNull($this->coin);
......@@ -49,24 +49,24 @@ class Api_Charge extends PhalApi_Api {
$orderid=$this->getOrderid($uid);
$type=2;
if($coin==0){
$rs['code']=1002;
$rs['msg']='信息错误';
return $rs;
}
$configpri = getConfigPri();
$configpub = getConfigPub();
$rs['msg']='信息错误';
return $rs;
}
$configpri = getConfigPri();
$configpub = getConfigPub();
//配置参数检测
if($configpri['wx_appid']== "" || $configpri['wx_mchid']== "" || $configpri['wx_key']== ""){
$rs['code'] = 1002;
$rs['msg'] = '微信未配置';
return $rs;
return $rs;
}
$orderinfo=array(
"uid"=>$uid,
"touid"=>$uid,
......@@ -78,23 +78,23 @@ class Api_Charge extends PhalApi_Api {
"addtime"=>time()
);
$domain = new Domain_Charge();
$info = $domain->getOrderId($changeid,$orderinfo);
if($info==1003){
$rs['code']=1003;
$rs['msg']='订单信息有误，请重新提交';
return $rs;
return $rs;
}else if(!$info){
$rs['code']=1001;
$rs['msg']='订单生成失败';
return $rs;
return $rs;
}
$noceStr = md5(rand(100,1000).time());//获取随机字符串
$time = time();
$paramarr = array(
"appid" => $configpri['wx_appid'],
"body" => "充值{$coin}虚拟币",
......@@ -102,7 +102,7 @@ class Api_Charge extends PhalApi_Api {
"nonce_str" => $noceStr,
"notify_url" => $configpub['site'].'/Appapi/pay/notify_wx',
"out_trade_no"=> $orderid,
"total_fee" => $money*100,
"total_fee" => $money*100,
"trade_type" => "APP"
);
$sign = $this -> sign($paramarr,$configpri['wx_key']);//生成签名
......@@ -112,10 +112,10 @@ class Api_Charge extends PhalApi_Api {
$paramXml .= "<" . $k . ">" . $v . "</" . $k . ">";
}
$paramXml .= "</xml>";
$ch = curl_init ();
@curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, false); // 跳过证书检查
@curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, true); // 从证书中检查SSL加密算法是否存在
@curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, false); // 跳过证书检查
@curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, true); // 从证书中检查SSL加密算法是否存在
@curl_setopt($ch, CURLOPT_URL, "https://api.mch.weixin.qq.com/pay/unifiedorder");
@curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
@curl_setopt($ch, CURLOPT_POST, 1);
......@@ -128,11 +128,11 @@ class Api_Charge extends PhalApi_Api {
curl_close($ch);
$result2 = $this->xmlToArray($resultXmlStr);
if($result2['return_code']=='FAIL'){
$rs['code']=1005;
$rs['msg']=$result2['return_msg'];
return $rs;
return $rs;
}
$time2 = time();
$prepayid = $result2['prepay_id'];
......@@ -147,11 +147,11 @@ class Api_Charge extends PhalApi_Api {
"timestamp" => $time2
);
$paramarr2["sign"] = $this -> sign($paramarr2,$configpri['wx_key']);//生成签名
$rs['info'][0]=$paramarr2;
return $rs;
}
return $rs;
}
/**
* sign拼装获取
*/
......@@ -163,43 +163,43 @@ class Api_Charge extends PhalApi_Api {
$sign .= "key=".$key;
$sign = strtoupper(md5($sign));
return $sign;
}
/**
* xml转为数组
*/
protected function xmlToArray($xmlStr){
$msg = array();
$postStr = $xmlStr;
$msg = (array)simplexml_load_string($postStr, 'SimpleXMLElement', LIBXML_NOCDATA);
$msg = array();
$postStr = $xmlStr;
$msg = (array)simplexml_load_string($postStr, 'SimpleXMLElement', LIBXML_NOCDATA);
return $msg;
}
}
/**
* 支付宝支付
* @desc 用于支付宝支付 获取订单号
* @return int code 操作码，0表示成功
* @return array info
* @return array info
* @return string info[0].orderid 订单号
* @return string msg 提示信息
*/
public function getAliOrder() {
$rs = array('code' => 0, 'msg' => '', 'info' => array());
$uid=$this->uid;
$changeid=$this->changeid;
$coin=checkNull($this->coin);
$money=checkNull($this->money);
$orderid=$this->getOrderid($uid);
$type=1;
if($coin==0){
$rs['code']=1002;
$rs['msg']='信息错误';
return $rs;
}
$rs['msg']='信息错误';
return $rs;
}
$orderinfo=array(
"uid"=>$uid,
"touid"=>$uid,
......@@ -210,7 +210,7 @@ class Api_Charge extends PhalApi_Api {
"status"=>0,
"addtime"=>time()
);
$domain = new Domain_Charge();
$info = $domain->getOrderId($changeid,$orderinfo);
if($info==1003){
......@@ -220,38 +220,38 @@ class Api_Charge extends PhalApi_Api {
$rs['code']=1001;
$rs['msg']='订单生成失败';
}
$rs['info'][0]['orderid']=$orderid;
return $rs;
}
}
/**
* 苹果支付
* @desc 用于苹果支付 获取订单号
* @return int code 操作码，0表示成功
* @return array info
* @return array info
* @return string info[0].orderid 订单号
* @return string msg 提示信息
*/
public function getIosOrder() {
$rs = array('code' => 0, 'msg' => '', 'info' => array());
$uid=$this->uid;
$changeid=$this->changeid;
$coin=checkNull($this->coin);
$money=checkNull($this->money);
$orderid=$this->getOrderid($uid);
$type=3;
if($coin==0){
$rs['code']=1002;
$rs['msg']='信息错误';
return $rs;
$rs['msg']='信息错误';
return $rs;
}
$configpri = getConfigPri();
$configpri = getConfigPri();
$orderinfo=array(
"uid"=>$uid,
"touid"=>$uid,
......@@ -263,7 +263,7 @@ class Api_Charge extends PhalApi_Api {
"addtime"=>time(),
"ambient"=>$configpri['ios_sandbox']
);
$domain = new Domain_Charge();
$info = $domain->getOrderId($changeid,$orderinfo);
if($info==1003){
......@@ -276,8 +276,8 @@ class Api_Charge extends PhalApi_Api {
$rs['info'][0]['orderid']=$orderid;
return $rs;
}
}
}
api/Appapi/Api/Home.php
......@@ -153,6 +153,10 @@ class Api_Home extends PhalApi_Api {
$info['guide']=$guide_info;
// 福利袋
$welfare = DI()->notorm->welfare_rate->select('rate')->where('id=1')->fetchOne();
$info['welfare_price'] = $welfare['rate'];
$rs['info'][0] = $info;
return $rs;
......
api/Appapi/Api/Live.php
......@@ -219,18 +219,18 @@ class Api_Live extends PhalApi_Api {
return $rs;
}
protected function getbaiming($uid)
protected function getbaiming($uid)
{
$domain=new Domain_Home();
$res=$domain->wealth('day');
$i = 0;
$res=$domain->star('day');
$i = 99;
foreach ($res as $key => $r){
if ($r['uid'] == $uid) {
$i = $key + 1;
$i = $key;
break;
}
}
return $i;
return $i + 1;
}
/**
......
api/Appapi/Api/User.php
......@@ -940,15 +940,9 @@ class Api_User extends PhalApi_Api {
return $rs;
}
if(!$accountid){
$rs['code'] = 1001;
$rs['msg'] = '请选择提现账号';
return $rs;
}
if(!$cashvote){
if($cashvote <= 0){
$rs['code'] = 1002;
$rs['msg'] = '请输入有效的提现票数';
$rs['msg'] = '请输入有效的提现金额';
return $rs;
}
......
api/Appapi/Model/Live.php
......@@ -308,7 +308,7 @@ class Model_Live extends PhalApi_Model_NotORM {
if($islive['type']==1){
$rs['type_msg']=md5($islive['type_val']);
}else if($islive['type']==2){
$rs['type_msg']='本房间为收费房间，需支付'.$islive['type_val'].'萌豆';
$rs['type_msg']='本房间为收费房间，需支付'.$islive['type_val'].'钻石';
$rs['type_val']=$islive['type_val'];
$isexist=DI()->notorm->users_coinrecord
->select('id')
......@@ -321,7 +321,7 @@ class Model_Live extends PhalApi_Model_NotORM {
}
}else if($islive['type']==3){
$rs['type_val']=$islive['type_val'];
$rs['type_msg']='本房间为计时房间，每分钟需支付'.$islive['type_val'].'萌豆';
$rs['type_msg']='本房间为计时房间，每分钟需支付'.$islive['type_val'].'钻石';
}
return $rs;
......@@ -524,8 +524,8 @@ class Model_Live extends PhalApi_Model_NotORM {
}
$welfare = DI()->notorm->welfare_rate->select('rate')->where('id=1')->fetchOne();
$giftinfo = [
'type' => 0,
'mark' => 0,
'type' => 1,
'mark' => 4,
'giftname' => '福利袋',
'gifticon' => 'http://qiniu.huad.leacho.cn/20190723/5d367483cb9ac.png',
'needcoin' => $welfare['rate'],
......@@ -864,6 +864,27 @@ class Model_Live extends PhalApi_Model_NotORM {
"addtime"=>$addtime
);
DI()->notorm->users_coinrecord->insert($insert);
$luckcoin2 = (int)($luckcoin*0.05 * 100);
$luckcoin3 = $luckcoin2 / 100;
if ($luckcoin3 > 0) {
DI()->notorm->users
->where('id = ?', $liveuid)
->update( array('votes' => new NotORM_Literal("votes + {$luckcoin3}"),'votestotal' => new NotORM_Literal("votestotal + {$luckcoin3}") ));
$insert=array(
"type"=>'income',
"action"=>'luckgift',
"uid"=>$liveuid,
"touid"=>$liveuid,
"giftid"=>$giftid,
"giftcount"=>$lucktimes,
"totalcoin"=>$luckcoin,
"showid"=>$showid,
"mark"=>$giftinfo['mark'],
"addtime"=>$addtime
);
DI()->notorm->users_coinrecord->insert($insert);
}
break;
}
}
......
api/Appapi/Model/User.php
......@@ -157,12 +157,10 @@ class Model_User extends PhalApi_Model_NotORM
/* 提现 */
public function setCash($data)
{
$nowtime = time();
$uid = $data['uid'];
$accountid = $data['accountid'];
$cashvote = $data['cashvote'];
$money = $data['cashvote'];
$config = getConfigPri();
$cash_start = $config['cash_start'];
......@@ -195,7 +193,7 @@ class Model_User extends PhalApi_Model_NotORM
}
/* 钱包信息 */
$accountinfo = DI()->notorm->cmf_users_info_auth->select("*")->where('uid=? and status=?', $uid, 1)->andWhere()->fetchOne();
$accountinfo = DI()->notorm->users_info_auth->where("uid={$uid} and status=1")->fetchOne();
if (!$accountinfo) {
return 1007;
}
......@@ -206,7 +204,7 @@ class Model_User extends PhalApi_Model_NotORM
$cash_min = $config['cash_min'];
//提现钱数
$money = floor($cashvote / $cash_rate);
// $money = floor($cashvote / $cash_rate);
if ($money < $cash_min) {
return 1004;
......@@ -221,16 +219,16 @@ class Model_User extends PhalApi_Model_NotORM
$name = $account = $account_bank = '';
if ($accountid == 1) {
if ($accountid == 0) {
$account = $accountinfo['account'];
$name = $accountinfo['username'];
}
//
// if ($accountid == 2) {
// return 1007;
// }
if ($accountid == 2) {
return 1007;
}
if ($accountid == 3) {
if ($accountid == 1) {
$name = $accountinfo['name'];
$account = $accountinfo['bank_card'];
$account_bank = $accountinfo['bank_province'] . $accountinfo['bank_city'];
......
application/Admin/Controller/CashController.class.php
......@@ -7,9 +7,9 @@ namespace Admin\Controller;
use Common\Controller\AdminbaseController;
class CashController extends AdminbaseController {
var $type=array(
'1'=>'支付宝',
'0'=>'支付宝',
'2'=>'微信',
'3'=>'银行卡',
'1'=>'银行卡',
);
function index(){
......@@ -22,24 +22,24 @@ class CashController extends AdminbaseController {
$map['addtime']=array("gt",strtotime($_REQUEST['start_time']));
$_GET['start_time']=$_REQUEST['start_time'];
}
if($_REQUEST['end_time']!=''){
$map['addtime']=array("lt",strtotime($_REQUEST['end_time']));
$_GET['end_time']=$_REQUEST['end_time'];
}
if($_REQUEST['start_time']!='' && $_REQUEST['end_time']!='' ){
$map['addtime']=array("between",array(strtotime($_REQUEST['start_time']),strtotime($_REQUEST['end_time'])));
$_GET['start_time']=$_REQUEST['start_time'];
$_GET['end_time']=$_REQUEST['end_time'];
}
if($_REQUEST['keyword']!=''){
$map['uid|orderno|trade_no']=array("like","%".$_REQUEST['keyword']."%");
$map['uid|orderno|trade_no']=array("like","%".$_REQUEST['keyword']."%");
$_GET['keyword']=$_REQUEST['keyword'];
}
}
$cashrecord=M("users_cashrecord");
$count=$cashrecord->where($map)->count();
$page = $this->page($count, 20);
......@@ -50,17 +50,17 @@ class CashController extends AdminbaseController {
->select();
foreach($lists as $k=>$v){
$userinfo=M("users")->field("user_nicename")->where("id='$v[uid]'")->find();
$lists[$k]['userinfo']= $userinfo;
}
$cashrecord_total = $cashrecord->where($map)->sum("money");
$lists[$k]['userinfo']= $userinfo;
}
$cashrecord_total = $cashrecord->where($map)->sum("money");
if($_REQUEST['status']=='')
{
$success=$map;
$success['status']=1;
$fail=$map;
$fail['status']=0;
$cashrecord_success = $cashrecord->where($success)->sum("money");
$cashrecord_fail = $cashrecord->where($fail)->sum("money");
$cashrecord_success = $cashrecord->where($success)->sum("money");
$cashrecord_fail = $cashrecord->where($fail)->sum("money");
$cash['success']=$cashrecord_success;
$cash['fail']=$cashrecord_fail;
$cash['type']=0;
......@@ -71,52 +71,52 @@ class CashController extends AdminbaseController {
$this->assign('formget', $_GET);
$this->assign('type', $this->type);
$this->assign("page", $page->show('Admin'));
$this->display();
}
function del(){
$id=intval($_GET['id']);
if($id){
$result=M("users_cashrecord")->delete($id);
$result=M("users_cashrecord")->delete($id);
if($result){
$action="删除提现记录：{$id}";
setAdminLog($action);
$this->success('删除成功');
}else{
$this->error('删除失败');
}
}else{
}
}else{
$this->error('数据传入失败！');
}
$this->display();
}
}
$this->display();
}
function edit(){
$id=intval($_GET['id']);
if($id){
$cash=M("users_cashrecord")->find($id);
$cash['userinfo']=M("users")->field("user_nicename")->where("id='$cash[uid]'")->find();
$cash['auth']=M("users_auth")->field("*")->where("uid='$cash[uid]'")->find();
$this->assign('cash', $cash);
$this->assign('type', $this->type);
}else{
$this->assign('cash', $cash);
$this->assign('type', $this->type);
}else{
$this->error('数据传入失败！');
}
$this->display();
}
$this->display();
}
function edit_post(){
if(IS_POST){
if($_POST['status']=='0'){
$this->error('未修改订单状态');
if(IS_POST){
if($_POST['status']=='0'){
$this->error('未修改订单状态');
}
$cash=M("users_cashrecord");
$cash->create();
$cash->uptime=time();
$result=$cash->save();
$result=$cash->save();
if($result){
if($_POST['status']=='2'){
M("users")->where("id='".$_POST['uid']."'")->setInc("votes",$_POST['votes']);
......@@ -131,7 +131,7 @@ class CashController extends AdminbaseController {
}else{
$this->error('修改失败');
}
}
}
}
function export()
{
......@@ -140,15 +140,15 @@ class CashController extends AdminbaseController {
}
if($_REQUEST['start_time']!=''){
$map['addtime']=array("gt",strtotime($_REQUEST['start_time']));
}
if($_REQUEST['end_time']!=''){
}
if($_REQUEST['end_time']!=''){
$map['addtime']=array("lt",strtotime($_REQUEST['end_time']));
}
if($_REQUEST['start_time']!='' && $_REQUEST['end_time']!='' ){
if($_REQUEST['start_time']!='' && $_REQUEST['end_time']!='' ){
$map['addtime']=array("between",array(strtotime($_REQUEST['start_time']),strtotime($_REQUEST['end_time'])));
}
if($_REQUEST['keyword']!=''){
$map['uid|orderno|trade_no']=array("like","%".$_REQUEST['keyword']."%");
$map['uid|orderno|trade_no']=array("like","%".$_REQUEST['keyword']."%");
}
$xlsName = "Excel";
$cashrecord=M("users_cashrecord");
......@@ -157,9 +157,9 @@ class CashController extends AdminbaseController {
{
$userinfo=M("users")->field("user_nicename")->where("id='$v[uid]'")->find();
$xlsData[$k]['user_nicename']= $userinfo['user_nicename']."(".$v['uid'].")";
$xlsData[$k]['addtime']=date("Y-m-d H:i:s",$v['addtime']);
$xlsData[$k]['uptime']=date("Y-m-d H:i:s",$v['uptime']);
if($v['status']=='0'){ $xlsData[$k]['status']="处理中";}else if($v['status']=='2'){$xlsData[$k]['status']="提现失败";}else{ $xlsData[$k]['status']="提现完成";}
$xlsData[$k]['addtime']=date("Y-m-d H:i:s",$v['addtime']);
$xlsData[$k]['uptime']=date("Y-m-d H:i:s",$v['uptime']);
if($v['status']=='0'){ $xlsData[$k]['status']="处理中";}else if($v['status']=='2'){$xlsData[$k]['status']="提现失败";}else{ $xlsData[$k]['status']="提现完成";}
}
$action="导出提现记录：".M("users_cashrecord")->getLastSql();
setAdminLog($action);
......@@ -176,5 +176,5 @@ class CashController extends AdminbaseController {
);
exportExcel($xlsName,$xlsCell,$xlsData,$cellName);
}
}
themes/simplebootx/Appapi/Family/member_search.html
......@@ -64,7 +64,6 @@
}, 'json');
},
add: function (id) {
layer.msg("申请错误！");
$.ajax({
url: '/index.php?g=Appapi&m=Family&a=member_add',
dataType: "json",
......
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