mkm/nk-lihaink-cn
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

更新数据展示，修复后台数据显示

Browse Source
This commit is contained in:
monanxiao 2023-03-21 15:50:55 +08:00
parent e6a7e01101
commit 11597a9c27
6 changed files with 291 additions and 83 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

105
app/admin/controller/Index.php
View File

@ -12,6 +12,10 @@ namespace app\admin\controller;
use app\admin\BaseController;
use think\facade\Db;
use think\facade\View;
use app\admin\model\ShopUser;
use app\admin\model\InformationUserMsg;
use app\admin\model\InformationUserAddress;
use app\admin\model\GeoStreet;
class Index extends BaseController
{
@ -43,38 +47,41 @@ class Index extends BaseController
}
public function main()
{
// return json($this->adminInfo);
$street_id = Db::table('fa_szxc_information_useraddress')
->where('admin_id',$this->adminInfo['id'])
->value('street_id');
{
// 镇街表id
$street_id = InformationUserAddress::where('admin_id',$this->adminInfo['id'])->value('street_id');
// 街道名称
$street_name = GeoStreet::where('street_code', $street_id)->value('street_name');
// 大屏相关
if ($this->adminInfo['group_access'] == 4){
// return $street_id;
$street_name = Db::table('fa_geo_street')
->where('street_code',$street_id)
->value('street_name');
if ($this->adminInfo['group_access']==4){
$urls="http://zhen.lihaink.cn/#/?street_id=$street_id"."&street_name=".$street_name;
View::assign('urls',$urls);
return View('main3');
}elseif($this->adminInfo['group_access']==5){
}elseif($this->adminInfo['group_access'] == 5){
$day_price=Db::connect('shop')->table('eb_product_order_log')->where('street_id',$street_id)
->where('status',1)
->whereDay('create_time')
->sum('product_price');
$day_order=Db::connect('shop')->table('eb_product_order_log')->where('street_id',$street_id)
->where('status',1)
->whereDay('create_time')
->count();
$Month_price=Db::connect('shop')->table('eb_product_order_log')->where('street_id',$street_id)
->where('status',1)
->whereMonth('create_time')
->sum('product_price');
$Month_order=Db::connect('shop')->table('eb_product_order_log')->where('street_id',$street_id)
->where('status',1)
->whereMonth('create_time')
->count();
$urls="http://zhenqiye.lihaink.cn/#/?street_id=$street_id"."&street_name=".$street_name;
View::assign('urls',$urls);
View::assign('day_order',$day_order);
@ -83,10 +90,17 @@ class Index extends BaseController
View::assign('month_order',$Month_order);
return View('main2');
}
if ($this->adminInfo['id']!=1){
$find = Db::table('fa_szxc_information_useraddress')->where('user_id', $this->adminInfo['user_id'])->find();
if ($find) {
if ($find['auth_range']==1){
// 如果登录ID不是超管的话
if ($this->adminInfo['id'] != 1){
// 获取当当前登录用户绑定地址
$find = InformationUserAddress::where('user_id', $this->adminInfo['user_id'])->find();
if($find)
{
// 所属市镇区县村级别
if ($find['auth_range'] == 1){
$where[] = ['village_id', '=', $find['village_id']];
}elseif ($find['auth_range']==2){
$where[] = ['street_id', '=', $find['street_id']];
@ -96,49 +110,60 @@ class Index extends BaseController
$where[] = ['brigade_id', '=', $find['brigade_id']];
}
}
}else{
$where=[];
}
$num =Db::table('fa_szxc_information_usermsg')->where($where)->count();
// 大于60岁人数
$old_num = Db::table('fa_szxc_information_usermsg')->where($where)->whereAge('>=', 60)->count();
// 儿童人数
$children_num = Db::table('fa_szxc_information_usermsg')->where($where)->whereAge('<', 15)->count();
// 未婚男
$unmarried_man_num = Db::table('fa_szxc_information_usermsg')->where($where)->where([['gender', '=', 1], ['marital_status', '=', 169]])->count();
// 未婚女
$unmarried_woman_num = Db::table('fa_szxc_information_usermsg')->where($where)->where([['gender', '=', 2], ['marital_status', '=', 169]])->count();
// 少数民族
$nation_s_num = Db::table('fa_szxc_information_usermsg')->where($where)->whereBetween('nation', [13, 68])->count();
// 汉族
$nation_h_num = Db::table('fa_szxc_information_usermsg')->where($where)->where('nation', 12)->count();
// 获取**数量
$num = InformationUserMsg::where($where)->count();
// 大于60岁人数
$old_num = InformationUserMsg::where($where)->whereAge('>=', 60)->count();
// 儿童人数
$children_num = InformationUserMsg::where($where)->whereAge('<', 15)->count();
// 未婚男
$unmarried_man_num = InformationUserMsg::where($where)->where($where)->where([['gender', '=', 1], ['marital_status', '=', 169]])->count();
// 未婚女
$unmarried_woman_num = InformationUserMsg::where($where)->where($where)->where([['gender', '=', 2], ['marital_status', '=', 169]])->count();
// 少数民族
$nation_s_num = InformationUserMsg::where($where)->where($where)->whereBetween('nation', [13, 68])->count();
// 汉族
$nation_h_num = InformationUserMsg::where($where)->where($where)->where('nation', 12)->count();
// foreach ($where as $key =>$value){
// $where[$key][0] = 'm.'.$value[0];
// }
// 残疾人数
// 残疾人数
$whether_disabled_num = Db::table('fa_szxc_information_usermsg')
->alias('m')
->where($where)
->join(['fa_szxc_information_insurance'=>'i'],'m.user_id=i.user_id and i.whether_disabled!=112')->count();
// 参保人数
// 参保人数
$insurance_type_num = Db::table('fa_szxc_information_usermsg')
->alias('m')
->where($where)
->join(['fa_szxc_information_insurance'=>'i'],'m.user_id=i.user_id and i.insurance_type!=219')->count();
if ($this->adminInfo['id']!=1){
// 工作人员数
$work_num = Db::table('fa_szxc_information_usermsg')
->alias('m')
->where($where)
->join(['shop.eb_user'=>'u'],'m.user_id=u.id and u.group_id = 3')->count();
$work_num = InformationUsermsg::with('user')->count();
if ($this->adminInfo['id'] != 1){
// 工作人员数
$work_num = InformationUsermsg::with('user')->where($where)->count();
// $work_num = Db::table('fa_szxc_information_usermsg')
// ->alias('m')
// ->join(['shop.eb_user'=>'u'],'m.user_id=u.id and u.group_id = 3')
// ->count();
}else{
$work_num = Db::connect('shop')->table('eb_user')
->where('group_id',3)
->count();
$work_num = ShopUser::where('group_id', 3)->count();
}
//土地
$land_area_num = Db::table('fa_szxc_information_useraddress')
->alias('u')

118
app/admin/controller/nk/Spread.php
View File

@ -7,6 +7,10 @@ use think\exception\ValidateException;
use think\facade\Db;
use app\admin\controller\nk\Article;
use think\facade\View;
use app\admin\model\ShopUser;
use app\admin\model\InformationUserMsg;
use app\admin\model\InformationUserAddress;
use app\admin\model\SupplyBrokerage as SupplyBrokerageModel;
/**
* 佣金管理
@ -30,26 +34,112 @@ class Spread extends BaseController
*/
public function index()
{
$nk_user=Db::connect('shop')->name('nk_user')->where('n_user_id',$this->adminInfo['id'])->value('user_id');
$total=0;
$list=[];
$brokerage_price=Db::connect('shop')->name('user')->where('uid',$nk_user)->value('brokerage_price');
$total = 0;
$list = [];
$mmm = [];
$map = [];
$post = get_params();
//权限组信息
if ($this->adminInfo['group_access'] != 1) {
$find = InformationUserAddress::where('admin_id', $this->adminInfo['id'])->find();
if ($find) {
if ($find['auth_range'] == 1) {
$mmm['area_id'] = $find['area_id'];
$mmm['street_id'] = $find['street_id'];
$mmm['village_id'] = $find['village_id'];
} elseif ($find['auth_range'] == 2) {
$mmm['area_id'] = $find['area_id'];
$mmm['street_id'] = $find['street_id'];
}elseif ($find['auth_range'] == 5) {
$mmm['area_id'] = $find['area_id'];
$mmm['street_id'] = $find['street_id'];
$mmm['village_id'] = $find['village_id'];
$mmm['brigade_id'] = $find['brigade_id'];
}
}
}
if ($post) {
if (isset($post['area_id']) && !empty($post['area_id'])) {
$mmm['area_id'] = $post['area_id'];
}
if (isset($post['street_id']) && !empty($post['street_id'])) {
$mmm['street_id'] = $post['street_id'];
}
if (isset($post['village_id']) && !empty($post['village_id'])) {
$mmm['village_id'] = $post['village_id'];
}
if (isset($post['brigade_id']) && !empty($post['brigade_id'])) {
$mmm['brigade_id'] = $post['brigade_id'];
}
}
if (request()->isAjax()) {
$params= get_params();
if ($nk_user!=0){
$list=Db::connect('shop')->name('store_order')->where('spread_uid',$nk_user)
->where('status',3)
->field('uid,order_sn,pay_time,extension_one,extension_two,is_selfbuy')
->page($params['page'])
->limit($params['limit'])
->select();
if (!empty($post['keywords'])) {
$map[] = ['m.name', 'LIKE', '%' . $post['keywords'] . '%'];
}
if (!empty($post['phone'])) {
$map[] = ['m.phone', 'LIKE', '%' . $post['phone'] . '%'];
}
// 获取当前地域成员
$userList = InformationUserMsg::where($mmm)
->where($map)
->with(['user'])
->select();
$arrUid = [];
foreach ($userList as $v) {
// 如果存在服务小组的话，则取出
if($v['user']['fa_supply_team_id'])
{
$arrUid[] = $v['user']['uid'];
}
}
$params= get_params();
$list = SupplyBrokerageModel::whereIn('user_id', $arrUid)
->with(['user', 'merchant', 'supplyChain', 'level'])
->page($params['page'])
->limit($params['limit'])
->select();
$result = ['total' => $total, 'data' => $list];
return table_assign(0, '', $result);
}
View::assign('brokerage_price', $brokerage_price);
return view('',['url'=>$this->url]);
// 获取当前地域成员
$userList = InformationUserMsg::where($mmm)
->where($map)
->with(['user'])
->select();
$arrUid = [];
foreach ($userList as $v) {
// 如果存在服务小组的话，则取出
if($v['user']['fa_supply_team_id'])
{
$arrUid[] = $v['user']['uid'];
}
}
// 总佣金
$borkerageSum = SupplyBrokerageModel::whereIn('user_id', $arrUid)->sum('brokerage_price');
View::assign('brokerage_price', $borkerageSum);
return view('',['url' => $this->url]);
}
/**
* 查看信息

12
app/admin/controller/nk/User.php
View File

@ -32,30 +32,35 @@ class User extends BaseController
'/admin/nk.user/postedit',
];
}
/**
* 查看
*/
public function index()
{
if (request()->isAjax()) {
$mmm = [];
$map = [];
$post = get_params();
if (!empty($post['keywords'])) {
$map[] = ['m.name', 'LIKE', '%' . $post['keywords'] . '%'];
}
if (!empty($post['phone'])) {
$map[] = ['m.phone', 'LIKE', '%' . $post['phone'] . '%'];
}
//权限组信息
if ($this->adminInfo['group_access'] != 1) {
$find = Db::table('fa_szxc_information_useraddress')->where('admin_id', $this->adminInfo['id'])->find();
$find = InformationUserAddress::where('admin_id', $this->adminInfo['id'])->find();
if ($find) {
if ($find['auth_range'] == 1) {
$mmm['area_id'] = $find['area_id'];
$mmm['street_id'] = $find['street_id'];
$mmm['village_id'] = $find['village_id'];
} elseif ($find['auth_range'] == 2) {
@ -69,6 +74,7 @@ class User extends BaseController
}
}
}
if ($post) {
if (isset($post['area_id']) && !empty($post['area_id'])) {
$mmm['area_id'] = $post['area_id'];
@ -88,11 +94,13 @@ class User extends BaseController
$total = InformationUserMsg::alias('m')
->where($mmm)
->where($map)
->where('user_id', '<>', $this->adminInfo['user_id'])
->count();
$list = InformationUserMsg::alias('m')
->where($mmm)
->where($map)
->where('user_id', '<>', $this->adminInfo['user_id'])
// ->join(['shop.eb_user' => 'u'], 'm.user_id=u.uid')u.avatar,u.group_id,u.status,
->with(['user.userGroup'])
// ->field('m.user_id id,m.name,m.phone,m.gender,m.age,m.householder_id,m.user_id')

10
app/admin/model/SupplyBrokerage.php
View File

@ -11,6 +11,16 @@ class SupplyBrokerage extends Model
// 设置当前模型对应的完整数据表名称
protected $table = 'fa_supply_brokerage';
/**
*
* 关联用户信息
*
*/
public function user()
{
return $this->hasOne(ShopUser::class, 'uid', 'user_id');
}
/**
* 关联商户
*

116
app/admin/view/nk/spread/index.html
View File

@ -56,12 +56,6 @@
<table class="layui-hide" id="article" lay-filter="article"></table>
</div>
<script type="text/html" id="barDemo">
<div class="layui-btn-group">
<a class="layui-btn layui-btn-normal layui-btn-xs" lay-event="read">查看</a>
{/if}
</script>
{/block}
<!-- /主体 -->
@ -79,25 +73,97 @@
page: true,
limit: 20,
cols: [
[
{
fixed: 'left',
field: 'id',
title: '编号',
align: 'center',
},{
field: 'order_sn',
title: '订单号',
},{
field: 'extension_one',
title: '一级佣金',
align: 'center',
},{
field: 'extension_two',
title: '一级佣金',
align: 'center',
}
]
[
{
fixed: 'left',
field: 'id',
title: '编号',
align: 'center',
width: 80
},{
field: 'supply_sn',
title: '流水号',
align: 'center',
width: 100
},{
field: 'mer_id',
title: '商户',
align: 'center',
width: 100,
templet: function (d)
{
return d.merchant.mer_name;
}
},{
field: 'fa_supply_chain_id',
title: '供应链团队',
align: 'center',
width: 100,
templet: function (d)
{
return d.supplyChain.name;
}
},{
field: 'order_sn',
title: '订单编号',
align: 'center',
width: 100
},{
field: 'order_id',
title: '订单ID',
align: 'center',
width: 100
},{
field: 'user_info',
title: '用户名',
align: 'center',
width: 100
},{
field: 'user_id',
title: '小组服务用户ID',
align: 'center',
width: 100
},{
field: 'supply_userId',
title: '供应链用户ID',
align: 'center',
width: 100
},{
field: 'pay_price',
title: '订单金额',
align: 'center',
width: 100
},{
field: 'brokerage_price',
title: '佣金金额',
align: 'center',
width: 100
},{
field: 'brokerage_rate',
title: '分佣等级',
align: 'center',
width: 300,
templet: function (d)
{
return d.level.name + ',分佣比例：' + d.level.rate + '%';
}
},{
field: 'status',
title: '分佣状态',
align: 'center',
width: 100
},{
field: 'group_user',
title: '用户组',
align: 'center',
width: 100
},{
field: 'create_time',
title: '创建时间',
align: 'center',
width: 100
}
]
]
});
//监听表格行工具事件

13
app/admin/view/nk/user/index.html
View File

@ -101,7 +101,7 @@
<script type="text/html" id="barDemo">
<div class="layui-btn-group">
<a class="layui-btn layui-btn-normal layui-btn-xs" lay-event="read">用户信息</a>
{if {:session('gougu_admin')['group_access']!=5}
{if {:session('gougu_admin')['group_access']!=3}
<a class="layui-btn layui-btn-normal layui-btn-xs" lay-event="auths">权限管理</a>
{/if}
{notin name=":session('gougu_admin')['group_access']" value="2,3,4,5"}
@ -165,7 +165,16 @@
field: 'user',
title: '头像',
align: 'center',
templet: '<div><img src="{{ d.user.avatar }}" style="width:30px; height:30px;"></div>',
templet: function (d)
{
if(d.user.avatar)
{
return '<div><img src="{{ d.user.avatar }}" style="width:30px; height:30px;"></div>';
}else{
return '<div><img src="/static/admin/images/icon.png" style="width:30px; height:30px;"></div>';
}
}
},{
field: 'gender',
title: '性别',