From 2f356008f8a5e3f92bf781715bc31459d031d0e1 Mon Sep 17 00:00:00 2001 From: Cui YongXing <2835316714@qq.com> Date: Thu, 1 Aug 2024 10:08:59 +0800 Subject: [PATCH] =?UTF-8?q?feat():=E5=A2=9E=E5=8A=A0=E4=BA=86=E5=AE=A2?= =?UTF-8?q?=E6=88=B7=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/domain/req/CustomerListReq.java | 6 +- .../pay/common/domain/resp/CustomerResp.java | 71 +++++++++++++++++++ .../OrderPayCustomerController.java | 3 +- .../service/OrderPayCustomerService.java | 3 +- .../impl/OrderPayCustomerServiceImpl.java | 7 +- doc/sql/cloud-pay-202481095420.sql | 51 +++++++++++++ 6 files changed, 134 insertions(+), 7 deletions(-) create mode 100644 cloud-pay-common/src/main/java/com/muyu/pay/common/domain/resp/CustomerResp.java create mode 100644 doc/sql/cloud-pay-202481095420.sql diff --git a/cloud-pay-common/src/main/java/com/muyu/pay/common/domain/req/CustomerListReq.java b/cloud-pay-common/src/main/java/com/muyu/pay/common/domain/req/CustomerListReq.java index 8e76cde..218a8b8 100644 --- a/cloud-pay-common/src/main/java/com/muyu/pay/common/domain/req/CustomerListReq.java +++ b/cloud-pay-common/src/main/java/com/muyu/pay/common/domain/req/CustomerListReq.java @@ -17,19 +17,19 @@ public class CustomerListReq { /** * 服务/客户名称 */ - @Schema(description = "客户名称 为微服务名称",type = "Long") + @Schema( defaultValue ="客户名称1", description = "客户名称 为微服务名称",type = "Long") private String appName; /** * 服务/客户编码 */ - @Schema(description = "客户编吗 为微服务名称",type = "String") + @Schema(defaultValue = "customer_code",description = "客户编吗 为微服务名称",type = "String") private String appCode; /** * 状态 * */ - @Schema(description = "客户状态 Y是开启 N是关闭",type = "String") + @Schema(defaultValue = "Y",description = "客户状态 Y是开启 N是关闭",type = "String") @IsSystemYesNo private String status; diff --git a/cloud-pay-common/src/main/java/com/muyu/pay/common/domain/resp/CustomerResp.java b/cloud-pay-common/src/main/java/com/muyu/pay/common/domain/resp/CustomerResp.java new file mode 100644 index 0000000..fe0092e --- /dev/null +++ b/cloud-pay-common/src/main/java/com/muyu/pay/common/domain/resp/CustomerResp.java @@ -0,0 +1,71 @@ +package com.muyu.pay.common.domain.resp; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.muyu.pay.common.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 lombok.NoArgsConstructor; + +import java.util.Date; + +@Data +@AllArgsConstructor +@NoArgsConstructor +@Builder +@Tag(name = "客户信息响应对象",description = "负责客户信息查询的响应结果") +public class CustomerResp { + + @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 = "------",type = "String") + private String appDesc; + + /** + * 状态 + */ + @Schema(description = "客户状态:同数据字典",defaultValue = "Y",type = "String") + private String status; + + + @Schema(description = "创建人",defaultValue = "大壮",type = "String") + private String createBy; + + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @Schema(description = "创建时间",defaultValue = "2024-7-31 21:16:45",type = "Date") + private Date createTime; + + public static CustomerResp customerBuild(OrderPayCustomer orderPayCustomer){ + return CustomerResp.builder() + .id(orderPayCustomer.getId()) + .appName(orderPayCustomer.getAppCode()) + .appCode(orderPayCustomer.getAppCode()) + .appDesc(orderPayCustomer.getAppDesc()) + .status(orderPayCustomer.getStatus()) + .createBy(orderPayCustomer.getCreateBy()) + .createTime(orderPayCustomer.getCreateTime()) + .build(); + } + + +} diff --git a/cloud-pay-server/src/main/java/com/muyu/pay/server/controller/OrderPayCustomerController.java b/cloud-pay-server/src/main/java/com/muyu/pay/server/controller/OrderPayCustomerController.java index cd76759..a4b0af9 100644 --- a/cloud-pay-server/src/main/java/com/muyu/pay/server/controller/OrderPayCustomerController.java +++ b/cloud-pay-server/src/main/java/com/muyu/pay/server/controller/OrderPayCustomerController.java @@ -3,6 +3,7 @@ package com.muyu.pay.server.controller; import com.muyu.common.core.domain.Result; import com.muyu.pay.common.domain.OrderPayCustomer; import com.muyu.pay.common.domain.req.CustomerListReq; +import com.muyu.pay.common.domain.resp.CustomerResp; import com.muyu.pay.server.service.OrderPayCustomerService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; @@ -28,7 +29,7 @@ public class OrderPayCustomerController { @PostMapping("/list") @Operation(summary = "查看客户",description = "根据客户名称 编号 状态 查询") - public Result> selectList( + public Result> selectList( @Validated @RequestBody CustomerListReq req){ return Result.success(orderPayCustomerService.selectList(req)); } diff --git a/cloud-pay-server/src/main/java/com/muyu/pay/server/service/OrderPayCustomerService.java b/cloud-pay-server/src/main/java/com/muyu/pay/server/service/OrderPayCustomerService.java index 53d410a..b605840 100644 --- a/cloud-pay-server/src/main/java/com/muyu/pay/server/service/OrderPayCustomerService.java +++ b/cloud-pay-server/src/main/java/com/muyu/pay/server/service/OrderPayCustomerService.java @@ -3,12 +3,13 @@ package com.muyu.pay.server.service; import com.baomidou.mybatisplus.extension.service.IService; import com.muyu.pay.common.domain.OrderPayCustomer; import com.muyu.pay.common.domain.req.CustomerListReq; +import com.muyu.pay.common.domain.resp.CustomerResp; import java.util.List; public interface OrderPayCustomerService extends IService { - public List selectList(CustomerListReq req); + public List selectList(CustomerListReq req); } diff --git a/cloud-pay-server/src/main/java/com/muyu/pay/server/service/impl/OrderPayCustomerServiceImpl.java b/cloud-pay-server/src/main/java/com/muyu/pay/server/service/impl/OrderPayCustomerServiceImpl.java index 1cc10b2..bd92411 100644 --- a/cloud-pay-server/src/main/java/com/muyu/pay/server/service/impl/OrderPayCustomerServiceImpl.java +++ b/cloud-pay-server/src/main/java/com/muyu/pay/server/service/impl/OrderPayCustomerServiceImpl.java @@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.muyu.common.core.utils.StringUtils; import com.muyu.pay.common.domain.OrderPayCustomer; import com.muyu.pay.common.domain.req.CustomerListReq; +import com.muyu.pay.common.domain.resp.CustomerResp; import com.muyu.pay.server.mapper.OrderPayCustomerMapper; import com.muyu.pay.server.service.OrderPayCustomerService; import lombok.extern.log4j.Log4j2; @@ -19,7 +20,7 @@ public class OrderPayCustomerServiceImpl implements OrderPayCustomerService { @Override - public List selectList(CustomerListReq req) { + public List selectList(CustomerListReq req) { LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); queryWrapper.like( StringUtils.isNotEmpty(req.getAppName()), @@ -36,6 +37,8 @@ public class OrderPayCustomerServiceImpl OrderPayCustomer::getStatus, req.getStatus() ); - return this.list(queryWrapper); + + return this.list(queryWrapper).stream().map(CustomerResp::customerBuild).toList(); + } } diff --git a/doc/sql/cloud-pay-202481095420.sql b/doc/sql/cloud-pay-202481095420.sql new file mode 100644 index 0000000..4d07dcf --- /dev/null +++ b/doc/sql/cloud-pay-202481095420.sql @@ -0,0 +1,51 @@ + +CREATE TABLE order_pay_info( + `id` INT AUTO_INCREMENT COMMENT '主键' , + `app_name` VARCHAR(16) NOT NULL COMMENT '客户名称' , + `app_code` VARCHAR(16) COMMENT '客户编号' , + `cus_order_number` VARCHAR(32) COMMENT '客户单号' , + `pay_order_number` VARCHAR(32) COMMENT '支付单号' , + `channel_type` VARCHAR(64) COMMENT '渠道商类型' , + `channel_order_number` VARCHAR(32) COMMENT '渠道商单号' , + `status` VARCHAR(32) COMMENT '支付单状态;0 新建 1 待支付 2. 支付中 3 支付成功 4 支付失败 5 支付超时' , + `price` DECIMAL(24,6) COMMENT '价格' , + `update_time` DATETIME COMMENT '更新时间' , + `create_by` bigint COMMENT '创建人' , + `create_time` DATETIME COMMENT '创建时间' , + `update_by` bigint COMMENT '更新人' , + `remark` VARCHAR(64) COMMENT '备注' , + PRIMARY KEY (id) +) COMMENT = '订单支付信息'; + + +CREATE TABLE order_pay_customer( + `id` INT AUTO_INCREMENT COMMENT '主键' , + `app_name` VARCHAR(16) NOT NULL COMMENT '服务/客户名称' , + `app_code` VARCHAR(16) COMMENT '服务/客户编号' , + `app_desc` TEXT COMMENT '客户描述' , + `status` VARCHAR(32) COMMENT '是否开启' , + `create_by` bigint COMMENT '创建人' , + `create_time` DATETIME COMMENT '创建时间' , + `update_by` bigint COMMENT '更新人' , + `update_time` DATETIME COMMENT '更新时间' , + `remark` VARCHAR(64) COMMENT '备注' , + PRIMARY KEY (id) +) COMMENT = '支付单客户'; + +CREATE TABLE order_pay_refund( + `id` INT AUTO_INCREMENT COMMENT '主键' , + `cus_order_number` VARCHAR(32) NOT NULL COMMENT '客户退单号' , + `pay_order_number` VARCHAR(32) NOT NULL COMMENT '支付退单号' , + `channel_order_number` VARCHAR(64) NOT NULL COMMENT '渠道商退单号' , + `price` DECIMAL(24,6) NOT NULL COMMENT '退款金额' , + `pay_info_number` VARCHAR(32) COMMENT '支付单号' , + `to_account_time` DATETIME COMMENT '到账时间' , + `status` VARCHAR(32) COMMENT '状态' , + `create_by` bigint COMMENT '创建人' , + `create_time` DATETIME COMMENT '创建时间' , + `update_by` bigint COMMENT '更新人' , + `update_time` DATETIME COMMENT '更新时间' , + `remark` VARCHAR(64) COMMENT '备注' , + PRIMARY KEY (id) +) COMMENT = '订单退款'; +