From 66d55bd1ed5fbbbe12af5099ab20a481c4cf7abc Mon Sep 17 00:00:00 2001 From: Yueng <14617246+YuengMeYuuer@user.noreply.gitee.com> Date: Wed, 7 Aug 2024 22:05:38 +0800 Subject: [PATCH] =?UTF-8?q?feat():=E6=96=B0=E5=A2=9E=E8=BF=94=E5=9B=9E?= =?UTF-8?q?=E7=BB=93=E6=9E=9C=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 | 1 + .../cloud/pay/domain/resp/CustomerResp.java | 49 +++++++++++++++++++ .../OrderPayCustomerController.java | 3 +- .../pay/service/OrderPayCustomerService.java | 3 +- .../impl/OrderPayCustomerServiceImpl.java | 8 ++- 5 files changed, 60 insertions(+), 4 deletions(-) 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 4b4f9e2..3269bb4 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 @@ -8,6 +8,7 @@ import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; +import lombok.experimental.SuperBuilder; import org.apache.skywalking.apm.toolkit.trace.Tags; /** 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 index 0e92daa..5d23973 100644 --- 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 @@ -1,11 +1,16 @@ 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：yang * @Package：com.muyu.cloud.pay.domain.resp @@ -20,6 +25,50 @@ import lombok.NoArgsConstructor; @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：33：23",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 37ffc99..4a1a9e6 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 @@ -3,6 +3,7 @@ package com.muyu.cloud.pay.controller; import com.alibaba.nacos.api.model.v2.Result; 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 io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; @@ -45,7 +46,7 @@ public class OrderPayCustomerController { */ @RequestMapping(path = "/list" ,method = RequestMethod.POST) @Operation(summary = "查询客户",description = "根据客户的名称，编码，是否开启等可以进行客户的筛选") - public Result> selectList(@Validated @RequestBody CustomerListReq customerListReq){ + 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 e705db9..c1e3633 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 org.springframework.stereotype.Service; import java.util.List; @@ -16,5 +17,5 @@ import java.util.List; */ public interface OrderPayCustomerService extends IService { - 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 2b5de95..75f8be3 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 org.apache.catalina.mapper.Mapper; import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; +import java.util.ArrayList; import java.util.List; /** @@ -26,7 +28,7 @@ public class OrderPayCustomerServiceImpl @Override - public List selectList(CustomerListReq customerListReq) { + public List selectList(CustomerListReq customerListReq) { LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); queryWrapper.like( @@ -41,6 +43,8 @@ public class OrderPayCustomerServiceImpl StringUtils.isNotEmpty(customerListReq.getStatus()), OrderPayCustomer::getStatus,customerListReq.getClass() ); - return this.list(queryWrapper); + List orderPayCustomerList = this.list(queryWrapper); + + return orderPayCustomerList.stream().map(CustomerResp::customerBuild).toList(); } }