diff --git a/plugins/team-dividend/src/models/TeamDividendLevelModel.php b/plugins/team-dividend/src/models/TeamDividendLevelModel.php index 4a213740..d1240153 100644 --- a/plugins/team-dividend/src/models/TeamDividendLevelModel.php +++ b/plugins/team-dividend/src/models/TeamDividendLevelModel.php @@ -209,4 +209,18 @@ class TeamDividendLevelModel extends BackendModel 'award_ratio' => 'required' ]; } + /** + * Common: 获取全部的等级信息 + * Author: wu-hui + * Time: 2023/10/23 9:16 + * @param $field + * @return mixed + */ + public static function getAll($field){ + return self::getList()->select($field)->get()->toArray(); + } + + + + } \ No newline at end of file diff --git a/plugins/weight-value/src/admin/IndexController.php b/plugins/weight-value/src/admin/IndexController.php index 2696931b..2e3c00d8 100644 --- a/plugins/weight-value/src/admin/IndexController.php +++ b/plugins/weight-value/src/admin/IndexController.php @@ -23,16 +23,12 @@ class IndexController extends BaseController{ $pageSize = request()->input('page_size',10); $search = request()->input('search'); // 获取列表信息 - $levelList = TeamDividendLevelModel::uniacid() - ->select(['id','level_name']) - ->get() - ->toArray(); $result = WeightValue::getList($pageSize,$search); $data = [ 'list' => $result['data'], 'pager' => PaginationHelper::show($result['total'],$result['current_page'],$result['per_page']), 'search' => $search, - 'level_list' => $levelList + 'level_list' => TeamDividendLevelModel::getAll(['id','level_name']) ]; return view('Yunshop\WeightValue::index.index',$data)->render(); diff --git a/plugins/weight-value/src/admin/TransferController.php b/plugins/weight-value/src/admin/TransferController.php new file mode 100644 index 00000000..97c6b9c7 --- /dev/null +++ b/plugins/weight-value/src/admin/TransferController.php @@ -0,0 +1,39 @@ +input('page_size',10); + $search = request()->input('search'); + // 获取列表信息 + $field = ['id','team_dividend_agency_level_id','member_id','transfer_member_id','transfer_num','receipt_num','service_charge','created_at']; + $result = WeightValueTransfer::getList($pageSize,$search, $field); + $data = [ + 'list' => $result['data'], + 'pager' => PaginationHelper::show($result['total'],$result['current_page'],$result['per_page']), + 'search' => $search, + 'level_list' => TeamDividendLevelModel::getAll(['id','level_name']) + ]; + + + return view('Yunshop\WeightValue::transfer.index',$data)->render(); + } + + + + + +} diff --git a/plugins/weight-value/src/models/WeightValueTransfer.php b/plugins/weight-value/src/models/WeightValueTransfer.php index 979a3a15..438c02ac 100644 --- a/plugins/weight-value/src/models/WeightValueTransfer.php +++ b/plugins/weight-value/src/models/WeightValueTransfer.php @@ -3,16 +3,81 @@ namespace Yunshop\WeightValue\models; use app\common\models\BaseModel; - +use app\common\models\Member; +use Yunshop\TeamDividend\models\TeamDividendLevelModel; class WeightValueTransfer extends BaseModel{ public $table = 'yz_weight_value_transfer'; public $timestamps = false; + public $casts = [ + 'created_at' => 'datetime' + ]; + /** + * Common: 获取转赠数量记录 + * Author: wu-hui + * Time: 2023/10/23 9:01 + * @param $pageSize + * @param $search + * @param string[] $field + * @return array + */ + public function getList($pageSize,$search,$field = ['*']){ + // 条件生成 + $where = []; + if((int)$search['member_id'] > 0) $where[] = ['member_id','=',(int)$search['member_id']]; + if((int)$search['transfer_member_id'] > 0) $where[] = ['transfer_member_id','=',(int)$search['transfer_member_id']]; + if((int)$search['team_dividend_agency_level_id'] > 0) $where[] = ['team_dividend_agency_level_id','=',(int)$search['team_dividend_agency_level_id']]; + // 列表获取 + $list = self::uniacid() + ->select($field) + ->where($where) + ->with([ + 'member' => function($query){ + $query->select(['uid','nickname','realname','avatar']); + }, + 'transferMember' => function($query){ + $query->select(['uid','nickname','realname','avatar']); + }, + 'level' => function($query){ + $query->select(['id','level_name']); + }, + ]) + ->orderBy('created_at','DESC') + ->orderBy('id','DESC') + ->paginate($pageSize); - + return $list ? $list->toArray() : []; + } + /** + * Common: 转赠用户 - 一对一关联 + * Author: wu-hui + * Time: 2023/10/23 8:58 + * @return \Illuminate\Database\Eloquent\Relations\HasOne + */ + public function member(){ + return $this->hasOne(Member::class, 'uid', 'member_id'); + } + /** + * Common: 受让人用户信息 - 一对一关联 + * Author: wu-hui + * Time: 2023/10/23 8:58 + * @return \Illuminate\Database\Eloquent\Relations\HasOne + */ + public function transferMember(){ + return $this->hasOne(Member::class, 'uid', 'transfer_member_id'); + } + /** + * Common: 一对一关联 经销商等级信息 + * Author: wu-hui + * Time: 2023/10/23 9:10 + * @return \Illuminate\Database\Eloquent\Relations\HasOne + */ + public function level(){ + return $this->hasOne(TeamDividendLevelModel::class, 'id', 'team_dividend_agency_level_id'); + } diff --git a/plugins/weight-value/views/index/index.blade.php b/plugins/weight-value/views/index/index.blade.php index bbc036b4..83094bf9 100644 --- a/plugins/weight-value/views/index/index.blade.php +++ b/plugins/weight-value/views/index/index.blade.php @@ -49,6 +49,9 @@ .level_4{ background-color: #d9534f!important; } + .panel-body .label{ + font-size: 14px!important; + } @section('content')
diff --git a/plugins/weight-value/views/transfer/index.blade.php b/plugins/weight-value/views/transfer/index.blade.php new file mode 100644 index 00000000..f97a0551 --- /dev/null +++ b/plugins/weight-value/views/transfer/index.blade.php @@ -0,0 +1,148 @@ +@extends('layouts.base') + +@section('content') +
+ {{--顶部搜索--}} +
+
+
+
+
+
+
+ +
+
+ +
+
+ +
+
+
+
+
+
+ +
+
+
+
+
+ {{--信息列表--}} +
+
+ + + + + + + + + + + + + @foreach ($list as $item) + + + + + + + + + @endforeach + +
ID转赠用户受让人用户信息 + 转赠数量 + 到账数量 + 手续费 + 权重值等级转赠时间
{{ $item['id'] }} +
+
+ +
+ +
+ 		+
+
+ +
+ +
+ 		+ {{ $item['transfer_num'] }} + {{ $item['receipt_num'] }} + {{ $item['service_charge'] }} + {{ $item['level']['level_name'] }}{{ $item['created_at'] }}
+ {!! $pager !!} +
+
+
+ + +@endsection +