From 9265f6758c2b2dab58bf7faccf54996d1b950681 Mon Sep 17 00:00:00 2001 From: DongZeLiang <2746733890@qq.com> Date: Wed, 31 Jul 2024 14:40:13 +0800 Subject: [PATCH] =?UTF-8?q?feat():=20=E6=96=B0=E5=A2=9E=E8=BF=94=E5=9B=9E?= =?UTF-8?q?=E7=BB=93=E6=9E=9C=E9=9B=86=E5=AF=B9=E8=B1=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cloud/pay/domain/req/CustomerListReq.java | 2 +- .../cloud/pay/domain/resp/CustomerResp.java | 75 +++++++++++++++++++ .../OrderPayCustomerController.java | 3 +- .../pay/service/OrderPayCustomerService.java | 3 +- .../impl/OrderPayCustomerServiceImpl.java | 9 ++- 5 files changed, 87 insertions(+), 5 deletions(-) create mode 100644 cloud-pay-common/src/main/java/com/muyu/cloud/pay/domain/resp/CustomerResp.java 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 c163038..cc99cef 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 @@ -30,7 +30,7 @@ public class CustomerListReq { /** * 服务/客户编码 */ - @Schema(name = "appCode", defaultValue = "customer_code", type = "String", description = "客户名称，为微服务名称") + @Schema(defaultValue = "customer_code", type = "String", description = "客户名称，为微服务名称") private String appCode; /** diff --git a/cloud-pay-common/src/main/java/com/muyu/cloud/pay/domain/resp/CustomerResp.java b/cloud-pay-common/src/main/java/com/muyu/cloud/pay/domain/resp/CustomerResp.java new file mode 100644 index 0000000..4d3aae1 --- /dev/null +++ b/cloud-pay-common/src/main/java/com/muyu/cloud/pay/domain/resp/CustomerResp.java @@ -0,0 +1,75 @@ +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 lombok.NoArgsConstructor; + +import java.util.Date; + +/** + * @Author: DongZeLiang + * @date: 2024/7/31 + * @Description: 客户集合返回值 + * @Version: 1.0 + */ +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +@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 = "Y", type = "String") + private String status; + + + @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; + + + /** + * 数据库对象构建为返回结果对象 + * @param orderPayCustomer 数据对象 + * @return 视图对象 + */ + public static CustomerResp customerBuild (OrderPayCustomer orderPayCustomer) { + return CustomerResp.builder() + .id(orderPayCustomer.getId()) + .appName(orderPayCustomer.getAppName()) + .appCode(orderPayCustomer.getAppCode()) + .status(orderPayCustomer.getStatus()) + .createBy(orderPayCustomer.getCreateBy()) + .createTime(orderPayCustomer.getCreateTime()) + .build(); + } +} diff --git a/cloud-pay-server/src/main/java/com/muyu/cloud/pay/controller/OrderPayCustomerController.java b/cloud-pay-server/src/main/java/com/muyu/cloud/pay/controller/OrderPayCustomerController.java index 59fe27f..18e7a26 100644 --- a/cloud-pay-server/src/main/java/com/muyu/cloud/pay/controller/OrderPayCustomerController.java +++ b/cloud-pay-server/src/main/java/com/muyu/cloud/pay/controller/OrderPayCustomerController.java @@ -2,6 +2,7 @@ package com.muyu.cloud.pay.controller; import com.muyu.cloud.pay.domain.OrderPayCustomer; import com.muyu.cloud.pay.domain.req.CustomerListReq; +import com.muyu.cloud.pay.domain.resp.CustomerResp; import com.muyu.cloud.pay.service.OrderPayCustomerService; import com.muyu.common.core.domain.Result; import io.swagger.v3.oas.annotations.Operation; @@ -39,7 +40,7 @@ public class OrderPayCustomerController { */ @RequestMapping(path = "/list", method = RequestMethod.POST) @Operation(summary = "查看客户", description = "根据客户的名称、编码、是否开启等可以进行客户的筛选") - public Result> selectList( + public Result> selectList( @Validated @RequestBody CustomerListReq customerListReq) { return Result.success( orderPayCustomerService.selectList(customerListReq) diff --git a/cloud-pay-server/src/main/java/com/muyu/cloud/pay/service/OrderPayCustomerService.java b/cloud-pay-server/src/main/java/com/muyu/cloud/pay/service/OrderPayCustomerService.java index 49153c9..0472326 100644 --- a/cloud-pay-server/src/main/java/com/muyu/cloud/pay/service/OrderPayCustomerService.java +++ b/cloud-pay-server/src/main/java/com/muyu/cloud/pay/service/OrderPayCustomerService.java @@ -3,6 +3,7 @@ package com.muyu.cloud.pay.service; import com.baomidou.mybatisplus.extension.service.IService; import com.muyu.cloud.pay.domain.OrderPayCustomer; import com.muyu.cloud.pay.domain.req.CustomerListReq; +import com.muyu.cloud.pay.domain.resp.CustomerResp; import java.util.List; @@ -19,5 +20,5 @@ public interface OrderPayCustomerService extends IService { * @param customerListReq 请求参数 * @return 客户集合 */ - public List selectList(CustomerListReq customerListReq); + public List selectList(CustomerListReq customerListReq); } diff --git a/cloud-pay-server/src/main/java/com/muyu/cloud/pay/service/impl/OrderPayCustomerServiceImpl.java b/cloud-pay-server/src/main/java/com/muyu/cloud/pay/service/impl/OrderPayCustomerServiceImpl.java index 1cd3ad4..5478f47 100644 --- a/cloud-pay-server/src/main/java/com/muyu/cloud/pay/service/impl/OrderPayCustomerServiceImpl.java +++ b/cloud-pay-server/src/main/java/com/muyu/cloud/pay/service/impl/OrderPayCustomerServiceImpl.java @@ -4,12 +4,14 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.muyu.cloud.pay.domain.OrderPayCustomer; import com.muyu.cloud.pay.domain.req.CustomerListReq; +import com.muyu.cloud.pay.domain.resp.CustomerResp; import com.muyu.cloud.pay.mapper.OrderPayCustomerMapper; import com.muyu.cloud.pay.service.OrderPayCustomerService; import com.muyu.common.core.utils.StringUtils; import lombok.extern.log4j.Log4j2; import org.springframework.stereotype.Service; +import java.util.ArrayList; import java.util.List; /** @@ -33,7 +35,7 @@ public class OrderPayCustomerServiceImpl * @return 客户集合 */ @Override - public List selectList (CustomerListReq customerListReq) { + public List selectList (CustomerListReq customerListReq) { LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); queryWrapper.like( StringUtils.isNotEmpty(customerListReq.getAppName()), @@ -47,6 +49,9 @@ public class OrderPayCustomerServiceImpl StringUtils.isNotEmpty(customerListReq.getStatus()), OrderPayCustomer::getStatus, customerListReq.getStatus() ); - return this.list(queryWrapper); + List orderPayCustomerList = this.list(queryWrapper); + return orderPayCustomerList.stream() + .map(CustomerResp::customerBuild) + .toList(); } }