From 2411b748702b32d9b09b4cc27e214c18ae8ecb02 Mon Sep 17 00:00:00 2001 From: Number7 <1845377266@qq.com> Date: Sun, 4 Aug 2024 11:50:55 +0800 Subject: [PATCH] =?UTF-8?q?feat():=20=E6=B5=8B=E8=AF=95=E4=BF=AE=E6=94=B9A?= =?UTF-8?q?pi=E6=8E=A5=E5=8F=A3=E6=96=87=E6=A1=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../muyu/cloud/pay/domain/OrderPayInfo.java | 70 +++++++++++++++++ .../cloud/pay/domain/req/CustomerListReq.java | 6 +- .../pay/domain/resp/CustomerListResp.java | 76 +++++++++++++++++++ .../resp/CustomerOrderPaySimpleResp.java | 44 +++++++++++ .../cloud/pay/domain/resp/OrderPayResp.java | 11 +++ 5 files changed, 204 insertions(+), 3 deletions(-) create mode 100644 cloud-pay-common/src/main/java/com/muyu/cloud/pay/domain/OrderPayInfo.java create mode 100644 cloud-pay-common/src/main/java/com/muyu/cloud/pay/domain/resp/CustomerListResp.java create mode 100644 cloud-pay-common/src/main/java/com/muyu/cloud/pay/domain/resp/CustomerOrderPaySimpleResp.java create mode 100644 cloud-pay-common/src/main/java/com/muyu/cloud/pay/domain/resp/OrderPayResp.java diff --git a/cloud-pay-common/src/main/java/com/muyu/cloud/pay/domain/OrderPayInfo.java b/cloud-pay-common/src/main/java/com/muyu/cloud/pay/domain/OrderPayInfo.java new file mode 100644 index 0000000..54b847e --- /dev/null +++ b/cloud-pay-common/src/main/java/com/muyu/cloud/pay/domain/OrderPayInfo.java @@ -0,0 +1,70 @@ +package com.muyu.cloud.pay.domain; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.muyu.common.core.web.domain.BaseEntity; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; +import lombok.experimental.SuperBuilder; + +import java.math.BigDecimal; + +/** + * @Author：liuxinyue + * @Package：com.muyu.cloud.pay.domain + * @Project：cloud-pay + * @name：OrderPayInfo + * @Date：2024/8/4 11:04 + */ +@Data +@SuperBuilder +@NoArgsConstructor +@AllArgsConstructor +@EqualsAndHashCode(callSuper = true) +@TableName(value = "order_pay_info",autoResultMap = true) +public class OrderPayInfo extends BaseEntity{ + + /** + * 客户名称 + */ + private String appName; + + /** + * 客户编号 + */ + private String appCode; + + /** + * 客户单号 + */ + private String cusOrderNumber; + + /** + * 支付单号 + */ + private String payOrderNumber; + + /** + *支付金额 + */ + private BigDecimal price; + + /** + * 渠道商类型 + */ + private String channelType; + + /** + * 渠道商单号 + */ + private String channelOrderNumber; + + /** + * 支付单状态 + */ + private String status; + + + +} diff --git a/cloud-pay-common/src/main/java/com/muyu/cloud/pay/domain/req/CustomerListReq.java b/cloud-pay-common/src/main/java/com/muyu/cloud/pay/domain/req/CustomerListReq.java index 172ad2c..6c4c6ba 100644 --- a/cloud-pay-common/src/main/java/com/muyu/cloud/pay/domain/req/CustomerListReq.java +++ b/cloud-pay-common/src/main/java/com/muyu/cloud/pay/domain/req/CustomerListReq.java @@ -26,17 +26,17 @@ public class CustomerListReq { /** * 服务/客户名称 */ - @Schema(name = "服务/客户名称",type = "String",description = "客户名称,为微服务中文名称") + @Schema(type = "String",description = "客户名称,为微服务中文名称") private String appName; /** * 服务/客户编码 */ - @Schema(name = "服务/客户编码",type = "String",description = "客户名称,为微服务名称") + @Schema(type = "String",description = "客户名称,为微服务名称") private String appCode; /** * 是否开启 */ - @Schema(name = "是否开启",type = "String",description = "客户状态,Y是开启,N是关闭") + @Schema(type = "String",description = "客户状态,Y是开启,N是关闭") @IsSystemYesNo private String status; diff --git a/cloud-pay-common/src/main/java/com/muyu/cloud/pay/domain/resp/CustomerListResp.java b/cloud-pay-common/src/main/java/com/muyu/cloud/pay/domain/resp/CustomerListResp.java new file mode 100644 index 0000000..1d080ed --- /dev/null +++ b/cloud-pay-common/src/main/java/com/muyu/cloud/pay/domain/resp/CustomerListResp.java @@ -0,0 +1,76 @@ +package com.muyu.cloud.pay.domain.resp; + +import com.fasterxml.jackson.annotation.JsonFormat; +import com.muyu.cloud.pay.domain.OrderPayCustomer; +import io.swagger.v3.oas.annotations.media.Schema; +import io.swagger.v3.oas.annotations.tags.Tag; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; + +import java.util.Date; +import java.util.List; + +/** + * @Author：liuxinyue + * @Package：com.muyu.cloud.pay.domain.resp + * @Project：cloud-pay + * @name：CustomerResp + * @Date：2024/8/4 11:03 + */ +@Tag(name ="客户信息相应对象",description ="负责客户信息查询的响应结果") +@Data +@AllArgsConstructor +@Builder +public class CustomerListResp { + + /** + * 主键 + */ + @Schema(description ="客户ID",defaultValue ="1",type = "Long") + private Long id; + + /** + * 服务/客户名称 + */ + @Schema(description ="客户名称",defaultValue ="商品服务",type ="String") + private String appName; + + /** + * 服务/客户编码 + */ + @Schema(description = "客户编码",defaultValue ="cloud_order",type = "String") + private String appCode; + + /** + * 状态 + */ + @Schema(description ="客户状态，同数据字典-系统是否",defaultValue ="Y",type = "String") + private String status; + + /** + * 客户最近5条支付单 + */ + private List orderPaySimpleRespList; + + + @Schema(description="创建人",defaultValue ="muyu", type ="String") + private String createBy; + + @JsonFormat( + pattern = "yyyy-MM-dd HH:mm:ss" + ) + @Schema(description ="创建时间", defaultValue ="2024-7-31 14:30:29", type ="Date") + private Date createTime; + + + public static CustomerListResp customerBuild(OrderPayCustomer orderPayCustomer) { + return CustomerListResp.builder() + .id(orderPayCustomer.getId()) + .appName(orderPayCustomer.getAppName()) + .appCode(orderPayCustomer.getAppCode()) + .createBy(orderPayCustomer.getCreateBy()) + .createTime(orderPayCustomer.getCreateTime()) + .build(); + } +} diff --git a/cloud-pay-common/src/main/java/com/muyu/cloud/pay/domain/resp/CustomerOrderPaySimpleResp.java b/cloud-pay-common/src/main/java/com/muyu/cloud/pay/domain/resp/CustomerOrderPaySimpleResp.java new file mode 100644 index 0000000..a57a2cd --- /dev/null +++ b/cloud-pay-common/src/main/java/com/muyu/cloud/pay/domain/resp/CustomerOrderPaySimpleResp.java @@ -0,0 +1,44 @@ +package com.muyu.cloud.pay.domain.resp; + +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.math.BigDecimal; + +/** + * @Author：liuxinyue + * @Package：com.muyu.cloud.pay.domain.resp + * @Project：cloud-pay + * @name：CustomerOrderPaySimpleResp + * @Date：2024/8/4 11:29 + */ +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +public class CustomerOrderPaySimpleResp { + + /** + * 客户单号 + */ + private String cusOrderNumber; + + /** + * 支付单号 + */ + private String payOrderNumber; + + /** + *支付金额 + */ + private BigDecimal price; + + /** + * 渠道商类型 + */ + private String channelType; + + +} diff --git a/cloud-pay-common/src/main/java/com/muyu/cloud/pay/domain/resp/OrderPayResp.java b/cloud-pay-common/src/main/java/com/muyu/cloud/pay/domain/resp/OrderPayResp.java new file mode 100644 index 0000000..29eb260 --- /dev/null +++ b/cloud-pay-common/src/main/java/com/muyu/cloud/pay/domain/resp/OrderPayResp.java @@ -0,0 +1,11 @@ +package com.muyu.cloud.pay.domain.resp; + +/** + * @Author：liuxinyue + * @Package：com.muyu.cloud.pay.domain.resp + * @Project：cloud-pay + * @name：OrderPayResp + * @Date：2024/8/4 11:28 + */ +public class OrderPayResp { +}