From d66c6f86b86859d9378254fca1390b5d62286d97 Mon Sep 17 00:00:00 2001 From: dzl <863620989@qq.com> Date: Thu, 15 May 2025 10:28:53 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E9=AA=91=E8=A1=8C?= =?UTF-8?q?=E8=AE=A2=E5=8D=95=E9=80=80=E6=AC=BE=E7=94=B3=E8=AF=B7=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2dto?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cdzy/payment/mapper/EbikeUserMapper.java | 14 +++ .../cdzy/payment/model/dto/ReqRefundDto.java | 21 ++++ .../payment/model/dto/ResApplyRefundDto.java | 79 ++++++++++++ .../payment/model/dto/ResCloseRefundDto.java | 89 ++++++++++++++ .../payment/model/dto/ResHandleRefundDto.java | 84 +++++++++++++ .../model/dto/ResProcessedRefundDto.java | 109 +++++++++++++++++ .../cdzy/payment/model/entity/EbikeUser.java | 113 ++++++++++++++++++ .../payment/service/EbikeUserService.java | 14 +++ .../service/impl/EbikeUserServiceImpl.java | 21 ++++ 9 files changed, 544 insertions(+) create mode 100644 ebike-payment/src/main/java/com/cdzy/payment/mapper/EbikeUserMapper.java create mode 100644 ebike-payment/src/main/java/com/cdzy/payment/model/dto/ReqRefundDto.java create mode 100644 ebike-payment/src/main/java/com/cdzy/payment/model/dto/ResApplyRefundDto.java create mode 100644 ebike-payment/src/main/java/com/cdzy/payment/model/dto/ResCloseRefundDto.java create mode 100644 ebike-payment/src/main/java/com/cdzy/payment/model/dto/ResHandleRefundDto.java create mode 100644 ebike-payment/src/main/java/com/cdzy/payment/model/dto/ResProcessedRefundDto.java create mode 100644 ebike-payment/src/main/java/com/cdzy/payment/model/entity/EbikeUser.java create mode 100644 ebike-payment/src/main/java/com/cdzy/payment/service/EbikeUserService.java create mode 100644 ebike-payment/src/main/java/com/cdzy/payment/service/impl/EbikeUserServiceImpl.java diff --git a/ebike-payment/src/main/java/com/cdzy/payment/mapper/EbikeUserMapper.java b/ebike-payment/src/main/java/com/cdzy/payment/mapper/EbikeUserMapper.java new file mode 100644 index 00000000..e380df1c --- /dev/null +++ b/ebike-payment/src/main/java/com/cdzy/payment/mapper/EbikeUserMapper.java @@ -0,0 +1,14 @@ +package com.cdzy.payment.mapper; + +import com.cdzy.payment.model.entity.EbikeUser; +import com.mybatisflex.core.BaseMapper; + +/** + * 用户信息 映射层。 + * + * @author dingchao + * @since 2025-04-07 + */ +public interface EbikeUserMapper extends BaseMapper { + +} diff --git a/ebike-payment/src/main/java/com/cdzy/payment/model/dto/ReqRefundDto.java b/ebike-payment/src/main/java/com/cdzy/payment/model/dto/ReqRefundDto.java new file mode 100644 index 00000000..438e113c --- /dev/null +++ b/ebike-payment/src/main/java/com/cdzy/payment/model/dto/ReqRefundDto.java @@ -0,0 +1,21 @@ +package com.cdzy.payment.model.dto; + +import lombok.Data; + +/** + * @author:Ding + * @ClassName:ReqRefundDto + * @Package:com.cdzy.payment.model.dto.ReqRefundDto + * @Description: + * @CreateDate:2025年05月15日 + * @Version: + **/ +@Data +public class ReqRefundDto { + + private String state; + + private String cyclingOrderNumber; + + private String phone; +} diff --git a/ebike-payment/src/main/java/com/cdzy/payment/model/dto/ResApplyRefundDto.java b/ebike-payment/src/main/java/com/cdzy/payment/model/dto/ResApplyRefundDto.java new file mode 100644 index 00000000..cb9788a4 --- /dev/null +++ b/ebike-payment/src/main/java/com/cdzy/payment/model/dto/ResApplyRefundDto.java @@ -0,0 +1,79 @@ +package com.cdzy.payment.model.dto; + +import lombok.Data; + +import java.math.BigDecimal; +import java.time.LocalDateTime; + +/** + * @author:Ding + * @ClassName:ResApplyRefundDto + * @Package:com.cdzy.payment.model.dto.ResApplyRefundDto + * @Description:申请中退款申请 + * @CreateDate:2025年05月15日 + * @Version: + **/ +@Data +public class ResApplyRefundDto { + + /** + * 逐渐id + */ + private String id; + + /** + * 申请时间 + */ + private LocalDateTime applyTime; + + /** + * 运营区域 + */ + private String operationArea; + + /** + * 用户手机号 + */ + private String phone; + + /** + * 骑行订单号 + */ + private String cyclingOrderNumber; + + /** + * 申请退款金额 + */ + private BigDecimal applyRefundAmount; + + /** + * 实付金额 + */ + private BigDecimal actualPayAmount; + + /** + * 支付方式 + */ + private String payMethod; + + /** + * 支付时间 + */ + private LocalDateTime payTime; + + /** + * 申请原因 + */ + private String applyReason; + + /** + * 来源 + */ + private String source; + + /** + * 申请人 + */ + private String applicant; + +} diff --git a/ebike-payment/src/main/java/com/cdzy/payment/model/dto/ResCloseRefundDto.java b/ebike-payment/src/main/java/com/cdzy/payment/model/dto/ResCloseRefundDto.java new file mode 100644 index 00000000..f45b85fe --- /dev/null +++ b/ebike-payment/src/main/java/com/cdzy/payment/model/dto/ResCloseRefundDto.java @@ -0,0 +1,89 @@ +package com.cdzy.payment.model.dto; + +import lombok.Data; + +import java.math.BigDecimal; +import java.time.LocalDateTime; + +/** + * @author:Ding + * @ClassName:ResCloseRefundDto + * @Package:com.cdzy.payment.model.dto.ResCloseRefundDto + * @Description:已关闭退款申请 + * @CreateDate:2025年05月15日 + * @Version: + **/ +@Data +public class ResCloseRefundDto { + + /** + * 逐渐id + */ + private String id; + + /** + * 申请时间 + */ + private LocalDateTime applyTime; + + /** + * 运营区域 + */ + private String operationArea; + + /** + * 用户手机号 + */ + private String phone; + + /** + * 骑行订单号 + */ + private String cyclingOrderNumber; + + /** + * 驳回时间 + */ + private LocalDateTime rejectTime; + + /** + * 驳回原因 + */ + private String rejectReason; + + /** + * 实付金额 + */ + private BigDecimal actualPayAmount; + + /** + * 申请退款金额 + */ + private BigDecimal applyRefundAmount; + + /** + * 支付方式 + */ + private String payMethod; + + /** + * 支付时间 + */ + private LocalDateTime payTime; + + /** + * 申请原因 + */ + private String applyReason; + + /** + * 来源 + */ + private String source; + + /** + * 申请人 + */ + private String applicant; + +} diff --git a/ebike-payment/src/main/java/com/cdzy/payment/model/dto/ResHandleRefundDto.java b/ebike-payment/src/main/java/com/cdzy/payment/model/dto/ResHandleRefundDto.java new file mode 100644 index 00000000..e2abbf1c --- /dev/null +++ b/ebike-payment/src/main/java/com/cdzy/payment/model/dto/ResHandleRefundDto.java @@ -0,0 +1,84 @@ +package com.cdzy.payment.model.dto; + +import lombok.Data; + +import java.math.BigDecimal; +import java.time.LocalDateTime; + +/** + * @author:Ding + * @ClassName:ResHandleRefundDto + * @Package:com.cdzy.payment.model.dto.ResHandleRefundDto + * @Description:处理中退款申请 + * @CreateDate:2025年05月15日 + * @Version: + **/ +@Data +public class ResHandleRefundDto { + + /** + * 逐渐id + */ + private String id; + + /** + * 申请时间 + */ + private LocalDateTime applyTime; + + /** + * 运营区域 + */ + private String operationArea; + + /** + * 用户手机号 + */ + private String phone; + + /** + * 骑行订单号 + */ + private String cyclingOrderNumber; + + /** + * 实付金额 + */ + private BigDecimal actualPayAmount; + + /** + * 退款金额 + */ + private BigDecimal refundAmount; + + /** + * 退款方式 + */ + private String refundMethod; + + /** + * 支付方式 + */ + private String payMethod; + + /** + * 支付时间 + */ + private LocalDateTime payTime; + + /** + * 申请原因 + */ + private String applyReason; + + /** + * 来源 + */ + private String source; + + /** + * 申请人 + */ + private String applicant; + +} diff --git a/ebike-payment/src/main/java/com/cdzy/payment/model/dto/ResProcessedRefundDto.java b/ebike-payment/src/main/java/com/cdzy/payment/model/dto/ResProcessedRefundDto.java new file mode 100644 index 00000000..66672969 --- /dev/null +++ b/ebike-payment/src/main/java/com/cdzy/payment/model/dto/ResProcessedRefundDto.java @@ -0,0 +1,109 @@ +package com.cdzy.payment.model.dto; + +import lombok.Data; + +import java.math.BigDecimal; +import java.time.LocalDateTime; + +/** + * @author:Ding + * @ClassName:ResProcessedRefundDto + * @Package:com.cdzy.payment.model.dto.ResProcessedRefundDto + * @Description:已处理退款申请 + * @CreateDate:2025年05月15日 + * @Version: + **/ +@Data +public class ResProcessedRefundDto { + + /** + * 逐渐id + */ + private String id; + + /** + * 申请时间 + */ + private LocalDateTime applyTime; + + /** + * 运营区域 + */ + private String operationArea; + + /** + * 用户手机号 + */ + private String phone; + + /** + * 骑行订单号 + */ + private String cyclingOrderNumber; + + /** + * 审核时间 + */ + private LocalDateTime reviewTime; + + /** + * 审核人 + */ + private String reviewer; + + /** + * 实付金额 + */ + private BigDecimal actualPayAmount; + + /** + * 退款金额 + */ + private BigDecimal refundAmount; + + /** + * 到账状态 + */ + private String arrivedState; + + /** + * 退款到账时间 + */ + private String arrivedTime; + + /** + * 退款方式 + */ + private LocalDateTime refundMethod; + + /** + * 支付方式 + */ + private String payMethod; + + /** + * 交易流水号 + */ + private String tradeSerialNumber + + /** + * 支付时间 + */ + private LocalDateTime payTime; + + /** + * 申请原因 + */ + private String applyReason; + + /** + * 来源 + */ + private String source; + + /** + * 申请人 + */ + private String applicant; + +} diff --git a/ebike-payment/src/main/java/com/cdzy/payment/model/entity/EbikeUser.java b/ebike-payment/src/main/java/com/cdzy/payment/model/entity/EbikeUser.java new file mode 100644 index 00000000..a63462f9 --- /dev/null +++ b/ebike-payment/src/main/java/com/cdzy/payment/model/entity/EbikeUser.java @@ -0,0 +1,113 @@ +package com.cdzy.payment.model.entity; + +import com.mybatisflex.annotation.Column; +import com.mybatisflex.annotation.Id; +import com.mybatisflex.annotation.Table; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.io.Serial; +import java.io.Serializable; +import java.time.LocalDateTime; + +/** + * 用户信息 实体类。 + * + * @author dingchao + * @since 2025-04-07 + */ +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +@Table("ebike_user") +public class EbikeUser implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 用户ID + */ + @Id + private String userId; + + /** + * OPENID + */ + private String openId; + + /** + * 手机号 + */ + private String mobile; + + /** + * 密码 + */ + private String password; + + /** + * 邮箱 + */ + private String email; + + /** + * 昵称 + */ + private String nickname; + + /** + * 性别 + */ + private String gender; + + /** + * 生日 + */ + private LocalDateTime birthdate; + + /** + * 头像 + */ + private String avatar; + + /** + * 用户注册时间 + */ + @Column(onInsertValue = "now()") + private LocalDateTime createdAt; + + /** + * 更新时间 + */ + private LocalDateTime updatedAt; + + /** + * 记录用户最后一次登录的时间 + */ + private LocalDateTime lastLoginAt; + + /** + * 用户的状态，通常有1-激活、0-禁用、-1注销 + */ + private Integer status; + + /** + * 角色 + */ + private String role; + + /** + * 地址 + */ + private String address; + + /** + * 是否通过实名认证 + */ + private String realNameVerified; + +} diff --git a/ebike-payment/src/main/java/com/cdzy/payment/service/EbikeUserService.java b/ebike-payment/src/main/java/com/cdzy/payment/service/EbikeUserService.java new file mode 100644 index 00000000..d2a14320 --- /dev/null +++ b/ebike-payment/src/main/java/com/cdzy/payment/service/EbikeUserService.java @@ -0,0 +1,14 @@ +package com.cdzy.payment.service; + +import com.cdzy.payment.model.entity.EbikeUser; +import com.mybatisflex.core.paginate.Page; +import com.mybatisflex.core.service.IService; + +/** + * 用户信息 服务层。 + * + * @author dingchao + * @since 2025-04-07 + */ +public interface EbikeUserService extends IService { +} diff --git a/ebike-payment/src/main/java/com/cdzy/payment/service/impl/EbikeUserServiceImpl.java b/ebike-payment/src/main/java/com/cdzy/payment/service/impl/EbikeUserServiceImpl.java new file mode 100644 index 00000000..e1de0c48 --- /dev/null +++ b/ebike-payment/src/main/java/com/cdzy/payment/service/impl/EbikeUserServiceImpl.java @@ -0,0 +1,21 @@ +package com.cdzy.payment.service.impl; + + +import com.cdzy.payment.mapper.EbikeUserMapper; +import com.cdzy.payment.model.entity.EbikeUser; +import com.cdzy.payment.service.EbikeUserService; +import com.mybatisflex.spring.service.impl.ServiceImpl; +import org.springframework.stereotype.Service; + + +/** + * 用户信息 服务层实现。 + * + * @author dingchao + * @since 2025-04-07 + */ +@Service +public class EbikeUserServiceImpl extends ServiceImpl implements EbikeUserService { + + +} From 9a522f94a934ef93fb444fa6b3eea82fab4c9c7b Mon Sep 17 00:00:00 2001 From: dzl <863620989@qq.com> Date: Thu, 15 May 2025 10:29:37 +0800 Subject: [PATCH 2/5] =?UTF-8?q?dto=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/cdzy/payment/model/dto/ResProcessedRefundDto.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ebike-payment/src/main/java/com/cdzy/payment/model/dto/ResProcessedRefundDto.java b/ebike-payment/src/main/java/com/cdzy/payment/model/dto/ResProcessedRefundDto.java index 66672969..7673b191 100644 --- a/ebike-payment/src/main/java/com/cdzy/payment/model/dto/ResProcessedRefundDto.java +++ b/ebike-payment/src/main/java/com/cdzy/payment/model/dto/ResProcessedRefundDto.java @@ -84,7 +84,7 @@ public class ResProcessedRefundDto { /** * 交易流水号 */ - private String tradeSerialNumber + private String tradeSerialNumber; /** * 支付时间 From 7432acb4b530f092aeac38fe7834fd55ea38b16c Mon Sep 17 00:00:00 2001 From: dzl <863620989@qq.com> Date: Thu, 15 May 2025 10:35:00 +0800 Subject: [PATCH 3/5] =?UTF-8?q?dto=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cdzy/payment/model/dto/ReqRefundDto.java | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/ebike-payment/src/main/java/com/cdzy/payment/model/dto/ReqRefundDto.java b/ebike-payment/src/main/java/com/cdzy/payment/model/dto/ReqRefundDto.java index 438e113c..0ed24421 100644 --- a/ebike-payment/src/main/java/com/cdzy/payment/model/dto/ReqRefundDto.java +++ b/ebike-payment/src/main/java/com/cdzy/payment/model/dto/ReqRefundDto.java @@ -1,21 +1,36 @@ package com.cdzy.payment.model.dto; +import com.alibaba.fastjson2.JSONArray; import lombok.Data; /** * @author:Ding * @ClassName:ReqRefundDto * @Package:com.cdzy.payment.model.dto.ReqRefundDto - * @Description: + * @Description:退款申请查询参数dto * @CreateDate:2025年05月15日 * @Version: **/ @Data public class ReqRefundDto { + /** + * 审核状态 1申请中 2处理中 3已处理 4已关闭 + */ private String state; + /** + * 骑行订单号 + */ private String cyclingOrderNumber; + /** + * 用户手机号 + */ private String phone; + + /** + * 退款时间 + */ + private JSONArray refundTime; } From 2a463770db073158930282f40cc1640febf8bfbd Mon Sep 17 00:00:00 2001 From: dzl <863620989@qq.com> Date: Thu, 15 May 2025 10:36:13 +0800 Subject: [PATCH 4/5] =?UTF-8?q?dto=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/cdzy/payment/model/dto/ReqRefundDto.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ebike-payment/src/main/java/com/cdzy/payment/model/dto/ReqRefundDto.java b/ebike-payment/src/main/java/com/cdzy/payment/model/dto/ReqRefundDto.java index 0ed24421..1a2de28d 100644 --- a/ebike-payment/src/main/java/com/cdzy/payment/model/dto/ReqRefundDto.java +++ b/ebike-payment/src/main/java/com/cdzy/payment/model/dto/ReqRefundDto.java @@ -15,7 +15,7 @@ import lombok.Data; public class ReqRefundDto { /** - * 审核状态 1申请中 2处理中 3已处理 4已关闭 + * 审核状态 0申请中 1处理中 2已处理 3已关闭 */ private String state; From 8afc55ca654584deea41438f8228ce987bb7b4a4 Mon Sep 17 00:00:00 2001 From: dzl <863620989@qq.com> Date: Thu, 15 May 2025 10:49:01 +0800 Subject: [PATCH 5/5] =?UTF-8?q?dto=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/cdzy/payment/model/dto/ReqRefundDto.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/ebike-payment/src/main/java/com/cdzy/payment/model/dto/ReqRefundDto.java b/ebike-payment/src/main/java/com/cdzy/payment/model/dto/ReqRefundDto.java index 1a2de28d..47ebe044 100644 --- a/ebike-payment/src/main/java/com/cdzy/payment/model/dto/ReqRefundDto.java +++ b/ebike-payment/src/main/java/com/cdzy/payment/model/dto/ReqRefundDto.java @@ -1,8 +1,10 @@ package com.cdzy.payment.model.dto; -import com.alibaba.fastjson2.JSONArray; import lombok.Data; +import java.time.LocalDateTime; +import java.util.List; + /** * @author:Ding * @ClassName:ReqRefundDto @@ -32,5 +34,5 @@ public class ReqRefundDto { /** * 退款时间 */ - private JSONArray refundTime; + private List refundTime; }