From 0e811d713a6a3606944d9022603303674216a878 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期三, 03 九月 2025 20:54:05 +0800
Subject: [PATCH] 加盟商设置是否隐藏
---
ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/mapper/ServeAdvantageMapper.java | 2
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysUser.java | 4 ++
ruoyi-auth/src/main/java/com/ruoyi/auth/service/SysLoginService.java | 10 -----
ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/service/ServeAdvantageService.java | 2
ruoyi-api/ruoyi-api-admin/src/main/java/com/ruoyi/admin/api/feignClient/AdminClient.java | 2 -
ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/ServeAdvantageController.java | 2
ruoyi-service/ruoyi-admin/src/main/resources/mapper/admin/ServeAdvantageMapper.xml | 2
ruoyi-api/ruoyi-api-admin/src/main/java/com/ruoyi/admin/api/factory/AdminFallbackFactory.java | 6 ---
ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/FranchiseeController.java | 27 ++++---------
ruoyi-common/ruoyi-common-security/pom.xml | 10 ++--
ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/entity/SysUser.java | 4 ++
ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml | 2 +
ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/service/impl/FranchiseeWithdrawServiceImpl.java | 6 ---
ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/entity/ServeAdvantage.java | 38 +++++++++++++++++++
ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/service/impl/ServeAdvantageServiceImpl.java | 2
15 files changed, 66 insertions(+), 53 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-admin/src/main/java/com/ruoyi/admin/api/factory/AdminFallbackFactory.java b/ruoyi-api/ruoyi-api-admin/src/main/java/com/ruoyi/admin/api/factory/AdminFallbackFactory.java
index c69c559..aca98dc 100644
--- a/ruoyi-api/ruoyi-api-admin/src/main/java/com/ruoyi/admin/api/factory/AdminFallbackFactory.java
+++ b/ruoyi-api/ruoyi-api-admin/src/main/java/com/ruoyi/admin/api/factory/AdminFallbackFactory.java
@@ -86,12 +86,6 @@
public R<String> getWorkPic(Integer id) {
return R.fail(cause.getMessage());
}
-
- @Override
- public R<FranchiseeVO> getFranchiseeInfo(Integer franchiseeId) {
- return R.fail("获取加盟商信息失败" + cause.getMessage());
- }
-
};
}
}
diff --git a/ruoyi-api/ruoyi-api-admin/src/main/java/com/ruoyi/admin/api/feignClient/AdminClient.java b/ruoyi-api/ruoyi-api-admin/src/main/java/com/ruoyi/admin/api/feignClient/AdminClient.java
index 9d092f7..31ceccb 100644
--- a/ruoyi-api/ruoyi-api-admin/src/main/java/com/ruoyi/admin/api/feignClient/AdminClient.java
+++ b/ruoyi-api/ruoyi-api-admin/src/main/java/com/ruoyi/admin/api/feignClient/AdminClient.java
@@ -133,6 +133,4 @@
@GetMapping(value = "/franchisee/getWorkPic")
R<String> getWorkPic(@RequestParam("id") Integer id);
- @GetMapping(value = "/franchisee/getFranchiseeInfo")
- R<FranchiseeVO> getFranchiseeInfo(@RequestParam("franchiseeId") Integer franchiseeId);
}
diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysUser.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysUser.java
index 563e508..c5eeec6 100644
--- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysUser.java
+++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysUser.java
@@ -76,6 +76,10 @@
@TableField("franchisee_id")
private Integer franchiseeId;
+ @ApiModelProperty("是否显示 1=是 0=否")
+ @TableField("isDisplay")
+ private Integer isDisplay;
+
public SysUser() {
}
diff --git a/ruoyi-auth/src/main/java/com/ruoyi/auth/service/SysLoginService.java b/ruoyi-auth/src/main/java/com/ruoyi/auth/service/SysLoginService.java
index 0b35774..edd7f38 100644
--- a/ruoyi-auth/src/main/java/com/ruoyi/auth/service/SysLoginService.java
+++ b/ruoyi-auth/src/main/java/com/ruoyi/auth/service/SysLoginService.java
@@ -1,7 +1,5 @@
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;
@@ -33,8 +31,6 @@
@Autowired
private SysRecordLogService recordLogService;
- @Autowired
- private AdminClient adminClient;
/**
* 登录
@@ -75,12 +71,6 @@
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, "对不起，您的账号已被删除");
diff --git a/ruoyi-common/ruoyi-common-security/pom.xml b/ruoyi-common/ruoyi-common-security/pom.xml
index c7a76f6..a0b8b08 100644
--- a/ruoyi-common/ruoyi-common-security/pom.xml
+++ b/ruoyi-common/ruoyi-common-security/pom.xml
@@ -28,11 +28,11 @@
<artifactId>ruoyi-api-system</artifactId>
</dependency>
- <dependency>
- <groupId>com.ruoyi</groupId>
- <artifactId>ruoyi-api-admin</artifactId>
- <version>3.6.4</version>
- </dependency>
+<!-- <dependency>-->
+<!-- <groupId>com.ruoyi</groupId>-->
+<!-- <artifactId>ruoyi-api-admin</artifactId>-->
+<!-- <version>3.6.4</version>-->
+<!-- </dependency>-->
<!-- RuoYi Common Redis-->
<dependency>
diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
index 7ea8957..78a8886 100644
--- a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
+++ b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
@@ -18,6 +18,7 @@
<result property="updateBy" column="update_by"/>
<result property="updateTime" column="update_time"/>
<result property="franchiseeId" column="franchisee_id"/>
+ <result property="isDisplay" column="isDisplay"/>
</resultMap>
<resultMap id="RoleResult" type="com.ruoyi.system.api.domain.SysRole">
@@ -41,6 +42,7 @@
u.create_by,
u.create_time,
u.franchisee_id,
+ u.isDisplay,
r.role_id,
r.role_name,
r.role_key,
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 3ccb91e..2730d6c 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
@@ -11,14 +11,13 @@
import com.alipay.api.AlipayApiException;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
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.*;
import com.ruoyi.admin.utils.MD5AndKL;
-import com.ruoyi.admin.utils.WeChatUtil;
import com.ruoyi.admin.utils.util.CreateLinkStringByGet1;
import com.ruoyi.admin.utils.util.HttpRequester;
import com.ruoyi.admin.utils.util.HttpRespons;
@@ -30,18 +29,12 @@
import com.ruoyi.common.core.utils.StringUtils;
import com.ruoyi.common.security.annotation.RequiresPermissions;
import com.ruoyi.common.security.service.TokenService;
-import com.ruoyi.common.security.utils.SecurityUtils;
import com.wechat.pay.contrib.apache.httpclient.auth.PrivateKeySigner;
import com.wechat.pay.contrib.apache.httpclient.util.PemUtil;
import com.wechat.pay.java.core.exception.MalformedMessageException;
import com.wechat.pay.java.core.exception.ServiceException;
import com.wechat.pay.java.core.notification.NotificationParser;
-import com.wechat.pay.java.service.partnerpayments.app.model.Transaction;
-import com.wechat.pay.java.service.payments.jsapi.model.Amount;
import com.wechat.pay.java.service.payments.jsapi.JsapiService;
-import com.wechat.pay.java.service.payments.jsapi.model.Payer;
-import com. wechat. pay. java. service. payments. jsapi. model. PrepayRequest;
-import com.wechat.pay.java.service.payments.jsapi.model.PrepayResponse;
import com.wechat.pay.java.service.payments.nativepay.NativePayService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
@@ -50,8 +43,6 @@
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;
import org.springframework.util.CollectionUtils;
@@ -64,14 +55,12 @@
import java.io.*;
import java.math.BigDecimal;
import java.net.URLEncoder;
-import java.nio.charset.StandardCharsets;
import java.security.PrivateKey;
import java.security.SecureRandom;
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
import java.util.*;
import java.util.stream.Collectors;
-import java.util.stream.Stream;
/**
@@ -880,13 +869,6 @@
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);
- }
/**
* 新增加盟商信息
@@ -1130,6 +1112,13 @@
Franchisee franchisee = franchiseeService.getById(id);
franchisee.setIsDisplay(isDisplay);
franchiseeService.updateById(franchisee);
+ // 查询用户信息
+ SysUser sysUser = sysUserService.getOne(Wrappers.lambdaQuery(SysUser.class)
+ .eq(SysUser::getFranchiseeId, id));
+ if (Objects.nonNull(sysUser)) {
+ sysUser.setIsDisplay(isDisplay);
+ sysUserService.updateById(sysUser);
+ }
return R.ok();
}
diff --git a/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/ServeAdvantageController.java b/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/ServeAdvantageController.java
index 9852224..cbb1db7 100644
--- a/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/ServeAdvantageController.java
+++ b/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/ServeAdvantageController.java
@@ -3,7 +3,7 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ruoyi.admin.api.entity.ServeAdvantage;
+import com.ruoyi.admin.entity.ServeAdvantage;
import com.ruoyi.admin.service.ServeAdvantageService;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.security.annotation.RequiresPermissions;
diff --git a/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/entity/ServeAdvantage.java b/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/entity/ServeAdvantage.java
new file mode 100644
index 0000000..4df2926
--- /dev/null
+++ b/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/entity/ServeAdvantage.java
@@ -0,0 +1,38 @@
+package com.ruoyi.admin.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.ruoyi.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * <p>
+ * 服务优势管理
+ * </p>
+ *
+ * @author hjl
+ * @since 2024-05-29
+ */
+@Getter
+@Setter
+@TableName("sys_serve_advantage")
+@ApiModel(value = "ServeAdvantage对象", description = "服务优势管理")
+public class ServeAdvantage extends BaseEntity {
+
+ @TableId(value = "id",type = IdType.AUTO)
+ private Integer id;
+
+ @ApiModelProperty("标题")
+ @TableField("title")
+ private String title;
+
+ @ApiModelProperty("描述")
+ @TableField("describe_detail")
+ private String describeDetail;
+
+}
diff --git a/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/entity/SysUser.java b/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/entity/SysUser.java
index 1efcafa..15ec553 100644
--- a/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/entity/SysUser.java
+++ b/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/entity/SysUser.java
@@ -90,4 +90,8 @@
@TableField("franchisee_id")
private Integer franchiseeId;
+ @ApiModelProperty("是否显示 1=是 0=否")
+ @TableField("isDisplay")
+ private Integer isDisplay;
+
}
diff --git a/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/mapper/ServeAdvantageMapper.java b/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/mapper/ServeAdvantageMapper.java
index 975d53c..db6b347 100644
--- a/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/mapper/ServeAdvantageMapper.java
+++ b/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/mapper/ServeAdvantageMapper.java
@@ -1,7 +1,7 @@
package com.ruoyi.admin.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.ruoyi.admin.api.entity.ServeAdvantage;
+import com.ruoyi.admin.entity.ServeAdvantage;
/**
* <p>
diff --git a/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/service/ServeAdvantageService.java b/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/service/ServeAdvantageService.java
index f7d59ce..cf5cde9 100644
--- a/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/service/ServeAdvantageService.java
+++ b/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/service/ServeAdvantageService.java
@@ -1,7 +1,7 @@
package com.ruoyi.admin.service;
import com.baomidou.mybatisplus.extension.service.IService;
-import com.ruoyi.admin.api.entity.ServeAdvantage;
+import com.ruoyi.admin.entity.ServeAdvantage;
/**
* <p>
diff --git a/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/service/impl/FranchiseeWithdrawServiceImpl.java b/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/service/impl/FranchiseeWithdrawServiceImpl.java
index 69321d2..5674a2b 100644
--- a/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/service/impl/FranchiseeWithdrawServiceImpl.java
+++ b/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/service/impl/FranchiseeWithdrawServiceImpl.java
@@ -2,16 +2,10 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.ruoyi.admin.entity.Agreement;
import com.ruoyi.admin.entity.FranchiseeWithdraw;
-import com.ruoyi.admin.mapper.AgreementMapper;
import com.ruoyi.admin.mapper.FranchiseeWithdrawMapper;
-import com.ruoyi.admin.service.AgreementService;
import com.ruoyi.admin.service.TFranchiseeWithdrawService;
-import com.ruoyi.common.core.constant.Constants;
-import com.ruoyi.common.core.domain.R;
import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
/**
* <p>
diff --git a/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/service/impl/ServeAdvantageServiceImpl.java b/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/service/impl/ServeAdvantageServiceImpl.java
index 9a9117b..134e249 100644
--- a/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/service/impl/ServeAdvantageServiceImpl.java
+++ b/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/service/impl/ServeAdvantageServiceImpl.java
@@ -1,6 +1,6 @@
package com.ruoyi.admin.service.impl;
-import com.ruoyi.admin.api.entity.ServeAdvantage;
+import com.ruoyi.admin.entity.ServeAdvantage;
import com.ruoyi.admin.mapper.ServeAdvantageMapper;
import com.ruoyi.admin.service.ServeAdvantageService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
diff --git a/ruoyi-service/ruoyi-admin/src/main/resources/mapper/admin/ServeAdvantageMapper.xml b/ruoyi-service/ruoyi-admin/src/main/resources/mapper/admin/ServeAdvantageMapper.xml
index 7421b7c..4f3efb0 100644
--- a/ruoyi-service/ruoyi-admin/src/main/resources/mapper/admin/ServeAdvantageMapper.xml
+++ b/ruoyi-service/ruoyi-admin/src/main/resources/mapper/admin/ServeAdvantageMapper.xml
@@ -2,7 +2,7 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.admin.mapper.ServeAdvantageMapper">
<!-- 通用查询映射结果 -->
- <resultMap id="BaseResultMap" type="com.ruoyi.admin.api.entity.ServeAdvantage">
+ <resultMap id="BaseResultMap" type="com.ruoyi.admin.entity.ServeAdvantage">
<id column="id" property="id"/>
<result column="title" property="title"/>
<result column="describe_detail" property="describeDetail"/>
--
Gitblit v1.7.1