aiotagro/aiotagro-mini
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改bug
Some checks failed
aagro-ui-admin CI / build (14.x) (push) Has been cancelled
Details
aagro-ui-admin CI / build (16.x) (push) Has been cancelled
Details
Java CI with Maven / build (11) (push) Has been cancelled
Details
Java CI with Maven / build (17) (push) Has been cancelled
Details
Java CI with Maven / build (8) (push) Has been cancelled
Details

Browse Source
This commit is contained in:
ylweng
2025-10-06 15:21:03 +08:00
parent f8f3cc8277
commit faad389e82
1682 changed files with 8962 additions and 48880 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
aagro-module-member/pom.xml
View File

@@ -3,8 +3,8 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<groupId>cn.aagro.gg</groupId>
<artifactId>aiot</artifactId>
<groupId>cn.aagro.aa</groupId>
<artifactId>aiotagro</artifactId>
<version>${revision}</version>
<relativePath>../pom.xml</relativePath>
</parent>
@@ -20,25 +20,25 @@
<dependencies>
<dependency>
<groupId>cn.aagro.gg</groupId>
<groupId>cn.aagro.aa</groupId>
<artifactId>aagro-module-system</artifactId>
<version>${revision}</version>
</dependency>
<dependency>
<groupId>cn.aagro.gg</groupId>
<groupId>cn.aagro.aa</groupId>
<artifactId>aagro-module-infra</artifactId>
<version>${revision}</version>
</dependency>
<!-- 业务组件 -->
<dependency>
<groupId>cn.aagro.gg</groupId>
<groupId>cn.aagro.aa</groupId>
<artifactId>aagro-spring-boot-starter-biz-tenant</artifactId>
</dependency>
<!-- Web 相关 -->
<dependency>
<groupId>cn.aagro.gg</groupId>
<groupId>cn.aagro.aa</groupId>
<artifactId>aagro-spring-boot-starter-security</artifactId>
</dependency>
@@ -49,40 +49,39 @@
<!-- DB 相关 -->
<dependency>
<groupId>cn.aagro.gg</groupId>
<groupId>cn.aagro.aa</groupId>
<artifactId>aagro-spring-boot-starter-mybatis</artifactId>
</dependency>
<dependency>
<groupId>cn.aagro.gg</groupId>
<groupId>cn.aagro.aa</groupId>
<artifactId>aagro-spring-boot-starter-redis</artifactId>
</dependency>
<!-- 消息队列相关 -->
<dependency>
<groupId>cn.aagro.gg</groupId>
<groupId>cn.aagro.aa</groupId>
<artifactId>aagro-spring-boot-starter-mq</artifactId>
</dependency>
<!-- Test 测试相关 -->
<dependency>
<groupId>cn.aagro.gg</groupId>
<artifactId>aagro-spring-boot-starter-test</artifactId>
<version>${revision}</version>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-test</artifactId>
<scope>test</scope>
</dependency>
<!-- 工具类相关 -->
<dependency>
<groupId>cn.aagro.gg</groupId>
<groupId>cn.aagro.aa</groupId>
<artifactId>aagro-spring-boot-starter-excel</artifactId>
</dependency>
<dependency>
<groupId>cn.aagro.gg</groupId>
<groupId>cn.aagro.aa</groupId>
<artifactId>aagro-spring-boot-starter-biz-ip</artifactId>
</dependency>
</dependencies>
</project>
</project>

6
aagro-module-member/src/main/java/cn/aagro/pp/module/member/api/address/MemberAddressApi.java → aagro-module-member/src/main/java/cn/aagro/ag/module/member/api/address/MemberAddressApi.java
View File

@@ -1,11 +1,11 @@
package cn.aagro.pp.module.member.api.address;
package cn.aagro.ag.module.member.api.address;
import cn.aagro.pp.module.member.api.address.dto.MemberAddressRespDTO;
import cn.aagro.ag.module.member.api.address.dto.MemberAddressRespDTO;
/**
* 用户收件地址 API 接口
*
* @author 芋道源码
* @author AIOTAGRO
*/
public interface MemberAddressApi {

12
aagro-module-member/src/main/java/cn/aagro/pp/module/member/api/address/MemberAddressApiImpl.java → aagro-module-member/src/main/java/cn/aagro/ag/module/member/api/address/MemberAddressApiImpl.java
View File

@@ -1,17 +1,17 @@
package cn.aagro.pp.module.member.api.address;
package cn.aagro.ag.module.member.api.address;
import cn.aagro.pp.module.member.api.address.dto.MemberAddressRespDTO;
import cn.aagro.pp.module.member.convert.address.AddressConvert;
import cn.aagro.pp.module.member.service.address.AddressService;
import cn.aagro.ag.module.member.api.address.dto.MemberAddressRespDTO;
import cn.aagro.ag.module.member.convert.address.AddressConvert;
import cn.aagro.ag.module.member.service.address.AddressService;
import org.springframework.stereotype.Service;
import org.springframework.validation.annotation.Validated;
import javax.annotation.Resource;
import jakarta.annotation.Resource;
/**
* 用户收件地址 API 实现类
*
* @author 芋道源码
* @author AIOTAGRO
*/
@Service
@Validated

4
aagro-module-member/src/main/java/cn/aagro/pp/module/member/api/address/dto/MemberAddressRespDTO.java → aagro-module-member/src/main/java/cn/aagro/ag/module/member/api/address/dto/MemberAddressRespDTO.java
View File

@@ -1,11 +1,11 @@
package cn.aagro.pp.module.member.api.address.dto;
package cn.aagro.ag.module.member.api.address.dto;
import lombok.Data;
/**
* 用户收件地址 Response DTO
*
* @author 芋道源码
* @author AIOTAGRO
*/
@Data
public class MemberAddressRespDTO {

4
aagro-module-member/src/main/java/cn/aagro/pp/module/member/api/config/MemberConfigApi.java → aagro-module-member/src/main/java/cn/aagro/ag/module/member/api/config/MemberConfigApi.java
View File

@@ -1,6 +1,6 @@
package cn.aagro.pp.module.member.api.config;
package cn.aagro.ag.module.member.api.config;
import cn.aagro.pp.module.member.api.config.dto.MemberConfigRespDTO;
import cn.aagro.ag.module.member.api.config.dto.MemberConfigRespDTO;
/**
* 用户配置 API 接口

10
aagro-module-member/src/main/java/cn/aagro/pp/module/member/api/config/MemberConfigApiImpl.java → aagro-module-member/src/main/java/cn/aagro/ag/module/member/api/config/MemberConfigApiImpl.java
View File

@@ -1,12 +1,12 @@
package cn.aagro.pp.module.member.api.config;
package cn.aagro.ag.module.member.api.config;
import cn.aagro.pp.module.member.api.config.dto.MemberConfigRespDTO;
import cn.aagro.pp.module.member.convert.config.MemberConfigConvert;
import cn.aagro.pp.module.member.service.config.MemberConfigService;
import cn.aagro.ag.module.member.api.config.dto.MemberConfigRespDTO;
import cn.aagro.ag.module.member.convert.config.MemberConfigConvert;
import cn.aagro.ag.module.member.service.config.MemberConfigService;
import org.springframework.stereotype.Service;
import org.springframework.validation.annotation.Validated;
import javax.annotation.Resource;
import jakarta.annotation.Resource;
/**
* 用户配置 API 实现类

4
aagro-module-member/src/main/java/cn/aagro/pp/module/member/api/config/dto/MemberConfigRespDTO.java → aagro-module-member/src/main/java/cn/aagro/ag/module/member/api/config/dto/MemberConfigRespDTO.java
View File

@@ -1,11 +1,11 @@
package cn.aagro.pp.module.member.api.config.dto;
package cn.aagro.ag.module.member.api.config.dto;
import lombok.Data;
/**
* 用户信息 Response DTO
*
* @author 芋道源码
* @author AIOTAGRO
*/
@Data
public class MemberConfigRespDTO {

6
aagro-module-member/src/main/java/cn/aagro/pp/module/member/api/level/MemberLevelApi.java → aagro-module-member/src/main/java/cn/aagro/ag/module/member/api/level/MemberLevelApi.java
View File

@@ -1,7 +1,7 @@
package cn.aagro.pp.module.member.api.level;
package cn.aagro.ag.module.member.api.level;
import cn.aagro.pp.module.member.api.level.dto.MemberLevelRespDTO;
import cn.aagro.pp.module.member.enums.MemberExperienceBizTypeEnum;
import cn.aagro.ag.module.member.api.level.dto.MemberLevelRespDTO;
import cn.aagro.ag.module.member.enums.MemberExperienceBizTypeEnum;
/**
* 会员等级 API 接口

16
aagro-module-member/src/main/java/cn/aagro/pp/module/member/api/level/MemberLevelApiImpl.java → aagro-module-member/src/main/java/cn/aagro/ag/module/member/api/level/MemberLevelApiImpl.java
View File

@@ -1,17 +1,17 @@
package cn.aagro.pp.module.member.api.level;
package cn.aagro.ag.module.member.api.level;
import cn.aagro.pp.module.member.api.level.dto.MemberLevelRespDTO;
import cn.aagro.pp.module.member.convert.level.MemberLevelConvert;
import cn.aagro.pp.module.member.enums.MemberExperienceBizTypeEnum;
import cn.aagro.pp.module.member.service.level.MemberLevelService;
import cn.aagro.ag.module.member.api.level.dto.MemberLevelRespDTO;
import cn.aagro.ag.module.member.convert.level.MemberLevelConvert;
import cn.aagro.ag.module.member.enums.MemberExperienceBizTypeEnum;
import cn.aagro.ag.module.member.service.level.MemberLevelService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
import org.springframework.validation.annotation.Validated;
import javax.annotation.Resource;
import jakarta.annotation.Resource;
import static cn.aagro.pp.framework.common.exception.util.ServiceExceptionUtil.exception;
import static cn.aagro.pp.module.member.enums.ErrorCodeConstants.EXPERIENCE_BIZ_NOT_SUPPORT;
import static cn.aagro.ag.framework.common.exception.util.ServiceExceptionUtil.exception;
import static cn.aagro.ag.module.member.enums.ErrorCodeConstants.EXPERIENCE_BIZ_NOT_SUPPORT;
/**
* 会员等级 API 实现类

6
aagro-module-member/src/main/java/cn/aagro/pp/module/member/api/level/dto/MemberLevelRespDTO.java → aagro-module-member/src/main/java/cn/aagro/ag/module/member/api/level/dto/MemberLevelRespDTO.java
View File

@@ -1,12 +1,12 @@
package cn.aagro.pp.module.member.api.level.dto;
package cn.aagro.ag.module.member.api.level.dto;
import cn.aagro.pp.framework.common.enums.CommonStatusEnum;
import cn.aagro.ag.framework.common.enums.CommonStatusEnum;
import lombok.Data;
/**
* 会员等级 Resp DTO
*
* @author 芋道源码
* @author AIOTAGRO
*/
@Data
public class MemberLevelRespDTO {

4
aagro-module-member/src/main/java/cn/aagro/ag/module/member/api/message/package-info.java Normal file
View File

@@ -0,0 +1,4 @@
/**
* 消息队列的消息
*/
package cn.aagro.ag.module.member.api.message;

4
aagro-module-member/src/main/java/cn/aagro/pp/module/member/api/message/user/MemberUserCreateMessage.java → aagro-module-member/src/main/java/cn/aagro/ag/module/member/api/message/user/MemberUserCreateMessage.java
View File

@@ -1,8 +1,8 @@
package cn.aagro.pp.module.member.api.message.user;
package cn.aagro.ag.module.member.api.message.user;
import lombok.Data;
import javax.validation.constraints.NotNull;
import jakarta.validation.constraints.NotNull;
/**
* 会员用户创建消息

2
aagro-module-member/src/main/java/cn/aagro/pp/module/member/api/package-info.java → aagro-module-member/src/main/java/cn/aagro/ag/module/member/api/package-info.java
View File

@@ -1,4 +1,4 @@
/**
* member API 包，定义并实现提供给其它模块的 API
*/
package cn.aagro.pp.module.member.api;
package cn.aagro.ag.module.member.api;

6
aagro-module-member/src/main/java/cn/aagro/pp/module/member/api/point/MemberPointApi.java → aagro-module-member/src/main/java/cn/aagro/ag/module/member/api/point/MemberPointApi.java
View File

@@ -1,8 +1,8 @@
package cn.aagro.pp.module.member.api.point;
package cn.aagro.ag.module.member.api.point;
import cn.aagro.pp.module.member.enums.point.MemberPointBizTypeEnum;
import cn.aagro.ag.module.member.enums.point.MemberPointBizTypeEnum;
import javax.validation.constraints.Min;
import jakarta.validation.constraints.Min;
/**
* 用户积分的 API 接口

12
aagro-module-member/src/main/java/cn/aagro/pp/module/member/api/point/MemberPointApiImpl.java → aagro-module-member/src/main/java/cn/aagro/ag/module/member/api/point/MemberPointApiImpl.java
View File

@@ -1,16 +1,16 @@
package cn.aagro.pp.module.member.api.point;
package cn.aagro.ag.module.member.api.point;
import cn.hutool.core.lang.Assert;
import cn.aagro.pp.module.member.enums.point.MemberPointBizTypeEnum;
import cn.aagro.pp.module.member.service.point.MemberPointRecordService;
import cn.aagro.ag.module.member.enums.point.MemberPointBizTypeEnum;
import cn.aagro.ag.module.member.service.point.MemberPointRecordService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
import org.springframework.validation.annotation.Validated;
import javax.annotation.Resource;
import jakarta.annotation.Resource;
import static cn.aagro.pp.framework.common.exception.util.ServiceExceptionUtil.exception;
import static cn.aagro.pp.module.member.enums.ErrorCodeConstants.POINT_RECORD_BIZ_NOT_SUPPORT;
import static cn.aagro.ag.framework.common.exception.util.ServiceExceptionUtil.exception;
import static cn.aagro.ag.module.member.enums.ErrorCodeConstants.POINT_RECORD_BIZ_NOT_SUPPORT;
/**
* 用户积分的 API 实现类

8
aagro-module-member/src/main/java/cn/aagro/pp/module/member/api/user/MemberUserApi.java → aagro-module-member/src/main/java/cn/aagro/ag/module/member/api/user/MemberUserApi.java
View File

@@ -1,17 +1,17 @@
package cn.aagro.pp.module.member.api.user;
package cn.aagro.ag.module.member.api.user;
import cn.aagro.pp.module.member.api.user.dto.MemberUserRespDTO;
import cn.aagro.ag.module.member.api.user.dto.MemberUserRespDTO;
import java.util.Collection;
import java.util.List;
import java.util.Map;
import static cn.aagro.pp.framework.common.util.collection.CollectionUtils.convertMap;
import static cn.aagro.ag.framework.common.util.collection.CollectionUtils.convertMap;
/**
* 会员用户的 API 接口
*
* @author 芋道源码
* @author AIOTAGRO
*/
public interface MemberUserApi {

18
aagro-module-member/src/main/java/cn/aagro/pp/module/member/api/user/MemberUserApiImpl.java → aagro-module-member/src/main/java/cn/aagro/ag/module/member/api/user/MemberUserApiImpl.java
View File

@@ -1,23 +1,23 @@
package cn.aagro.pp.module.member.api.user;
package cn.aagro.ag.module.member.api.user;
import cn.aagro.pp.module.member.api.user.dto.MemberUserRespDTO;
import cn.aagro.pp.module.member.convert.user.MemberUserConvert;
import cn.aagro.pp.module.member.dal.dataobject.user.MemberUserDO;
import cn.aagro.pp.module.member.service.user.MemberUserService;
import cn.aagro.ag.module.member.api.user.dto.MemberUserRespDTO;
import cn.aagro.ag.module.member.convert.user.MemberUserConvert;
import cn.aagro.ag.module.member.dal.dataobject.user.MemberUserDO;
import cn.aagro.ag.module.member.service.user.MemberUserService;
import org.springframework.stereotype.Service;
import org.springframework.validation.annotation.Validated;
import javax.annotation.Resource;
import jakarta.annotation.Resource;
import java.util.Collection;
import java.util.List;
import static cn.aagro.pp.framework.common.exception.util.ServiceExceptionUtil.exception;
import static cn.aagro.pp.module.member.enums.ErrorCodeConstants.USER_MOBILE_NOT_EXISTS;
import static cn.aagro.ag.framework.common.exception.util.ServiceExceptionUtil.exception;
import static cn.aagro.ag.module.member.enums.ErrorCodeConstants.USER_MOBILE_NOT_EXISTS;
/**
* 会员用户的 API 实现类
*
* @author 芋道源码
* @author AIOTAGRO
*/
@Service
@Validated

6
aagro-module-member/src/main/java/cn/aagro/pp/module/member/api/user/dto/MemberUserRespDTO.java → aagro-module-member/src/main/java/cn/aagro/ag/module/member/api/user/dto/MemberUserRespDTO.java
View File

@@ -1,6 +1,6 @@
package cn.aagro.pp.module.member.api.user.dto;
package cn.aagro.ag.module.member.api.user.dto;
import cn.aagro.pp.framework.common.enums.CommonStatusEnum;
import cn.aagro.ag.framework.common.enums.CommonStatusEnum;
import lombok.Data;
import java.time.LocalDateTime;
@@ -8,7 +8,7 @@ import java.time.LocalDateTime;
/**
* 用户信息 Response DTO
*
* @author 芋道源码
* @author AIOTAGRO
*/
@Data
public class MemberUserRespDTO {

16
aagro-module-member/src/main/java/cn/aagro/pp/module/member/controller/admin/address/AddressController.java → aagro-module-member/src/main/java/cn/aagro/ag/module/member/controller/admin/address/AddressController.java
View File

@@ -1,10 +1,10 @@
package cn.aagro.pp.module.member.controller.admin.address;
package cn.aagro.ag.module.member.controller.admin.address;
import cn.aagro.pp.framework.common.pojo.CommonResult;
import cn.aagro.pp.module.member.controller.admin.address.vo.AddressRespVO;
import cn.aagro.pp.module.member.convert.address.AddressConvert;
import cn.aagro.pp.module.member.dal.dataobject.address.MemberAddressDO;
import cn.aagro.pp.module.member.service.address.AddressService;
import cn.aagro.ag.framework.common.pojo.CommonResult;
import cn.aagro.ag.module.member.controller.admin.address.vo.AddressRespVO;
import cn.aagro.ag.module.member.convert.address.AddressConvert;
import cn.aagro.ag.module.member.dal.dataobject.address.MemberAddressDO;
import cn.aagro.ag.module.member.service.address.AddressService;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.tags.Tag;
@@ -15,10 +15,10 @@ import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import javax.annotation.Resource;
import jakarta.annotation.Resource;
import java.util.List;
import static cn.aagro.pp.framework.common.pojo.CommonResult.success;
import static cn.aagro.ag.framework.common.pojo.CommonResult.success;
@Tag(name = "管理后台 - 用户收件地址")
@RestController

1
aagro-module-member/src/main/java/cn/aagro/ag/module/member/controller/admin/address/package-info.java Normal file
View File

@@ -0,0 +1 @@
package cn.aagro.ag.module.member.controller.admin.address;

4
aagro-module-member/src/main/java/cn/aagro/pp/module/member/controller/admin/address/vo/AddressBaseVO.java → aagro-module-member/src/main/java/cn/aagro/ag/module/member/controller/admin/address/vo/AddressBaseVO.java
View File

@@ -1,11 +1,11 @@
package cn.aagro.pp.module.member.controller.admin.address.vo;
package cn.aagro.ag.module.member.controller.admin.address.vo;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.*;
import java.time.LocalDateTime;
import java.time.LocalDateTime;
import java.util.*;
import javax.validation.constraints.*;
import jakarta.validation.constraints.*;
/**
* 用户收件地址 Base VO，提供给添加、修改、详细的子 VO 使用

2
aagro-module-member/src/main/java/cn/aagro/pp/module/member/controller/admin/address/vo/AddressRespVO.java → aagro-module-member/src/main/java/cn/aagro/ag/module/member/controller/admin/address/vo/AddressRespVO.java
View File

@@ -1,4 +1,4 @@
package cn.aagro.pp.module.member.controller.admin.address.vo;
package cn.aagro.ag.module.member.controller.admin.address.vo;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.*;

20
aagro-module-member/src/main/java/cn/aagro/pp/module/member/controller/admin/config/MemberConfigController.java → aagro-module-member/src/main/java/cn/aagro/ag/module/member/controller/admin/config/MemberConfigController.java
View File

@@ -1,21 +1,21 @@
package cn.aagro.pp.module.member.controller.admin.config;
package cn.aagro.ag.module.member.controller.admin.config;
import cn.aagro.pp.framework.common.pojo.CommonResult;
import cn.aagro.pp.module.member.controller.admin.config.vo.MemberConfigRespVO;
import cn.aagro.pp.module.member.controller.admin.config.vo.MemberConfigSaveReqVO;
import cn.aagro.pp.module.member.convert.config.MemberConfigConvert;
import cn.aagro.pp.module.member.dal.dataobject.config.MemberConfigDO;
import cn.aagro.pp.module.member.service.config.MemberConfigService;
import cn.aagro.ag.framework.common.pojo.CommonResult;
import cn.aagro.ag.module.member.controller.admin.config.vo.MemberConfigRespVO;
import cn.aagro.ag.module.member.controller.admin.config.vo.MemberConfigSaveReqVO;
import cn.aagro.ag.module.member.convert.config.MemberConfigConvert;
import cn.aagro.ag.module.member.dal.dataobject.config.MemberConfigDO;
import cn.aagro.ag.module.member.service.config.MemberConfigService;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import javax.validation.Valid;
import jakarta.annotation.Resource;
import jakarta.validation.Valid;
import static cn.aagro.pp.framework.common.pojo.CommonResult.success;
import static cn.aagro.ag.framework.common.pojo.CommonResult.success;
@Tag(name = "管理后台 - 会员设置")
@RestController

4
aagro-module-member/src/main/java/cn/aagro/pp/module/member/controller/admin/config/vo/MemberConfigBaseVO.java → aagro-module-member/src/main/java/cn/aagro/ag/module/member/controller/admin/config/vo/MemberConfigBaseVO.java
View File

@@ -1,9 +1,9 @@
package cn.aagro.pp.module.member.controller.admin.config.vo;
package cn.aagro.ag.module.member.controller.admin.config.vo;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import javax.validation.constraints.NotNull;
import jakarta.validation.constraints.NotNull;
/**
* 会员配置 Base VO，提供给添加、修改、详细的子 VO 使用

2
aagro-module-member/src/main/java/cn/aagro/pp/module/member/controller/admin/config/vo/MemberConfigRespVO.java → aagro-module-member/src/main/java/cn/aagro/ag/module/member/controller/admin/config/vo/MemberConfigRespVO.java
View File

@@ -1,4 +1,4 @@
package cn.aagro.pp.module.member.controller.admin.config.vo;
package cn.aagro.ag.module.member.controller.admin.config.vo;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;

2
aagro-module-member/src/main/java/cn/aagro/pp/module/member/controller/admin/config/vo/MemberConfigSaveReqVO.java → aagro-module-member/src/main/java/cn/aagro/ag/module/member/controller/admin/config/vo/MemberConfigSaveReqVO.java
View File

@@ -1,4 +1,4 @@
package cn.aagro.pp.module.member.controller.admin.config.vo;
package cn.aagro.ag.module.member.controller.admin.config.vo;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;

20
aagro-module-member/src/main/java/cn/aagro/pp/module/member/controller/admin/group/MemberGroupController.java → aagro-module-member/src/main/java/cn/aagro/ag/module/member/controller/admin/group/MemberGroupController.java
View File

@@ -1,11 +1,11 @@
package cn.aagro.pp.module.member.controller.admin.group;
package cn.aagro.ag.module.member.controller.admin.group;
import cn.aagro.pp.framework.common.pojo.CommonResult;
import cn.aagro.pp.framework.common.pojo.PageResult;
import cn.aagro.pp.module.member.controller.admin.group.vo.*;
import cn.aagro.pp.module.member.convert.group.MemberGroupConvert;
import cn.aagro.pp.module.member.dal.dataobject.group.MemberGroupDO;
import cn.aagro.pp.module.member.service.group.MemberGroupService;
import cn.aagro.ag.framework.common.pojo.CommonResult;
import cn.aagro.ag.framework.common.pojo.PageResult;
import cn.aagro.ag.module.member.controller.admin.group.vo.*;
import cn.aagro.ag.module.member.convert.group.MemberGroupConvert;
import cn.aagro.ag.module.member.dal.dataobject.group.MemberGroupDO;
import cn.aagro.ag.module.member.service.group.MemberGroupService;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.tags.Tag;
@@ -13,11 +13,11 @@ import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import javax.validation.Valid;
import jakarta.annotation.Resource;
import jakarta.validation.Valid;
import java.util.List;
import static cn.aagro.pp.framework.common.pojo.CommonResult.success;
import static cn.aagro.ag.framework.common.pojo.CommonResult.success;
@Tag(name = "管理后台 - 用户分组")

8
aagro-module-member/src/main/java/cn/aagro/pp/module/member/controller/admin/group/vo/MemberGroupBaseVO.java → aagro-module-member/src/main/java/cn/aagro/ag/module/member/controller/admin/group/vo/MemberGroupBaseVO.java
View File

@@ -1,11 +1,11 @@
package cn.aagro.pp.module.member.controller.admin.group.vo;
package cn.aagro.ag.module.member.controller.admin.group.vo;
import cn.aagro.pp.framework.common.enums.CommonStatusEnum;
import cn.aagro.pp.framework.common.validation.InEnum;
import cn.aagro.ag.framework.common.enums.CommonStatusEnum;
import cn.aagro.ag.framework.common.validation.InEnum;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import javax.validation.constraints.NotNull;
import jakarta.validation.constraints.NotNull;
/**
* 用户分组 Base VO，提供给添加、修改、详细的子 VO 使用

2
aagro-module-member/src/main/java/cn/aagro/pp/module/member/controller/admin/group/vo/MemberGroupCreateReqVO.java → aagro-module-member/src/main/java/cn/aagro/ag/module/member/controller/admin/group/vo/MemberGroupCreateReqVO.java
View File

@@ -1,4 +1,4 @@
package cn.aagro.pp.module.member.controller.admin.group.vo;
package cn.aagro.ag.module.member.controller.admin.group.vo;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;

6
aagro-module-member/src/main/java/cn/aagro/pp/module/member/controller/admin/group/vo/MemberGroupPageReqVO.java → aagro-module-member/src/main/java/cn/aagro/ag/module/member/controller/admin/group/vo/MemberGroupPageReqVO.java
View File

@@ -1,6 +1,6 @@
package cn.aagro.pp.module.member.controller.admin.group.vo;
package cn.aagro.ag.module.member.controller.admin.group.vo;
import cn.aagro.pp.framework.common.pojo.PageParam;
import cn.aagro.ag.framework.common.pojo.PageParam;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -9,7 +9,7 @@ import org.springframework.format.annotation.DateTimeFormat;
import java.time.LocalDateTime;
import static cn.aagro.pp.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
import static cn.aagro.ag.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
@Schema(description = "管理后台 - 用户分组分页 Request VO")
@Data

2
aagro-module-member/src/main/java/cn/aagro/pp/module/member/controller/admin/group/vo/MemberGroupRespVO.java → aagro-module-member/src/main/java/cn/aagro/ag/module/member/controller/admin/group/vo/MemberGroupRespVO.java
View File

@@ -1,4 +1,4 @@
package cn.aagro.pp.module.member.controller.admin.group.vo;
package cn.aagro.ag.module.member.controller.admin.group.vo;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;

2
aagro-module-member/src/main/java/cn/aagro/pp/module/member/controller/admin/group/vo/MemberGroupSimpleRespVO.java → aagro-module-member/src/main/java/cn/aagro/ag/module/member/controller/admin/group/vo/MemberGroupSimpleRespVO.java
View File

@@ -1,4 +1,4 @@
package cn.aagro.pp.module.member.controller.admin.group.vo;
package cn.aagro.ag.module.member.controller.admin.group.vo;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;

4
aagro-module-member/src/main/java/cn/aagro/pp/module/member/controller/admin/group/vo/MemberGroupUpdateReqVO.java → aagro-module-member/src/main/java/cn/aagro/ag/module/member/controller/admin/group/vo/MemberGroupUpdateReqVO.java
View File

@@ -1,11 +1,11 @@
package cn.aagro.pp.module.member.controller.admin.group.vo;
package cn.aagro.ag.module.member.controller.admin.group.vo;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.ToString;
import javax.validation.constraints.NotNull;
import jakarta.validation.constraints.NotNull;
@Schema(description = "管理后台 - 用户分组更新 Request VO")
@Data

22
aagro-module-member/src/main/java/cn/aagro/pp/module/member/controller/admin/level/MemberExperienceRecordController.java → aagro-module-member/src/main/java/cn/aagro/ag/module/member/controller/admin/level/MemberExperienceRecordController.java
View File

@@ -1,12 +1,12 @@
package cn.aagro.pp.module.member.controller.admin.level;
package cn.aagro.ag.module.member.controller.admin.level;
import cn.aagro.pp.framework.common.pojo.CommonResult;
import cn.aagro.pp.framework.common.pojo.PageResult;
import cn.aagro.pp.module.member.controller.admin.level.vo.experience.MemberExperienceRecordPageReqVO;
import cn.aagro.pp.module.member.controller.admin.level.vo.experience.MemberExperienceRecordRespVO;
import cn.aagro.pp.module.member.convert.level.MemberExperienceRecordConvert;
import cn.aagro.pp.module.member.dal.dataobject.level.MemberExperienceRecordDO;
import cn.aagro.pp.module.member.service.level.MemberExperienceRecordService;
import cn.aagro.ag.framework.common.pojo.CommonResult;
import cn.aagro.ag.framework.common.pojo.PageResult;
import cn.aagro.ag.module.member.controller.admin.level.vo.experience.MemberExperienceRecordPageReqVO;
import cn.aagro.ag.module.member.controller.admin.level.vo.experience.MemberExperienceRecordRespVO;
import cn.aagro.ag.module.member.convert.level.MemberExperienceRecordConvert;
import cn.aagro.ag.module.member.dal.dataobject.level.MemberExperienceRecordDO;
import cn.aagro.ag.module.member.service.level.MemberExperienceRecordService;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.tags.Tag;
@@ -17,10 +17,10 @@ import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import javax.annotation.Resource;
import javax.validation.Valid;
import jakarta.annotation.Resource;
import jakarta.validation.Valid;
import static cn.aagro.pp.framework.common.pojo.CommonResult.success;
import static cn.aagro.ag.framework.common.pojo.CommonResult.success;
@Tag(name = "管理后台 - 会员经验记录")
@RestController

18
aagro-module-member/src/main/java/cn/aagro/pp/module/member/controller/admin/level/MemberLevelController.java → aagro-module-member/src/main/java/cn/aagro/ag/module/member/controller/admin/level/MemberLevelController.java
View File

@@ -1,10 +1,10 @@
package cn.aagro.pp.module.member.controller.admin.level;
package cn.aagro.ag.module.member.controller.admin.level;
import cn.aagro.pp.framework.common.pojo.CommonResult;
import cn.aagro.pp.module.member.controller.admin.level.vo.level.*;
import cn.aagro.pp.module.member.convert.level.MemberLevelConvert;
import cn.aagro.pp.module.member.dal.dataobject.level.MemberLevelDO;
import cn.aagro.pp.module.member.service.level.MemberLevelService;
import cn.aagro.ag.framework.common.pojo.CommonResult;
import cn.aagro.ag.module.member.controller.admin.level.vo.level.*;
import cn.aagro.ag.module.member.convert.level.MemberLevelConvert;
import cn.aagro.ag.module.member.dal.dataobject.level.MemberLevelDO;
import cn.aagro.ag.module.member.service.level.MemberLevelService;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.tags.Tag;
@@ -12,11 +12,11 @@ import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import javax.validation.Valid;
import jakarta.annotation.Resource;
import jakarta.validation.Valid;
import java.util.List;
import static cn.aagro.pp.framework.common.pojo.CommonResult.success;
import static cn.aagro.ag.framework.common.pojo.CommonResult.success;
@Tag(name = "管理后台 - 会员等级")
@RestController

22
aagro-module-member/src/main/java/cn/aagro/pp/module/member/controller/admin/level/MemberLevelRecordController.java → aagro-module-member/src/main/java/cn/aagro/ag/module/member/controller/admin/level/MemberLevelRecordController.java
View File

@@ -1,12 +1,12 @@
package cn.aagro.pp.module.member.controller.admin.level;
package cn.aagro.ag.module.member.controller.admin.level;
import cn.aagro.pp.framework.common.pojo.CommonResult;
import cn.aagro.pp.framework.common.pojo.PageResult;
import cn.aagro.pp.module.member.controller.admin.level.vo.record.MemberLevelRecordPageReqVO;
import cn.aagro.pp.module.member.controller.admin.level.vo.record.MemberLevelRecordRespVO;
import cn.aagro.pp.module.member.convert.level.MemberLevelRecordConvert;
import cn.aagro.pp.module.member.dal.dataobject.level.MemberLevelRecordDO;
import cn.aagro.pp.module.member.service.level.MemberLevelRecordService;
import cn.aagro.ag.framework.common.pojo.CommonResult;
import cn.aagro.ag.framework.common.pojo.PageResult;
import cn.aagro.ag.module.member.controller.admin.level.vo.record.MemberLevelRecordPageReqVO;
import cn.aagro.ag.module.member.controller.admin.level.vo.record.MemberLevelRecordRespVO;
import cn.aagro.ag.module.member.convert.level.MemberLevelRecordConvert;
import cn.aagro.ag.module.member.dal.dataobject.level.MemberLevelRecordDO;
import cn.aagro.ag.module.member.service.level.MemberLevelRecordService;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.tags.Tag;
@@ -17,10 +17,10 @@ import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import javax.annotation.Resource;
import javax.validation.Valid;
import jakarta.annotation.Resource;
import jakarta.validation.Valid;
import static cn.aagro.pp.framework.common.pojo.CommonResult.success;
import static cn.aagro.ag.framework.common.pojo.CommonResult.success;
@Tag(name = "管理后台 - 会员等级记录")
@RestController

4
aagro-module-member/src/main/java/cn/aagro/pp/module/member/controller/admin/level/vo/experience/MemberExperienceRecordBaseVO.java → aagro-module-member/src/main/java/cn/aagro/ag/module/member/controller/admin/level/vo/experience/MemberExperienceRecordBaseVO.java
View File

@@ -1,9 +1,9 @@
package cn.aagro.pp.module.member.controller.admin.level.vo.experience;
package cn.aagro.ag.module.member.controller.admin.level.vo.experience;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import javax.validation.constraints.NotNull;
import jakarta.validation.constraints.NotNull;
/**
* 会员经验记录 Base VO，提供给添加、修改、详细的子 VO 使用

6
aagro-module-member/src/main/java/cn/aagro/pp/module/member/controller/admin/level/vo/experience/MemberExperienceRecordPageReqVO.java → aagro-module-member/src/main/java/cn/aagro/ag/module/member/controller/admin/level/vo/experience/MemberExperienceRecordPageReqVO.java
View File

@@ -1,6 +1,6 @@
package cn.aagro.pp.module.member.controller.admin.level.vo.experience;
package cn.aagro.ag.module.member.controller.admin.level.vo.experience;
import cn.aagro.pp.framework.common.pojo.PageParam;
import cn.aagro.ag.framework.common.pojo.PageParam;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -9,7 +9,7 @@ import org.springframework.format.annotation.DateTimeFormat;
import java.time.LocalDateTime;
import static cn.aagro.pp.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
import static cn.aagro.ag.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
@Schema(description = "管理后台 - 会员经验记录分页 Request VO")
@Data

2
aagro-module-member/src/main/java/cn/aagro/pp/module/member/controller/admin/level/vo/experience/MemberExperienceRecordRespVO.java → aagro-module-member/src/main/java/cn/aagro/ag/module/member/controller/admin/level/vo/experience/MemberExperienceRecordRespVO.java
View File

@@ -1,4 +1,4 @@
package cn.aagro.pp.module.member.controller.admin.level.vo.experience;
package cn.aagro.ag.module.member.controller.admin.level.vo.experience;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;

12
aagro-module-member/src/main/java/cn/aagro/pp/module/member/controller/admin/level/vo/level/MemberLevelBaseVO.java → aagro-module-member/src/main/java/cn/aagro/ag/module/member/controller/admin/level/vo/level/MemberLevelBaseVO.java
View File

@@ -1,15 +1,15 @@
package cn.aagro.pp.module.member.controller.admin.level.vo.level;
package cn.aagro.ag.module.member.controller.admin.level.vo.level;
import cn.aagro.pp.framework.common.enums.CommonStatusEnum;
import cn.aagro.pp.framework.common.validation.InEnum;
import cn.aagro.ag.framework.common.enums.CommonStatusEnum;
import cn.aagro.ag.framework.common.validation.InEnum;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import org.hibernate.validator.constraints.Range;
import org.hibernate.validator.constraints.URL;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
import javax.validation.constraints.Positive;
import jakarta.validation.constraints.NotBlank;
import jakarta.validation.constraints.NotNull;
import jakarta.validation.constraints.Positive;
/**
* 会员等级 Base VO，提供给添加、修改、详细的子 VO 使用

2
aagro-module-member/src/main/java/cn/aagro/pp/module/member/controller/admin/level/vo/level/MemberLevelCreateReqVO.java → aagro-module-member/src/main/java/cn/aagro/ag/module/member/controller/admin/level/vo/level/MemberLevelCreateReqVO.java
View File

@@ -1,4 +1,4 @@
package cn.aagro.pp.module.member.controller.admin.level.vo.level;
package cn.aagro.ag.module.member.controller.admin.level.vo.level;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;

2
aagro-module-member/src/main/java/cn/aagro/pp/module/member/controller/admin/level/vo/level/MemberLevelListReqVO.java → aagro-module-member/src/main/java/cn/aagro/ag/module/member/controller/admin/level/vo/level/MemberLevelListReqVO.java
View File

@@ -1,4 +1,4 @@
package cn.aagro.pp.module.member.controller.admin.level.vo.level;
package cn.aagro.ag.module.member.controller.admin.level.vo.level;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;

2
aagro-module-member/src/main/java/cn/aagro/pp/module/member/controller/admin/level/vo/level/MemberLevelRespVO.java → aagro-module-member/src/main/java/cn/aagro/ag/module/member/controller/admin/level/vo/level/MemberLevelRespVO.java
View File

@@ -1,4 +1,4 @@
package cn.aagro.pp.module.member.controller.admin.level.vo.level;
package cn.aagro.ag.module.member.controller.admin.level.vo.level;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;

2
aagro-module-member/src/main/java/cn/aagro/pp/module/member/controller/admin/level/vo/level/MemberLevelSimpleRespVO.java → aagro-module-member/src/main/java/cn/aagro/ag/module/member/controller/admin/level/vo/level/MemberLevelSimpleRespVO.java
View File

@@ -1,4 +1,4 @@
package cn.aagro.pp.module.member.controller.admin.level.vo.level;
package cn.aagro.ag.module.member.controller.admin.level.vo.level;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;

4
aagro-module-member/src/main/java/cn/aagro/pp/module/member/controller/admin/level/vo/level/MemberLevelUpdateReqVO.java → aagro-module-member/src/main/java/cn/aagro/ag/module/member/controller/admin/level/vo/level/MemberLevelUpdateReqVO.java
View File

@@ -1,11 +1,11 @@
package cn.aagro.pp.module.member.controller.admin.level.vo.level;
package cn.aagro.ag.module.member.controller.admin.level.vo.level;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.ToString;
import javax.validation.constraints.NotNull;
import jakarta.validation.constraints.NotNull;
@Schema(description = "管理后台 - 会员等级更新 Request VO")
@Data

4
aagro-module-member/src/main/java/cn/aagro/pp/module/member/controller/admin/level/vo/record/MemberLevelRecordBaseVO.java → aagro-module-member/src/main/java/cn/aagro/ag/module/member/controller/admin/level/vo/record/MemberLevelRecordBaseVO.java
View File

@@ -1,9 +1,9 @@
package cn.aagro.pp.module.member.controller.admin.level.vo.record;
package cn.aagro.ag.module.member.controller.admin.level.vo.record;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import javax.validation.constraints.NotNull;
import jakarta.validation.constraints.NotNull;
/**
* 会员等级记录 Base VO，提供给添加、修改、详细的子 VO 使用

6
aagro-module-member/src/main/java/cn/aagro/pp/module/member/controller/admin/level/vo/record/MemberLevelRecordPageReqVO.java → aagro-module-member/src/main/java/cn/aagro/ag/module/member/controller/admin/level/vo/record/MemberLevelRecordPageReqVO.java
View File

@@ -1,6 +1,6 @@
package cn.aagro.pp.module.member.controller.admin.level.vo.record;
package cn.aagro.ag.module.member.controller.admin.level.vo.record;
import cn.aagro.pp.framework.common.pojo.PageParam;
import cn.aagro.ag.framework.common.pojo.PageParam;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -9,7 +9,7 @@ import org.springframework.format.annotation.DateTimeFormat;
import java.time.LocalDateTime;
import static cn.aagro.pp.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
import static cn.aagro.ag.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
@Schema(description = "管理后台 - 会员等级记录分页 Request VO")
@Data

2
aagro-module-member/src/main/java/cn/aagro/pp/module/member/controller/admin/level/vo/record/MemberLevelRecordRespVO.java → aagro-module-member/src/main/java/cn/aagro/ag/module/member/controller/admin/level/vo/record/MemberLevelRecordRespVO.java
View File

@@ -1,4 +1,4 @@
package cn.aagro.pp.module.member.controller.admin.level.vo.record;
package cn.aagro.ag.module.member.controller.admin.level.vo.record;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;

28
aagro-module-member/src/main/java/cn/aagro/pp/module/member/controller/admin/point/MemberPointRecordController.java → aagro-module-member/src/main/java/cn/aagro/ag/module/member/controller/admin/point/MemberPointRecordController.java
View File

@@ -1,14 +1,14 @@
package cn.aagro.pp.module.member.controller.admin.point;
package cn.aagro.ag.module.member.controller.admin.point;
import cn.aagro.pp.framework.common.pojo.CommonResult;
import cn.aagro.pp.framework.common.pojo.PageResult;
import cn.aagro.pp.module.member.controller.admin.point.vo.recrod.MemberPointRecordPageReqVO;
import cn.aagro.pp.module.member.controller.admin.point.vo.recrod.MemberPointRecordRespVO;
import cn.aagro.pp.module.member.convert.point.MemberPointRecordConvert;
import cn.aagro.pp.module.member.dal.dataobject.point.MemberPointRecordDO;
import cn.aagro.pp.module.member.dal.dataobject.user.MemberUserDO;
import cn.aagro.pp.module.member.service.point.MemberPointRecordService;
import cn.aagro.pp.module.member.service.user.MemberUserService;
import cn.aagro.ag.framework.common.pojo.CommonResult;
import cn.aagro.ag.framework.common.pojo.PageResult;
import cn.aagro.ag.module.member.controller.admin.point.vo.recrod.MemberPointRecordPageReqVO;
import cn.aagro.ag.module.member.controller.admin.point.vo.recrod.MemberPointRecordRespVO;
import cn.aagro.ag.module.member.convert.point.MemberPointRecordConvert;
import cn.aagro.ag.module.member.dal.dataobject.point.MemberPointRecordDO;
import cn.aagro.ag.module.member.dal.dataobject.user.MemberUserDO;
import cn.aagro.ag.module.member.service.point.MemberPointRecordService;
import cn.aagro.ag.module.member.service.user.MemberUserService;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
import org.springframework.security.access.prepost.PreAuthorize;
@@ -18,12 +18,12 @@ import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import javax.annotation.Resource;
import javax.validation.Valid;
import jakarta.annotation.Resource;
import jakarta.validation.Valid;
import java.util.List;
import static cn.aagro.pp.framework.common.pojo.CommonResult.success;
import static cn.aagro.pp.framework.common.util.collection.CollectionUtils.convertSet;
import static cn.aagro.ag.framework.common.pojo.CommonResult.success;
import static cn.aagro.ag.framework.common.util.collection.CollectionUtils.convertSet;
@Tag(name = "管理后台 - 签到记录")
@RestController

4
aagro-module-member/src/main/java/cn/aagro/pp/module/member/controller/admin/point/vo/recrod/MemberPointRecordPageReqVO.java → aagro-module-member/src/main/java/cn/aagro/ag/module/member/controller/admin/point/vo/recrod/MemberPointRecordPageReqVO.java
View File

@@ -1,6 +1,6 @@
package cn.aagro.pp.module.member.controller.admin.point.vo.recrod;
package cn.aagro.ag.module.member.controller.admin.point.vo.recrod;
import cn.aagro.pp.framework.common.pojo.PageParam;
import cn.aagro.ag.framework.common.pojo.PageParam;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import lombok.EqualsAndHashCode;

2
aagro-module-member/src/main/java/cn/aagro/pp/module/member/controller/admin/point/vo/recrod/MemberPointRecordRespVO.java → aagro-module-member/src/main/java/cn/aagro/ag/module/member/controller/admin/point/vo/recrod/MemberPointRecordRespVO.java
View File

@@ -1,4 +1,4 @@
package cn.aagro.pp.module.member.controller.admin.point.vo.recrod;
package cn.aagro.ag.module.member.controller.admin.point.vo.recrod;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;

22
aagro-module-member/src/main/java/cn/aagro/pp/module/member/controller/admin/signin/MemberSignInConfigController.java → aagro-module-member/src/main/java/cn/aagro/ag/module/member/controller/admin/signin/MemberSignInConfigController.java
View File

@@ -1,12 +1,12 @@
package cn.aagro.pp.module.member.controller.admin.signin;
package cn.aagro.ag.module.member.controller.admin.signin;
import cn.aagro.pp.framework.common.pojo.CommonResult;
import cn.aagro.pp.module.member.controller.admin.signin.vo.config.MemberSignInConfigCreateReqVO;
import cn.aagro.pp.module.member.controller.admin.signin.vo.config.MemberSignInConfigRespVO;
import cn.aagro.pp.module.member.controller.admin.signin.vo.config.MemberSignInConfigUpdateReqVO;
import cn.aagro.pp.module.member.convert.signin.MemberSignInConfigConvert;
import cn.aagro.pp.module.member.dal.dataobject.signin.MemberSignInConfigDO;
import cn.aagro.pp.module.member.service.signin.MemberSignInConfigService;
import cn.aagro.ag.framework.common.pojo.CommonResult;
import cn.aagro.ag.module.member.controller.admin.signin.vo.config.MemberSignInConfigCreateReqVO;
import cn.aagro.ag.module.member.controller.admin.signin.vo.config.MemberSignInConfigRespVO;
import cn.aagro.ag.module.member.controller.admin.signin.vo.config.MemberSignInConfigUpdateReqVO;
import cn.aagro.ag.module.member.convert.signin.MemberSignInConfigConvert;
import cn.aagro.ag.module.member.dal.dataobject.signin.MemberSignInConfigDO;
import cn.aagro.ag.module.member.service.signin.MemberSignInConfigService;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.tags.Tag;
@@ -14,11 +14,11 @@ import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import javax.validation.Valid;
import jakarta.annotation.Resource;
import jakarta.validation.Valid;
import java.util.List;
import static cn.aagro.pp.framework.common.pojo.CommonResult.success;
import static cn.aagro.ag.framework.common.pojo.CommonResult.success;
// TODO 芋艿：url
@Tag(name = "管理后台 - 签到规则")

28
aagro-module-member/src/main/java/cn/aagro/pp/module/member/controller/admin/signin/MemberSignInRecordController.java → aagro-module-member/src/main/java/cn/aagro/ag/module/member/controller/admin/signin/MemberSignInRecordController.java
View File

@@ -1,14 +1,14 @@
package cn.aagro.pp.module.member.controller.admin.signin;
package cn.aagro.ag.module.member.controller.admin.signin;
import cn.aagro.pp.framework.common.pojo.CommonResult;
import cn.aagro.pp.framework.common.pojo.PageResult;
import cn.aagro.pp.module.member.controller.admin.signin.vo.record.MemberSignInRecordPageReqVO;
import cn.aagro.pp.module.member.controller.admin.signin.vo.record.MemberSignInRecordRespVO;
import cn.aagro.pp.module.member.convert.signin.MemberSignInRecordConvert;
import cn.aagro.pp.module.member.dal.dataobject.signin.MemberSignInRecordDO;
import cn.aagro.pp.module.member.dal.dataobject.user.MemberUserDO;
import cn.aagro.pp.module.member.service.signin.MemberSignInRecordService;
import cn.aagro.pp.module.member.service.user.MemberUserService;
import cn.aagro.ag.framework.common.pojo.CommonResult;
import cn.aagro.ag.framework.common.pojo.PageResult;
import cn.aagro.ag.module.member.controller.admin.signin.vo.record.MemberSignInRecordPageReqVO;
import cn.aagro.ag.module.member.controller.admin.signin.vo.record.MemberSignInRecordRespVO;
import cn.aagro.ag.module.member.convert.signin.MemberSignInRecordConvert;
import cn.aagro.ag.module.member.dal.dataobject.signin.MemberSignInRecordDO;
import cn.aagro.ag.module.member.dal.dataobject.user.MemberUserDO;
import cn.aagro.ag.module.member.service.signin.MemberSignInRecordService;
import cn.aagro.ag.module.member.service.user.MemberUserService;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
import org.springframework.security.access.prepost.PreAuthorize;
@@ -18,12 +18,12 @@ import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import javax.annotation.Resource;
import javax.validation.Valid;
import jakarta.annotation.Resource;
import jakarta.validation.Valid;
import java.util.List;
import static cn.aagro.pp.framework.common.pojo.CommonResult.success;
import static cn.aagro.pp.framework.common.util.collection.CollectionUtils.convertSet;
import static cn.aagro.ag.framework.common.pojo.CommonResult.success;
import static cn.aagro.ag.framework.common.util.collection.CollectionUtils.convertSet;
@Tag(name = "管理后台 - 签到记录")
@RestController

12
aagro-module-member/src/main/java/cn/aagro/pp/module/member/controller/admin/signin/vo/config/MemberSignInConfigBaseVO.java → aagro-module-member/src/main/java/cn/aagro/ag/module/member/controller/admin/signin/vo/config/MemberSignInConfigBaseVO.java
View File

@@ -1,15 +1,15 @@
package cn.aagro.pp.module.member.controller.admin.signin.vo.config;
package cn.aagro.ag.module.member.controller.admin.signin.vo.config;
import cn.hutool.core.util.ObjUtil;
import cn.aagro.pp.framework.common.enums.CommonStatusEnum;
import cn.aagro.pp.framework.common.validation.InEnum;
import cn.aagro.ag.framework.common.enums.CommonStatusEnum;
import cn.aagro.ag.framework.common.validation.InEnum;
import com.fasterxml.jackson.annotation.JsonIgnore;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import javax.validation.constraints.AssertTrue;
import javax.validation.constraints.NotNull;
import javax.validation.constraints.PositiveOrZero;
import jakarta.validation.constraints.AssertTrue;
import jakarta.validation.constraints.NotNull;
import jakarta.validation.constraints.PositiveOrZero;
/**
* 签到规则 Base VO，提供给添加、修改、详细的子 VO 使用

2
aagro-module-member/src/main/java/cn/aagro/pp/module/member/controller/admin/signin/vo/config/MemberSignInConfigCreateReqVO.java → aagro-module-member/src/main/java/cn/aagro/ag/module/member/controller/admin/signin/vo/config/MemberSignInConfigCreateReqVO.java
View File

@@ -1,4 +1,4 @@
package cn.aagro.pp.module.member.controller.admin.signin.vo.config;
package cn.aagro.ag.module.member.controller.admin.signin.vo.config;
import lombok.*;
import io.swagger.v3.oas.annotations.media.Schema;

2
aagro-module-member/src/main/java/cn/aagro/pp/module/member/controller/admin/signin/vo/config/MemberSignInConfigRespVO.java → aagro-module-member/src/main/java/cn/aagro/ag/module/member/controller/admin/signin/vo/config/MemberSignInConfigRespVO.java
View File

@@ -1,4 +1,4 @@
package cn.aagro.pp.module.member.controller.admin.signin.vo.config;
package cn.aagro.ag.module.member.controller.admin.signin.vo.config;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.*;

4
aagro-module-member/src/main/java/cn/aagro/pp/module/member/controller/admin/signin/vo/config/MemberSignInConfigUpdateReqVO.java → aagro-module-member/src/main/java/cn/aagro/ag/module/member/controller/admin/signin/vo/config/MemberSignInConfigUpdateReqVO.java
View File

@@ -1,9 +1,9 @@
package cn.aagro.pp.module.member.controller.admin.signin.vo.config;
package cn.aagro.ag.module.member.controller.admin.signin.vo.config;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.*;
import javax.validation.constraints.*;
import jakarta.validation.constraints.*;
@Schema(description = "管理后台 - 签到规则更新 Request VO")
@Data

6
aagro-module-member/src/main/java/cn/aagro/pp/module/member/controller/admin/signin/vo/record/MemberSignInRecordPageReqVO.java → aagro-module-member/src/main/java/cn/aagro/ag/module/member/controller/admin/signin/vo/record/MemberSignInRecordPageReqVO.java
View File

@@ -1,6 +1,6 @@
package cn.aagro.pp.module.member.controller.admin.signin.vo.record;
package cn.aagro.ag.module.member.controller.admin.signin.vo.record;
import cn.aagro.pp.framework.common.pojo.PageParam;
import cn.aagro.ag.framework.common.pojo.PageParam;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -9,7 +9,7 @@ import org.springframework.format.annotation.DateTimeFormat;
import java.time.LocalDateTime;
import static cn.aagro.pp.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
import static cn.aagro.ag.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
@Schema(description = "管理后台 - 签到记录分页 Request VO")
@Data

2
aagro-module-member/src/main/java/cn/aagro/pp/module/member/controller/admin/signin/vo/record/MemberSignInRecordRespVO.java → aagro-module-member/src/main/java/cn/aagro/ag/module/member/controller/admin/signin/vo/record/MemberSignInRecordRespVO.java
View File

@@ -1,4 +1,4 @@
package cn.aagro.pp.module.member.controller.admin.signin.vo.record;
package cn.aagro.ag.module.member.controller.admin.signin.vo.record;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;

26
aagro-module-member/src/main/java/cn/aagro/pp/module/member/controller/admin/tag/MemberTagController.java → aagro-module-member/src/main/java/cn/aagro/ag/module/member/controller/admin/tag/MemberTagController.java
View File

@@ -1,14 +1,14 @@
package cn.aagro.pp.module.member.controller.admin.tag;
package cn.aagro.ag.module.member.controller.admin.tag;
import cn.aagro.pp.framework.common.pojo.CommonResult;
import cn.aagro.pp.framework.common.pojo.PageResult;
import cn.aagro.pp.module.member.controller.admin.tag.vo.MemberTagCreateReqVO;
import cn.aagro.pp.module.member.controller.admin.tag.vo.MemberTagPageReqVO;
import cn.aagro.pp.module.member.controller.admin.tag.vo.MemberTagRespVO;
import cn.aagro.pp.module.member.controller.admin.tag.vo.MemberTagUpdateReqVO;
import cn.aagro.pp.module.member.convert.tag.MemberTagConvert;
import cn.aagro.pp.module.member.dal.dataobject.tag.MemberTagDO;
import cn.aagro.pp.module.member.service.tag.MemberTagService;
import cn.aagro.ag.framework.common.pojo.CommonResult;
import cn.aagro.ag.framework.common.pojo.PageResult;
import cn.aagro.ag.module.member.controller.admin.tag.vo.MemberTagCreateReqVO;
import cn.aagro.ag.module.member.controller.admin.tag.vo.MemberTagPageReqVO;
import cn.aagro.ag.module.member.controller.admin.tag.vo.MemberTagRespVO;
import cn.aagro.ag.module.member.controller.admin.tag.vo.MemberTagUpdateReqVO;
import cn.aagro.ag.module.member.convert.tag.MemberTagConvert;
import cn.aagro.ag.module.member.dal.dataobject.tag.MemberTagDO;
import cn.aagro.ag.module.member.service.tag.MemberTagService;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.tags.Tag;
@@ -16,12 +16,12 @@ import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import javax.validation.Valid;
import jakarta.annotation.Resource;
import jakarta.validation.Valid;
import java.util.Collection;
import java.util.List;
import static cn.aagro.pp.framework.common.pojo.CommonResult.success;
import static cn.aagro.ag.framework.common.pojo.CommonResult.success;
@Tag(name = "管理后台 - 会员标签")
@RestController

4
aagro-module-member/src/main/java/cn/aagro/pp/module/member/controller/admin/tag/vo/MemberTagBaseVO.java → aagro-module-member/src/main/java/cn/aagro/ag/module/member/controller/admin/tag/vo/MemberTagBaseVO.java
View File

@@ -1,9 +1,9 @@
package cn.aagro.pp.module.member.controller.admin.tag.vo;
package cn.aagro.ag.module.member.controller.admin.tag.vo;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import javax.validation.constraints.NotNull;
import jakarta.validation.constraints.NotNull;
/**
* 会员标签 Base VO，提供给添加、修改、详细的子 VO 使用

2
aagro-module-member/src/main/java/cn/aagro/pp/module/member/controller/admin/tag/vo/MemberTagCreateReqVO.java → aagro-module-member/src/main/java/cn/aagro/ag/module/member/controller/admin/tag/vo/MemberTagCreateReqVO.java
View File

@@ -1,4 +1,4 @@
package cn.aagro.pp.module.member.controller.admin.tag.vo;
package cn.aagro.ag.module.member.controller.admin.tag.vo;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;

6
aagro-module-member/src/main/java/cn/aagro/pp/module/member/controller/admin/tag/vo/MemberTagPageReqVO.java → aagro-module-member/src/main/java/cn/aagro/ag/module/member/controller/admin/tag/vo/MemberTagPageReqVO.java
View File

@@ -1,6 +1,6 @@
package cn.aagro.pp.module.member.controller.admin.tag.vo;
package cn.aagro.ag.module.member.controller.admin.tag.vo;
import cn.aagro.pp.framework.common.pojo.PageParam;
import cn.aagro.ag.framework.common.pojo.PageParam;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -9,7 +9,7 @@ import org.springframework.format.annotation.DateTimeFormat;
import java.time.LocalDateTime;
import static cn.aagro.pp.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
import static cn.aagro.ag.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
@Schema(description = "管理后台 - 会员标签分页 Request VO")
@Data

2
aagro-module-member/src/main/java/cn/aagro/pp/module/member/controller/admin/tag/vo/MemberTagRespVO.java → aagro-module-member/src/main/java/cn/aagro/ag/module/member/controller/admin/tag/vo/MemberTagRespVO.java
View File

@@ -1,4 +1,4 @@
package cn.aagro.pp.module.member.controller.admin.tag.vo;
package cn.aagro.ag.module.member.controller.admin.tag.vo;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;

4
aagro-module-member/src/main/java/cn/aagro/pp/module/member/controller/admin/tag/vo/MemberTagUpdateReqVO.java → aagro-module-member/src/main/java/cn/aagro/ag/module/member/controller/admin/tag/vo/MemberTagUpdateReqVO.java
View File

@@ -1,11 +1,11 @@
package cn.aagro.pp.module.member.controller.admin.tag.vo;
package cn.aagro.ag.module.member.controller.admin.tag.vo;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.ToString;
import javax.validation.constraints.NotNull;
import jakarta.validation.constraints.NotNull;
@Schema(description = "管理后台 - 会员标签更新 Request VO")
@Data

40
aagro-module-member/src/main/java/cn/aagro/pp/module/member/controller/admin/user/MemberUserController.java → aagro-module-member/src/main/java/cn/aagro/ag/module/member/controller/admin/user/MemberUserController.java
View File

@@ -1,20 +1,20 @@
package cn.aagro.pp.module.member.controller.admin.user;
package cn.aagro.ag.module.member.controller.admin.user;
import cn.hutool.core.collection.CollUtil;
import cn.aagro.pp.framework.common.pojo.CommonResult;
import cn.aagro.pp.framework.common.pojo.PageResult;
import cn.aagro.pp.module.member.controller.admin.user.vo.*;
import cn.aagro.pp.module.member.convert.user.MemberUserConvert;
import cn.aagro.pp.module.member.dal.dataobject.group.MemberGroupDO;
import cn.aagro.pp.module.member.dal.dataobject.level.MemberLevelDO;
import cn.aagro.pp.module.member.dal.dataobject.tag.MemberTagDO;
import cn.aagro.pp.module.member.dal.dataobject.user.MemberUserDO;
import cn.aagro.pp.module.member.enums.point.MemberPointBizTypeEnum;
import cn.aagro.pp.module.member.service.group.MemberGroupService;
import cn.aagro.pp.module.member.service.level.MemberLevelService;
import cn.aagro.pp.module.member.service.point.MemberPointRecordService;
import cn.aagro.pp.module.member.service.tag.MemberTagService;
import cn.aagro.pp.module.member.service.user.MemberUserService;
import cn.aagro.ag.framework.common.pojo.CommonResult;
import cn.aagro.ag.framework.common.pojo.PageResult;
import cn.aagro.ag.module.member.controller.admin.user.vo.*;
import cn.aagro.ag.module.member.convert.user.MemberUserConvert;
import cn.aagro.ag.module.member.dal.dataobject.group.MemberGroupDO;
import cn.aagro.ag.module.member.dal.dataobject.level.MemberLevelDO;
import cn.aagro.ag.module.member.dal.dataobject.tag.MemberTagDO;
import cn.aagro.ag.module.member.dal.dataobject.user.MemberUserDO;
import cn.aagro.ag.module.member.enums.point.MemberPointBizTypeEnum;
import cn.aagro.ag.module.member.service.group.MemberGroupService;
import cn.aagro.ag.module.member.service.level.MemberLevelService;
import cn.aagro.ag.module.member.service.point.MemberPointRecordService;
import cn.aagro.ag.module.member.service.tag.MemberTagService;
import cn.aagro.ag.module.member.service.user.MemberUserService;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.tags.Tag;
@@ -22,17 +22,17 @@ import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import javax.validation.Valid;
import jakarta.annotation.Resource;
import jakarta.validation.Valid;
import java.util.Collection;
import java.util.List;
import java.util.Objects;
import java.util.Set;
import java.util.stream.Collectors;
import static cn.aagro.pp.framework.common.pojo.CommonResult.success;
import static cn.aagro.pp.framework.common.util.collection.CollectionUtils.convertSet;
import static cn.aagro.pp.framework.web.core.util.WebFrameworkUtils.getLoginUserId;
import static cn.aagro.ag.framework.common.pojo.CommonResult.success;
import static cn.aagro.ag.framework.common.util.collection.CollectionUtils.convertSet;
import static cn.aagro.ag.framework.web.core.util.WebFrameworkUtils.getLoginUserId;
@Tag(name = "管理后台 - 会员用户")
@RestController

6
aagro-module-member/src/main/java/cn/aagro/pp/module/member/controller/admin/user/vo/MemberUserBaseVO.java → aagro-module-member/src/main/java/cn/aagro/ag/module/member/controller/admin/user/vo/MemberUserBaseVO.java
View File

@@ -1,15 +1,15 @@
package cn.aagro.pp.module.member.controller.admin.user.vo;
package cn.aagro.ag.module.member.controller.admin.user.vo;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import org.hibernate.validator.constraints.URL;
import org.springframework.format.annotation.DateTimeFormat;
import javax.validation.constraints.NotNull;
import jakarta.validation.constraints.NotNull;
import java.time.LocalDateTime;
import java.util.List;
import static cn.aagro.pp.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY;
import static cn.aagro.ag.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY;
/**
* 会员用户 Base VO，提供给添加、修改、详细的子 VO 使用

6
aagro-module-member/src/main/java/cn/aagro/pp/module/member/controller/admin/user/vo/MemberUserPageReqVO.java → aagro-module-member/src/main/java/cn/aagro/ag/module/member/controller/admin/user/vo/MemberUserPageReqVO.java
View File

@@ -1,6 +1,6 @@
package cn.aagro.pp.module.member.controller.admin.user.vo;
package cn.aagro.ag.module.member.controller.admin.user.vo;
import cn.aagro.pp.framework.common.pojo.PageParam;
import cn.aagro.ag.framework.common.pojo.PageParam;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -10,7 +10,7 @@ import org.springframework.format.annotation.DateTimeFormat;
import java.time.LocalDateTime;
import java.util.List;
import static cn.aagro.pp.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
import static cn.aagro.ag.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
@Schema(description = "管理后台 - 会员用户分页 Request VO")
@Data

2
aagro-module-member/src/main/java/cn/aagro/pp/module/member/controller/admin/user/vo/MemberUserRespVO.java → aagro-module-member/src/main/java/cn/aagro/ag/module/member/controller/admin/user/vo/MemberUserRespVO.java
View File

@@ -1,4 +1,4 @@
package cn.aagro.pp.module.member.controller.admin.user.vo;
package cn.aagro.ag.module.member.controller.admin.user.vo;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;

6
aagro-module-member/src/main/java/cn/aagro/pp/module/member/controller/admin/user/vo/MemberUserUpdateLevelReqVO.java → aagro-module-member/src/main/java/cn/aagro/ag/module/member/controller/admin/user/vo/MemberUserUpdateLevelReqVO.java
View File

@@ -1,11 +1,11 @@
package cn.aagro.pp.module.member.controller.admin.user.vo;
package cn.aagro.ag.module.member.controller.admin.user.vo;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import lombok.ToString;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
import jakarta.validation.constraints.NotBlank;
import jakarta.validation.constraints.NotNull;
@Schema(description = "管理后台 - 用户修改等级 Request VO")
@Data

4
aagro-module-member/src/main/java/cn/aagro/pp/module/member/controller/admin/user/vo/MemberUserUpdatePointReqVO.java → aagro-module-member/src/main/java/cn/aagro/ag/module/member/controller/admin/user/vo/MemberUserUpdatePointReqVO.java
View File

@@ -1,10 +1,10 @@
package cn.aagro.pp.module.member.controller.admin.user.vo;
package cn.aagro.ag.module.member.controller.admin.user.vo;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import lombok.ToString;
import javax.validation.constraints.NotNull;
import jakarta.validation.constraints.NotNull;
@Schema(description = "管理后台 - 用户修改积分 Request VO")
@Data

4
aagro-module-member/src/main/java/cn/aagro/pp/module/member/controller/admin/user/vo/MemberUserUpdateReqVO.java → aagro-module-member/src/main/java/cn/aagro/ag/module/member/controller/admin/user/vo/MemberUserUpdateReqVO.java
View File

@@ -1,11 +1,11 @@
package cn.aagro.pp.module.member.controller.admin.user.vo;
package cn.aagro.ag.module.member.controller.admin.user.vo;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.ToString;
import javax.validation.constraints.NotNull;
import jakarta.validation.constraints.NotNull;
@Schema(description = "管理后台 - 会员用户更新 Request VO")
@Data

0
aagro-module-member/src/main/java/cn/aagro/pp/module/member/controller/app/address/AppAddressController.http → aagro-module-member/src/main/java/cn/aagro/ag/module/member/controller/app/address/AppAddressController.http
View File

24
aagro-module-member/src/main/java/cn/aagro/pp/module/member/controller/app/address/AppAddressController.java → aagro-module-member/src/main/java/cn/aagro/ag/module/member/controller/app/address/AppAddressController.java
View File

@@ -1,24 +1,24 @@
package cn.aagro.pp.module.member.controller.app.address;
package cn.aagro.ag.module.member.controller.app.address;
import cn.aagro.pp.framework.common.pojo.CommonResult;
import cn.aagro.pp.module.member.controller.app.address.vo.AppAddressCreateReqVO;
import cn.aagro.pp.module.member.controller.app.address.vo.AppAddressRespVO;
import cn.aagro.pp.module.member.controller.app.address.vo.AppAddressUpdateReqVO;
import cn.aagro.pp.module.member.convert.address.AddressConvert;
import cn.aagro.pp.module.member.dal.dataobject.address.MemberAddressDO;
import cn.aagro.pp.module.member.service.address.AddressService;
import cn.aagro.ag.framework.common.pojo.CommonResult;
import cn.aagro.ag.module.member.controller.app.address.vo.AppAddressCreateReqVO;
import cn.aagro.ag.module.member.controller.app.address.vo.AppAddressRespVO;
import cn.aagro.ag.module.member.controller.app.address.vo.AppAddressUpdateReqVO;
import cn.aagro.ag.module.member.convert.address.AddressConvert;
import cn.aagro.ag.module.member.dal.dataobject.address.MemberAddressDO;
import cn.aagro.ag.module.member.service.address.AddressService;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.tags.Tag;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import javax.validation.Valid;
import jakarta.annotation.Resource;
import jakarta.validation.Valid;
import java.util.List;
import static cn.aagro.pp.framework.common.pojo.CommonResult.success;
import static cn.aagro.pp.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId;
import static cn.aagro.ag.framework.common.pojo.CommonResult.success;
import static cn.aagro.ag.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId;
@Tag(name = "用户 APP - 用户收件地址")
@RestController

4
aagro-module-member/src/main/java/cn/aagro/pp/module/member/controller/app/address/vo/AppAddressBaseVO.java → aagro-module-member/src/main/java/cn/aagro/ag/module/member/controller/app/address/vo/AppAddressBaseVO.java
View File

@@ -1,8 +1,8 @@
package cn.aagro.pp.module.member.controller.app.address.vo;
package cn.aagro.ag.module.member.controller.app.address.vo;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import javax.validation.constraints.NotNull;
import jakarta.validation.constraints.NotNull;
// TODO 芋艿：example 缺失
/**

2
aagro-module-member/src/main/java/cn/aagro/pp/module/member/controller/app/address/vo/AppAddressCreateReqVO.java → aagro-module-member/src/main/java/cn/aagro/ag/module/member/controller/app/address/vo/AppAddressCreateReqVO.java
View File

@@ -1,4 +1,4 @@
package cn.aagro.pp.module.member.controller.app.address.vo;
package cn.aagro.ag.module.member.controller.app.address.vo;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.*;

2
aagro-module-member/src/main/java/cn/aagro/pp/module/member/controller/app/address/vo/AppAddressRespVO.java → aagro-module-member/src/main/java/cn/aagro/ag/module/member/controller/app/address/vo/AppAddressRespVO.java
View File

@@ -1,4 +1,4 @@
package cn.aagro.pp.module.member.controller.app.address.vo;
package cn.aagro.ag.module.member.controller.app.address.vo;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;

4
aagro-module-member/src/main/java/cn/aagro/pp/module/member/controller/app/address/vo/AppAddressUpdateReqVO.java → aagro-module-member/src/main/java/cn/aagro/ag/module/member/controller/app/address/vo/AppAddressUpdateReqVO.java
View File

@@ -1,7 +1,7 @@
package cn.aagro.pp.module.member.controller.app.address.vo;
package cn.aagro.ag.module.member.controller.app.address.vo;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.*;
import javax.validation.constraints.*;
import jakarta.validation.constraints.*;
@Schema(description = "用户 APP - 用户收件地址更新 Request VO")
@Data

0
aagro-module-member/src/main/java/cn/aagro/pp/module/member/controller/app/auth/AppAuthController.http → aagro-module-member/src/main/java/cn/aagro/ag/module/member/controller/app/auth/AppAuthController.http
View File

32
aagro-module-member/src/main/java/cn/aagro/pp/module/member/controller/app/auth/AppAuthController.java → aagro-module-member/src/main/java/cn/aagro/ag/module/member/controller/app/auth/AppAuthController.java
View File

@@ -1,15 +1,15 @@
package cn.aagro.pp.module.member.controller.app.auth;
package cn.aagro.ag.module.member.controller.app.auth;
import cn.hutool.core.util.StrUtil;
import cn.aagro.pp.framework.common.enums.UserTypeEnum;
import cn.aagro.pp.framework.common.pojo.CommonResult;
import cn.aagro.pp.framework.security.config.SecurityProperties;
import cn.aagro.pp.framework.security.core.util.SecurityFrameworkUtils;
import cn.aagro.pp.module.member.controller.app.auth.vo.*;
import cn.aagro.pp.module.member.convert.auth.AuthConvert;
import cn.aagro.pp.module.member.service.auth.MemberAuthService;
import cn.aagro.pp.module.system.api.social.SocialClientApi;
import cn.aagro.pp.module.system.api.social.dto.SocialWxJsapiSignatureRespDTO;
import cn.aagro.ag.framework.common.enums.UserTypeEnum;
import cn.aagro.ag.framework.common.pojo.CommonResult;
import cn.aagro.ag.framework.security.config.SecurityProperties;
import cn.aagro.ag.framework.security.core.util.SecurityFrameworkUtils;
import cn.aagro.ag.module.member.controller.app.auth.vo.*;
import cn.aagro.ag.module.member.convert.auth.AuthConvert;
import cn.aagro.ag.module.member.service.auth.MemberAuthService;
import cn.aagro.ag.module.system.api.social.SocialClientApi;
import cn.aagro.ag.module.system.api.social.dto.SocialWxJsapiSignatureRespDTO;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.Parameters;
@@ -18,13 +18,13 @@ import lombok.extern.slf4j.Slf4j;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import javax.annotation.security.PermitAll;
import javax.servlet.http.HttpServletRequest;
import javax.validation.Valid;
import jakarta.annotation.Resource;
import jakarta.annotation.security.PermitAll;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.validation.Valid;
import static cn.aagro.pp.framework.common.pojo.CommonResult.success;
import static cn.aagro.pp.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId;
import static cn.aagro.ag.framework.common.pojo.CommonResult.success;
import static cn.aagro.ag.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId;
@Tag(name = "用户 APP - 认证")
@RestController

14
aagro-module-member/src/main/java/cn/aagro/pp/module/member/controller/app/auth/vo/AppAuthCheckCodeReqVO.java → aagro-module-member/src/main/java/cn/aagro/ag/module/member/controller/app/auth/vo/AppAuthCheckCodeReqVO.java
View File

@@ -1,8 +1,8 @@
package cn.aagro.pp.module.member.controller.app.auth.vo;
package cn.aagro.ag.module.member.controller.app.auth.vo;
import cn.aagro.pp.framework.common.validation.InEnum;
import cn.aagro.pp.framework.common.validation.Mobile;
import cn.aagro.pp.module.system.enums.sms.SmsSceneEnum;
import cn.aagro.ag.framework.common.validation.InEnum;
import cn.aagro.ag.framework.common.validation.Mobile;
import cn.aagro.ag.module.system.enums.sms.SmsSceneEnum;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.AllArgsConstructor;
import lombok.Builder;
@@ -10,9 +10,9 @@ import lombok.Data;
import lombok.NoArgsConstructor;
import org.hibernate.validator.constraints.Length;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
import javax.validation.constraints.Pattern;
import jakarta.validation.constraints.NotBlank;
import jakarta.validation.constraints.NotNull;
import jakarta.validation.constraints.Pattern;
// TODO 芋艿：code review 相关逻辑
@Schema(description = "用户 APP - 校验验证码 Request VO")

12
aagro-module-member/src/main/java/cn/aagro/pp/module/member/controller/app/auth/vo/AppAuthLoginReqVO.java → aagro-module-member/src/main/java/cn/aagro/ag/module/member/controller/app/auth/vo/AppAuthLoginReqVO.java
View File

@@ -1,9 +1,9 @@
package cn.aagro.pp.module.member.controller.app.auth.vo;
package cn.aagro.ag.module.member.controller.app.auth.vo;
import cn.hutool.core.util.StrUtil;
import cn.aagro.pp.framework.common.validation.InEnum;
import cn.aagro.pp.framework.common.validation.Mobile;
import cn.aagro.pp.module.system.enums.social.SocialTypeEnum;
import cn.aagro.ag.framework.common.validation.InEnum;
import cn.aagro.ag.framework.common.validation.Mobile;
import cn.aagro.ag.module.system.enums.social.SocialTypeEnum;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.AllArgsConstructor;
import lombok.Builder;
@@ -11,8 +11,8 @@ import lombok.Data;
import lombok.NoArgsConstructor;
import org.hibernate.validator.constraints.Length;
import javax.validation.constraints.AssertTrue;
import javax.validation.constraints.NotEmpty;
import jakarta.validation.constraints.AssertTrue;
import jakarta.validation.constraints.NotEmpty;
@Schema(description = "用户 APP - 手机 + 密码登录 Request VO,如果登录并绑定社交用户，需要传递 social 开头的参数")
@Data

2
aagro-module-member/src/main/java/cn/aagro/pp/module/member/controller/app/auth/vo/AppAuthLoginRespVO.java → aagro-module-member/src/main/java/cn/aagro/ag/module/member/controller/app/auth/vo/AppAuthLoginRespVO.java
View File

@@ -1,4 +1,4 @@
package cn.aagro.pp.module.member.controller.app.auth.vo;
package cn.aagro.ag.module.member.controller.app.auth.vo;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.AllArgsConstructor;

14
aagro-module-member/src/main/java/cn/aagro/pp/module/member/controller/app/auth/vo/AppAuthSmsLoginReqVO.java → aagro-module-member/src/main/java/cn/aagro/ag/module/member/controller/app/auth/vo/AppAuthSmsLoginReqVO.java
View File

@@ -1,9 +1,9 @@
package cn.aagro.pp.module.member.controller.app.auth.vo;
package cn.aagro.ag.module.member.controller.app.auth.vo;
import cn.hutool.core.util.StrUtil;
import cn.aagro.pp.framework.common.validation.InEnum;
import cn.aagro.pp.framework.common.validation.Mobile;
import cn.aagro.pp.module.system.enums.social.SocialTypeEnum;
import cn.aagro.ag.framework.common.validation.InEnum;
import cn.aagro.ag.framework.common.validation.Mobile;
import cn.aagro.ag.module.system.enums.social.SocialTypeEnum;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.AllArgsConstructor;
import lombok.Builder;
@@ -11,9 +11,9 @@ import lombok.Data;
import lombok.NoArgsConstructor;
import org.hibernate.validator.constraints.Length;
import javax.validation.constraints.AssertTrue;
import javax.validation.constraints.NotEmpty;
import javax.validation.constraints.Pattern;
import jakarta.validation.constraints.AssertTrue;
import jakarta.validation.constraints.NotEmpty;
import jakarta.validation.constraints.Pattern;
@Schema(description = "用户 APP - 手机 + 验证码登录 Request VO,如果登录并绑定社交用户，需要传递 social 开头的参数")
@Data

10
aagro-module-member/src/main/java/cn/aagro/pp/module/member/controller/app/auth/vo/AppAuthSmsSendReqVO.java → aagro-module-member/src/main/java/cn/aagro/ag/module/member/controller/app/auth/vo/AppAuthSmsSendReqVO.java
View File

@@ -1,12 +1,12 @@
package cn.aagro.pp.module.member.controller.app.auth.vo;
package cn.aagro.ag.module.member.controller.app.auth.vo;
import cn.aagro.pp.framework.common.validation.InEnum;
import cn.aagro.pp.framework.common.validation.Mobile;
import cn.aagro.pp.module.system.enums.sms.SmsSceneEnum;
import cn.aagro.ag.framework.common.validation.InEnum;
import cn.aagro.ag.framework.common.validation.Mobile;
import cn.aagro.ag.module.system.enums.sms.SmsSceneEnum;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import javax.validation.constraints.NotNull;
import jakarta.validation.constraints.NotNull;
@Schema(description = "用户 APP - 发送手机验证码 Request VO")
@Data

14
aagro-module-member/src/main/java/cn/aagro/pp/module/member/controller/app/auth/vo/AppAuthSmsValidateReqVO.java → aagro-module-member/src/main/java/cn/aagro/ag/module/member/controller/app/auth/vo/AppAuthSmsValidateReqVO.java
View File

@@ -1,15 +1,15 @@
package cn.aagro.pp.module.member.controller.app.auth.vo;
package cn.aagro.ag.module.member.controller.app.auth.vo;
import cn.aagro.pp.framework.common.validation.InEnum;
import cn.aagro.pp.framework.common.validation.Mobile;
import cn.aagro.pp.module.system.enums.sms.SmsSceneEnum;
import cn.aagro.ag.framework.common.validation.InEnum;
import cn.aagro.ag.framework.common.validation.Mobile;
import cn.aagro.ag.module.system.enums.sms.SmsSceneEnum;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import org.hibernate.validator.constraints.Length;
import javax.validation.constraints.NotEmpty;
import javax.validation.constraints.NotNull;
import javax.validation.constraints.Pattern;
import jakarta.validation.constraints.NotEmpty;
import jakarta.validation.constraints.NotNull;
import jakarta.validation.constraints.Pattern;
@Schema(description = "用户 APP - 校验手机验证码 Request VO")
@Data

10
aagro-module-member/src/main/java/cn/aagro/pp/module/member/controller/app/auth/vo/AppAuthSocialLoginReqVO.java → aagro-module-member/src/main/java/cn/aagro/ag/module/member/controller/app/auth/vo/AppAuthSocialLoginReqVO.java
View File

@@ -1,15 +1,15 @@
package cn.aagro.pp.module.member.controller.app.auth.vo;
package cn.aagro.ag.module.member.controller.app.auth.vo;
import cn.aagro.pp.framework.common.validation.InEnum;
import cn.aagro.pp.module.system.enums.social.SocialTypeEnum;
import cn.aagro.ag.framework.common.validation.InEnum;
import cn.aagro.ag.module.system.enums.social.SocialTypeEnum;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
import javax.validation.constraints.NotEmpty;
import javax.validation.constraints.NotNull;
import jakarta.validation.constraints.NotEmpty;
import jakarta.validation.constraints.NotNull;
@Schema(description = "用户 APP - 社交快捷登录 Request VO，使用 code 授权码")
@Data

4
aagro-module-member/src/main/java/cn/aagro/pp/module/member/controller/app/auth/vo/AppAuthWeixinMiniAppLoginReqVO.java → aagro-module-member/src/main/java/cn/aagro/ag/module/member/controller/app/auth/vo/AppAuthWeixinMiniAppLoginReqVO.java
View File

@@ -1,4 +1,4 @@
package cn.aagro.pp.module.member.controller.app.auth.vo;
package cn.aagro.ag.module.member.controller.app.auth.vo;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.AllArgsConstructor;
@@ -6,7 +6,7 @@ import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
import javax.validation.constraints.NotEmpty;
import jakarta.validation.constraints.NotEmpty;
@Schema(description = "用户 APP - 微信小程序手机登录 Request VO")
@Data

2
aagro-module-member/src/main/java/cn/aagro/pp/module/member/controller/app/auth/vo/AuthWeixinJsapiSignatureRespVO.java → aagro-module-member/src/main/java/cn/aagro/ag/module/member/controller/app/auth/vo/AuthWeixinJsapiSignatureRespVO.java
View File

@@ -1,4 +1,4 @@
package cn.aagro.pp.module.member.controller.app.auth.vo;
package cn.aagro.ag.module.member.controller.app.auth.vo;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.AllArgsConstructor;

24
aagro-module-member/src/main/java/cn/aagro/pp/module/member/controller/app/level/AppMemberExperienceRecordController.java → aagro-module-member/src/main/java/cn/aagro/ag/module/member/controller/app/level/AppMemberExperienceRecordController.java
View File

@@ -1,12 +1,12 @@
package cn.aagro.pp.module.member.controller.app.level;
package cn.aagro.ag.module.member.controller.app.level;
import cn.aagro.pp.framework.common.pojo.CommonResult;
import cn.aagro.pp.framework.common.pojo.PageParam;
import cn.aagro.pp.framework.common.pojo.PageResult;
import cn.aagro.pp.module.member.controller.app.level.vo.experience.AppMemberExperienceRecordRespVO;
import cn.aagro.pp.module.member.convert.level.MemberExperienceRecordConvert;
import cn.aagro.pp.module.member.dal.dataobject.level.MemberExperienceRecordDO;
import cn.aagro.pp.module.member.service.level.MemberExperienceRecordService;
import cn.aagro.ag.framework.common.pojo.CommonResult;
import cn.aagro.ag.framework.common.pojo.PageParam;
import cn.aagro.ag.framework.common.pojo.PageResult;
import cn.aagro.ag.module.member.controller.app.level.vo.experience.AppMemberExperienceRecordRespVO;
import cn.aagro.ag.module.member.convert.level.MemberExperienceRecordConvert;
import cn.aagro.ag.module.member.dal.dataobject.level.MemberExperienceRecordDO;
import cn.aagro.ag.module.member.service.level.MemberExperienceRecordService;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
import org.springframework.validation.annotation.Validated;
@@ -14,11 +14,11 @@ import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import javax.annotation.Resource;
import javax.validation.Valid;
import jakarta.annotation.Resource;
import jakarta.validation.Valid;
import static cn.aagro.pp.framework.common.pojo.CommonResult.success;
import static cn.aagro.pp.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId;
import static cn.aagro.ag.framework.common.pojo.CommonResult.success;
import static cn.aagro.ag.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId;
@Tag(name = "用户 App - 会员经验记录")
@RestController

18
aagro-module-member/src/main/java/cn/aagro/pp/module/member/controller/app/level/AppMemberLevelController.java → aagro-module-member/src/main/java/cn/aagro/ag/module/member/controller/app/level/AppMemberLevelController.java
View File

@@ -1,10 +1,10 @@
package cn.aagro.pp.module.member.controller.app.level;
package cn.aagro.ag.module.member.controller.app.level;
import cn.aagro.pp.framework.common.pojo.CommonResult;
import cn.aagro.pp.module.member.controller.app.level.vo.level.AppMemberLevelRespVO;
import cn.aagro.pp.module.member.convert.level.MemberLevelConvert;
import cn.aagro.pp.module.member.dal.dataobject.level.MemberLevelDO;
import cn.aagro.pp.module.member.service.level.MemberLevelService;
import cn.aagro.ag.framework.common.pojo.CommonResult;
import cn.aagro.ag.module.member.controller.app.level.vo.level.AppMemberLevelRespVO;
import cn.aagro.ag.module.member.convert.level.MemberLevelConvert;
import cn.aagro.ag.module.member.dal.dataobject.level.MemberLevelDO;
import cn.aagro.ag.module.member.service.level.MemberLevelService;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
import org.springframework.validation.annotation.Validated;
@@ -12,11 +12,11 @@ import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import javax.annotation.Resource;
import javax.annotation.security.PermitAll;
import jakarta.annotation.Resource;
import jakarta.annotation.security.PermitAll;
import java.util.List;
import static cn.aagro.pp.framework.common.pojo.CommonResult.success;
import static cn.aagro.ag.framework.common.pojo.CommonResult.success;
@Tag(name = "用户 App - 会员等级")
@RestController

2
aagro-module-member/src/main/java/cn/aagro/pp/module/member/controller/app/level/vo/experience/AppMemberExperienceRecordRespVO.java → aagro-module-member/src/main/java/cn/aagro/ag/module/member/controller/app/level/vo/experience/AppMemberExperienceRecordRespVO.java
View File

@@ -1,4 +1,4 @@
package cn.aagro.pp.module.member.controller.app.level.vo.experience;
package cn.aagro.ag.module.member.controller.app.level.vo.experience;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;

2
aagro-module-member/src/main/java/cn/aagro/pp/module/member/controller/app/level/vo/level/AppMemberLevelRespVO.java → aagro-module-member/src/main/java/cn/aagro/ag/module/member/controller/app/level/vo/level/AppMemberLevelRespVO.java
View File

@@ -1,4 +1,4 @@
package cn.aagro.pp.module.member.controller.app.level.vo.level;
package cn.aagro.ag.module.member.controller.app.level.vo.level;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;

24
aagro-module-member/src/main/java/cn/aagro/pp/module/member/controller/app/point/AppMemberPointRecordController.java → aagro-module-member/src/main/java/cn/aagro/ag/module/member/controller/app/point/AppMemberPointRecordController.java
View File

@@ -1,12 +1,12 @@
package cn.aagro.pp.module.member.controller.app.point;
package cn.aagro.ag.module.member.controller.app.point;
import cn.aagro.pp.framework.common.pojo.CommonResult;
import cn.aagro.pp.framework.common.pojo.PageResult;
import cn.aagro.pp.framework.common.util.object.BeanUtils;
import cn.aagro.pp.module.member.controller.app.point.vo.AppMemberPointRecordPageReqVO;
import cn.aagro.pp.module.member.controller.app.point.vo.AppMemberPointRecordRespVO;
import cn.aagro.pp.module.member.dal.dataobject.point.MemberPointRecordDO;
import cn.aagro.pp.module.member.service.point.MemberPointRecordService;
import cn.aagro.ag.framework.common.pojo.CommonResult;
import cn.aagro.ag.framework.common.pojo.PageResult;
import cn.aagro.ag.framework.common.util.object.BeanUtils;
import cn.aagro.ag.module.member.controller.app.point.vo.AppMemberPointRecordPageReqVO;
import cn.aagro.ag.module.member.controller.app.point.vo.AppMemberPointRecordRespVO;
import cn.aagro.ag.module.member.dal.dataobject.point.MemberPointRecordDO;
import cn.aagro.ag.module.member.service.point.MemberPointRecordService;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
import org.springframework.validation.annotation.Validated;
@@ -14,11 +14,11 @@ import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import javax.annotation.Resource;
import javax.validation.Valid;
import jakarta.annotation.Resource;
import jakarta.validation.Valid;
import static cn.aagro.pp.framework.common.pojo.CommonResult.success;
import static cn.aagro.pp.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId;
import static cn.aagro.ag.framework.common.pojo.CommonResult.success;
import static cn.aagro.ag.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId;
@Tag(name = "用户 App - 签到记录")
@RestController

6
aagro-module-member/src/main/java/cn/aagro/pp/module/member/controller/app/point/vo/AppMemberPointRecordPageReqVO.java → aagro-module-member/src/main/java/cn/aagro/ag/module/member/controller/app/point/vo/AppMemberPointRecordPageReqVO.java
View File

@@ -1,13 +1,13 @@
package cn.aagro.pp.module.member.controller.app.point.vo;
package cn.aagro.ag.module.member.controller.app.point.vo;
import cn.aagro.pp.framework.common.pojo.PageParam;
import cn.aagro.ag.framework.common.pojo.PageParam;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
import java.time.LocalDateTime;
import static cn.aagro.pp.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
import static cn.aagro.ag.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
@Schema(description = "用户 App - 用户积分记录分页 Request VO")
@Data

2
aagro-module-member/src/main/java/cn/aagro/pp/module/member/controller/app/point/vo/AppMemberPointRecordRespVO.java → aagro-module-member/src/main/java/cn/aagro/ag/module/member/controller/app/point/vo/AppMemberPointRecordRespVO.java
View File

@@ -1,4 +1,4 @@
package cn.aagro.pp.module.member.controller.app.point.vo;
package cn.aagro.ag.module.member.controller.app.point.vo;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;

20
aagro-module-member/src/main/java/cn/aagro/pp/module/member/controller/app/signin/AppMemberSignInConfigController.java → aagro-module-member/src/main/java/cn/aagro/ag/module/member/controller/app/signin/AppMemberSignInConfigController.java
View File

@@ -1,11 +1,11 @@
package cn.aagro.pp.module.member.controller.app.signin;
package cn.aagro.ag.module.member.controller.app.signin;
import cn.aagro.pp.framework.common.enums.CommonStatusEnum;
import cn.aagro.pp.framework.common.pojo.CommonResult;
import cn.aagro.pp.module.member.controller.app.signin.vo.config.AppMemberSignInConfigRespVO;
import cn.aagro.pp.module.member.convert.signin.MemberSignInConfigConvert;
import cn.aagro.pp.module.member.dal.dataobject.signin.MemberSignInConfigDO;
import cn.aagro.pp.module.member.service.signin.MemberSignInConfigService;
import cn.aagro.ag.framework.common.enums.CommonStatusEnum;
import cn.aagro.ag.framework.common.pojo.CommonResult;
import cn.aagro.ag.module.member.controller.app.signin.vo.config.AppMemberSignInConfigRespVO;
import cn.aagro.ag.module.member.convert.signin.MemberSignInConfigConvert;
import cn.aagro.ag.module.member.dal.dataobject.signin.MemberSignInConfigDO;
import cn.aagro.ag.module.member.service.signin.MemberSignInConfigService;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
import org.springframework.validation.annotation.Validated;
@@ -13,11 +13,11 @@ import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import javax.annotation.Resource;
import javax.annotation.security.PermitAll;
import jakarta.annotation.Resource;
import jakarta.annotation.security.PermitAll;
import java.util.List;
import static cn.aagro.pp.framework.common.pojo.CommonResult.success;
import static cn.aagro.ag.framework.common.pojo.CommonResult.success;
@Tag(name = "用户 App - 签到规则")
@RestController

24
aagro-module-member/src/main/java/cn/aagro/pp/module/member/controller/app/signin/AppMemberSignInRecordController.java → aagro-module-member/src/main/java/cn/aagro/ag/module/member/controller/app/signin/AppMemberSignInRecordController.java
View File

@@ -1,13 +1,13 @@
package cn.aagro.pp.module.member.controller.app.signin;
package cn.aagro.ag.module.member.controller.app.signin;
import cn.aagro.pp.framework.common.pojo.CommonResult;
import cn.aagro.pp.framework.common.pojo.PageParam;
import cn.aagro.pp.framework.common.pojo.PageResult;
import cn.aagro.pp.module.member.controller.app.signin.vo.record.AppMemberSignInRecordRespVO;
import cn.aagro.pp.module.member.controller.app.signin.vo.record.AppMemberSignInRecordSummaryRespVO;
import cn.aagro.pp.module.member.convert.signin.MemberSignInRecordConvert;
import cn.aagro.pp.module.member.dal.dataobject.signin.MemberSignInRecordDO;
import cn.aagro.pp.module.member.service.signin.MemberSignInRecordService;
import cn.aagro.ag.framework.common.pojo.CommonResult;
import cn.aagro.ag.framework.common.pojo.PageParam;
import cn.aagro.ag.framework.common.pojo.PageResult;
import cn.aagro.ag.module.member.controller.app.signin.vo.record.AppMemberSignInRecordRespVO;
import cn.aagro.ag.module.member.controller.app.signin.vo.record.AppMemberSignInRecordSummaryRespVO;
import cn.aagro.ag.module.member.convert.signin.MemberSignInRecordConvert;
import cn.aagro.ag.module.member.dal.dataobject.signin.MemberSignInRecordDO;
import cn.aagro.ag.module.member.service.signin.MemberSignInRecordService;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
import org.springframework.validation.annotation.Validated;
@@ -16,10 +16,10 @@ import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import javax.annotation.Resource;
import jakarta.annotation.Resource;
import static cn.aagro.pp.framework.common.pojo.CommonResult.success;
import static cn.aagro.pp.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId;
import static cn.aagro.ag.framework.common.pojo.CommonResult.success;
import static cn.aagro.ag.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId;
@Tag(name = "用户 App - 签到记录")
@RestController

2
aagro-module-member/src/main/java/cn/aagro/pp/module/member/controller/app/signin/vo/config/AppMemberSignInConfigRespVO.java → aagro-module-member/src/main/java/cn/aagro/ag/module/member/controller/app/signin/vo/config/AppMemberSignInConfigRespVO.java
View File

@@ -1,4 +1,4 @@
package cn.aagro.pp.module.member.controller.app.signin.vo.config;
package cn.aagro.ag.module.member.controller.app.signin.vo.config;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;

2
aagro-module-member/src/main/java/cn/aagro/pp/module/member/controller/app/signin/vo/record/AppMemberSignInRecordRespVO.java → aagro-module-member/src/main/java/cn/aagro/ag/module/member/controller/app/signin/vo/record/AppMemberSignInRecordRespVO.java
View File

@@ -1,4 +1,4 @@
package cn.aagro.pp.module.member.controller.app.signin.vo.record;
package cn.aagro.ag.module.member.controller.app.signin.vo.record;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;

Some files were not shown because too many files have changed in this diff Show More