|
@@ -5,7 +5,6 @@ namespace app\api\controller;
|
|
use app\common\controller\Api;
|
|
use app\common\controller\Api;
|
|
use think\Db;
|
|
use think\Db;
|
|
use addons\epay\library\Service;
|
|
use addons\epay\library\Service;
|
|
-use app\common\model\Wallet;
|
|
|
|
/**
|
|
/**
|
|
* 充值配置与充值订单
|
|
* 充值配置与充值订单
|
|
*/
|
|
*/
|
|
@@ -117,7 +116,7 @@ class Pay extends Api
|
|
|
|
|
|
//金币充值
|
|
//金币充值
|
|
public function gold_config(){
|
|
public function gold_config(){
|
|
- $list = Db::name('paygold_config')->where('is_show',1)->order('weight asc,id asc')->select();
|
|
|
|
|
|
+ $list = Db::name('paygold_webcon')->order('weigh asc,id asc')->select();
|
|
$data['goldconfig'] = $list;
|
|
$data['goldconfig'] = $list;
|
|
$data['gold'] = model('wallet')->getWallet($this->auth->id,'gold');
|
|
$data['gold'] = model('wallet')->getWallet($this->auth->id,'gold');
|
|
$data['money_to_gold'] = config('site.money_to_gold');
|
|
$data['money_to_gold'] = config('site.money_to_gold');
|
|
@@ -129,6 +128,7 @@ class Pay extends Api
|
|
|
|
|
|
$rc_id = input_post('rc_id',0);
|
|
$rc_id = input_post('rc_id',0);
|
|
$pay_type = input_post('pay_type','wechat');
|
|
$pay_type = input_post('pay_type','wechat');
|
|
|
|
+ $platform = 'app';
|
|
$freemoney = input_post('freemoney',0);
|
|
$freemoney = input_post('freemoney',0);
|
|
$uid = $this->auth->id;
|
|
$uid = $this->auth->id;
|
|
|
|
|
|
@@ -138,11 +138,9 @@ class Pay extends Api
|
|
|
|
|
|
//赋值money
|
|
//赋值money
|
|
if($rc_id){
|
|
if($rc_id){
|
|
- $recharge_config = Db::name('paygold_config')->where('id',$rc_id)->find();
|
|
|
|
|
|
+ $recharge_config = Db::name('paygold_webcon')->where('id',$rc_id)->find();
|
|
$money = $recharge_config['money'] ?: 0;
|
|
$money = $recharge_config['money'] ?: 0;
|
|
$gold = $recharge_config['gold'] ?: 0;
|
|
$gold = $recharge_config['gold'] ?: 0;
|
|
- $first_gold = $recharge_config['first_gold'] ?: 0;
|
|
|
|
- $first_vipdays = $recharge_config['first_vipdays'] ?: 0;
|
|
|
|
}
|
|
}
|
|
|
|
|
|
//自由输入覆盖
|
|
//自由输入覆盖
|
|
@@ -151,8 +149,6 @@ class Pay extends Api
|
|
$money = floatval($freemoney);
|
|
$money = floatval($freemoney);
|
|
$bili = config('site.money_to_gold') ?: 10;
|
|
$bili = config('site.money_to_gold') ?: 10;
|
|
$gold = bcmul($money,$bili,0);
|
|
$gold = bcmul($money,$bili,0);
|
|
- $first_gold = 0;
|
|
|
|
- $first_vipdays = 0;
|
|
|
|
}
|
|
}
|
|
|
|
|
|
//
|
|
//
|
|
@@ -165,52 +161,33 @@ class Pay extends Api
|
|
}
|
|
}
|
|
|
|
|
|
//创建订单
|
|
//创建订单
|
|
- $data = [];
|
|
|
|
- $data['status'] = 0;
|
|
|
|
- $pay_no = createUniqueNo('P',$uid);
|
|
|
|
- $data['pay_no'] = $pay_no;
|
|
|
|
- $data['money'] = $money;
|
|
|
|
- $data['payment_class'] = $pay_type;
|
|
|
|
$data['user_id'] = $uid;
|
|
$data['user_id'] = $uid;
|
|
- $data['ext_info'] = json_encode(['subject'=>'充值金币支付']);
|
|
|
|
- $data['memo'] = '充值金币支付';
|
|
|
|
|
|
+ $data['out_trade_no'] = createUniqueNo('P',$uid); // 数据库订单号加密
|
|
|
|
+ $data['order_amount'] = $money;
|
|
$data['createtime'] = time();
|
|
$data['createtime'] = time();
|
|
- $data['payment'] = 'app';
|
|
|
|
- $orderid = Db::name('pay_order')->insertGetId($data);
|
|
|
|
-
|
|
|
|
- //创建回调
|
|
|
|
- $even_data = [];
|
|
|
|
- $even_data['event'] = 'success';
|
|
|
|
- $even_data['class'] = 'app\common\model\Recharge';
|
|
|
|
- $even_data['method'] = 'goldpaysucc';
|
|
|
|
- $even_data['args'] = json_encode(['user_id'=>$uid,'gold'=>$gold,'money'=>$money,'pg_id'=>$rc_id,'first_gold'=>$first_gold,'first_vipdays'=>$first_vipdays]);
|
|
|
|
- $even_data['pay_no'] = $pay_no;
|
|
|
|
- Db::name('pay_event')->insertGetId($even_data);
|
|
|
|
-
|
|
|
|
- $return = [
|
|
|
|
- 'pay_no'=>$pay_no,
|
|
|
|
- 'title' => '充值金币支付',
|
|
|
|
- ];
|
|
|
|
|
|
|
|
- /* $this->success('success',$return);
|
|
|
|
- }
|
|
|
|
|
|
+ $data['pay_type'] = $pay_type;
|
|
|
|
+ $data['platform'] = $platform;
|
|
|
|
+ $data['order_status'] = 0;
|
|
|
|
+ $data['table_name'] = 'gold_recharge';
|
|
|
|
+ $data['table_id'] = 0;
|
|
|
|
+ $data['args'] = json_encode(['gold'=>$gold]);
|
|
|
|
|
|
- public function topay(){*/
|
|
|
|
|
|
+ $orderid = Db::name('pay_order')->insertGetId($data);
|
|
|
|
|
|
- //$openid = $this->auth->openid;
|
|
|
|
- /*$pay_no = input('pay_no');
|
|
|
|
- $orderInfo = Db::name('pay_order')->where('pay_no',$pay_no)->find();*/
|
|
|
|
|
|
+// $openid = $this->auth->mini_openid;
|
|
//下单
|
|
//下单
|
|
$params = [
|
|
$params = [
|
|
'type' => $pay_type,
|
|
'type' => $pay_type,
|
|
- 'orderid' => $pay_no,
|
|
|
|
- 'title' => $data['memo'],
|
|
|
|
- 'amount' => $data['money'],
|
|
|
|
- //'amount' => 0.01,
|
|
|
|
- 'method' => 'app',
|
|
|
|
- 'notifyurl' => $this->request->root(true) . '/notify.php/paytype/'.$pay_type,
|
|
|
|
|
|
+ 'orderid' => $data['out_trade_no'],
|
|
|
|
+ 'title' => '支付订单',
|
|
|
|
+ 'amount' => $data['order_amount'],
|
|
|
|
+ 'method' => $platform,
|
|
|
|
+// 'openid' => $openid,
|
|
|
|
+ 'notifyurl' => config('pay_notify_url').'/api/pay/order_notify_base/paytype/'.$pay_type,
|
|
'returnurl' => '',
|
|
'returnurl' => '',
|
|
];
|
|
];
|
|
|
|
+
|
|
$res = Service::submitOrder($params);
|
|
$res = Service::submitOrder($params);
|
|
|
|
|
|
if($pay_type == 'wechat'){
|
|
if($pay_type == 'wechat'){
|
|
@@ -220,4 +197,5 @@ class Pay extends Api
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
|
|
+
|
|
}
|
|
}
|