Commit e4039343 by haojie

1

parent 8eefbf5e
...@@ -40,18 +40,6 @@ protected function grid() ...@@ -40,18 +40,6 @@ protected function grid()
<div>$this->end_time</div> <div>$this->end_time</div>
</div>"; </div>";
}); });
# $grid->column('end_time');
# $grid->column('status', '当前状态');
# 中奖人数
# $grid->column('winner_num')
# 项目图片
# $grid->column('project_icon');
# 批量生成项目
# $grid->column('box_num');
# $grid->column('rules', '规则');
// $grid->column('created_at');
// $grid->column('updated_at')->sortable();
$grid->filter(function (Grid\Filter $filter) { $grid->filter(function (Grid\Filter $filter) {
$filter->equal('id'); $filter->equal('id');
}); });
...@@ -100,9 +88,6 @@ protected function form() ...@@ -100,9 +88,6 @@ protected function form()
$form->number('min_participants_num')->default(1)->min(0); $form->number('min_participants_num')->default(1)->min(0);
$form->datetime('start_time'); $form->datetime('start_time');
$form->datetime('end_time'); $form->datetime('end_time');
#purchased--已购买
# winner_list--中奖用户列表
// $form->display('status');
$form->number('winner_num', '中奖人数')->default(1)->min(0); $form->number('winner_num', '中奖人数')->default(1)->min(0);
$form->number('box_num', '生成盲盒数量')->default(1)->min(0); $form->number('box_num', '生成盲盒数量')->default(1)->min(0);
$form->number('can_invite_num', '最高邀请人数')->default(1)->min(0); $form->number('can_invite_num', '最高邀请人数')->default(1)->min(0);
......
...@@ -87,18 +87,24 @@ protected function grid() ...@@ -87,18 +87,24 @@ protected function grid()
return '暂无'; return '暂无';
} }
return '点击展开'; return '点击展开';
})->expand(function () { })->expand(function ($model) {
// 返回显示的详情 // 返回显示的详情
$json = json_decode($this->purchased); $json = json_decode($this->purchased);
# 是数组
$div = ''; $div = '';
if ($json && count($json)) { if ($json && count($json)) {
foreach ($json as $value) { foreach ($json as $value) {
$div = $div . "<div>$value->address</div>"; $div = $div . "<div>$value->address</div>";
} }
} }
return "<div style='padding:10px 10px 0'>$div</div>"; return "<div style='padding:10px 0'>$div</div>";
// $div = '';
// $list = BlindBoxList::find($this->id)->user_wallet()->where('status', 1)->get();
// if ($list && count($list)) {
// foreach ($list as $value) {
// $div = $div . "<div>$value->user_address</div>";
// }
// }
// return $div;
}); });
# winner_list-中奖钱包 # winner_list-中奖钱包
$grid->column('winner_list', '中奖钱包')->display(function ($item) { $grid->column('winner_list', '中奖钱包')->display(function ($item) {
...@@ -132,16 +138,6 @@ protected function grid() ...@@ -132,16 +138,6 @@ protected function grid()
} }
return ''; return '';
}); });
# 中奖人数
# $grid->column('winner_num')
# 项目图片
# $grid->column('project_icon');
# 批量生成项目
# $grid->column('box_num');
# $grid->column('rules', '规则');
// $grid->column('created_at');
// $grid->column('updated_at')->sortable();
$grid->filter(function (Grid\Filter $filter) { $grid->filter(function (Grid\Filter $filter) {
# $filter->equal('status', '状态'); # $filter->equal('status', '状态');
$filter->where('status', function ($query) { $filter->where('status', function ($query) {
......
...@@ -3,10 +3,13 @@ ...@@ -3,10 +3,13 @@
namespace App\Admin\Controllers; namespace App\Admin\Controllers;
use App\Admin\Repositories\SetAddress; use App\Admin\Repositories\SetAddress;
use App\Service\RedisKeyController;
use Dcat\Admin\Form; use Dcat\Admin\Form;
use Dcat\Admin\Grid; use Dcat\Admin\Grid;
use Dcat\Admin\Show; use Dcat\Admin\Show;
use Dcat\Admin\Http\Controllers\AdminController; use Dcat\Admin\Http\Controllers\AdminController;
use Illuminate\Support\Facades\Log;
use Illuminate\Support\Facades\Redis;
class SetAddressController extends AdminController class SetAddressController extends AdminController
{ {
...@@ -28,10 +31,8 @@ protected function grid() ...@@ -28,10 +31,8 @@ protected function grid()
$grid->column('address')->editable(); $grid->column('address')->editable();
# $grid->column('created_at'); # $grid->column('created_at');
# $grid->column('updated_at')->sortable(); # $grid->column('updated_at')->sortable();
$grid->filter(function (Grid\Filter $filter) { $grid->filter(function (Grid\Filter $filter) {
$filter->equal('id'); $filter->equal('id');
}); });
}); });
} }
...@@ -63,9 +64,12 @@ protected function form() ...@@ -63,9 +64,12 @@ protected function form()
return Form::make(new SetAddress(), function (Form $form) { return Form::make(new SetAddress(), function (Form $form) {
$form->display('id'); $form->display('id');
$form->text('address'); $form->text('address');
$form->display('created_at'); $form->display('created_at');
$form->display('updated_at'); $form->display('updated_at');
$form->saved(function (Form $from, $res) {
# 更新缓存
Redis::set(RedisKeyController::receipt_account, $from->address);
});
}); });
} }
} }
...@@ -7,6 +7,7 @@ ...@@ -7,6 +7,7 @@
use App\Http\Controllers\API\Redis\CheckArrivalCl; use App\Http\Controllers\API\Redis\CheckArrivalCl;
use App\Http\Controllers\API\Test\TestController; use App\Http\Controllers\API\Test\TestController;
use App\Http\Controllers\Controller; use App\Http\Controllers\Controller;
use App\Service\RedisKeyController;
use Illuminate\Http\Request; use Illuminate\Http\Request;
use App\Http\Controllers\API\BlindBox\BlindBoxController; use App\Http\Controllers\API\BlindBox\BlindBoxController;
use App\Http\Controllers\API\BlindBox\BuyBlindBoxController; use App\Http\Controllers\API\BlindBox\BuyBlindBoxController;
...@@ -43,6 +44,10 @@ public function getUserInfo(Request $request) ...@@ -43,6 +44,10 @@ public function getUserInfo(Request $request)
*/ */
public function getReceiptAddress(Request $request) public function getReceiptAddress(Request $request)
{ {
$address = Redis::get(RedisKeyController::receipt_account);
if ($address) {
return $this->success('success', $address);
}
$address = SetAddress::query()->first(['address']); $address = SetAddress::query()->first(['address']);
return $this->success('success', $address->address); return $this->success('success', $address->address);
......
...@@ -25,6 +25,10 @@ class BlindBoxList extends Model ...@@ -25,6 +25,10 @@ class BlindBoxList extends Model
'status', 'status',
'can_invite_num', 'can_invite_num',
'invite_up_rate' 'invite_up_rate'
]; ];
public function user_wallet()
{
return $this->hasMany(UserWallet::class, 'blind_box_id');
}
} }
...@@ -8,7 +8,11 @@ ...@@ -8,7 +8,11 @@
class SetAddress extends Model class SetAddress extends Model
{ {
use HasDateTimeFormatter; use HasDateTimeFormatter;
protected $fillable = [
'address'
];
protected $table = 'set_address'; protected $table = 'set_address';
} }
...@@ -20,5 +20,4 @@ class UserWallet extends Model ...@@ -20,5 +20,4 @@ class UserWallet extends Model
'transfer_status' 'transfer_status'
]; ];
protected $table = 'user_wallet'; protected $table = 'user_wallet';
} }
<?php
namespace App\Service;
/**
* redis-key
*/
class RedisKeyController
{
# 收款账号
public const receipt_account = 'receipt_account';
}
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