diff --git "a/\\" "b/\\" deleted file mode 100644 index caab504..0000000 --- "a/\\" +++ /dev/null @@ -1,5 +0,0 @@ -合并分支：更新 -# 请输入一个提交信息以解释此合并的必要性，尤其是将一个更新后的上游分支 -# 合并到主题分支。 -# -# 以 '#' 开头的行将被忽略，而且空提交说明将会终止提交。 diff --git a/app/admin/controller/SupplyBrokerage.php b/app/admin/controller/SupplyBrokerage.php index c1ea4d1..2a06f5d 100644 --- a/app/admin/controller/SupplyBrokerage.php +++ b/app/admin/controller/SupplyBrokerage.php @@ -36,21 +36,28 @@ class SupplyBrokerage extends BaseController $param = get_params(); $where = []; - $list = $this->model->getSupplyBrokerageList($where,$param); + $list = $this->model->with(['merchant', 'supplyChain', 'level'])->order('id desc')->select(); // 只读取来源为供应链小组的订单 + $total = $this->model->count(); foreach ($list as $k =>$v){ - $list[$k]['fa_supply_chain_id'] = Db::table('fa_supply_team')->where('id',$v['fa_supply_chain_id'])->value('name'); - $list[$k]['mer_id'] = Db::connect('shop')->table('eb_merchant')->where('mer_id',$v['mer_id'])->value('mer_name'); - $list[$k]['user_id'] = Db::table('fa_szxc_information_usermsg')->where('user_id',$v['user_id'])->value('name'); + + // $list[$k]['fa_supply_chain_id'] = Db::table('fa_supply_team')->where('id',$v['fa_supply_chain_id'])->value('name'); + // $list[$k]['mer_id'] = Db::connect('shop')->table('eb_merchant')->where('mer_id',$v['mer_id'])->value('mer_name'); + // $list[$k]['user_id'] = Db::table('fa_szxc_information_usermsg')->where('user_id',$v['user_id'])->value('name'); + if($v['status'] == 1){ $list[$k]['status'] = '成功'; }else{ $list[$k]['status'] = '待分佣'; } - $list[$k]['supply_level_id'] = Db::table('fa_supply_level')->where('id',$v['supply_level_id'])->value('name'); - $list[$k]['supply_userId'] = Db::table('cms_admin')->where('id',$v['supply_userId'])->value('nickname'); + + // $list[$k]['supply_level_id'] = Db::table('fa_supply_level')->where('id',$v['supply_level_id'])->value('name'); + // $list[$k]['supply_userId'] = Db::table('cms_admin')->where('id',$v['supply_team_id'])->value('nickname'); } - return table_assign(0, '', $list); + + $result = ['total' => $total, 'data' => $list]; + + return table_assign(0, '', $result); } else{ return view(); diff --git a/app/admin/controller/SupplyTeam.php b/app/admin/controller/SupplyTeam.php index 7f84ab0..1524bd7 100644 --- a/app/admin/controller/SupplyTeam.php +++ b/app/admin/controller/SupplyTeam.php @@ -15,6 +15,7 @@ use app\admin\validate\SupplyTeamValidate; use think\exception\ValidateException; use think\facade\Db; use think\facade\View; +use app\admin\model\Admin; class SupplyTeam extends BaseController @@ -36,13 +37,17 @@ class SupplyTeam extends BaseController $param = get_params(); $where = []; - $list = $this->model->getSupplyTeamList($where,$param); - foreach ($list as $k =>$v){ - $list[$k]['area_id'] = Db::table('fa_geo_area')->where('area_id',$v['area_id'])->value('area_name'); - $list[$k]['supply_level_id'] = Db::table('fa_supply_level')->where('id',$v['supply_level_id'])->value('name'); - $list[$k]['user_id'] = Db::table('fa_szxc_information_usermsg')->where('user_id',$v['user_id'])->value('name'); - } - return table_assign(0, '', $list); + $list = $this->model->with('level')->select(); + $total = $this->model->count(); + // $list = $this->model->getSupplyTeamList($where,$param); + // foreach ($list as $k =>$v){ + // $list[$k]['area_id'] = Db::table('fa_geo_area')->where('area_id',$v['parent_code'])->value('area_name'); + // $list[$k]['supply_level_id'] = Db::table('fa_supply_level')->where('id',$v['supply_level_id'])->value('name'); + // $list[$k]['user_id'] = Db::table('fa_szxc_information_usermsg')->where('user_id',$v['user_id'])->value('name'); + // } + $result = ['total' => $total, 'data' => $list]; + + return table_assign(0, '', $result); } else{ return view(); @@ -56,7 +61,7 @@ class SupplyTeam extends BaseController { if (request()->isAjax()) { $param = get_params(); - + // 检验完整性 try { validate(SupplyTeamValidate::class)->check($param); @@ -65,14 +70,49 @@ class SupplyTeam extends BaseController return to_assign(1, $e->getError()); } + $userAdmin = Db::table('fa_szxc_information_useraddress')->where('admin_id', $param['user_id'])->find(); + $parent_code = ''; + + // 验证用户级别，获取对应的区域代码 + switch ($userAdmin['auth_range']) { + case 1: + // 单独处理 + $parent_code = $userAdmin['village_code']; // 村 + break; + case 2: + // 单独处理 + $parent_code = $userAdmin['street_id']; // 乡镇 + break; + case 3: + // 单独处理 + $parent_code = $userAdmin['area_id']; // 区县 + break; + case 4: + // 单独处理 + $parent_code = Db::table('fa_szxc_information_useraddress')->where('admin_id', $userAdmin['area_id'])->value('city_code'); // 市级 + break; + } + + $param['auth_range'] = $userAdmin['auth_range']; // 市区线级别 + $param['parent_code'] = $parent_code; // 所属区域代码 + $this->model->addSupplyTeam($param); + }else{ $geo_area = Db::table('fa_geo_area')->where('city_code',510500)->select(); View::assign('geo_area', $geo_area); - $level = Db::table('fa_supply_level')->select(); + $level = Db::table('fa_supply_level')->whereNotIn('id', [1])->select(); View::assign('level', $level); + //获取用户信息 - $this->users = Db::table('fa_szxc_information_usermsg')->where('status',1)->field('user_id,name')->select(); + $this->users = Db::table('fa_szxc_information_useraddress') + ->alias('a') + ->where('a.status',1) + ->whereNotIn('a.id', [1]) + ->leftJoin ('nk_lihaink_cn.cms_admin b', 'a.admin_id = b.id') + ->field('b.id, b.username, b.nickname, a.admin_id, a.street_id, a.area_id, a.village_id, a.village_code, a.brigade_id') + ->select(); + View::assign('users', $this->users); return view(); } diff --git a/app/admin/controller/nk/User.php b/app/admin/controller/nk/User.php index c50972d..234e284 100644 --- a/app/admin/controller/nk/User.php +++ b/app/admin/controller/nk/User.php @@ -560,6 +560,18 @@ class User extends BaseController // 'village_id' => $params['village_id'] != '' ? $village['village_id'] : 0, // 'admin_id' => $admin['id'], // ]; + $phone = Db::table('fa_szxc_information_usermsg')->where('user_id', $params['id'])->value('phone'); + + // 如果为工作人员 == 服务小组采购人员 + if($params['group_id'] == 3) + { + Db::connect('shop')->table('eb_user')->where('phone', $phone)->update(['fa_supply_team_id' => 1]); // 默认分佣比例 1 为小组服务 + + }else{ + + Db::connect('shop')->table('eb_user')->where('phone', $phone)->update(['fa_supply_team_id' => null]); // 如果不是工作人员，则去除分佣 + } + if ($admin) { Db::startTrans(); try { diff --git a/app/admin/controller/supplychain/Merchant.php b/app/admin/controller/supplychain/Merchant.php index d77e5f8..cb7a9ec 100644 --- a/app/admin/controller/supplychain/Merchant.php +++ b/app/admin/controller/supplychain/Merchant.php @@ -141,7 +141,9 @@ class Merchant extends BaseController }else{ $total = StoreOrderModel::count(); - $list = StoreOrderModel::with(['merchant'])->select(); + $list = StoreOrderModel::with(['merchant', 'user']) + ->where('source', 1) // 只读取来源为供应链小组的订单 + ->select(); View::assign('url', $this->url); View::assign('list', $list); diff --git a/app/admin/model/ShopUser.php b/app/admin/model/ShopUser.php new file mode 100644 index 0000000..63d5420 --- /dev/null +++ b/app/admin/model/ShopUser.php @@ -0,0 +1,25 @@ +hasOne(Merchant::class, 'mer_id', 'mer_id'); + return $this->hasOne(ShopUser::class, 'uid', 'uid'); } } \ No newline at end of file diff --git a/app/admin/model/SupplyBrokerage.php b/app/admin/model/SupplyBrokerage.php index 4ef17d4..c6539fa 100644 --- a/app/admin/model/SupplyBrokerage.php +++ b/app/admin/model/SupplyBrokerage.php @@ -11,6 +11,35 @@ class SupplyBrokerage extends Model // 设置当前模型对应的完整数据表名称 protected $table = 'fa_supply_brokerage'; + /** + * 关联商户 + * + */ + public function merchant() + { + return $this->hasOne(Merchant::class, 'mer_id', 'mer_id'); + } + + /** + * + * 关联供应链团队 + * + */ + public function supplyChain() + { + return $this->hasOne(SupplyChain::class, 'id', 'fa_supply_chain_id'); + } + + /** + * + * 关联分佣等级 + * + */ + public function level() + { + return $this->hasOne(SupplyLevel::class, 'id', 'supply_level_id'); + } + /** * 获取分页列表 * @param $where @@ -20,7 +49,7 @@ class SupplyBrokerage extends Model { $rows = empty($param['limit']) ? get_config('app . page_size') : $param['limit']; $order = empty($param['order']) ? 'id desc' : $param['order']; - $list = self::where($where)->field('id,supply_sn,mer_id,fa_supply_chain_id,order_sn,order_id,user_info,user_id,supply_userId,pay_price,brokerage_price,brokerage_rate,status,supply_level_id,group_user,create_time')->order($order)->paginate($rows, false, ['query' => $param]); + $list = self::where($where)->field('id,supply_sn,mer_id,fa_supply_chain_id,order_sn,order_id,user_info,user_id,supply_team_id,pay_price,brokerage_price,brokerage_rate,status,supply_level_id,group_user,create_time')->order($order)->paginate($rows, false, ['query' => $param]); return $list; } diff --git a/app/admin/model/SupplyLevel.php b/app/admin/model/SupplyLevel.php index e0c3e46..658aff5 100644 --- a/app/admin/model/SupplyLevel.php +++ b/app/admin/model/SupplyLevel.php @@ -6,6 +6,7 @@ */ namespace app\admin\model; use think\model; + class SupplyLevel extends Model { // 设置当前模型对应的完整数据表名称 diff --git a/app/admin/model/SupplyTeam.php b/app/admin/model/SupplyTeam.php index 1b83f92..77e5ecf 100644 --- a/app/admin/model/SupplyTeam.php +++ b/app/admin/model/SupplyTeam.php @@ -10,6 +10,17 @@ class SupplyTeam extends Model { // 设置当前模型对应的完整数据表名称 protected $table = 'fa_supply_team'; + + /** + * + * 关联分佣等级 + * + */ + public function level() + { + return $this->hasOne(SupplyLevel::class, 'id', 'supply_level_id'); + } + /** * 获取分页列表 * @param $where @@ -17,10 +28,13 @@ class SupplyTeam extends Model */ public function getSupplyTeamList($where, $param) { - $rows = empty($param['limit']) ? get_config('app . page_size') : $param['limit']; - $order = empty($param['order']) ? 'id desc' : $param['order']; - $list = self::where($where)->field('id,name,lng,lat,area_id,brokerage,withdraw_brokerage,free_brokerage,supply_level_id,user_id')->order($order)->paginate($rows, false, ['query' => $param]); - return $list; + $rows = empty($param['limit']) ? get_config('app . page_size') : $param['limit']; + + $order = empty($param['order']) ? 'id desc' : $param['order']; + $list = self::where($where)->field('id,name,lng,lat,parent_code,brokerage,withdraw_brokerage,free_brokerage,supply_level_id,user_id') + ->order($order) + ->paginate($rows, false, ['query' => $param]); + return $list; } /** diff --git a/app/admin/validate/SupplyTeamValidate.php b/app/admin/validate/SupplyTeamValidate.php index 7d42bd0..aad2ff2 100644 --- a/app/admin/validate/SupplyTeamValidate.php +++ b/app/admin/validate/SupplyTeamValidate.php @@ -14,10 +14,6 @@ class SupplyTeamValidate extends Validate 'name' => 'require', 'lng' => 'require', 'lat' => 'require', - 'area_id' => 'require', - 'brokerage' => 'require', - 'withdraw_brokerage' => 'require', - 'free_brokerage' => 'require', 'supply_level_id' => 'require', 'user_id' => 'require', ]; @@ -26,10 +22,6 @@ class SupplyTeamValidate extends Validate 'name.require' => '后台供应链团队分组名称不能为空', 'lng.require' => '经度不能为空', 'lat.require' => '维度不能为空', - 'area_id.require' => '区县ID不能为空', - 'brokerage.require' => '团队分佣金额不能为空', - 'withdraw_brokerage.require' => '团队分佣已提现金额不能为空', - 'free_brokerage.require' => '分佣冻结金额不能为空', 'supply_level_id.require' => '团队所属等级不能为空', 'user_id.require' => '团队后台负责人ID不能为空', ]; diff --git a/app/admin/view/supply_brokerage/datalist.html b/app/admin/view/supply_brokerage/datalist.html index d61742a..a7848c8 100644 --- a/app/admin/view/supply_brokerage/datalist.html +++ b/app/admin/view/supply_brokerage/datalist.html @@ -12,12 +12,6 @@
- - - - - - @@ -49,19 +43,27 @@ width: 80 },{ field: 'supply_sn', - title: '供应链佣金流水号', + title: '流水号', align: 'center', width: 100 },{ field: 'mer_id', title: '商户', align: 'center', - width: 100 + width: 100, + templet: function (d) + { + return d.merchant.mer_name; + } },{ field: 'fa_supply_chain_id', title: '供应链团队', align: 'center', - width: 100 + width: 100, + templet: function (d) + { + return d.supplyChain.name; + } },{ field: 'order_sn', title: '订单编号', @@ -99,19 +101,18 @@ width: 100 },{ field: 'brokerage_rate', - title: '分佣比例', + title: '分佣等级', align: 'center', - width: 100 + width: 300, + templet: function (d) + { + return d.level.name + ',分佣比例：' + d.level.rate + '%'; + } },{ field: 'status', title: '分佣状态', align: 'center', width: 100 - },{ - field: 'supply_level_id', - title: '分佣等级', - align: 'center', - width: 100 },{ field: 'group_user', title: '用户组', diff --git a/app/admin/view/supply_level/datalist.html b/app/admin/view/supply_level/datalist.html index 44b94d6..6f73755 100644 --- a/app/admin/view/supply_level/datalist.html +++ b/app/admin/view/supply_level/datalist.html @@ -14,7 +14,7 @@ @@ -33,7 +33,7 @@ var table = layui.table,tool = layui.tool, form = layui.form; layui.pageTable = table.render({ elem: '#supply_level', - title: '供应链团队角色列表', + title: '角色分佣', toolbar: '#toolbarDemo', url: '/admin/supply_level/datalist', page: true, @@ -51,19 +51,16 @@ field: 'name', title: '角色名称', align: 'center', - width: 100 },{ field: 'rate', title: '分佣比例', align: 'center', - width: 100 }, { fixed: 'right', field: 'right', title: '操作', toolbar: '#barDemo', - width: 136, align: 'center' } ] diff --git a/app/admin/view/supply_team/add.html b/app/admin/view/supply_team/add.html index bc20f04..0cc0bbf 100644 --- a/app/admin/view/supply_team/add.html +++ b/app/admin/view/supply_team/add.html @@ -17,25 +17,11 @@

新建供应链分组

- - + + - - - - - - - - - + + - - - + + + + +
后台供应链团队分组名称*团队分组名称*
区县ID* - - 团队分佣金额*团队分佣已提现金额*
分佣冻结金额*团队所属等级*
团队所属等级* 团队后台负责人ID* - -
供应链后台团队负责人* + +
坐标 @@ -77,14 +65,13 @@