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

25
aagro-module-pay/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>
@@ -21,51 +21,50 @@
<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-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>
<!-- 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>
<!-- Job 定时任务相关 -->
<dependency>
<groupId>cn.aagro.gg</groupId>
<groupId>cn.aagro.aa</groupId>
<artifactId>aagro-spring-boot-starter-job</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>
@@ -88,4 +87,4 @@
</dependencies>
</project>
</project>

8
aagro-module-pay/src/main/java/cn/aagro/pp/module/pay/api/notify/dto/PayOrderNotifyReqDTO.java → aagro-module-pay/src/main/java/cn/aagro/ag/module/pay/api/notify/dto/PayOrderNotifyReqDTO.java
View File

@@ -1,17 +1,17 @@
package cn.aagro.pp.module.pay.api.notify.dto;
package cn.aagro.ag.module.pay.api.notify.dto;
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;
/**
* 支付单的通知 Request DTO
*
* @author 芋道源码
* @author AIOTAGRO
*/
@Data
@Builder

8
aagro-module-pay/src/main/java/cn/aagro/pp/module/pay/api/notify/dto/PayRefundNotifyReqDTO.java → aagro-module-pay/src/main/java/cn/aagro/ag/module/pay/api/notify/dto/PayRefundNotifyReqDTO.java
View File

@@ -1,17 +1,17 @@
package cn.aagro.pp.module.pay.api.notify.dto;
package cn.aagro.ag.module.pay.api.notify.dto;
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;
/**
* 退款单的通知 Request DTO
*
* @author 芋道源码
* @author AIOTAGRO
*/
@Data
@Builder

6
aagro-module-pay/src/main/java/cn/aagro/pp/module/pay/api/notify/dto/PayTransferNotifyReqDTO.java → aagro-module-pay/src/main/java/cn/aagro/ag/module/pay/api/notify/dto/PayTransferNotifyReqDTO.java
View File

@@ -1,12 +1,12 @@
package cn.aagro.pp.module.pay.api.notify.dto;
package cn.aagro.ag.module.pay.api.notify.dto;
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;
/**
* 转账单的通知 Request DTO

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

@@ -0,0 +1,4 @@
/**
* 占位符，无特殊作用
*/
package cn.aagro.ag.module.pay.api.notify;

8
aagro-module-pay/src/main/java/cn/aagro/pp/module/pay/api/order/PayOrderApi.java → aagro-module-pay/src/main/java/cn/aagro/ag/module/pay/api/order/PayOrderApi.java
View File

@@ -1,9 +1,9 @@
package cn.aagro.pp.module.pay.api.order;
package cn.aagro.ag.module.pay.api.order;
import cn.aagro.pp.module.pay.api.order.dto.PayOrderCreateReqDTO;
import cn.aagro.pp.module.pay.api.order.dto.PayOrderRespDTO;
import cn.aagro.ag.module.pay.api.order.dto.PayOrderCreateReqDTO;
import cn.aagro.ag.module.pay.api.order.dto.PayOrderRespDTO;
import javax.validation.Valid;
import jakarta.validation.Valid;
/**
* 支付单 API 接口

16
aagro-module-pay/src/main/java/cn/aagro/pp/module/pay/api/order/PayOrderApiImpl.java → aagro-module-pay/src/main/java/cn/aagro/ag/module/pay/api/order/PayOrderApiImpl.java
View File

@@ -1,18 +1,18 @@
package cn.aagro.pp.module.pay.api.order;
package cn.aagro.ag.module.pay.api.order;
import cn.aagro.pp.module.pay.api.order.dto.PayOrderCreateReqDTO;
import cn.aagro.pp.module.pay.api.order.dto.PayOrderRespDTO;
import cn.aagro.pp.module.pay.convert.order.PayOrderConvert;
import cn.aagro.pp.module.pay.dal.dataobject.order.PayOrderDO;
import cn.aagro.pp.module.pay.service.order.PayOrderService;
import cn.aagro.ag.module.pay.api.order.dto.PayOrderCreateReqDTO;
import cn.aagro.ag.module.pay.api.order.dto.PayOrderRespDTO;
import cn.aagro.ag.module.pay.convert.order.PayOrderConvert;
import cn.aagro.ag.module.pay.dal.dataobject.order.PayOrderDO;
import cn.aagro.ag.module.pay.service.order.PayOrderService;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import jakarta.annotation.Resource;
/**
* 支付单 API 实现类
*
* @author 芋道源码
* @author AIOTAGRO
*/
@Service
public class PayOrderApiImpl implements PayOrderApi {

12
aagro-module-pay/src/main/java/cn/aagro/pp/module/pay/api/order/dto/PayOrderCreateReqDTO.java → aagro-module-pay/src/main/java/cn/aagro/ag/module/pay/api/order/dto/PayOrderCreateReqDTO.java
View File

@@ -1,13 +1,13 @@
package cn.aagro.pp.module.pay.api.order.dto;
package cn.aagro.ag.module.pay.api.order.dto;
import cn.aagro.pp.framework.common.enums.UserTypeEnum;
import cn.aagro.pp.framework.common.validation.InEnum;
import cn.aagro.ag.framework.common.enums.UserTypeEnum;
import cn.aagro.ag.framework.common.validation.InEnum;
import lombok.Data;
import org.hibernate.validator.constraints.Length;
import javax.validation.constraints.DecimalMin;
import javax.validation.constraints.NotEmpty;
import javax.validation.constraints.NotNull;
import jakarta.validation.constraints.DecimalMin;
import jakarta.validation.constraints.NotEmpty;
import jakarta.validation.constraints.NotNull;
import java.io.Serializable;
import java.time.LocalDateTime;

6
aagro-module-pay/src/main/java/cn/aagro/pp/module/pay/api/order/dto/PayOrderRespDTO.java → aagro-module-pay/src/main/java/cn/aagro/ag/module/pay/api/order/dto/PayOrderRespDTO.java
View File

@@ -1,6 +1,6 @@
package cn.aagro.pp.module.pay.api.order.dto;
package cn.aagro.ag.module.pay.api.order.dto;
import cn.aagro.pp.module.pay.enums.order.PayOrderStatusEnum;
import cn.aagro.ag.module.pay.enums.order.PayOrderStatusEnum;
import lombok.Data;
import java.time.LocalDateTime;
@@ -8,7 +8,7 @@ import java.time.LocalDateTime;
/**
* 支付单信息 Response DTO
*
* @author 芋道源码
* @author AIOTAGRO
*/
@Data
public class PayOrderRespDTO {

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

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

10
aagro-module-pay/src/main/java/cn/aagro/pp/module/pay/api/refund/PayRefundApi.java → aagro-module-pay/src/main/java/cn/aagro/ag/module/pay/api/refund/PayRefundApi.java
View File

@@ -1,14 +1,14 @@
package cn.aagro.pp.module.pay.api.refund;
package cn.aagro.ag.module.pay.api.refund;
import cn.aagro.pp.module.pay.api.refund.dto.PayRefundCreateReqDTO;
import cn.aagro.pp.module.pay.api.refund.dto.PayRefundRespDTO;
import cn.aagro.ag.module.pay.api.refund.dto.PayRefundCreateReqDTO;
import cn.aagro.ag.module.pay.api.refund.dto.PayRefundRespDTO;
import javax.validation.Valid;
import jakarta.validation.Valid;
/**
* 退款单 API 接口
*
* @author 芋道源码
* @author AIOTAGRO
*/
public interface PayRefundApi {

16
aagro-module-pay/src/main/java/cn/aagro/pp/module/pay/api/refund/PayRefundApiImpl.java → aagro-module-pay/src/main/java/cn/aagro/ag/module/pay/api/refund/PayRefundApiImpl.java
View File

@@ -1,19 +1,19 @@
package cn.aagro.pp.module.pay.api.refund;
package cn.aagro.ag.module.pay.api.refund;
import cn.aagro.pp.framework.common.util.object.BeanUtils;
import cn.aagro.pp.module.pay.api.refund.dto.PayRefundCreateReqDTO;
import cn.aagro.pp.module.pay.api.refund.dto.PayRefundRespDTO;
import cn.aagro.pp.module.pay.dal.dataobject.refund.PayRefundDO;
import cn.aagro.pp.module.pay.service.refund.PayRefundService;
import cn.aagro.ag.framework.common.util.object.BeanUtils;
import cn.aagro.ag.module.pay.api.refund.dto.PayRefundCreateReqDTO;
import cn.aagro.ag.module.pay.api.refund.dto.PayRefundRespDTO;
import cn.aagro.ag.module.pay.dal.dataobject.refund.PayRefundDO;
import cn.aagro.ag.module.pay.service.refund.PayRefundService;
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

14
aagro-module-pay/src/main/java/cn/aagro/pp/module/pay/api/refund/dto/PayRefundCreateReqDTO.java → aagro-module-pay/src/main/java/cn/aagro/ag/module/pay/api/refund/dto/PayRefundCreateReqDTO.java
View File

@@ -1,18 +1,18 @@
package cn.aagro.pp.module.pay.api.refund.dto;
package cn.aagro.ag.module.pay.api.refund.dto;
import cn.aagro.pp.framework.common.enums.UserTypeEnum;
import cn.aagro.pp.framework.common.validation.InEnum;
import cn.aagro.ag.framework.common.enums.UserTypeEnum;
import cn.aagro.ag.framework.common.validation.InEnum;
import lombok.Data;
import org.hibernate.validator.constraints.Length;
import javax.validation.constraints.Min;
import javax.validation.constraints.NotEmpty;
import javax.validation.constraints.NotNull;
import jakarta.validation.constraints.Min;
import jakarta.validation.constraints.NotEmpty;
import jakarta.validation.constraints.NotNull;
/**
* 退款单创建 Request DTO
*
* @author 芋道源码
* @author AIOTAGRO
*/
@Data
public class PayRefundCreateReqDTO {

6
aagro-module-pay/src/main/java/cn/aagro/pp/module/pay/api/refund/dto/PayRefundRespDTO.java → aagro-module-pay/src/main/java/cn/aagro/ag/module/pay/api/refund/dto/PayRefundRespDTO.java
View File

@@ -1,6 +1,6 @@
package cn.aagro.pp.module.pay.api.refund.dto;
package cn.aagro.ag.module.pay.api.refund.dto;
import cn.aagro.pp.module.pay.enums.refund.PayRefundStatusEnum;
import cn.aagro.ag.module.pay.enums.refund.PayRefundStatusEnum;
import lombok.Data;
import java.time.LocalDateTime;
@@ -8,7 +8,7 @@ import java.time.LocalDateTime;
/**
* 退款单信息 Response DTO
*
* @author 芋道源码
* @author AIOTAGRO
*/
@Data
public class PayRefundRespDTO {

10
aagro-module-pay/src/main/java/cn/aagro/pp/module/pay/api/transfer/PayTransferApi.java → aagro-module-pay/src/main/java/cn/aagro/ag/module/pay/api/transfer/PayTransferApi.java
View File

@@ -1,9 +1,9 @@
package cn.aagro.pp.module.pay.api.transfer;
package cn.aagro.ag.module.pay.api.transfer;
import cn.aagro.pp.module.pay.api.transfer.dto.PayTransferCreateReqDTO;
import cn.aagro.pp.module.pay.api.transfer.dto.PayTransferCreateRespDTO;
import cn.aagro.pp.module.pay.api.transfer.dto.PayTransferRespDTO;
import javax.validation.Valid;
import cn.aagro.ag.module.pay.api.transfer.dto.PayTransferCreateReqDTO;
import cn.aagro.ag.module.pay.api.transfer.dto.PayTransferCreateRespDTO;
import cn.aagro.ag.module.pay.api.transfer.dto.PayTransferRespDTO;
import jakarta.validation.Valid;
/**
* 转账单 API 接口

22
aagro-module-pay/src/main/java/cn/aagro/pp/module/pay/api/transfer/PayTransferApiImpl.java → aagro-module-pay/src/main/java/cn/aagro/ag/module/pay/api/transfer/PayTransferApiImpl.java
View File

@@ -1,18 +1,18 @@
package cn.aagro.pp.module.pay.api.transfer;
package cn.aagro.ag.module.pay.api.transfer;
import cn.aagro.pp.framework.common.util.object.BeanUtils;
import cn.aagro.pp.module.pay.framework.pay.core.client.impl.weixin.WxPayClientConfig;
import cn.aagro.pp.module.pay.api.transfer.dto.PayTransferCreateReqDTO;
import cn.aagro.pp.module.pay.api.transfer.dto.PayTransferCreateRespDTO;
import cn.aagro.pp.module.pay.api.transfer.dto.PayTransferRespDTO;
import cn.aagro.pp.module.pay.dal.dataobject.channel.PayChannelDO;
import cn.aagro.pp.module.pay.dal.dataobject.transfer.PayTransferDO;
import cn.aagro.pp.module.pay.service.channel.PayChannelService;
import cn.aagro.pp.module.pay.service.transfer.PayTransferService;
import cn.aagro.ag.framework.common.util.object.BeanUtils;
import cn.aagro.ag.module.pay.framework.pay.core.client.impl.weixin.WxPayClientConfig;
import cn.aagro.ag.module.pay.api.transfer.dto.PayTransferCreateReqDTO;
import cn.aagro.ag.module.pay.api.transfer.dto.PayTransferCreateRespDTO;
import cn.aagro.ag.module.pay.api.transfer.dto.PayTransferRespDTO;
import cn.aagro.ag.module.pay.dal.dataobject.channel.PayChannelDO;
import cn.aagro.ag.module.pay.dal.dataobject.transfer.PayTransferDO;
import cn.aagro.ag.module.pay.service.channel.PayChannelService;
import cn.aagro.ag.module.pay.service.transfer.PayTransferService;
import org.springframework.stereotype.Service;
import org.springframework.validation.annotation.Validated;
import javax.annotation.Resource;
import jakarta.annotation.Resource;
/**
* 转账单 API 实现类

14
aagro-module-pay/src/main/java/cn/aagro/pp/module/pay/api/transfer/dto/PayTransferCreateReqDTO.java → aagro-module-pay/src/main/java/cn/aagro/ag/module/pay/api/transfer/dto/PayTransferCreateReqDTO.java
View File

@@ -1,14 +1,14 @@
package cn.aagro.pp.module.pay.api.transfer.dto;
package cn.aagro.ag.module.pay.api.transfer.dto;
import cn.hutool.core.util.StrUtil;
import cn.aagro.pp.framework.common.enums.UserTypeEnum;
import cn.aagro.pp.framework.common.util.json.JsonUtils;
import cn.aagro.pp.framework.common.validation.InEnum;
import cn.aagro.ag.framework.common.enums.UserTypeEnum;
import cn.aagro.ag.framework.common.util.json.JsonUtils;
import cn.aagro.ag.framework.common.validation.InEnum;
import lombok.Data;
import javax.validation.constraints.Min;
import javax.validation.constraints.NotEmpty;
import javax.validation.constraints.NotNull;
import jakarta.validation.constraints.Min;
import jakarta.validation.constraints.NotEmpty;
import jakarta.validation.constraints.NotNull;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;

4
aagro-module-pay/src/main/java/cn/aagro/pp/module/pay/api/transfer/dto/PayTransferCreateRespDTO.java → aagro-module-pay/src/main/java/cn/aagro/ag/module/pay/api/transfer/dto/PayTransferCreateRespDTO.java
View File

@@ -1,11 +1,11 @@
package cn.aagro.pp.module.pay.api.transfer.dto;
package cn.aagro.ag.module.pay.api.transfer.dto;
import lombok.Data;
/**
* 转账单创建 Response DTO
*
* @author 芋道源码
* @author AIOTAGRO
*/
@Data
public class PayTransferCreateRespDTO {

6
aagro-module-pay/src/main/java/cn/aagro/pp/module/pay/api/transfer/dto/PayTransferRespDTO.java → aagro-module-pay/src/main/java/cn/aagro/ag/module/pay/api/transfer/dto/PayTransferRespDTO.java
View File

@@ -1,7 +1,7 @@
package cn.aagro.pp.module.pay.api.transfer.dto;
package cn.aagro.ag.module.pay.api.transfer.dto;
import cn.aagro.pp.module.pay.enums.PayChannelEnum;
import cn.aagro.pp.module.pay.enums.transfer.PayTransferStatusEnum;
import cn.aagro.ag.module.pay.enums.PayChannelEnum;
import cn.aagro.ag.module.pay.enums.transfer.PayTransferStatusEnum;
import lombok.Data;
import java.time.LocalDateTime;

6
aagro-module-pay/src/main/java/cn/aagro/pp/module/pay/api/wallet/PayWalletApi.java → aagro-module-pay/src/main/java/cn/aagro/ag/module/pay/api/wallet/PayWalletApi.java
View File

@@ -1,7 +1,7 @@
package cn.aagro.pp.module.pay.api.wallet;
package cn.aagro.ag.module.pay.api.wallet;
import cn.aagro.pp.module.pay.api.wallet.dto.PayWalletAddBalanceReqDTO;
import cn.aagro.pp.module.pay.api.wallet.dto.PayWalletRespDTO;
import cn.aagro.ag.module.pay.api.wallet.dto.PayWalletAddBalanceReqDTO;
import cn.aagro.ag.module.pay.api.wallet.dto.PayWalletRespDTO;
/**
* 钱包 API 接口

18
aagro-module-pay/src/main/java/cn/aagro/pp/module/pay/api/wallet/PayWalletApiImpl.java → aagro-module-pay/src/main/java/cn/aagro/ag/module/pay/api/wallet/PayWalletApiImpl.java
View File

@@ -1,20 +1,20 @@
package cn.aagro.pp.module.pay.api.wallet;
package cn.aagro.ag.module.pay.api.wallet;
import cn.hutool.core.lang.Assert;
import cn.aagro.pp.framework.common.util.object.BeanUtils;
import cn.aagro.pp.module.pay.api.wallet.dto.PayWalletAddBalanceReqDTO;
import cn.aagro.pp.module.pay.api.wallet.dto.PayWalletRespDTO;
import cn.aagro.pp.module.pay.dal.dataobject.wallet.PayWalletDO;
import cn.aagro.pp.module.pay.enums.wallet.PayWalletBizTypeEnum;
import cn.aagro.pp.module.pay.service.wallet.PayWalletService;
import cn.aagro.ag.framework.common.util.object.BeanUtils;
import cn.aagro.ag.module.pay.api.wallet.dto.PayWalletAddBalanceReqDTO;
import cn.aagro.ag.module.pay.api.wallet.dto.PayWalletRespDTO;
import cn.aagro.ag.module.pay.dal.dataobject.wallet.PayWalletDO;
import cn.aagro.ag.module.pay.enums.wallet.PayWalletBizTypeEnum;
import cn.aagro.ag.module.pay.service.wallet.PayWalletService;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import jakarta.annotation.Resource;
/**
* 钱包 API 实现类
*
* @author 芋道源码
* @author AIOTAGRO
*/
@Service
public class PayWalletApiImpl implements PayWalletApi {

8
aagro-module-pay/src/main/java/cn/aagro/pp/module/pay/api/wallet/dto/PayWalletAddBalanceReqDTO.java → aagro-module-pay/src/main/java/cn/aagro/ag/module/pay/api/wallet/dto/PayWalletAddBalanceReqDTO.java
View File

@@ -1,14 +1,14 @@
package cn.aagro.pp.module.pay.api.wallet.dto;
package cn.aagro.ag.module.pay.api.wallet.dto;
import cn.aagro.pp.framework.common.enums.UserTypeEnum;
import cn.aagro.ag.framework.common.enums.UserTypeEnum;
import lombok.Data;
import javax.validation.constraints.NotNull;
import jakarta.validation.constraints.NotNull;
/**
* 钱包余额增加 Request DTO
*
* @author 芋道源码
* @author AIOTAGRO
*/
@Data
public class PayWalletAddBalanceReqDTO {

4
aagro-module-pay/src/main/java/cn/aagro/pp/module/pay/api/wallet/dto/PayWalletRespDTO.java → aagro-module-pay/src/main/java/cn/aagro/ag/module/pay/api/wallet/dto/PayWalletRespDTO.java
View File

@@ -1,6 +1,6 @@
package cn.aagro.pp.module.pay.api.wallet.dto;
package cn.aagro.ag.module.pay.api.wallet.dto;
import cn.aagro.pp.framework.common.enums.UserTypeEnum;
import cn.aagro.ag.framework.common.enums.UserTypeEnum;
import lombok.Data;
/**

28
aagro-module-pay/src/main/java/cn/aagro/pp/module/pay/controller/admin/app/PayAppController.java → aagro-module-pay/src/main/java/cn/aagro/ag/module/pay/controller/admin/app/PayAppController.java
View File

@@ -1,15 +1,15 @@
package cn.aagro.pp.module.pay.controller.admin.app;
package cn.aagro.ag.module.pay.controller.admin.app;
import cn.hutool.core.collection.CollUtil;
import cn.aagro.pp.framework.common.enums.CommonStatusEnum;
import cn.aagro.pp.framework.common.pojo.CommonResult;
import cn.aagro.pp.framework.common.pojo.PageResult;
import cn.aagro.pp.module.pay.controller.admin.app.vo.*;
import cn.aagro.pp.module.pay.convert.app.PayAppConvert;
import cn.aagro.pp.module.pay.dal.dataobject.app.PayAppDO;
import cn.aagro.pp.module.pay.dal.dataobject.channel.PayChannelDO;
import cn.aagro.pp.module.pay.service.app.PayAppService;
import cn.aagro.pp.module.pay.service.channel.PayChannelService;
import cn.aagro.ag.framework.common.enums.CommonStatusEnum;
import cn.aagro.ag.framework.common.pojo.CommonResult;
import cn.aagro.ag.framework.common.pojo.PageResult;
import cn.aagro.ag.module.pay.controller.admin.app.vo.*;
import cn.aagro.ag.module.pay.convert.app.PayAppConvert;
import cn.aagro.ag.module.pay.dal.dataobject.app.PayAppDO;
import cn.aagro.ag.module.pay.dal.dataobject.channel.PayChannelDO;
import cn.aagro.ag.module.pay.service.app.PayAppService;
import cn.aagro.ag.module.pay.service.channel.PayChannelService;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.tags.Tag;
@@ -18,12 +18,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.List;
import static cn.aagro.pp.framework.common.pojo.CommonResult.success;
import static cn.aagro.pp.framework.common.util.collection.CollectionUtils.convertList;
import static cn.aagro.ag.framework.common.pojo.CommonResult.success;
import static cn.aagro.ag.framework.common.util.collection.CollectionUtils.convertList;
@Slf4j
@Tag(name = "管理后台 - 支付应用信息")

8
aagro-module-pay/src/main/java/cn/aagro/pp/module/pay/controller/admin/app/vo/PayAppBaseVO.java → aagro-module-pay/src/main/java/cn/aagro/ag/module/pay/controller/admin/app/vo/PayAppBaseVO.java
View File

@@ -1,11 +1,11 @@
package cn.aagro.pp.module.pay.controller.admin.app.vo;
import cn.aagro.pp.framework.common.enums.CommonStatusEnum;
import cn.aagro.pp.framework.common.validation.InEnum;
package cn.aagro.ag.module.pay.controller.admin.app.vo;
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.*;
import org.hibernate.validator.constraints.URL;
import javax.validation.constraints.*;
import jakarta.validation.constraints.*;
/**
* 支付应用信息 Base VO，提供给添加、修改、详细的子 VO 使用

2
aagro-module-pay/src/main/java/cn/aagro/pp/module/pay/controller/admin/app/vo/PayAppCreateReqVO.java → aagro-module-pay/src/main/java/cn/aagro/ag/module/pay/controller/admin/app/vo/PayAppCreateReqVO.java
View File

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

2
aagro-module-pay/src/main/java/cn/aagro/pp/module/pay/controller/admin/app/vo/PayAppPageItemRespVO.java → aagro-module-pay/src/main/java/cn/aagro/ag/module/pay/controller/admin/app/vo/PayAppPageItemRespVO.java
View File

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

6
aagro-module-pay/src/main/java/cn/aagro/pp/module/pay/controller/admin/app/vo/PayAppPageReqVO.java → aagro-module-pay/src/main/java/cn/aagro/ag/module/pay/controller/admin/app/vo/PayAppPageReqVO.java
View File

@@ -1,6 +1,6 @@
package cn.aagro.pp.module.pay.controller.admin.app.vo;
package cn.aagro.ag.module.pay.controller.admin.app.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-pay/src/main/java/cn/aagro/pp/module/pay/controller/admin/app/vo/PayAppRespVO.java → aagro-module-pay/src/main/java/cn/aagro/ag/module/pay/controller/admin/app/vo/PayAppRespVO.java
View File

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

4
aagro-module-pay/src/main/java/cn/aagro/pp/module/pay/controller/admin/app/vo/PayAppUpdateReqVO.java → aagro-module-pay/src/main/java/cn/aagro/ag/module/pay/controller/admin/app/vo/PayAppUpdateReqVO.java
View File

@@ -1,8 +1,8 @@
package cn.aagro.pp.module.pay.controller.admin.app.vo;
package cn.aagro.ag.module.pay.controller.admin.app.vo;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.*;
import javax.validation.constraints.*;
import jakarta.validation.constraints.*;
@Schema(description = "管理后台 - 支付应用信息更新 Request VO")
@Data

4
aagro-module-pay/src/main/java/cn/aagro/pp/module/pay/controller/admin/app/vo/PayAppUpdateStatusReqVO.java → aagro-module-pay/src/main/java/cn/aagro/ag/module/pay/controller/admin/app/vo/PayAppUpdateStatusReqVO.java
View File

@@ -1,9 +1,9 @@
package cn.aagro.pp.module.pay.controller.admin.app.vo;
package cn.aagro.ag.module.pay.controller.admin.app.vo;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import javax.validation.constraints.NotNull;
import jakarta.validation.constraints.NotNull;
@Schema(description = "管理后台 - 应用更新状态 Request VO")
@Data

24
aagro-module-pay/src/main/java/cn/aagro/pp/module/pay/controller/admin/channel/PayChannelController.java → aagro-module-pay/src/main/java/cn/aagro/ag/module/pay/controller/admin/channel/PayChannelController.java
View File

@@ -1,12 +1,12 @@
package cn.aagro.pp.module.pay.controller.admin.channel;
package cn.aagro.ag.module.pay.controller.admin.channel;
import cn.aagro.pp.framework.common.pojo.CommonResult;
import cn.aagro.pp.module.pay.controller.admin.channel.vo.PayChannelCreateReqVO;
import cn.aagro.pp.module.pay.controller.admin.channel.vo.PayChannelRespVO;
import cn.aagro.pp.module.pay.controller.admin.channel.vo.PayChannelUpdateReqVO;
import cn.aagro.pp.module.pay.convert.channel.PayChannelConvert;
import cn.aagro.pp.module.pay.dal.dataobject.channel.PayChannelDO;
import cn.aagro.pp.module.pay.service.channel.PayChannelService;
import cn.aagro.ag.framework.common.pojo.CommonResult;
import cn.aagro.ag.module.pay.controller.admin.channel.vo.PayChannelCreateReqVO;
import cn.aagro.ag.module.pay.controller.admin.channel.vo.PayChannelRespVO;
import cn.aagro.ag.module.pay.controller.admin.channel.vo.PayChannelUpdateReqVO;
import cn.aagro.ag.module.pay.convert.channel.PayChannelConvert;
import cn.aagro.ag.module.pay.dal.dataobject.channel.PayChannelDO;
import cn.aagro.ag.module.pay.service.channel.PayChannelService;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.tags.Tag;
@@ -14,13 +14,13 @@ 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 java.util.Set;
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

8
aagro-module-pay/src/main/java/cn/aagro/pp/module/pay/controller/admin/channel/vo/PayChannelBaseVO.java → aagro-module-pay/src/main/java/cn/aagro/ag/module/pay/controller/admin/channel/vo/PayChannelBaseVO.java
View File

@@ -1,9 +1,9 @@
package cn.aagro.pp.module.pay.controller.admin.channel.vo;
import cn.aagro.pp.framework.common.enums.CommonStatusEnum;
import cn.aagro.pp.framework.common.validation.InEnum;
package cn.aagro.ag.module.pay.controller.admin.channel.vo;
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.*;
import javax.validation.constraints.*;
import jakarta.validation.constraints.*;
/**
* 支付渠道 Base VO，提供给添加、修改、详细的子 VO 使用

6
aagro-module-pay/src/main/java/cn/aagro/pp/module/pay/controller/admin/channel/vo/PayChannelCreateReqVO.java → aagro-module-pay/src/main/java/cn/aagro/ag/module/pay/controller/admin/channel/vo/PayChannelCreateReqVO.java
View File

@@ -1,12 +1,12 @@
package cn.aagro.pp.module.pay.controller.admin.channel.vo;
package cn.aagro.ag.module.pay.controller.admin.channel.vo;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import lombok.EqualsAndHashCode;
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

2
aagro-module-pay/src/main/java/cn/aagro/pp/module/pay/controller/admin/channel/vo/PayChannelRespVO.java → aagro-module-pay/src/main/java/cn/aagro/ag/module/pay/controller/admin/channel/vo/PayChannelRespVO.java
View File

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

4
aagro-module-pay/src/main/java/cn/aagro/pp/module/pay/controller/admin/channel/vo/PayChannelUpdateReqVO.java → aagro-module-pay/src/main/java/cn/aagro/ag/module/pay/controller/admin/channel/vo/PayChannelUpdateReqVO.java
View File

@@ -1,7 +1,7 @@
package cn.aagro.pp.module.pay.controller.admin.channel.vo;
package cn.aagro.ag.module.pay.controller.admin.channel.vo;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.*;
import javax.validation.constraints.*;
import jakarta.validation.constraints.*;
@Schema(description = "管理后台 - 支付渠道 更新 Request VO")
@Data

34
aagro-module-pay/src/main/java/cn/aagro/pp/module/pay/controller/admin/demo/PayDemoOrderController.java → aagro-module-pay/src/main/java/cn/aagro/ag/module/pay/controller/admin/demo/PayDemoOrderController.java
View File

@@ -1,28 +1,28 @@
package cn.aagro.pp.module.pay.controller.admin.demo;
package cn.aagro.ag.module.pay.controller.admin.demo;
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.framework.common.util.object.BeanUtils;
import cn.aagro.pp.module.pay.api.notify.dto.PayOrderNotifyReqDTO;
import cn.aagro.pp.module.pay.api.notify.dto.PayRefundNotifyReqDTO;
import cn.aagro.pp.module.pay.controller.admin.demo.vo.order.PayDemoOrderCreateReqVO;
import cn.aagro.pp.module.pay.controller.admin.demo.vo.order.PayDemoOrderRespVO;
import cn.aagro.pp.module.pay.dal.dataobject.demo.PayDemoOrderDO;
import cn.aagro.pp.module.pay.service.demo.PayDemoOrderService;
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.framework.common.util.object.BeanUtils;
import cn.aagro.ag.module.pay.api.notify.dto.PayOrderNotifyReqDTO;
import cn.aagro.ag.module.pay.api.notify.dto.PayRefundNotifyReqDTO;
import cn.aagro.ag.module.pay.controller.admin.demo.vo.order.PayDemoOrderCreateReqVO;
import cn.aagro.ag.module.pay.controller.admin.demo.vo.order.PayDemoOrderRespVO;
import cn.aagro.ag.module.pay.dal.dataobject.demo.PayDemoOrderDO;
import cn.aagro.ag.module.pay.service.demo.PayDemoOrderService;
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.annotation.security.PermitAll;
import javax.validation.Valid;
import jakarta.annotation.Resource;
import jakarta.annotation.security.PermitAll;
import jakarta.validation.Valid;
import static cn.aagro.pp.framework.common.pojo.CommonResult.success;
import static cn.aagro.pp.framework.common.util.servlet.ServletUtils.getClientIP;
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.common.util.servlet.ServletUtils.getClientIP;
import static cn.aagro.ag.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId;
@Tag(name = "管理后台 - 示例订单") // 目的：演示支付、退款功能
@RestController

0
aagro-module-pay/src/main/java/cn/aagro/pp/module/pay/controller/admin/demo/PayDemoWithdrawController.http → aagro-module-pay/src/main/java/cn/aagro/ag/module/pay/controller/admin/demo/PayDemoWithdrawController.http
View File

30
aagro-module-pay/src/main/java/cn/aagro/pp/module/pay/controller/admin/demo/PayDemoWithdrawController.java → aagro-module-pay/src/main/java/cn/aagro/ag/module/pay/controller/admin/demo/PayDemoWithdrawController.java
View File

@@ -1,26 +1,26 @@
package cn.aagro.pp.module.pay.controller.admin.demo;
package cn.aagro.ag.module.pay.controller.admin.demo;
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.framework.common.util.object.BeanUtils;
import cn.aagro.pp.module.pay.api.notify.dto.PayTransferNotifyReqDTO;
import cn.aagro.pp.module.pay.controller.admin.demo.vo.withdraw.PayDemoWithdrawCreateReqVO;
import cn.aagro.pp.module.pay.controller.admin.demo.vo.withdraw.PayDemoWithdrawRespVO;
import cn.aagro.pp.module.pay.dal.dataobject.demo.PayDemoWithdrawDO;
import cn.aagro.pp.module.pay.service.demo.PayDemoWithdrawService;
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.framework.common.util.object.BeanUtils;
import cn.aagro.ag.module.pay.api.notify.dto.PayTransferNotifyReqDTO;
import cn.aagro.ag.module.pay.controller.admin.demo.vo.withdraw.PayDemoWithdrawCreateReqVO;
import cn.aagro.ag.module.pay.controller.admin.demo.vo.withdraw.PayDemoWithdrawRespVO;
import cn.aagro.ag.module.pay.dal.dataobject.demo.PayDemoWithdrawDO;
import cn.aagro.ag.module.pay.service.demo.PayDemoWithdrawService;
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.annotation.security.PermitAll;
import javax.validation.Valid;
import jakarta.annotation.Resource;
import jakarta.annotation.security.PermitAll;
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 = "管理后台 - 示例提现订单") // 目的：演示转账功能
@RestController

4
aagro-module-pay/src/main/java/cn/aagro/pp/module/pay/controller/admin/demo/vo/order/PayDemoOrderCreateReqVO.java → aagro-module-pay/src/main/java/cn/aagro/ag/module/pay/controller/admin/demo/vo/order/PayDemoOrderCreateReqVO.java
View File

@@ -1,9 +1,9 @@
package cn.aagro.pp.module.pay.controller.admin.demo.vo.order;
package cn.aagro.ag.module.pay.controller.admin.demo.vo.order;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import javax.validation.constraints.NotNull;
import jakarta.validation.constraints.NotNull;
@Schema(description = "管理后台 - 示例订单创建 Request VO")
@Data

2
aagro-module-pay/src/main/java/cn/aagro/pp/module/pay/controller/admin/demo/vo/order/PayDemoOrderRespVO.java → aagro-module-pay/src/main/java/cn/aagro/ag/module/pay/controller/admin/demo/vo/order/PayDemoOrderRespVO.java
View File

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

8
aagro-module-pay/src/main/java/cn/aagro/pp/module/pay/controller/admin/demo/vo/withdraw/PayDemoWithdrawCreateReqVO.java → aagro-module-pay/src/main/java/cn/aagro/ag/module/pay/controller/admin/demo/vo/withdraw/PayDemoWithdrawCreateReqVO.java
View File

@@ -1,12 +1,12 @@
package cn.aagro.pp.module.pay.controller.admin.demo.vo.withdraw;
package cn.aagro.ag.module.pay.controller.admin.demo.vo.withdraw;
import cn.hutool.core.util.ObjectUtil;
import cn.aagro.pp.framework.common.validation.InEnum;
import cn.aagro.pp.module.pay.enums.demo.PayDemoWithdrawTypeEnum;
import cn.aagro.ag.framework.common.validation.InEnum;
import cn.aagro.ag.module.pay.enums.demo.PayDemoWithdrawTypeEnum;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import javax.validation.constraints.*;
import jakarta.validation.constraints.*;
@Schema(description = "管理后台 - 示例提现单创建 Request VO")
@Data

2
aagro-module-pay/src/main/java/cn/aagro/pp/module/pay/controller/admin/demo/vo/withdraw/PayDemoWithdrawRespVO.java → aagro-module-pay/src/main/java/cn/aagro/ag/module/pay/controller/admin/demo/vo/withdraw/PayDemoWithdrawRespVO.java
View File

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

56
aagro-module-pay/src/main/java/cn/aagro/pp/module/pay/controller/admin/notify/PayNotifyController.java → aagro-module-pay/src/main/java/cn/aagro/ag/module/pay/controller/admin/notify/PayNotifyController.java
View File

@@ -1,26 +1,26 @@
package cn.aagro.pp.module.pay.controller.admin.notify;
package cn.aagro.ag.module.pay.controller.admin.notify;
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.framework.common.util.object.BeanUtils;
import cn.aagro.pp.module.pay.framework.pay.core.client.PayClient;
import cn.aagro.pp.module.pay.framework.pay.core.client.dto.order.PayOrderRespDTO;
import cn.aagro.pp.module.pay.framework.pay.core.client.dto.refund.PayRefundRespDTO;
import cn.aagro.pp.module.pay.framework.pay.core.client.dto.transfer.PayTransferRespDTO;
import cn.aagro.pp.framework.tenant.core.aop.TenantIgnore;
import cn.aagro.pp.module.pay.controller.admin.notify.vo.PayNotifyTaskDetailRespVO;
import cn.aagro.pp.module.pay.controller.admin.notify.vo.PayNotifyTaskPageReqVO;
import cn.aagro.pp.module.pay.controller.admin.notify.vo.PayNotifyTaskRespVO;
import cn.aagro.pp.module.pay.dal.dataobject.app.PayAppDO;
import cn.aagro.pp.module.pay.dal.dataobject.notify.PayNotifyLogDO;
import cn.aagro.pp.module.pay.dal.dataobject.notify.PayNotifyTaskDO;
import cn.aagro.pp.module.pay.service.app.PayAppService;
import cn.aagro.pp.module.pay.service.channel.PayChannelService;
import cn.aagro.pp.module.pay.service.notify.PayNotifyService;
import cn.aagro.pp.module.pay.service.order.PayOrderService;
import cn.aagro.pp.module.pay.service.refund.PayRefundService;
import cn.aagro.pp.module.pay.service.transfer.PayTransferService;
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.pay.framework.pay.core.client.PayClient;
import cn.aagro.ag.module.pay.framework.pay.core.client.dto.order.PayOrderRespDTO;
import cn.aagro.ag.module.pay.framework.pay.core.client.dto.refund.PayRefundRespDTO;
import cn.aagro.ag.module.pay.framework.pay.core.client.dto.transfer.PayTransferRespDTO;
import cn.aagro.ag.framework.tenant.core.aop.TenantIgnore;
import cn.aagro.ag.module.pay.controller.admin.notify.vo.PayNotifyTaskDetailRespVO;
import cn.aagro.ag.module.pay.controller.admin.notify.vo.PayNotifyTaskPageReqVO;
import cn.aagro.ag.module.pay.controller.admin.notify.vo.PayNotifyTaskRespVO;
import cn.aagro.ag.module.pay.dal.dataobject.app.PayAppDO;
import cn.aagro.ag.module.pay.dal.dataobject.notify.PayNotifyLogDO;
import cn.aagro.ag.module.pay.dal.dataobject.notify.PayNotifyTaskDO;
import cn.aagro.ag.module.pay.service.app.PayAppService;
import cn.aagro.ag.module.pay.service.channel.PayChannelService;
import cn.aagro.ag.module.pay.service.notify.PayNotifyService;
import cn.aagro.ag.module.pay.service.order.PayOrderService;
import cn.aagro.ag.module.pay.service.refund.PayRefundService;
import cn.aagro.ag.module.pay.service.transfer.PayTransferService;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.tags.Tag;
@@ -29,16 +29,16 @@ 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.annotation.security.PermitAll;
import javax.validation.Valid;
import jakarta.annotation.Resource;
import jakarta.annotation.security.PermitAll;
import jakarta.validation.Valid;
import java.util.List;
import java.util.Map;
import static cn.aagro.pp.framework.common.exception.util.ServiceExceptionUtil.exception;
import static cn.aagro.pp.framework.common.pojo.CommonResult.success;
import static cn.aagro.pp.framework.common.util.collection.CollectionUtils.convertList;
import static cn.aagro.pp.module.pay.enums.ErrorCodeConstants.CHANNEL_NOT_FOUND;
import static cn.aagro.ag.framework.common.exception.util.ServiceExceptionUtil.exception;
import static cn.aagro.ag.framework.common.pojo.CommonResult.success;
import static cn.aagro.ag.framework.common.util.collection.CollectionUtils.convertList;
import static cn.aagro.ag.module.pay.enums.ErrorCodeConstants.CHANNEL_NOT_FOUND;
@Tag(name = "管理后台 - 回调通知")
@RestController

2
aagro-module-pay/src/main/java/cn/aagro/pp/module/pay/controller/admin/notify/vo/PayNotifyTaskDetailRespVO.java → aagro-module-pay/src/main/java/cn/aagro/ag/module/pay/controller/admin/notify/vo/PayNotifyTaskDetailRespVO.java
View File

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

6
aagro-module-pay/src/main/java/cn/aagro/pp/module/pay/controller/admin/notify/vo/PayNotifyTaskPageReqVO.java → aagro-module-pay/src/main/java/cn/aagro/ag/module/pay/controller/admin/notify/vo/PayNotifyTaskPageReqVO.java
View File

@@ -1,6 +1,6 @@
package cn.aagro.pp.module.pay.controller.admin.notify.vo;
package cn.aagro.ag.module.pay.controller.admin.notify.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-pay/src/main/java/cn/aagro/pp/module/pay/controller/admin/notify/vo/PayNotifyTaskRespVO.java → aagro-module-pay/src/main/java/cn/aagro/ag/module/pay/controller/admin/notify/vo/PayNotifyTaskRespVO.java
View File

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

54
aagro-module-pay/src/main/java/cn/aagro/pp/module/pay/controller/admin/order/PayOrderController.java → aagro-module-pay/src/main/java/cn/aagro/ag/module/pay/controller/admin/order/PayOrderController.java
View File

@@ -1,23 +1,23 @@
package cn.aagro.pp.module.pay.controller.admin.order;
package cn.aagro.ag.module.pay.controller.admin.order;
import cn.hutool.core.collection.CollectionUtil;
import cn.aagro.pp.framework.apilog.core.annotation.ApiAccessLog;
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.framework.excel.core.util.ExcelUtils;
import cn.aagro.pp.module.pay.controller.admin.order.vo.*;
import cn.aagro.pp.module.pay.convert.order.PayOrderConvert;
import cn.aagro.pp.module.pay.dal.dataobject.app.PayAppDO;
import cn.aagro.pp.module.pay.dal.dataobject.order.PayOrderDO;
import cn.aagro.pp.module.pay.dal.dataobject.order.PayOrderExtensionDO;
import cn.aagro.pp.module.pay.dal.dataobject.wallet.PayWalletDO;
import cn.aagro.pp.module.pay.enums.PayChannelEnum;
import cn.aagro.pp.module.pay.enums.order.PayOrderStatusEnum;
import cn.aagro.pp.module.pay.framework.pay.core.client.impl.wallet.WalletPayClient;
import cn.aagro.pp.module.pay.service.app.PayAppService;
import cn.aagro.pp.module.pay.service.order.PayOrderService;
import cn.aagro.pp.module.pay.service.wallet.PayWalletService;
import cn.aagro.ag.framework.apilog.core.annotation.ApiAccessLog;
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.framework.excel.core.util.ExcelUtils;
import cn.aagro.ag.module.pay.controller.admin.order.vo.*;
import cn.aagro.ag.module.pay.convert.order.PayOrderConvert;
import cn.aagro.ag.module.pay.dal.dataobject.app.PayAppDO;
import cn.aagro.ag.module.pay.dal.dataobject.order.PayOrderDO;
import cn.aagro.ag.module.pay.dal.dataobject.order.PayOrderExtensionDO;
import cn.aagro.ag.module.pay.dal.dataobject.wallet.PayWalletDO;
import cn.aagro.ag.module.pay.enums.PayChannelEnum;
import cn.aagro.ag.module.pay.enums.order.PayOrderStatusEnum;
import cn.aagro.ag.module.pay.framework.pay.core.client.impl.wallet.WalletPayClient;
import cn.aagro.ag.module.pay.service.app.PayAppService;
import cn.aagro.ag.module.pay.service.order.PayOrderService;
import cn.aagro.ag.module.pay.service.wallet.PayWalletService;
import com.google.common.collect.Maps;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
@@ -27,21 +27,21 @@ 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.servlet.http.HttpServletResponse;
import javax.validation.Valid;
import jakarta.annotation.Resource;
import jakarta.servlet.http.HttpServletResponse;
import jakarta.validation.Valid;
import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.Objects;
import static cn.aagro.pp.framework.apilog.core.enums.OperateTypeEnum.EXPORT;
import static cn.aagro.pp.framework.common.pojo.CommonResult.success;
import static cn.aagro.pp.framework.common.util.collection.CollectionUtils.convertList;
import static cn.aagro.pp.framework.common.util.servlet.ServletUtils.getClientIP;
import static cn.aagro.pp.framework.web.core.util.WebFrameworkUtils.getLoginUserId;
import static cn.aagro.pp.framework.web.core.util.WebFrameworkUtils.getLoginUserType;
import static cn.aagro.ag.framework.apilog.core.enums.OperateTypeEnum.EXPORT;
import static cn.aagro.ag.framework.common.pojo.CommonResult.success;
import static cn.aagro.ag.framework.common.util.collection.CollectionUtils.convertList;
import static cn.aagro.ag.framework.common.util.servlet.ServletUtils.getClientIP;
import static cn.aagro.ag.framework.web.core.util.WebFrameworkUtils.getLoginUserId;
import static cn.aagro.ag.framework.web.core.util.WebFrameworkUtils.getLoginUserType;
@Tag(name = "管理后台 - 支付订单")
@RestController

6
aagro-module-pay/src/main/java/cn/aagro/pp/module/pay/controller/admin/order/vo/PayOrderBaseVO.java → aagro-module-pay/src/main/java/cn/aagro/ag/module/pay/controller/admin/order/vo/PayOrderBaseVO.java
View File

@@ -1,12 +1,12 @@
package cn.aagro.pp.module.pay.controller.admin.order.vo;
package cn.aagro.ag.module.pay.controller.admin.order.vo;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
import javax.validation.constraints.NotNull;
import jakarta.validation.constraints.NotNull;
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;
/**
* 支付订单 Base VO，提供给添加、修改、详细的子 VO 使用

4
aagro-module-pay/src/main/java/cn/aagro/pp/module/pay/controller/admin/order/vo/PayOrderDetailsRespVO.java → aagro-module-pay/src/main/java/cn/aagro/ag/module/pay/controller/admin/order/vo/PayOrderDetailsRespVO.java
View File

@@ -1,4 +1,4 @@
package cn.aagro.pp.module.pay.controller.admin.order.vo;
package cn.aagro.ag.module.pay.controller.admin.order.vo;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
@@ -16,7 +16,7 @@ public class PayOrderDetailsRespVO extends PayOrderBaseVO {
@Schema(description = "支付订单编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
private Long id;
@Schema(description = "应用名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋道源码")
@Schema(description = "应用名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "AIOTAGRO")
private String appName;
@Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)

10
aagro-module-pay/src/main/java/cn/aagro/pp/module/pay/controller/admin/order/vo/PayOrderExcelVO.java → aagro-module-pay/src/main/java/cn/aagro/ag/module/pay/controller/admin/order/vo/PayOrderExcelVO.java
View File

@@ -1,9 +1,9 @@
package cn.aagro.pp.module.pay.controller.admin.order.vo;
package cn.aagro.ag.module.pay.controller.admin.order.vo;
import cn.aagro.pp.framework.excel.core.annotations.DictFormat;
import cn.aagro.pp.framework.excel.core.convert.DictConvert;
import cn.aagro.pp.framework.excel.core.convert.MoneyConvert;
import cn.aagro.pp.module.pay.enums.DictTypeConstants;
import cn.aagro.ag.framework.excel.core.annotations.DictFormat;
import cn.aagro.ag.framework.excel.core.convert.DictConvert;
import cn.aagro.ag.framework.excel.core.convert.MoneyConvert;
import cn.aagro.ag.module.pay.enums.DictTypeConstants;
import cn.idev.excel.annotation.ExcelProperty;
import lombok.Data;

4
aagro-module-pay/src/main/java/cn/aagro/pp/module/pay/controller/admin/order/vo/PayOrderExportReqVO.java → aagro-module-pay/src/main/java/cn/aagro/ag/module/pay/controller/admin/order/vo/PayOrderExportReqVO.java
View File

@@ -1,4 +1,4 @@
package cn.aagro.pp.module.pay.controller.admin.order.vo;
package cn.aagro.ag.module.pay.controller.admin.order.vo;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
@@ -6,7 +6,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 = "管理后台 - 支付订单 Excel 导出 Request VO，参数和 PayOrderPageReqVO 是一致的")
@Data

2
aagro-module-pay/src/main/java/cn/aagro/pp/module/pay/controller/admin/order/vo/PayOrderPageItemRespVO.java → aagro-module-pay/src/main/java/cn/aagro/ag/module/pay/controller/admin/order/vo/PayOrderPageItemRespVO.java
View File

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

6
aagro-module-pay/src/main/java/cn/aagro/pp/module/pay/controller/admin/order/vo/PayOrderPageReqVO.java → aagro-module-pay/src/main/java/cn/aagro/ag/module/pay/controller/admin/order/vo/PayOrderPageReqVO.java
View File

@@ -1,6 +1,6 @@
package cn.aagro.pp.module.pay.controller.admin.order.vo;
package cn.aagro.ag.module.pay.controller.admin.order.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-pay/src/main/java/cn/aagro/pp/module/pay/controller/admin/order/vo/PayOrderRespVO.java → aagro-module-pay/src/main/java/cn/aagro/ag/module/pay/controller/admin/order/vo/PayOrderRespVO.java
View File

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

6
aagro-module-pay/src/main/java/cn/aagro/pp/module/pay/controller/admin/order/vo/PayOrderSubmitReqVO.java → aagro-module-pay/src/main/java/cn/aagro/ag/module/pay/controller/admin/order/vo/PayOrderSubmitReqVO.java
View File

@@ -1,11 +1,11 @@
package cn.aagro.pp.module.pay.controller.admin.order.vo;
package cn.aagro.ag.module.pay.controller.admin.order.vo;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import org.hibernate.validator.constraints.URL;
import javax.validation.constraints.NotEmpty;
import javax.validation.constraints.NotNull;
import jakarta.validation.constraints.NotEmpty;
import jakarta.validation.constraints.NotNull;
import java.util.Map;
@Schema(description = "管理后台 - 支付订单提交 Request VO")

2
aagro-module-pay/src/main/java/cn/aagro/pp/module/pay/controller/admin/order/vo/PayOrderSubmitRespVO.java → aagro-module-pay/src/main/java/cn/aagro/ag/module/pay/controller/admin/order/vo/PayOrderSubmitRespVO.java
View File

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

34
aagro-module-pay/src/main/java/cn/aagro/pp/module/pay/controller/admin/refund/PayRefundController.java → aagro-module-pay/src/main/java/cn/aagro/ag/module/pay/controller/admin/refund/PayRefundController.java
View File

@@ -1,16 +1,16 @@
package cn.aagro.pp.module.pay.controller.admin.refund;
package cn.aagro.ag.module.pay.controller.admin.refund;
import cn.hutool.core.collection.CollectionUtil;
import cn.aagro.pp.framework.apilog.core.annotation.ApiAccessLog;
import cn.aagro.pp.framework.common.pojo.CommonResult;
import cn.aagro.pp.framework.common.pojo.PageResult;
import cn.aagro.pp.framework.excel.core.util.ExcelUtils;
import cn.aagro.pp.module.pay.controller.admin.refund.vo.*;
import cn.aagro.pp.module.pay.convert.refund.PayRefundConvert;
import cn.aagro.pp.module.pay.dal.dataobject.app.PayAppDO;
import cn.aagro.pp.module.pay.dal.dataobject.refund.PayRefundDO;
import cn.aagro.pp.module.pay.service.app.PayAppService;
import cn.aagro.pp.module.pay.service.refund.PayRefundService;
import cn.aagro.ag.framework.apilog.core.annotation.ApiAccessLog;
import cn.aagro.ag.framework.common.pojo.CommonResult;
import cn.aagro.ag.framework.common.pojo.PageResult;
import cn.aagro.ag.framework.excel.core.util.ExcelUtils;
import cn.aagro.ag.module.pay.controller.admin.refund.vo.*;
import cn.aagro.ag.module.pay.convert.refund.PayRefundConvert;
import cn.aagro.ag.module.pay.dal.dataobject.app.PayAppDO;
import cn.aagro.ag.module.pay.dal.dataobject.refund.PayRefundDO;
import cn.aagro.ag.module.pay.service.app.PayAppService;
import cn.aagro.ag.module.pay.service.refund.PayRefundService;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.tags.Tag;
@@ -21,16 +21,16 @@ 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.servlet.http.HttpServletResponse;
import javax.validation.Valid;
import jakarta.annotation.Resource;
import jakarta.servlet.http.HttpServletResponse;
import jakarta.validation.Valid;
import java.io.IOException;
import java.util.List;
import java.util.Map;
import static cn.aagro.pp.framework.apilog.core.enums.OperateTypeEnum.EXPORT;
import static cn.aagro.pp.framework.common.pojo.CommonResult.success;
import static cn.aagro.pp.framework.common.util.collection.CollectionUtils.convertList;
import static cn.aagro.ag.framework.apilog.core.enums.OperateTypeEnum.EXPORT;
import static cn.aagro.ag.framework.common.pojo.CommonResult.success;
import static cn.aagro.ag.framework.common.util.collection.CollectionUtils.convertList;
@Tag(name = "管理后台 - 退款订单")
@RestController

2
aagro-module-pay/src/main/java/cn/aagro/pp/module/pay/controller/admin/refund/vo/PayRefundBaseVO.java → aagro-module-pay/src/main/java/cn/aagro/ag/module/pay/controller/admin/refund/vo/PayRefundBaseVO.java
View File

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

2
aagro-module-pay/src/main/java/cn/aagro/pp/module/pay/controller/admin/refund/vo/PayRefundDetailsRespVO.java → aagro-module-pay/src/main/java/cn/aagro/ag/module/pay/controller/admin/refund/vo/PayRefundDetailsRespVO.java
View File

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

10
aagro-module-pay/src/main/java/cn/aagro/pp/module/pay/controller/admin/refund/vo/PayRefundExcelVO.java → aagro-module-pay/src/main/java/cn/aagro/ag/module/pay/controller/admin/refund/vo/PayRefundExcelVO.java
View File

@@ -1,9 +1,9 @@
package cn.aagro.pp.module.pay.controller.admin.refund.vo;
package cn.aagro.ag.module.pay.controller.admin.refund.vo;
import cn.aagro.pp.framework.excel.core.annotations.DictFormat;
import cn.aagro.pp.framework.excel.core.convert.DictConvert;
import cn.aagro.pp.framework.excel.core.convert.MoneyConvert;
import cn.aagro.pp.module.pay.enums.DictTypeConstants;
import cn.aagro.ag.framework.excel.core.annotations.DictFormat;
import cn.aagro.ag.framework.excel.core.convert.DictConvert;
import cn.aagro.ag.framework.excel.core.convert.MoneyConvert;
import cn.aagro.ag.module.pay.enums.DictTypeConstants;
import cn.idev.excel.annotation.ExcelProperty;
import lombok.Data;

4
aagro-module-pay/src/main/java/cn/aagro/pp/module/pay/controller/admin/refund/vo/PayRefundExportReqVO.java → aagro-module-pay/src/main/java/cn/aagro/ag/module/pay/controller/admin/refund/vo/PayRefundExportReqVO.java
View File

@@ -1,4 +1,4 @@
package cn.aagro.pp.module.pay.controller.admin.refund.vo;
package cn.aagro.ag.module.pay.controller.admin.refund.vo;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
@@ -6,7 +6,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 = "管理后台 - 退款订单 Excel 导出 Request VO，参数和 PayRefundPageReqVO 是一致的")
@Data

2
aagro-module-pay/src/main/java/cn/aagro/pp/module/pay/controller/admin/refund/vo/PayRefundPageItemRespVO.java → aagro-module-pay/src/main/java/cn/aagro/ag/module/pay/controller/admin/refund/vo/PayRefundPageItemRespVO.java
View File

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

6
aagro-module-pay/src/main/java/cn/aagro/pp/module/pay/controller/admin/refund/vo/PayRefundPageReqVO.java → aagro-module-pay/src/main/java/cn/aagro/ag/module/pay/controller/admin/refund/vo/PayRefundPageReqVO.java
View File

@@ -1,6 +1,6 @@
package cn.aagro.pp.module.pay.controller.admin.refund.vo;
package cn.aagro.ag.module.pay.controller.admin.refund.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

38
aagro-module-pay/src/main/java/cn/aagro/pp/module/pay/controller/admin/transfer/PayTransferController.java → aagro-module-pay/src/main/java/cn/aagro/ag/module/pay/controller/admin/transfer/PayTransferController.java
View File

@@ -1,16 +1,16 @@
package cn.aagro.pp.module.pay.controller.admin.transfer;
package cn.aagro.ag.module.pay.controller.admin.transfer;
import cn.aagro.pp.framework.apilog.core.annotation.ApiAccessLog;
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.framework.excel.core.util.ExcelUtils;
import cn.aagro.pp.module.pay.controller.admin.transfer.vo.PayTransferPageReqVO;
import cn.aagro.pp.module.pay.controller.admin.transfer.vo.PayTransferRespVO;
import cn.aagro.pp.module.pay.dal.dataobject.app.PayAppDO;
import cn.aagro.pp.module.pay.dal.dataobject.transfer.PayTransferDO;
import cn.aagro.pp.module.pay.service.app.PayAppService;
import cn.aagro.pp.module.pay.service.transfer.PayTransferService;
import cn.aagro.ag.framework.apilog.core.annotation.ApiAccessLog;
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.framework.excel.core.util.ExcelUtils;
import cn.aagro.ag.module.pay.controller.admin.transfer.vo.PayTransferPageReqVO;
import cn.aagro.ag.module.pay.controller.admin.transfer.vo.PayTransferRespVO;
import cn.aagro.ag.module.pay.dal.dataobject.app.PayAppDO;
import cn.aagro.ag.module.pay.dal.dataobject.transfer.PayTransferDO;
import cn.aagro.ag.module.pay.service.app.PayAppService;
import cn.aagro.ag.module.pay.service.transfer.PayTransferService;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
import org.springframework.security.access.prepost.PreAuthorize;
@@ -20,16 +20,16 @@ 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.servlet.http.HttpServletResponse;
import javax.validation.Valid;
import jakarta.annotation.Resource;
import jakarta.servlet.http.HttpServletResponse;
import jakarta.validation.Valid;
import java.io.IOException;
import java.util.Map;
import static cn.aagro.pp.framework.apilog.core.enums.OperateTypeEnum.EXPORT;
import static cn.aagro.pp.framework.common.pojo.CommonResult.success;
import static cn.aagro.pp.framework.common.pojo.PageParam.PAGE_SIZE_NONE;
import static cn.aagro.pp.framework.common.util.collection.CollectionUtils.convertList;
import static cn.aagro.ag.framework.apilog.core.enums.OperateTypeEnum.EXPORT;
import static cn.aagro.ag.framework.common.pojo.CommonResult.success;
import static cn.aagro.ag.framework.common.pojo.PageParam.PAGE_SIZE_NONE;
import static cn.aagro.ag.framework.common.util.collection.CollectionUtils.convertList;
@Tag(name = "管理后台 - 转账单")
@RestController

2
aagro-module-pay/src/main/java/cn/aagro/pp/module/pay/controller/admin/transfer/vo/PayTransferCreateRespVO.java → aagro-module-pay/src/main/java/cn/aagro/ag/module/pay/controller/admin/transfer/vo/PayTransferCreateRespVO.java
View File

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

6
aagro-module-pay/src/main/java/cn/aagro/pp/module/pay/controller/admin/transfer/vo/PayTransferPageReqVO.java → aagro-module-pay/src/main/java/cn/aagro/ag/module/pay/controller/admin/transfer/vo/PayTransferPageReqVO.java
View File

@@ -1,12 +1,12 @@
package cn.aagro.pp.module.pay.controller.admin.transfer.vo;
package cn.aagro.ag.module.pay.controller.admin.transfer.vo;
import lombok.*;
import io.swagger.v3.oas.annotations.media.Schema;
import cn.aagro.pp.framework.common.pojo.PageParam;
import cn.aagro.ag.framework.common.pojo.PageParam;
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

10
aagro-module-pay/src/main/java/cn/aagro/pp/module/pay/controller/admin/transfer/vo/PayTransferRespVO.java → aagro-module-pay/src/main/java/cn/aagro/ag/module/pay/controller/admin/transfer/vo/PayTransferRespVO.java
View File

@@ -1,9 +1,9 @@
package cn.aagro.pp.module.pay.controller.admin.transfer.vo;
package cn.aagro.ag.module.pay.controller.admin.transfer.vo;
import cn.aagro.pp.framework.excel.core.annotations.DictFormat;
import cn.aagro.pp.framework.excel.core.convert.DictConvert;
import cn.aagro.pp.framework.excel.core.convert.MoneyConvert;
import cn.aagro.pp.module.pay.enums.DictTypeConstants;
import cn.aagro.ag.framework.excel.core.annotations.DictFormat;
import cn.aagro.ag.framework.excel.core.convert.DictConvert;
import cn.aagro.ag.framework.excel.core.convert.MoneyConvert;
import cn.aagro.ag.module.pay.enums.DictTypeConstants;
import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
import cn.idev.excel.annotation.ExcelProperty;

34
aagro-module-pay/src/main/java/cn/aagro/pp/module/pay/controller/admin/wallet/PayWalletController.java → aagro-module-pay/src/main/java/cn/aagro/ag/module/pay/controller/admin/wallet/PayWalletController.java
View File

@@ -1,15 +1,15 @@
package cn.aagro.pp.module.pay.controller.admin.wallet;
package cn.aagro.ag.module.pay.controller.admin.wallet;
import cn.aagro.pp.framework.common.pojo.CommonResult;
import cn.aagro.pp.framework.common.pojo.PageResult;
import cn.aagro.pp.module.pay.controller.admin.wallet.vo.wallet.PayWalletPageReqVO;
import cn.aagro.pp.module.pay.controller.admin.wallet.vo.wallet.PayWalletRespVO;
import cn.aagro.pp.module.pay.controller.admin.wallet.vo.wallet.PayWalletUpdateBalanceReqVO;
import cn.aagro.pp.module.pay.controller.admin.wallet.vo.wallet.PayWalletUserReqVO;
import cn.aagro.pp.module.pay.convert.wallet.PayWalletConvert;
import cn.aagro.pp.module.pay.dal.dataobject.wallet.PayWalletDO;
import cn.aagro.pp.module.pay.enums.wallet.PayWalletBizTypeEnum;
import cn.aagro.pp.module.pay.service.wallet.PayWalletService;
import cn.aagro.ag.framework.common.pojo.CommonResult;
import cn.aagro.ag.framework.common.pojo.PageResult;
import cn.aagro.ag.module.pay.controller.admin.wallet.vo.wallet.PayWalletPageReqVO;
import cn.aagro.ag.module.pay.controller.admin.wallet.vo.wallet.PayWalletRespVO;
import cn.aagro.ag.module.pay.controller.admin.wallet.vo.wallet.PayWalletUpdateBalanceReqVO;
import cn.aagro.ag.module.pay.controller.admin.wallet.vo.wallet.PayWalletUserReqVO;
import cn.aagro.ag.module.pay.convert.wallet.PayWalletConvert;
import cn.aagro.ag.module.pay.dal.dataobject.wallet.PayWalletDO;
import cn.aagro.ag.module.pay.enums.wallet.PayWalletBizTypeEnum;
import cn.aagro.ag.module.pay.service.wallet.PayWalletService;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.extern.slf4j.Slf4j;
@@ -17,13 +17,13 @@ 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.enums.UserTypeEnum.MEMBER;
import static cn.aagro.pp.framework.common.exception.util.ServiceExceptionUtil.exception;
import static cn.aagro.pp.framework.common.pojo.CommonResult.success;
import static cn.aagro.pp.module.pay.enums.ErrorCodeConstants.WALLET_NOT_FOUND;
import static cn.aagro.ag.framework.common.enums.UserTypeEnum.MEMBER;
import static cn.aagro.ag.framework.common.exception.util.ServiceExceptionUtil.exception;
import static cn.aagro.ag.framework.common.pojo.CommonResult.success;
import static cn.aagro.ag.module.pay.enums.ErrorCodeConstants.WALLET_NOT_FOUND;
@Tag(name = "管理后台 - 用户钱包")
@RestController

20
aagro-module-pay/src/main/java/cn/aagro/pp/module/pay/controller/admin/wallet/PayWalletRechargeController.java → aagro-module-pay/src/main/java/cn/aagro/ag/module/pay/controller/admin/wallet/PayWalletRechargeController.java
View File

@@ -1,9 +1,9 @@
package cn.aagro.pp.module.pay.controller.admin.wallet;
package cn.aagro.ag.module.pay.controller.admin.wallet;
import cn.aagro.pp.framework.common.pojo.CommonResult;
import cn.aagro.pp.module.pay.api.notify.dto.PayOrderNotifyReqDTO;
import cn.aagro.pp.module.pay.api.notify.dto.PayRefundNotifyReqDTO;
import cn.aagro.pp.module.pay.service.wallet.PayWalletRechargeService;
import cn.aagro.ag.framework.common.pojo.CommonResult;
import cn.aagro.ag.module.pay.api.notify.dto.PayOrderNotifyReqDTO;
import cn.aagro.ag.module.pay.api.notify.dto.PayRefundNotifyReqDTO;
import cn.aagro.ag.module.pay.service.wallet.PayWalletRechargeService;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.tags.Tag;
@@ -11,12 +11,12 @@ 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.validation.Valid;
import jakarta.annotation.Resource;
import jakarta.annotation.security.PermitAll;
import jakarta.validation.Valid;
import static cn.aagro.pp.framework.common.pojo.CommonResult.success;
import static cn.aagro.pp.framework.common.util.servlet.ServletUtils.getClientIP;
import static cn.aagro.ag.framework.common.pojo.CommonResult.success;
import static cn.aagro.ag.framework.common.util.servlet.ServletUtils.getClientIP;
@Tag(name = "管理后台 - 钱包充值")
@RestController

26
aagro-module-pay/src/main/java/cn/aagro/pp/module/pay/controller/admin/wallet/PayWalletRechargePackageController.java → aagro-module-pay/src/main/java/cn/aagro/ag/module/pay/controller/admin/wallet/PayWalletRechargePackageController.java
View File

@@ -1,14 +1,14 @@
package cn.aagro.pp.module.pay.controller.admin.wallet;
package cn.aagro.ag.module.pay.controller.admin.wallet;
import cn.aagro.pp.framework.common.pojo.CommonResult;
import cn.aagro.pp.framework.common.pojo.PageResult;
import cn.aagro.pp.module.pay.controller.admin.wallet.vo.rechargepackage.WalletRechargePackageCreateReqVO;
import cn.aagro.pp.module.pay.controller.admin.wallet.vo.rechargepackage.WalletRechargePackagePageReqVO;
import cn.aagro.pp.module.pay.controller.admin.wallet.vo.rechargepackage.WalletRechargePackageRespVO;
import cn.aagro.pp.module.pay.controller.admin.wallet.vo.rechargepackage.WalletRechargePackageUpdateReqVO;
import cn.aagro.pp.module.pay.convert.wallet.PayWalletRechargePackageConvert;
import cn.aagro.pp.module.pay.dal.dataobject.wallet.PayWalletRechargePackageDO;
import cn.aagro.pp.module.pay.service.wallet.PayWalletRechargePackageService;
import cn.aagro.ag.framework.common.pojo.CommonResult;
import cn.aagro.ag.framework.common.pojo.PageResult;
import cn.aagro.ag.module.pay.controller.admin.wallet.vo.rechargepackage.WalletRechargePackageCreateReqVO;
import cn.aagro.ag.module.pay.controller.admin.wallet.vo.rechargepackage.WalletRechargePackagePageReqVO;
import cn.aagro.ag.module.pay.controller.admin.wallet.vo.rechargepackage.WalletRechargePackageRespVO;
import cn.aagro.ag.module.pay.controller.admin.wallet.vo.rechargepackage.WalletRechargePackageUpdateReqVO;
import cn.aagro.ag.module.pay.convert.wallet.PayWalletRechargePackageConvert;
import cn.aagro.ag.module.pay.dal.dataobject.wallet.PayWalletRechargePackageDO;
import cn.aagro.ag.module.pay.service.wallet.PayWalletRechargePackageService;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.tags.Tag;
@@ -16,10 +16,10 @@ 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 = "管理后台 - 钱包充值套餐")

22
aagro-module-pay/src/main/java/cn/aagro/pp/module/pay/controller/admin/wallet/PayWalletTransactionController.java → aagro-module-pay/src/main/java/cn/aagro/ag/module/pay/controller/admin/wallet/PayWalletTransactionController.java
View File

@@ -1,12 +1,12 @@
package cn.aagro.pp.module.pay.controller.admin.wallet;
package cn.aagro.ag.module.pay.controller.admin.wallet;
import cn.aagro.pp.framework.common.pojo.CommonResult;
import cn.aagro.pp.framework.common.pojo.PageResult;
import cn.aagro.pp.module.pay.controller.admin.wallet.vo.transaction.PayWalletTransactionPageReqVO;
import cn.aagro.pp.module.pay.controller.admin.wallet.vo.transaction.PayWalletTransactionRespVO;
import cn.aagro.pp.module.pay.convert.wallet.PayWalletTransactionConvert;
import cn.aagro.pp.module.pay.dal.dataobject.wallet.PayWalletTransactionDO;
import cn.aagro.pp.module.pay.service.wallet.PayWalletTransactionService;
import cn.aagro.ag.framework.common.pojo.CommonResult;
import cn.aagro.ag.framework.common.pojo.PageResult;
import cn.aagro.ag.module.pay.controller.admin.wallet.vo.transaction.PayWalletTransactionPageReqVO;
import cn.aagro.ag.module.pay.controller.admin.wallet.vo.transaction.PayWalletTransactionRespVO;
import cn.aagro.ag.module.pay.convert.wallet.PayWalletTransactionConvert;
import cn.aagro.ag.module.pay.dal.dataobject.wallet.PayWalletTransactionDO;
import cn.aagro.ag.module.pay.service.wallet.PayWalletTransactionService;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.extern.slf4j.Slf4j;
@@ -16,10 +16,10 @@ 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.ag.framework.common.pojo.CommonResult.success;
@Tag(name = "管理后台 - 钱包余额明细")
@RestController

4
aagro-module-pay/src/main/java/cn/aagro/pp/module/pay/controller/admin/wallet/vo/rechargepackage/WalletRechargePackageBaseVO.java → aagro-module-pay/src/main/java/cn/aagro/ag/module/pay/controller/admin/wallet/vo/rechargepackage/WalletRechargePackageBaseVO.java
View File

@@ -1,9 +1,9 @@
package cn.aagro.pp.module.pay.controller.admin.wallet.vo.rechargepackage;
package cn.aagro.ag.module.pay.controller.admin.wallet.vo.rechargepackage;
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-pay/src/main/java/cn/aagro/pp/module/pay/controller/admin/wallet/vo/rechargepackage/WalletRechargePackageCreateReqVO.java → aagro-module-pay/src/main/java/cn/aagro/ag/module/pay/controller/admin/wallet/vo/rechargepackage/WalletRechargePackageCreateReqVO.java
View File

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

6
aagro-module-pay/src/main/java/cn/aagro/pp/module/pay/controller/admin/wallet/vo/rechargepackage/WalletRechargePackagePageReqVO.java → aagro-module-pay/src/main/java/cn/aagro/ag/module/pay/controller/admin/wallet/vo/rechargepackage/WalletRechargePackagePageReqVO.java
View File

@@ -1,6 +1,6 @@
package cn.aagro.pp.module.pay.controller.admin.wallet.vo.rechargepackage;
package cn.aagro.ag.module.pay.controller.admin.wallet.vo.rechargepackage;
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-pay/src/main/java/cn/aagro/pp/module/pay/controller/admin/wallet/vo/rechargepackage/WalletRechargePackageRespVO.java → aagro-module-pay/src/main/java/cn/aagro/ag/module/pay/controller/admin/wallet/vo/rechargepackage/WalletRechargePackageRespVO.java
View File

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

4
aagro-module-pay/src/main/java/cn/aagro/pp/module/pay/controller/admin/wallet/vo/rechargepackage/WalletRechargePackageUpdateReqVO.java → aagro-module-pay/src/main/java/cn/aagro/ag/module/pay/controller/admin/wallet/vo/rechargepackage/WalletRechargePackageUpdateReqVO.java
View File

@@ -1,11 +1,11 @@
package cn.aagro.pp.module.pay.controller.admin.wallet.vo.rechargepackage;
package cn.aagro.ag.module.pay.controller.admin.wallet.vo.rechargepackage;
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

8
aagro-module-pay/src/main/java/cn/aagro/pp/module/pay/controller/admin/wallet/vo/transaction/PayWalletTransactionPageReqVO.java → aagro-module-pay/src/main/java/cn/aagro/ag/module/pay/controller/admin/wallet/vo/transaction/PayWalletTransactionPageReqVO.java
View File

@@ -1,8 +1,8 @@
package cn.aagro.pp.module.pay.controller.admin.wallet.vo.transaction;
package cn.aagro.ag.module.pay.controller.admin.wallet.vo.transaction;
import cn.aagro.pp.framework.common.enums.UserTypeEnum;
import cn.aagro.pp.framework.common.pojo.PageParam;
import cn.aagro.pp.framework.common.validation.InEnum;
import cn.aagro.ag.framework.common.enums.UserTypeEnum;
import cn.aagro.ag.framework.common.pojo.PageParam;
import cn.aagro.ag.framework.common.validation.InEnum;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;

2
aagro-module-pay/src/main/java/cn/aagro/pp/module/pay/controller/admin/wallet/vo/transaction/PayWalletTransactionRespVO.java → aagro-module-pay/src/main/java/cn/aagro/ag/module/pay/controller/admin/wallet/vo/transaction/PayWalletTransactionRespVO.java
View File

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

4
aagro-module-pay/src/main/java/cn/aagro/pp/module/pay/controller/admin/wallet/vo/wallet/PayWalletBaseVO.java → aagro-module-pay/src/main/java/cn/aagro/ag/module/pay/controller/admin/wallet/vo/wallet/PayWalletBaseVO.java
View File

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

10
aagro-module-pay/src/main/java/cn/aagro/pp/module/pay/controller/admin/wallet/vo/wallet/PayWalletPageReqVO.java → aagro-module-pay/src/main/java/cn/aagro/ag/module/pay/controller/admin/wallet/vo/wallet/PayWalletPageReqVO.java
View File

@@ -1,8 +1,8 @@
package cn.aagro.pp.module.pay.controller.admin.wallet.vo.wallet;
package cn.aagro.ag.module.pay.controller.admin.wallet.vo.wallet;
import cn.aagro.pp.framework.common.enums.UserTypeEnum;
import cn.aagro.pp.framework.common.pojo.PageParam;
import cn.aagro.pp.framework.common.validation.InEnum;
import cn.aagro.ag.framework.common.enums.UserTypeEnum;
import cn.aagro.ag.framework.common.pojo.PageParam;
import cn.aagro.ag.framework.common.validation.InEnum;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -11,7 +11,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-pay/src/main/java/cn/aagro/pp/module/pay/controller/admin/wallet/vo/wallet/PayWalletRespVO.java → aagro-module-pay/src/main/java/cn/aagro/ag/module/pay/controller/admin/wallet/vo/wallet/PayWalletRespVO.java
View File

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

4
aagro-module-pay/src/main/java/cn/aagro/pp/module/pay/controller/admin/wallet/vo/wallet/PayWalletUpdateBalanceReqVO.java → aagro-module-pay/src/main/java/cn/aagro/ag/module/pay/controller/admin/wallet/vo/wallet/PayWalletUpdateBalanceReqVO.java
View File

@@ -1,9 +1,9 @@
package cn.aagro.pp.module.pay.controller.admin.wallet.vo.wallet;
package cn.aagro.ag.module.pay.controller.admin.wallet.vo.wallet;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import javax.validation.constraints.NotNull;
import jakarta.validation.constraints.NotNull;
@Schema(description = "管理后台 - 修改钱包余额 Request VO")
@Data

4
aagro-module-pay/src/main/java/cn/aagro/pp/module/pay/controller/admin/wallet/vo/wallet/PayWalletUserReqVO.java → aagro-module-pay/src/main/java/cn/aagro/ag/module/pay/controller/admin/wallet/vo/wallet/PayWalletUserReqVO.java
View File

@@ -1,9 +1,9 @@
package cn.aagro.pp.module.pay.controller.admin.wallet.vo.wallet;
package cn.aagro.ag.module.pay.controller.admin.wallet.vo.wallet;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import javax.validation.constraints.NotNull;
import jakarta.validation.constraints.NotNull;
@Schema(description = "管理后台 - 用户钱包明细 Request VO")
@Data

14
aagro-module-pay/src/main/java/cn/aagro/pp/module/pay/controller/app/channel/AppPayChannelController.java → aagro-module-pay/src/main/java/cn/aagro/ag/module/pay/controller/app/channel/AppPayChannelController.java
View File

@@ -1,8 +1,8 @@
package cn.aagro.pp.module.pay.controller.app.channel;
package cn.aagro.ag.module.pay.controller.app.channel;
import cn.aagro.pp.framework.common.pojo.CommonResult;
import cn.aagro.pp.module.pay.dal.dataobject.channel.PayChannelDO;
import cn.aagro.pp.module.pay.service.channel.PayChannelService;
import cn.aagro.ag.framework.common.pojo.CommonResult;
import cn.aagro.ag.module.pay.dal.dataobject.channel.PayChannelDO;
import cn.aagro.ag.module.pay.service.channel.PayChannelService;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.tags.Tag;
@@ -12,12 +12,12 @@ 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 java.util.Set;
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 = "用户 App - 支付渠道")
@RestController

0
aagro-module-pay/src/main/java/cn/aagro/pp/module/pay/controller/app/order/AppPayOrderController.http → aagro-module-pay/src/main/java/cn/aagro/ag/module/pay/controller/app/order/AppPayOrderController.http
View File

38
aagro-module-pay/src/main/java/cn/aagro/pp/module/pay/controller/app/order/AppPayOrderController.java → aagro-module-pay/src/main/java/cn/aagro/ag/module/pay/controller/app/order/AppPayOrderController.java
View File

@@ -1,19 +1,19 @@
package cn.aagro.pp.module.pay.controller.app.order;
package cn.aagro.ag.module.pay.controller.app.order;
import cn.hutool.core.util.ObjUtil;
import cn.aagro.pp.framework.common.pojo.CommonResult;
import cn.aagro.pp.framework.common.util.object.BeanUtils;
import cn.aagro.pp.module.pay.controller.admin.order.vo.PayOrderRespVO;
import cn.aagro.pp.module.pay.controller.admin.order.vo.PayOrderSubmitRespVO;
import cn.aagro.pp.module.pay.controller.app.order.vo.AppPayOrderSubmitReqVO;
import cn.aagro.pp.module.pay.controller.app.order.vo.AppPayOrderSubmitRespVO;
import cn.aagro.pp.module.pay.dal.dataobject.order.PayOrderDO;
import cn.aagro.pp.module.pay.dal.dataobject.wallet.PayWalletDO;
import cn.aagro.pp.module.pay.enums.PayChannelEnum;
import cn.aagro.pp.module.pay.enums.order.PayOrderStatusEnum;
import cn.aagro.pp.module.pay.framework.pay.core.client.impl.wallet.WalletPayClient;
import cn.aagro.pp.module.pay.service.order.PayOrderService;
import cn.aagro.pp.module.pay.service.wallet.PayWalletService;
import cn.aagro.ag.framework.common.pojo.CommonResult;
import cn.aagro.ag.framework.common.util.object.BeanUtils;
import cn.aagro.ag.module.pay.controller.admin.order.vo.PayOrderRespVO;
import cn.aagro.ag.module.pay.controller.admin.order.vo.PayOrderSubmitRespVO;
import cn.aagro.ag.module.pay.controller.app.order.vo.AppPayOrderSubmitReqVO;
import cn.aagro.ag.module.pay.controller.app.order.vo.AppPayOrderSubmitRespVO;
import cn.aagro.ag.module.pay.dal.dataobject.order.PayOrderDO;
import cn.aagro.ag.module.pay.dal.dataobject.wallet.PayWalletDO;
import cn.aagro.ag.module.pay.enums.PayChannelEnum;
import cn.aagro.ag.module.pay.enums.order.PayOrderStatusEnum;
import cn.aagro.ag.module.pay.framework.pay.core.client.impl.wallet.WalletPayClient;
import cn.aagro.ag.module.pay.service.order.PayOrderService;
import cn.aagro.ag.module.pay.service.wallet.PayWalletService;
import com.google.common.collect.Maps;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
@@ -23,13 +23,13 @@ import lombok.extern.slf4j.Slf4j;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import jakarta.annotation.Resource;
import java.util.Objects;
import static cn.aagro.pp.framework.common.pojo.CommonResult.success;
import static cn.aagro.pp.framework.common.util.servlet.ServletUtils.getClientIP;
import static cn.aagro.pp.framework.web.core.util.WebFrameworkUtils.getLoginUserId;
import static cn.aagro.pp.framework.web.core.util.WebFrameworkUtils.getLoginUserType;
import static cn.aagro.ag.framework.common.pojo.CommonResult.success;
import static cn.aagro.ag.framework.common.util.servlet.ServletUtils.getClientIP;
import static cn.aagro.ag.framework.web.core.util.WebFrameworkUtils.getLoginUserId;
import static cn.aagro.ag.framework.web.core.util.WebFrameworkUtils.getLoginUserType;
@Tag(name = "用户 APP - 支付订单")
@RestController

8
aagro-module-pay/src/main/java/cn/aagro/pp/module/pay/controller/app/order/vo/AppPayOrderSubmitReqVO.java → aagro-module-pay/src/main/java/cn/aagro/ag/module/pay/controller/app/order/vo/AppPayOrderSubmitReqVO.java
View File

@@ -1,11 +1,11 @@
package cn.aagro.pp.module.pay.controller.app.order.vo;
package cn.aagro.ag.module.pay.controller.app.order.vo;
import cn.aagro.pp.module.pay.controller.admin.order.vo.PayOrderSubmitReqVO;
import cn.aagro.ag.module.pay.controller.admin.order.vo.PayOrderSubmitReqVO;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import javax.validation.constraints.NotEmpty;
import javax.validation.constraints.NotNull;
import jakarta.validation.constraints.NotEmpty;
import jakarta.validation.constraints.NotNull;
import java.util.Map;
@Schema(description = "用户 APP - 支付订单提交 Request VO")

4
aagro-module-pay/src/main/java/cn/aagro/pp/module/pay/controller/app/order/vo/AppPayOrderSubmitRespVO.java → aagro-module-pay/src/main/java/cn/aagro/ag/module/pay/controller/app/order/vo/AppPayOrderSubmitRespVO.java
View File

@@ -1,6 +1,6 @@
package cn.aagro.pp.module.pay.controller.app.order.vo;
package cn.aagro.ag.module.pay.controller.app.order.vo;
import cn.aagro.pp.module.pay.controller.admin.order.vo.PayOrderSubmitRespVO;
import cn.aagro.ag.module.pay.controller.admin.order.vo.PayOrderSubmitRespVO;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.AllArgsConstructor;
import lombok.Builder;

10
aagro-module-pay/src/main/java/cn/aagro/pp/module/pay/controller/app/transfer/AppPayTransferController.java → aagro-module-pay/src/main/java/cn/aagro/ag/module/pay/controller/app/transfer/AppPayTransferController.java
View File

@@ -1,7 +1,7 @@
package cn.aagro.pp.module.pay.controller.app.transfer;
package cn.aagro.ag.module.pay.controller.app.transfer;
import cn.aagro.pp.framework.common.pojo.CommonResult;
import cn.aagro.pp.module.pay.service.transfer.PayTransferService;
import cn.aagro.ag.framework.common.pojo.CommonResult;
import cn.aagro.ag.module.pay.service.transfer.PayTransferService;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.tags.Tag;
@@ -12,9 +12,9 @@ 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 static cn.aagro.pp.framework.common.pojo.CommonResult.success;
import static cn.aagro.ag.framework.common.pojo.CommonResult.success;
@Tag(name = "用户 APP - 转账单")
@RestController

20
aagro-module-pay/src/main/java/cn/aagro/pp/module/pay/controller/app/wallet/AppPayWalletController.java → aagro-module-pay/src/main/java/cn/aagro/ag/module/pay/controller/app/wallet/AppPayWalletController.java
View File

@@ -1,11 +1,11 @@
package cn.aagro.pp.module.pay.controller.app.wallet;
package cn.aagro.ag.module.pay.controller.app.wallet;
import cn.aagro.pp.framework.common.enums.UserTypeEnum;
import cn.aagro.pp.framework.common.pojo.CommonResult;
import cn.aagro.pp.module.pay.controller.app.wallet.vo.wallet.AppPayWalletRespVO;
import cn.aagro.pp.module.pay.convert.wallet.PayWalletConvert;
import cn.aagro.pp.module.pay.dal.dataobject.wallet.PayWalletDO;
import cn.aagro.pp.module.pay.service.wallet.PayWalletService;
import cn.aagro.ag.framework.common.enums.UserTypeEnum;
import cn.aagro.ag.framework.common.pojo.CommonResult;
import cn.aagro.ag.module.pay.controller.app.wallet.vo.wallet.AppPayWalletRespVO;
import cn.aagro.ag.module.pay.convert.wallet.PayWalletConvert;
import cn.aagro.ag.module.pay.dal.dataobject.wallet.PayWalletDO;
import cn.aagro.ag.module.pay.service.wallet.PayWalletService;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.extern.slf4j.Slf4j;
@@ -14,10 +14,10 @@ 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 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;
/**
* @author jason

42
aagro-module-pay/src/main/java/cn/aagro/pp/module/pay/controller/app/wallet/AppPayWalletRechargeController.java → aagro-module-pay/src/main/java/cn/aagro/ag/module/pay/controller/app/wallet/AppPayWalletRechargeController.java
View File

@@ -1,19 +1,19 @@
package cn.aagro.pp.module.pay.controller.app.wallet;
package cn.aagro.ag.module.pay.controller.app.wallet;
import cn.hutool.core.collection.CollUtil;
import cn.aagro.pp.framework.common.enums.UserTypeEnum;
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.pay.controller.app.wallet.vo.recharge.AppPayWalletRechargeCreateReqVO;
import cn.aagro.pp.module.pay.controller.app.wallet.vo.recharge.AppPayWalletRechargeCreateRespVO;
import cn.aagro.pp.module.pay.controller.app.wallet.vo.recharge.AppPayWalletRechargeRespVO;
import cn.aagro.pp.module.pay.convert.wallet.PayWalletConvert;
import cn.aagro.pp.module.pay.convert.wallet.PayWalletRechargeConvert;
import cn.aagro.pp.module.pay.dal.dataobject.order.PayOrderDO;
import cn.aagro.pp.module.pay.dal.dataobject.wallet.PayWalletRechargeDO;
import cn.aagro.pp.module.pay.service.order.PayOrderService;
import cn.aagro.pp.module.pay.service.wallet.PayWalletRechargeService;
import cn.aagro.ag.framework.common.enums.UserTypeEnum;
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.pay.controller.app.wallet.vo.recharge.AppPayWalletRechargeCreateReqVO;
import cn.aagro.ag.module.pay.controller.app.wallet.vo.recharge.AppPayWalletRechargeCreateRespVO;
import cn.aagro.ag.module.pay.controller.app.wallet.vo.recharge.AppPayWalletRechargeRespVO;
import cn.aagro.ag.module.pay.convert.wallet.PayWalletConvert;
import cn.aagro.ag.module.pay.convert.wallet.PayWalletRechargeConvert;
import cn.aagro.ag.module.pay.dal.dataobject.order.PayOrderDO;
import cn.aagro.ag.module.pay.dal.dataobject.wallet.PayWalletRechargeDO;
import cn.aagro.ag.module.pay.service.order.PayOrderService;
import cn.aagro.ag.module.pay.service.wallet.PayWalletRechargeService;
import com.google.common.collect.Lists;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
@@ -21,18 +21,18 @@ import lombok.extern.slf4j.Slf4j;
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.time.LocalDateTime;
import java.util.Arrays;
import java.util.List;
import static cn.aagro.pp.framework.common.pojo.CommonResult.success;
import static cn.aagro.pp.framework.common.util.collection.CollectionUtils.convertList;
import static cn.aagro.pp.framework.common.util.servlet.ServletUtils.getClientIP;
import static cn.aagro.pp.framework.web.core.util.WebFrameworkUtils.getLoginUserId;
import static cn.aagro.pp.framework.web.core.util.WebFrameworkUtils.getLoginUserType;
import static cn.aagro.ag.framework.common.pojo.CommonResult.success;
import static cn.aagro.ag.framework.common.util.collection.CollectionUtils.convertList;
import static cn.aagro.ag.framework.common.util.servlet.ServletUtils.getClientIP;
import static cn.aagro.ag.framework.web.core.util.WebFrameworkUtils.getLoginUserId;
import static cn.aagro.ag.framework.web.core.util.WebFrameworkUtils.getLoginUserType;
@Tag(name = "用户 APP - 钱包充值")
@RestController

18
aagro-module-pay/src/main/java/cn/aagro/pp/module/pay/controller/app/wallet/AppPayWalletRechargePackageController.java → aagro-module-pay/src/main/java/cn/aagro/ag/module/pay/controller/app/wallet/AppPayWalletRechargePackageController.java
View File

@@ -1,11 +1,11 @@
package cn.aagro.pp.module.pay.controller.app.wallet;
package cn.aagro.ag.module.pay.controller.app.wallet;
import cn.aagro.pp.framework.common.enums.CommonStatusEnum;
import cn.aagro.pp.framework.common.pojo.CommonResult;
import cn.aagro.pp.framework.common.util.object.BeanUtils;
import cn.aagro.pp.module.pay.controller.app.wallet.vo.recharge.AppPayWalletPackageRespVO;
import cn.aagro.pp.module.pay.dal.dataobject.wallet.PayWalletRechargePackageDO;
import cn.aagro.pp.module.pay.service.wallet.PayWalletRechargePackageService;
import cn.aagro.ag.framework.common.enums.CommonStatusEnum;
import cn.aagro.ag.framework.common.pojo.CommonResult;
import cn.aagro.ag.framework.common.util.object.BeanUtils;
import cn.aagro.ag.module.pay.controller.app.wallet.vo.recharge.AppPayWalletPackageRespVO;
import cn.aagro.ag.module.pay.dal.dataobject.wallet.PayWalletRechargePackageDO;
import cn.aagro.ag.module.pay.service.wallet.PayWalletRechargePackageService;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.extern.slf4j.Slf4j;
@@ -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 jakarta.annotation.Resource;
import java.util.Comparator;
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

30
aagro-module-pay/src/main/java/cn/aagro/pp/module/pay/controller/app/wallet/AppPayWalletTransactionController.java → aagro-module-pay/src/main/java/cn/aagro/ag/module/pay/controller/app/wallet/AppPayWalletTransactionController.java
View File

@@ -1,14 +1,14 @@
package cn.aagro.pp.module.pay.controller.app.wallet;
package cn.aagro.ag.module.pay.controller.app.wallet;
import cn.aagro.pp.framework.common.enums.UserTypeEnum;
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.pay.controller.app.wallet.vo.transaction.AppPayWalletTransactionPageReqVO;
import cn.aagro.pp.module.pay.controller.app.wallet.vo.transaction.AppPayWalletTransactionRespVO;
import cn.aagro.pp.module.pay.controller.app.wallet.vo.transaction.AppPayWalletTransactionSummaryRespVO;
import cn.aagro.pp.module.pay.dal.dataobject.wallet.PayWalletTransactionDO;
import cn.aagro.pp.module.pay.service.wallet.PayWalletTransactionService;
import cn.aagro.ag.framework.common.enums.UserTypeEnum;
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.pay.controller.app.wallet.vo.transaction.AppPayWalletTransactionPageReqVO;
import cn.aagro.ag.module.pay.controller.app.wallet.vo.transaction.AppPayWalletTransactionRespVO;
import cn.aagro.ag.module.pay.controller.app.wallet.vo.transaction.AppPayWalletTransactionSummaryRespVO;
import cn.aagro.ag.module.pay.dal.dataobject.wallet.PayWalletTransactionDO;
import cn.aagro.ag.module.pay.service.wallet.PayWalletTransactionService;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.tags.Tag;
@@ -20,13 +20,13 @@ 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 java.time.LocalDateTime;
import static cn.aagro.pp.framework.common.pojo.CommonResult.success;
import static cn.aagro.pp.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
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.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
import static cn.aagro.ag.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId;
@Tag(name = "用户 APP - 钱包余额明细")
@RestController

2
aagro-module-pay/src/main/java/cn/aagro/pp/module/pay/controller/app/wallet/vo/recharge/AppPayWalletPackageRespVO.java → aagro-module-pay/src/main/java/cn/aagro/ag/module/pay/controller/app/wallet/vo/recharge/AppPayWalletPackageRespVO.java
View File

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

6
aagro-module-pay/src/main/java/cn/aagro/pp/module/pay/controller/app/wallet/vo/recharge/AppPayWalletRechargeCreateReqVO.java → aagro-module-pay/src/main/java/cn/aagro/ag/module/pay/controller/app/wallet/vo/recharge/AppPayWalletRechargeCreateReqVO.java
View File

@@ -1,10 +1,10 @@
package cn.aagro.pp.module.pay.controller.app.wallet.vo.recharge;
package cn.aagro.ag.module.pay.controller.app.wallet.vo.recharge;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import javax.validation.constraints.AssertTrue;
import javax.validation.constraints.Min;
import jakarta.validation.constraints.AssertTrue;
import jakarta.validation.constraints.Min;
import java.util.Objects;
@Schema(description = "用户 APP - 创建钱包充值 Request VO")

2
aagro-module-pay/src/main/java/cn/aagro/pp/module/pay/controller/app/wallet/vo/recharge/AppPayWalletRechargeCreateRespVO.java → aagro-module-pay/src/main/java/cn/aagro/ag/module/pay/controller/app/wallet/vo/recharge/AppPayWalletRechargeCreateRespVO.java
View File

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

2
aagro-module-pay/src/main/java/cn/aagro/pp/module/pay/controller/app/wallet/vo/recharge/AppPayWalletRechargeRespVO.java → aagro-module-pay/src/main/java/cn/aagro/ag/module/pay/controller/app/wallet/vo/recharge/AppPayWalletRechargeRespVO.java
View File

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

6
aagro-module-pay/src/main/java/cn/aagro/pp/module/pay/controller/app/wallet/vo/transaction/AppPayWalletTransactionPageReqVO.java → aagro-module-pay/src/main/java/cn/aagro/ag/module/pay/controller/app/wallet/vo/transaction/AppPayWalletTransactionPageReqVO.java
View File

@@ -1,7 +1,7 @@
package cn.aagro.pp.module.pay.controller.app.wallet.vo.transaction;
package cn.aagro.ag.module.pay.controller.app.wallet.vo.transaction;
import cn.aagro.pp.framework.common.pojo.PageParam;
import cn.aagro.pp.framework.common.util.date.DateUtils;
import cn.aagro.ag.framework.common.pojo.PageParam;
import cn.aagro.ag.framework.common.util.date.DateUtils;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;

2
aagro-module-pay/src/main/java/cn/aagro/pp/module/pay/controller/app/wallet/vo/transaction/AppPayWalletTransactionRespVO.java → aagro-module-pay/src/main/java/cn/aagro/ag/module/pay/controller/app/wallet/vo/transaction/AppPayWalletTransactionRespVO.java
View File

@@ -1,4 +1,4 @@
package cn.aagro.pp.module.pay.controller.app.wallet.vo.transaction;
package cn.aagro.ag.module.pay.controller.app.wallet.vo.transaction;
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