Skip to content

杨树贤 / ic_server_welfare

Go to a project
Commit 87b5ca90 by 杨树贤
Options

修改好友助力中user_id的获取方式

parent 0915a5ee
Inline Side-by-side
Showing with 58 additions and 46 deletions
app/Http/Controllers/AssistsController.php
...@@ -6,6 +6,7 @@ namespace App\Http\Controllers; ...@@ -6,6 +6,7 @@ namespace App\Http\Controllers;
use App\Http\Filters\AssistFilter; use App\Http\Filters\AssistFilter;
use App\Models\Assist; use App\Models\Assist;
use App\Models\UserExchange;
use Illuminate\Http\Request; use Illuminate\Http\Request;
/** /**
...@@ -40,20 +41,23 @@ class AssistsController extends Controller ...@@ -40,20 +41,23 @@ class AssistsController extends Controller
* 存储好友助力 * 存储好友助力
* @param Request $request * @param Request $request
* @param Assist $assist * @param Assist $assist
* @param UserExchange $userExchange
* @return array * @return array
*/ */
public function store(Request $request, Assist $assist) public function store(Request $request, Assist $assist, UserExchange $userExchange)
{ {
$exchangeId = $request->get('exchange_id'); $exchangeId = $request->get('exchange_id');
$assistUserId = $request->get('assist_user_id'); $assistUserId = $request->get('assist_user_id');
$exchange = $userExchange->getUserExchange($exchangeId);
$userId = array_get((array)$exchange, 'user_id');
$data = [ $data = [
'user_id' => $request->user_id, 'user_id' => $userId,
'assist_user_id' => $assistUserId, 'assist_user_id' => $assistUserId,
'add_time' => time(), 'add_time' => time(),
'exchange_id' => $exchangeId, 'exchange_id' => $exchangeId,
]; ];
//因为最多是两个好友对一条兑换进行助力 //因为最多是两个好友对一条兑换进行助力
$canAssist = $assist->checkCanAssist($exchangeId,$assistUserId); $canAssist = $assist->checkCanAssist($exchangeId, $assistUserId);
if ($canAssist) { if ($canAssist) {
$result = $assist->addAssist($data); $result = $assist->addAssist($data);
if ($result) { if ($result) {
......
app/Models/UserExchange.php
...@@ -4,9 +4,11 @@ ...@@ -4,9 +4,11 @@
namespace App\Models; namespace App\Models;
use App\Http\Controllers\ExchangesTask;
use App\Http\Filters\QueryFilter; use App\Http\Filters\QueryFilter;
use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\Model;
use Illuminate\Support\Facades\DB; use Illuminate\Support\Facades\DB;
use Illuminate\Support\Facades\Log;
class UserExchange extends Model class UserExchange extends Model
{ {
...@@ -22,21 +24,24 @@ class UserExchange extends Model ...@@ -22,21 +24,24 @@ class UserExchange extends Model
return $filters->apply($query); return $filters->apply($query);
} }
//添加提现记录 //添加提现记录
public function addRecord(&$data){ public function addRecord(&$data)
{
$data['add_time'] = time(); $data['add_time'] = time();
$data['update_time'] = $data['add_time']; $data['update_time'] = $data['add_time'];
$ID = $this->insertGetId($data); $ID = $this->insertGetId($data);
if(!$ID) if (!$ID) {
return false; return false;
}
$data['id'] = $ID; $data['id'] = $ID;
return true; return true;
} }
public function SaveRecord($id,$data) public function SaveRecord($id, $data)
{ {
$data['update_time'] = time(); $data['update_time'] = time();
return $this->where('id', '=', $id)->update($data); return $this->where('id', '=', $id)->update($data);
} }
...@@ -67,34 +72,28 @@ class UserExchange extends Model ...@@ -67,34 +72,28 @@ class UserExchange extends Model
public function auditUserExchange($id, $exchangedAmount, $data = []) public function auditUserExchange($id, $exchangedAmount, $data = [])
{ {
$result = DB::transaction(function () use ($id, $exchangedAmount, $data) { $result = DB::transaction(function () use ($id, $exchangedAmount, $data) {
//先去修改审核状态等信息 //如果是通过的操作,则直接调用ExchangeTask,否则自己写数据库改变状态
$result = DB::table('user_exchanges')->where('id', $id)->update($data); if ($data['status'] == 1) {
if (!$result) { $exchange['amount'] = $exchangedAmount;
return false; if ($exchangedAmount > 100) {
} Log::Error('出现大于200的兑换申请!');
//兑换审核通过后,需要对用户剩余的红包金额进行对应的减少
$result = DB::table('user_integrals')->where('user_id', $data['user_id'])
->decrement('integral', $exchangedAmount);
if (!$result) {
return false; return false;
} }
$task = new ExchangesTask($data, $exchange, $data['audit_id']);
//同时用户积分详情的更新时间 } elseif ($data['status'] == -1) {
$result = DB::table('user_integrals')->where('user_id', $data['user_id']) //如果是拒绝审核,那就是我直接操作数据库就完事了
->update(['update_time' => $data['update_time']]); $result = DB::table('user_exchanges')->where('id', $id)
->update($data);
if (!$result) { if (!$result) {
return false; return false;
} }
}
return true; return true;
}); });
if (!$result) { return $result ? true : false;
return false;
}
return true;
} }
...@@ -106,4 +105,12 @@ class UserExchange extends Model ...@@ -106,4 +105,12 @@ class UserExchange extends Model
return $res; return $res;
} }
public function getUserExchange($id)
{
$result = DB::table('user_exchanges')->where('id', $id)
->first();
return $result;
}
} }
\ No newline at end of file
config/database.php
...@@ -64,27 +64,27 @@ return [ ...@@ -64,27 +64,27 @@ return [
], ],
], ],
// 'ic_inquiry' => [ 'ic_data' => [
// 'driver' => 'mysql', 'driver' => 'mysql',
// 'database' => env('DB_DATABASE', ''), 'database' => env('IC_DATA_DB_DATABASE', ''),
// 'read' => [ 'read' => [
// 'host' => env('DB_HOST_R') 'host' => env('IC_DATA_DB_HOST_R')
// ], ],
// 'write' => [ 'write' => [
// 'host' => env('DB_HOST_W') 'host' => env('IC_DATA_DB_HOST_W')
// ], ],
// 'username' => env('DB_USERNAME', ''), 'username' => env('IC_DATA_DB_USERNAME', ''),
// 'password' => env('DB_PASSWORD', ''), 'password' => env('IC_DATA_DB_PASSWORD', ''),
// 'port' => env('DB_PORT', 3306), 'port' => env('IC_DATA_DB_PORT', 3306),
// 'charset' => 'utf8', 'charset' => 'utf8',
// 'collation' => 'utf8_general_ci', 'collation' => 'utf8_general_ci',
// 'prefix' => env('DB_PREFIX', 'ic_'), 'prefix' => env('IC_DATA_DB_PREFIX', 'ic_'),
// 'sticky' => true,//防止主从同步不及时 'sticky' => true,//防止主从同步不及时
// 'options' => [ 'options' => [
// // 开启持久连接 // 开启持久连接
// \PDO::ATTR_PERSISTENT => true, \PDO::ATTR_PERSISTENT => true,
// ], ],
// ], ],
'pgsql' => [ 'pgsql' => [
'driver' => 'pgsql', 'driver' => 'pgsql',
......
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 sign in to comment