From dc9239d73b15b9a51c46a9e8d25c0d4400e613ce Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期一, 29 七月 2024 09:17:54 +0800
Subject: [PATCH] 7.29
---
ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/FranchiseeController.java | 34 ++++++++++++++++++++++++++--------
1 files changed, 26 insertions(+), 8 deletions(-)
diff --git a/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/FranchiseeController.java b/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/FranchiseeController.java
index abd18d9..c872de5 100644
--- a/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/FranchiseeController.java
+++ b/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/FranchiseeController.java
@@ -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;
@@ -47,6 +43,10 @@
private SysUserService sysUserService;
@Resource
private UserRoleService userRoleService;
+ @Resource
+ private RegionService regionService;
+ @Resource
+ private MasterWorkerService masterWorkerService;
/**
* 加盟商信息分页列表
@@ -104,7 +104,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());
}
/**
@@ -120,6 +126,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();
@@ -217,7 +235,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());
--
Gitblit v1.7.1