协议管理修改

mitao

2025-03-07 e16a9f6a4238ec02dc754be7b94639ad8af4e5a8

协议管理修改

 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)

 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;
}

 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());
        }

 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));
    }


 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;