diff --git a/Application/Callback/Controller/BaseController.class.php b/Application/Callback/Controller/BaseController.class.php index 40e48d0a..3fa320b6 100644 --- a/Application/Callback/Controller/BaseController.class.php +++ b/Application/Callback/Controller/BaseController.class.php @@ -162,6 +162,7 @@ class BaseController extends Controller { $data_save['pay_status'] = 1; $data_save['order_number'] = $data['trade_no']; + $data_save['payed_time'] = time(); $map_s['pay_order_number'] = $data['out_trade_no']; $r = $spend->where($map_s)->save($data_save); $this->set_ratio($d['pay_order_number']); @@ -235,12 +236,19 @@ class BaseController extends Controller { if(empty($d)){return false;} if($d['pay_status'] == 0){ $data_save['pay_status'] = 1; + $data_save['payed_time'] = time(); $data_save['order_number'] = $data['trade_no']; $data_save['check_sign'] = get_check_sign($d['user_id'],$data['trade_no'],$d['pay_amount'],$d['create_time']); $map_s['pay_order_number'] = $data['out_trade_no']; $r = $deposit->where($map_s)->save($data_save); if($r !== false){ $user = M("user","tab_"); + $userInfo = $user->where(array('id' => $d['user_id']))->find(); + $before = $userInfo['balance']; + $after = $before + $d['pay_amount']; + $valueDetailLogModel = new \Sdk\Model\ValueDetailLogModel(); + $valueDetailLogModel->add($d['user_id'], $before, $d['pay_amount'], $after, $valueDetailLogModel::BALANCE, "平台币抵扣".$d['pay_amount']); + $user->where("id=".$d['user_id'])->setInc("balance",$d['pay_amount']); $user->where("id=".$d['user_id'])->setInc("cumulative",$d['pay_amount']); //APP邀请好友消费奖励平台币 diff --git a/Application/Sdk/Controller/BaseController.class.php b/Application/Sdk/Controller/BaseController.class.php index 4ce521fd..c10f45e7 100644 --- a/Application/Sdk/Controller/BaseController.class.php +++ b/Application/Sdk/Controller/BaseController.class.php @@ -523,6 +523,10 @@ class BaseController extends RestController{ $data_spned['discount_amount'] = $param["discount_amount"];// 折扣价格 $data_spned['pay_time'] = NOW_TIME; $data_spned['pay_status'] = $param["pay_status"]; + if ($param["pay_status"] == 1) + $data_spned['payed_time'] = time(); + else + $data_spned['payed_time'] = 0; $data_spned['pay_game_status'] = 0; $data_spned['extend'] = $param['extend']; $data_spned['pay_way'] = $param["pay_way"]; @@ -901,7 +905,6 @@ class BaseController extends RestController{ public function update_pay_info($id, $data) { if (!$id || !$data) return 0; - $info['pay_order_number'] = $order_id; $r = M("pay_info", "tab_")->where([ 'id' => $id ])->save($data); @@ -909,4 +912,5 @@ class BaseController extends RestController{ return $r; } + } diff --git a/Application/Sdk/Controller/PayH5Controller.class.php b/Application/Sdk/Controller/PayH5Controller.class.php index ff3b75a9..f1743fb8 100644 --- a/Application/Sdk/Controller/PayH5Controller.class.php +++ b/Application/Sdk/Controller/PayH5Controller.class.php @@ -10,6 +10,7 @@ use Org\SqpaySDK\Sqpay; use Org\HeepaySDK\Heepay; use Qiniu\json_decode; use Think\Log; +use Sdk\Model\ValueDetailLogModel; class PayH5Controller extends BaseController{ @@ -1060,6 +1061,7 @@ ADD COLUMN `pay_url` text NULL AFTER `check_sign`; } $result = false; $notice_order = []; // 需要更新的通知游戏订单 + $valueDetailLogModel = new ValueDetailLogModel(); // 记录数值增减 (绑定币 平台币) // 先扣绑币 $request['pay_way'] = C('PAY_WAY.BIND_COIN'); $user_play = M("UserPlay", "tab_"); @@ -1078,12 +1080,14 @@ ADD COLUMN `pay_url` text NULL AFTER `check_sign`; $user_play->where($user_play_map)->save(array('bind_balance' => 0)); // 扣绑定币 $request['price'] = $user_play_data['bind_balance']; $result = $this->add_spend($request); + $valueDetailLogModel->add($request['user_id'], $user_play_data['bind_balance'], -$user_play_data['bind_balance'], 0, $valueDetailLogModel::BANDBI, "绑定币消费:".$user_play_data['pay_amount']); $this->set_ratio($request['pay_order_number'], 2); // 游戏返利 $notice_order[] = $request['pay_order_number']; } $request['pay_order_number'] = $pay_order_number; $request['pay_way'] = 0; // 扣平台币 $real_price = $price - $user_play_data['bind_balance']; + $valueDetailLogModel->add($request['user_id'], $balance, -$real_price, 0, $valueDetailLogModel::BALANCE, "平台币消费:".$real_price); $user->where(array('id' => $request["user_id"]))->setDec("balance", $real_price); //$this->set_message(0,"fail", $request['pay_order_number']); @@ -1092,6 +1096,8 @@ ADD COLUMN `pay_url` text NULL AFTER `check_sign`; $this->set_ratio($request['pay_order_number'], 1); // 游戏返利 $notice_order[] = $request['pay_order_number']; } else { // 绑定币足够扣 + $valueDetailLogModel->add($request['user_id'], $user_play_data['bind_balance'], -$request['price'], $user_play_data['bind_balance'] - $request['price'], $valueDetailLogModel::BANDBI, "绑定币消费.:".$request['price']); + $user_play->where($user_play_map)->setDec('bind_balance', $request['price']); // 扣绑定币 $result = $this->add_spend($request); $this->set_ratio($request['pay_order_number'], 2); // 游戏返利 diff --git a/Application/Sdk/Controller/UserController.class.php b/Application/Sdk/Controller/UserController.class.php index 6e126689..3fee5408 100644 --- a/Application/Sdk/Controller/UserController.class.php +++ b/Application/Sdk/Controller/UserController.class.php @@ -973,7 +973,17 @@ class UserController extends BaseController } $res_msg = array(); if ($result > 0) { - + try { // 注册成功通知 + $url = C('TASK_URL')."/game-event/register"; + post_async($url, [ + 'form_params' => [ + 'user_id' => $result, + ] + ]); + } catch(\Exception $e) { + + } + $this -> set_message(200, "success", "注册成功"); } else {