ruoyi-api/ruoyi-api-admin/src/main/java/com/ruoyi/admin/api/entity/FranchiseeVO.java
New file @@ -0,0 +1,65 @@ package com.ruoyi.admin.api.entity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.io.Serializable; import java.math.BigDecimal; @Data @ApiModel(value = "加盟商信息FranchiseeVO") public class FranchiseeVO implements Serializable { private Integer id; @ApiModelProperty("加盟商名称") private String name; @ApiModelProperty("负责人") private String head; @ApiModelProperty("负责人电话") private String headPhone; @ApiModelProperty("负责人身份证号码") private String idNumber; @ApiModelProperty("营业执照") private String businessLicense; @ApiModelProperty("管理员账号") private String adminAccount; @ApiModelProperty("管理员密码") private String adminPassword; @ApiModelProperty("管辖城市( ',' 隔开)") private String city; @ApiModelProperty("身份证正反面照片 ,隔开") private String identityPhoto; @ApiModelProperty("角色id") private Integer roleId; @ApiModelProperty("是否启用") private Integer isEnable; @ApiModelProperty("管辖城市二维数组") private String cityStr; @ApiModelProperty("对应城市code") private String cityCode; @ApiModelProperty("管辖城市二维数组") private String siteIds; @ApiModelProperty("余额") private BigDecimal balance; @ApiModelProperty("操作密码") private String payPassword; @ApiModelProperty("是否显示 1=是 0=否") private Integer isDisplay; } ruoyi-api/ruoyi-api-admin/src/main/java/com/ruoyi/admin/api/factory/AdminFallbackFactory.java
@@ -87,6 +87,11 @@ return R.fail(cause.getMessage()); } @Override public R<FranchiseeVO> getFranchiseeInfo(Integer franchiseeId) { return R.fail("获取加盟商信息失败" + cause.getMessage()); } }; } } ruoyi-api/ruoyi-api-admin/src/main/java/com/ruoyi/admin/api/feignClient/AdminClient.java
@@ -133,5 +133,6 @@ @GetMapping(value = "/franchisee/getWorkPic") R<String> getWorkPic(@RequestParam("id") Integer id); @GetMapping(value = "/franchisee/getFranchiseeInfo") R<FranchiseeVO> getFranchiseeInfo(@RequestParam("franchiseeId") Integer franchiseeId); } ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/model/LoginUser.java
@@ -76,5 +76,9 @@ * 用户信息 */ private SysUser sysUser; /** * 是否显示师傅信息 1=是 0=否 */ private Integer isDisplay; } ruoyi-auth/src/main/java/com/ruoyi/auth/service/SysLoginService.java
@@ -1,5 +1,7 @@ package com.ruoyi.auth.service; import com.ruoyi.admin.api.entity.FranchiseeVO; import com.ruoyi.admin.api.feignClient.AdminClient; import com.ruoyi.common.core.constant.Constants; import com.ruoyi.common.core.constant.SecurityConstants; import com.ruoyi.common.core.constant.UserConstants; @@ -13,6 +15,8 @@ import com.ruoyi.system.api.model.LoginUser; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; import java.util.Objects; /** * 登录校验方法 @@ -29,6 +33,8 @@ @Autowired private SysRecordLogService recordLogService; @Autowired private AdminClient adminClient; /** * 登录 @@ -69,6 +75,12 @@ userInfo.setIsFranchisee(Boolean.FALSE); }else { userInfo.setIsFranchisee(Boolean.TRUE); // 查询加盟商信息 R<FranchiseeVO> franchiseeResult = adminClient.getFranchiseeInfo(user.getFranchiseeId()); FranchiseeVO franchiseeVO = franchiseeResult.getData(); if(Objects.nonNull(franchiseeVO)){ userInfo.setIsDisplay(franchiseeVO.getIsDisplay()); } } if (UserStatus.DELETED.getCode().equals(user.getIsDelete())) { recordLogService.recordLogininfor(username, Constants.LOGIN_FAIL, "对不起，您的账号已被删除"); ruoyi-common/ruoyi-common-security/pom.xml
@@ -28,6 +28,12 @@ <artifactId>ruoyi-api-system</artifactId> </dependency> <dependency> <groupId>com.ruoyi</groupId> <artifactId>ruoyi-api-admin</artifactId> <version>3.6.4</version> </dependency> <!-- RuoYi Common Redis--> <dependency> <groupId>com.ruoyi</groupId> ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/FranchiseeController.java
@@ -13,6 +13,7 @@ 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.api.entity.FranchiseeVO; import com.ruoyi.admin.config.WeChatConfig; import com.ruoyi.admin.entity.*; import com.ruoyi.admin.service.*; @@ -49,6 +50,7 @@ import lombok.Getter; import org.apache.commons.codec.CharEncoding; import org.apache.poi.util.IOUtils; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder; import org.springframework.transaction.annotation.Transactional; @@ -878,6 +880,13 @@ MasterWorker byId = masterWorkerService.getById(id); return R.ok(byId.getProfilePicture()); } @GetMapping(value = "/getFranchiseeInfo") public R<FranchiseeVO> getFranchiseeInfo(@RequestParam("franchiseeId") Integer franchiseeId) { Franchisee franchisee = franchiseeService.getById(franchiseeId); FranchiseeVO franchiseeVO = new FranchiseeVO(); BeanUtils.copyProperties(franchisee, franchiseeVO); return R.ok(franchiseeVO); } /** * 新增加盟商信息 @@ -1110,5 +1119,18 @@ return R.ok(); } /** * 设置加盟商是否显示司机信息 * */ @ApiOperation(value = "加盟商设置是否显示【202509】",notes = "id:加盟商id,isDisplay:是否显示 1=是 0=否", tags = {"后台-加盟商管理"}) @PutMapping(value = "/setIsDisplay") public R<String> setIsDisplay(@RequestParam(value = "id") Integer id, @RequestParam(value = "isDisplay") Integer isDisplay) { Franchisee franchisee = franchiseeService.getById(id); franchisee.setIsDisplay(isDisplay); franchiseeService.updateById(franchisee); return R.ok(); } } ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/OrderController.java
@@ -544,8 +544,10 @@ } orderQueryRequest.setServIds(servIds); Integer franchiseeId = loginUser.getSysUser().getFranchiseeId(); Integer isDisplay = 0; if (franchiseeId!=null) { Franchisee byId = franchiseeService.getById(franchiseeId); isDisplay = byId.getIsDisplay(); String[] siteIds = byId.getSiteIds().split(","); orderQueryRequest.setSiteIds(siteIds); if (loginUser.getIsFranchisee() && siteIds.length == 0) { @@ -562,6 +564,20 @@ R<List<Order>> result = orderClient.excelExport(orderQueryRequest); if(franchiseeId!=null){ if(isDisplay == 0){ for (Order datum : result.getData()) { if(StringUtils.hasLength(datum.getServerName())){ datum.setServerName(datum.getServerName().charAt(0)+"***"); } if(StringUtils.hasLength(datum.getServerPhone())){ datum.setServerPhone(around(datum.getServerPhone(), 3, 4)); } } return orderService.excelExport(result.getData(), response); } return orderService.excelExport(result.getData(), response); } for (Order datum : result.getData()) { if(StringUtils.hasLength(datum.getServerName()) && !"admin".equals(loginUser.getSysUser().getAccount())){ datum.setServerName(datum.getServerName().charAt(0)+"***"); ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/entity/Franchisee.java
@@ -97,6 +97,11 @@ @ApiModelProperty("操作密码") @TableField("payPassword") private String payPassword; @ApiModelProperty("是否显示 1=是 0=否") @TableField("isDisplay") private Integer isDisplay; @TableField(exist = false) private String siteStr; } ruoyi-service/ruoyi-admin/src/main/resources/mapper/admin/FranchiseeMapper.xml
@@ -15,6 +15,7 @@ <result column="city" property="city" /> <result column="Identity_photo" property="identityPhoto" /> <result column="role_id" property="roleId" /> <result column="isDisplay" property="isDisplay" /> <result column="createBy" property="createBy" /> <result column="updateBy" property="updateBy" /> <result column="createTime" property="createTime" />
