java/JiaDianHuiShou.git

			@@ -4,12 +4,8 @@
			import com.baomidou.mybatisplus.core.metadata.IPage;
			import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
			import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
			import com.ruoyi.admin.entity.Franchisee;
			import com.ruoyi.admin.entity.SysUser;
			import com.ruoyi.admin.entity.UserRole;
			import com.ruoyi.admin.service.FranchiseeService;
			import com.ruoyi.admin.service.SysUserService;
			import com.ruoyi.admin.service.UserRoleService;
			import com.ruoyi.admin.entity.*;
			import com.ruoyi.admin.service.*;
			import com.ruoyi.common.core.constant.Constants;
			import com.ruoyi.common.core.domain.R;
			import com.ruoyi.common.core.exception.GlobalException;
			@@ -24,6 +20,7 @@
			import org.springframework.web.bind.annotation.*;

			import javax.annotation.Resource;
			import java.util.ArrayList;
			import java.util.Arrays;
			import java.util.List;
			import java.util.stream.Collectors;
			@@ -47,6 +44,10 @@
			private SysUserService sysUserService;
			@Resource
			private UserRoleService userRoleService;
			@Resource
			private RegionService regionService;
			@Resource
			private MasterWorkerService masterWorkerService;

			/**
			* 加盟商信息分页列表
			@@ -54,7 +55,7 @@
			* @param pageNum 页码
			* @param pageSize 每页显示条数
			*/
			@RequiresPermissions("franchisee")
			@RequiresPermissions("franchisee_list")
			@ApiOperation(value = "加盟商信息分页查询列表", tags = {"后台-加盟商管理"})
			@GetMapping(value = "/page")
			@ApiImplicitParams({
			@@ -82,7 +83,7 @@
			*
			* @param id 加盟商信息id
			*/
			@RequiresPermissions("franchisee")
			@RequiresPermissions("franchisee_detail")
			@ApiOperation(value = "加盟商信息详情", tags = {"后台-加盟商管理"})
			@GetMapping(value = "/detail")
			@ApiImplicitParams({
			@@ -104,7 +105,13 @@
			public R<List<String>> cityDetail(@RequestParam("id") Integer id) {
			Franchisee franchisee = franchiseeService.lambdaQuery()
			.eq(Franchisee::getId, id).eq(Franchisee::getIsDelete, 0).one();
			return R.ok(Arrays.stream(franchisee.getCity().split(",")).collect(Collectors.toList()));
			return R.ok(Arrays.stream(franchisee.getCityCode().split(",")).collect(Collectors.toList()));
			}

			@GetMapping(value = "/getWorkPic")
			public R<String> getWorkPic(@RequestParam("id") Integer id) {
			MasterWorker byId = masterWorkerService.getById(id);
			return R.ok(byId.getProfilePicture());
			}

			/**
			@@ -112,7 +119,7 @@
			*
			* @param franchisee 加盟商信息信息
			*/
			@RequiresPermissions("franchisee")
			@RequiresPermissions("franchisee_save")
			@ApiOperation(value = "新增加盟商信息", tags = {"后台-加盟商管理"})
			@PostMapping(value = "/save")
			public R<String> save(@RequestBody @Validated Franchisee franchisee) {
			@@ -120,6 +127,18 @@
			throw new GlobalException("请输入管理员初始密码！");
			}
			String md5Password = checkFranchisee(franchisee);
			String cityCode = franchisee.getCityCode();
			List<String> list = Arrays.stream(cityCode.split(",")).collect(Collectors.toList());
			StringBuilder str = new StringBuilder();
			for (String code : list) {
			Region region = regionService.lambdaQuery()
			.eq(Region::getCode, code).one();
			if (null != region) {
			str.append(region.getName()).append(",");
			}
			}
			String city = str.substring(Constants.ZERO, str.length() - 1);
			franchisee.setCity(city);
			boolean save = franchiseeService.save(franchisee);
			// 生成sysUser账号
			SysUser sysUser = new SysUser();
			@@ -144,10 +163,14 @@
			*
			* @param franchisee 加盟商信息信息
			*/
			@RequiresPermissions("franchisee")
			@RequiresPermissions("franchisee_update")
			@ApiOperation(value = "修改加盟商信息", tags = {"后台-加盟商管理"})
			@PostMapping(value = "/update")
			public R<String> update(@RequestBody @Validated Franchisee franchisee) {
			boolean b = false;
			if (franchisee.getAdminPassword().equals("")){
			b = true;
			}
			String md5Password = checkFranchisee(franchisee);
			SysUser sysUser = sysUserService.lambdaQuery()
			.eq(SysUser::getFranchiseeId, franchisee.getId())
			@@ -164,10 +187,22 @@
			// 生成sysUser账号
			sysUser.setNickName(franchisee.getName());
			sysUser.setAccount(franchisee.getAdminAccount());
			sysUser.setPassword(md5Password);
			if (!b) {
			sysUser.setPassword(md5Password);
			}
			sysUser.setIsEnable(franchisee.getIsEnable());



			sysUserService.updateById(sysUser);
			}
			List<String> cityStr = new ArrayList<>();
			String[] split = franchisee.getCityCode().split(",");
			for (String s : split) {
			Region one = regionService.lambdaQuery().eq(Region::getCode, s).one();
			cityStr.add(one.getName());
			}
			franchisee.setCity(String.join(",", cityStr));

			return franchiseeService.updateById(franchisee) ? R.ok() : R.fail();
			}
			@@ -178,7 +213,7 @@
			* @param id 加盟商id
			* @param enable 启用/关闭
			*/
			@RequiresPermissions("franchisee")
			@RequiresPermissions("franchisee_enable")
			@ApiOperation(value = "启用/关闭加盟商", tags = {"后台-加盟商管理"})
			@GetMapping(value = "/enable")
			@ApiImplicitParams({
			@@ -217,7 +252,7 @@
			.eq(SysUser::getIsDelete, Constants.ZERO)
			.eq(SysUser::getFranchiseeId, null).one();
			if (null != only \|\| null != user) {
			throw new GlobalException("该账号已存在！");
			throw new GlobalException("该账号已存在！", 500);
			}
			// String city = franchisee.getCity();
			// List<String> cityList = Arrays.stream(city.split(",")).collect(Collectors.toList());
			@@ -240,7 +275,7 @@
			*
			* @param ids 加盟商信息多条id拼接
			*/
			@RequiresPermissions("franchisee")
			@RequiresPermissions("franchisee_delete")
			@ApiOperation(value = "批量删除加盟商信息", tags = {"后台-加盟商管理"})
			@GetMapping(value = "/batchDelete")
			@ApiImplicitParams({