Commit 87b5ca90 by 杨树贤

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

parent 0915a5ee
......@@ -6,6 +6,7 @@ namespace App\Http\Controllers;
use App\Http\Filters\AssistFilter;
use App\Models\Assist;
use App\Models\UserExchange;
use Illuminate\Http\Request;
/**
......@@ -40,20 +41,23 @@ class AssistsController extends Controller
* 存储好友助力
* @param Request $request
* @param Assist $assist
* @param UserExchange $userExchange
* @return array
*/
public function store(Request $request, Assist $assist)
public function store(Request $request, Assist $assist, UserExchange $userExchange)
{
$exchangeId = $request->get('exchange_id');
$assistUserId = $request->get('assist_user_id');
$exchange = $userExchange->getUserExchange($exchangeId);
$userId = array_get((array)$exchange, 'user_id');
$data = [
'user_id' => $request->user_id,
'user_id' => $userId,
'assist_user_id' => $assistUserId,
'add_time' => time(),
'exchange_id' => $exchangeId,
];
//因为最多是两个好友对一条兑换进行助力
$canAssist = $assist->checkCanAssist($exchangeId,$assistUserId);
$canAssist = $assist->checkCanAssist($exchangeId, $assistUserId);
if ($canAssist) {
$result = $assist->addAssist($data);
if ($result) {
......
......@@ -4,9 +4,11 @@
namespace App\Models;
use App\Http\Controllers\ExchangesTask;
use App\Http\Filters\QueryFilter;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Support\Facades\DB;
use Illuminate\Support\Facades\Log;
class UserExchange extends Model
{
......@@ -22,21 +24,24 @@ class UserExchange extends Model
return $filters->apply($query);
}
//添加提现记录
public function addRecord(&$data){
public function addRecord(&$data)
{
$data['add_time'] = time();
$data['update_time'] = $data['add_time'];
$ID = $this->insertGetId($data);
if(!$ID)
if (!$ID) {
return false;
}
$data['id'] = $ID;
return true;
}
public function SaveRecord($id,$data)
public function SaveRecord($id, $data)
{
$data['update_time'] = time();
return $this->where('id', '=', $id)->update($data);
}
......@@ -67,34 +72,28 @@ class UserExchange extends Model
public function auditUserExchange($id, $exchangedAmount, $data = [])
{
$result = DB::transaction(function () use ($id, $exchangedAmount, $data) {
//先去修改审核状态等信息
$result = DB::table('user_exchanges')->where('id', $id)->update($data);
if (!$result) {
return false;
}
//兑换审核通过后,需要对用户剩余的红包金额进行对应的减少
$result = DB::table('user_integrals')->where('user_id', $data['user_id'])
->decrement('integral', $exchangedAmount);
if (!$result) {
return false;
}
//同时用户积分详情的更新时间
$result = DB::table('user_integrals')->where('user_id', $data['user_id'])
->update(['update_time' => $data['update_time']]);
if (!$result) {
return false;
//如果是通过的操作,则直接调用ExchangeTask,否则自己写数据库改变状态
if ($data['status'] == 1) {
$exchange['amount'] = $exchangedAmount;
if ($exchangedAmount > 100) {
Log::Error('出现大于200的兑换申请!');
return false;
}
$task = new ExchangesTask($data, $exchange, $data['audit_id']);
} elseif ($data['status'] == -1) {
//如果是拒绝审核,那就是我直接操作数据库就完事了
$result = DB::table('user_exchanges')->where('id', $id)
->update($data);
if (!$result) {
return false;
}
}
return true;
});
if (!$result) {
return false;
}
return true;
return $result ? true : false;
}
......@@ -106,4 +105,12 @@ class UserExchange extends Model
return $res;
}
public function getUserExchange($id)
{
$result = DB::table('user_exchanges')->where('id', $id)
->first();
return $result;
}
}
\ No newline at end of file
<?php
return [
/*
|--------------------------------------------------------------------------
| Default Database Connection Name
|--------------------------------------------------------------------------
|
| Here you may specify which of the database connections below you wish
| to use as your default connection for all database work. Of course
| you may use many connections at once using the Database library.
|
*/
'default' => env('DB_CONNECTION', 'mysql'),
/*
|--------------------------------------------------------------------------
| Database Connections
|--------------------------------------------------------------------------
|
| Here are each of the database connections setup for your application.
| Of course, examples of configuring each database platform that is
| supported by Laravel is shown below to make development simple.
|
|
| All database work in Laravel is done through the PHP PDO facilities
| so make sure you have the driver for your particular database of
| choice installed on your machine before you begin development.
|
*/
'connections' => [
'sqlite' => [
'driver' => 'sqlite',
'database' => env('DB_DATABASE', database_path('database.sqlite')),
'prefix' => '',
],
'mysql' => [
'driver' => 'mysql',
'read' => [
'host' => env('DB_HOST')
],
'write' => [
'host' => env('DB_HOST')
],
'port' => env('DB_PORT', '3306'),
'database' => env('DB_DATABASE', 'forge'),
'username' => env('DB_USERNAME', 'forge'),
'password' => env('DB_PASSWORD', ''),
'unix_socket' => env('DB_SOCKET', ''),
'charset' => 'utf8mb4',
'collation' => 'utf8mb4_unicode_ci',
'prefix' => env('DB_PREFIX',''),
'strict' => true,
'engine' => null,
'sticky' => true,//防止主从同步不及时
'options' => [
// 开启持久连接
\PDO::ATTR_PERSISTENT => true,
],
],
// 'ic_inquiry' => [
// 'driver' => 'mysql',
// 'database' => env('DB_DATABASE', ''),
// 'read' => [
// 'host' => env('DB_HOST_R')
// ],
// 'write' => [
// 'host' => env('DB_HOST_W')
// ],
// 'username' => env('DB_USERNAME', ''),
// 'password' => env('DB_PASSWORD', ''),
// 'port' => env('DB_PORT', 3306),
// 'charset' => 'utf8',
// 'collation' => 'utf8_general_ci',
// 'prefix' => env('DB_PREFIX', 'ic_'),
// 'sticky' => true,//防止主从同步不及时
// 'options' => [
// // 开启持久连接
// \PDO::ATTR_PERSISTENT => true,
// ],
// ],
'pgsql' => [
'driver' => 'pgsql',
'host' => env('DB_HOST', '127.0.0.1'),
'port' => env('DB_PORT', '5432'),
'database' => env('DB_DATABASE', 'forge'),
'username' => env('DB_USERNAME', 'forge'),
'password' => env('DB_PASSWORD', ''),
'charset' => 'utf8',
'prefix' => '',
'schema' => 'public',
'sslmode' => 'prefer',
],
'sqlsrv' => [
'driver' => 'sqlsrv',
'host' => env('DB_HOST', 'localhost'),
'port' => env('DB_PORT', '1433'),
'database' => env('DB_DATABASE', 'forge'),
'username' => env('DB_USERNAME', 'forge'),
'password' => env('DB_PASSWORD', ''),
'charset' => 'utf8',
'prefix' => '',
],
],
/*
|--------------------------------------------------------------------------
| Migration Repository Table
|--------------------------------------------------------------------------
|
| This table keeps track of all the migrations that have already run for
| your application. Using this information, we can determine which of
| the migrations on disk haven't actually been run in the database.
|
*/
'migrations' => 'migrations',
/*
|--------------------------------------------------------------------------
| Redis Databases
|--------------------------------------------------------------------------
|
| Redis is an open source, fast, and advanced key-value store that also
| provides a richer set of commands than a typical key-value systems
| such as APC or Memcached. Laravel makes it easy to dig right in.
|
*/
'redis' => [
'cluster' => env('REDIS_CLUSTER', false),
'default' => [
'host' => env('REDIS_HOST', '127.0.0.1'),
'password' => env('REDIS_PASSWORD', null),
'port' => env('REDIS_PORT', 6379),
'database' => 0
],
'read' =>[
'host' => env('REDIS_READ_HOST', ''),
'password' => env('REDIS_READ_PASSWORD', null),
'port' => env('REDIS_READ_PORT', 6379),
'database' => 0
]
],
];
<?php
return [
/*
|--------------------------------------------------------------------------
| Default Database Connection Name
|--------------------------------------------------------------------------
|
| Here you may specify which of the database connections below you wish
| to use as your default connection for all database work. Of course
| you may use many connections at once using the Database library.
|
*/
'default' => env('DB_CONNECTION', 'mysql'),
/*
|--------------------------------------------------------------------------
| Database Connections
|--------------------------------------------------------------------------
|
| Here are each of the database connections setup for your application.
| Of course, examples of configuring each database platform that is
| supported by Laravel is shown below to make development simple.
|
|
| All database work in Laravel is done through the PHP PDO facilities
| so make sure you have the driver for your particular database of
| choice installed on your machine before you begin development.
|
*/
'connections' => [
'sqlite' => [
'driver' => 'sqlite',
'database' => env('DB_DATABASE', database_path('database.sqlite')),
'prefix' => '',
],
'mysql' => [
'driver' => 'mysql',
'read' => [
'host' => env('DB_HOST')
],
'write' => [
'host' => env('DB_HOST')
],
'port' => env('DB_PORT', '3306'),
'database' => env('DB_DATABASE', 'forge'),
'username' => env('DB_USERNAME', 'forge'),
'password' => env('DB_PASSWORD', ''),
'unix_socket' => env('DB_SOCKET', ''),
'charset' => 'utf8mb4',
'collation' => 'utf8mb4_unicode_ci',
'prefix' => env('DB_PREFIX',''),
'strict' => true,
'engine' => null,
'sticky' => true,//防止主从同步不及时
'options' => [
// 开启持久连接
\PDO::ATTR_PERSISTENT => true,
],
],
'ic_data' => [
'driver' => 'mysql',
'database' => env('IC_DATA_DB_DATABASE', ''),
'read' => [
'host' => env('IC_DATA_DB_HOST_R')
],
'write' => [
'host' => env('IC_DATA_DB_HOST_W')
],
'username' => env('IC_DATA_DB_USERNAME', ''),
'password' => env('IC_DATA_DB_PASSWORD', ''),
'port' => env('IC_DATA_DB_PORT', 3306),
'charset' => 'utf8',
'collation' => 'utf8_general_ci',
'prefix' => env('IC_DATA_DB_PREFIX', 'ic_'),
'sticky' => true,//防止主从同步不及时
'options' => [
// 开启持久连接
\PDO::ATTR_PERSISTENT => true,
],
],
'pgsql' => [
'driver' => 'pgsql',
'host' => env('DB_HOST', '127.0.0.1'),
'port' => env('DB_PORT', '5432'),
'database' => env('DB_DATABASE', 'forge'),
'username' => env('DB_USERNAME', 'forge'),
'password' => env('DB_PASSWORD', ''),
'charset' => 'utf8',
'prefix' => '',
'schema' => 'public',
'sslmode' => 'prefer',
],
'sqlsrv' => [
'driver' => 'sqlsrv',
'host' => env('DB_HOST', 'localhost'),
'port' => env('DB_PORT', '1433'),
'database' => env('DB_DATABASE', 'forge'),
'username' => env('DB_USERNAME', 'forge'),
'password' => env('DB_PASSWORD', ''),
'charset' => 'utf8',
'prefix' => '',
],
],
/*
|--------------------------------------------------------------------------
| Migration Repository Table
|--------------------------------------------------------------------------
|
| This table keeps track of all the migrations that have already run for
| your application. Using this information, we can determine which of
| the migrations on disk haven't actually been run in the database.
|
*/
'migrations' => 'migrations',
/*
|--------------------------------------------------------------------------
| Redis Databases
|--------------------------------------------------------------------------
|
| Redis is an open source, fast, and advanced key-value store that also
| provides a richer set of commands than a typical key-value systems
| such as APC or Memcached. Laravel makes it easy to dig right in.
|
*/
'redis' => [
'cluster' => env('REDIS_CLUSTER', false),
'default' => [
'host' => env('REDIS_HOST', '127.0.0.1'),
'password' => env('REDIS_PASSWORD', null),
'port' => env('REDIS_PORT', 6379),
'database' => 0
],
'read' =>[
'host' => env('REDIS_READ_HOST', ''),
'password' => env('REDIS_READ_PASSWORD', null),
'port' => env('REDIS_READ_PORT', 6379),
'database' => 0
]
],
];
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