From e16a9f6a4238ec02dc754be7b94639ad8af4e5a8 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期五, 07 三月 2025 18:42:07 +0800
Subject: [PATCH] 协议管理修改
---
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/AgreementController.java | 8 +++++---
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/dto/AgreementDTO.java | 2 +-
ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/management/dto/MgtMemberQuery.java | 3 +++
ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/RuoYiAuctionApplication.java | 2 ++
ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/MemberServiceImpl.java | 4 ++++
5 files changed, 15 insertions(+), 4 deletions(-)
diff --git a/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/RuoYiAuctionApplication.java b/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/RuoYiAuctionApplication.java
index 802f5f2..f7d98c6 100644
--- a/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/RuoYiAuctionApplication.java
+++ b/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/RuoYiAuctionApplication.java
@@ -6,6 +6,7 @@
import org.mybatis.spring.annotation.MapperScan;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.context.annotation.ComponentScan;
import org.springframework.scheduling.annotation.EnableAsync;
import org.springframework.scheduling.annotation.EnableScheduling;
@@ -21,6 +22,7 @@
@EnableCustomSwagger2
@EnableRyFeignClients
@SpringBootApplication
+@ComponentScan(basePackages = {"com.ruoyi.auction", "com.ruoyi.system.api.factory"})
public class RuoYiAuctionApplication
{
public static void main(String[] args)
diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/management/dto/MgtMemberQuery.java b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/management/dto/MgtMemberQuery.java
index 14b04b9..437cc46 100644
--- a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/management/dto/MgtMemberQuery.java
+++ b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/management/dto/MgtMemberQuery.java
@@ -26,4 +26,7 @@
@ApiModelProperty(value = "会员等级")
private String level;
+
+ @ApiModelProperty(value = "会员分类(1：普通用户；2：会员用户；3：超级会员用户；)")
+ private Integer vipClassify;
}
diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/MemberServiceImpl.java b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/MemberServiceImpl.java
index 7d59d75..99c2f57 100644
--- a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/MemberServiceImpl.java
+++ b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/MemberServiceImpl.java
@@ -54,6 +54,7 @@
import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import java.util.Objects;
import javax.annotation.Resource;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.io.IOUtils;
@@ -523,8 +524,11 @@
query.getRealName())
.like(StringUtils.isNotBlank(query.getPhone()), Member::getPhone, query.getPhone())
.eq(StringUtils.isNotBlank(query.getLevel()), Member::getLevel, query.getLevel())
+ .eq(Objects.nonNull(query.getVipClassify()), Member::getVipClassify,
+ query.getVipClassify())
.orderByDesc(Member::getCreateTime)
.page(new Page<>(query.getPageCurr(), query.getPageSize()));
+
if (StringUtils.isEmpty(page.getRecords())) {
return PageDTO.empty(page.getTotal(), page.getPages());
}
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/AgreementController.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/AgreementController.java
index c5d1970..eeb5bb2 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/AgreementController.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/AgreementController.java
@@ -8,6 +8,7 @@
import com.ruoyi.system.service.IAgreementService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
import java.util.List;
import javax.annotation.Resource;
import org.springframework.validation.annotation.Validated;
@@ -35,8 +36,9 @@
private IAgreementService iAgreementService;
@RequestMapping(value = "/getAgreement/{agreementType}", method = RequestMethod.GET)
- @ApiOperation(value = "获取用户协议/隐私协议")
- public R<Agreement> getAgreement(@PathVariable("agreementType") Integer agreementType) {
+ @ApiOperation(value = "获取用户协议/隐私协议/竞拍说明")
+ public R<Agreement> getAgreement(
+ @ApiParam(name = "agreementType", value = "协议类型1：用户协议 2：隐私协议 3：竞拍说明") @PathVariable("agreementType") Integer agreementType) {
return R.ok(iAgreementService.getAgreement(agreementType));
}
@@ -48,7 +50,7 @@
@ApiOperation("管理后台-获取协议列表")
@GetMapping("/list")
public R<List<AgreementDTO>> getAgreementList() {
- List<Agreement> list = iAgreementService.lambdaQuery().last("limit 2").list();
+ List<Agreement> list = iAgreementService.lambdaQuery().last("limit 3").list();
return R.ok(BeanUtils.copyList(list, AgreementDTO.class));
}
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/dto/AgreementDTO.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/dto/AgreementDTO.java
index 6a739c6..22f1edb 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/dto/AgreementDTO.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/dto/AgreementDTO.java
@@ -20,7 +20,7 @@
@ApiModelProperty(value = "协议id")
private Long id;
- @ApiModelProperty(value = "协议类型 1=用户协议 2=隐私协议")
+ @ApiModelProperty(value = "协议类型 1=用户协议 2=隐私协议 3=竞拍说明")
@NotNull(message = "协议类型不能为空")
private Integer agreementType;
--
Gitblit v1.7.1