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 6c4c6ba..72dc6ad 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(type = "String",description = "客户名称,为微服务中文名称") + @Schema(type = "String",defaultValue = "客户名称1",description = "客户名称,为微服务中文名称") private String appName; /** * 服务/客户编码 */ - @Schema(type = "String",description = "客户名称,为微服务名称") + @Schema(defaultValue = "customer_code",description = "客户名称,为微服务名称") private String appCode; /** * 是否开启 */ - @Schema(type = "String",description = "客户状态,Y是开启,N是关闭") + @Schema(type = "String",defaultValue = "Y",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/CustomerResp.java similarity index 87% rename from cloud-pay-common/src/main/java/com/muyu/cloud/pay/domain/resp/CustomerListResp.java rename to cloud-pay-common/src/main/java/com/muyu/cloud/pay/domain/resp/CustomerResp.java index 1d080ed..9024fba 100644 --- 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/CustomerResp.java @@ -22,7 +22,8 @@ import java.util.List; @Data @AllArgsConstructor @Builder -public class CustomerListResp { + +public class CustomerResp { /** * 主键 @@ -64,8 +65,13 @@ public class CustomerListResp { private Date createTime; - public static CustomerListResp customerBuild(OrderPayCustomer orderPayCustomer) { - return CustomerListResp.builder() + /** + * 数据库对象构建为返回结果对象 + * @param orderPayCustomer 数据对象 + * @return 视图对象 + */ + public static CustomerResp customerBuild(OrderPayCustomer orderPayCustomer) { + return CustomerResp.builder() .id(orderPayCustomer.getId()) .appName(orderPayCustomer.getAppName()) .appCode(orderPayCustomer.getAppCode()) diff --git a/cloud-pay-server/src/main/java/com/muyu/cloud/pay/controller/OrderPayCustomerServiceController.java b/cloud-pay-server/src/main/java/com/muyu/cloud/pay/controller/OrderPayCustomerServiceController.java index e9450fa..71d23e0 100644 --- a/cloud-pay-server/src/main/java/com/muyu/cloud/pay/controller/OrderPayCustomerServiceController.java +++ b/cloud-pay-server/src/main/java/com/muyu/cloud/pay/controller/OrderPayCustomerServiceController.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; @@ -42,7 +43,7 @@ public class OrderPayCustomerServiceController { */ @RequestMapping(path = "/list",method = RequestMethod.POST) @Operation(summary = "查看客户",description = "根据客户的名称,编码,是否开启等可以进行客户的筛选") - public Result> selectList( + public Result> selectList( @Valid @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 6b26c47..7139099 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; @@ -20,6 +21,6 @@ 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 421dde6..488d732 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 @@ -3,6 +3,7 @@ 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 lombok.extern.log4j.Log4j2; @@ -28,7 +29,7 @@ public class OrderPayCustomerServiceImpl * @return 客户集合 */ @Override - public List selectList(CustomerListReq customerListReq) { + public List selectList(CustomerListReq customerListReq) { LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); @@ -47,6 +48,10 @@ public class OrderPayCustomerServiceImpl OrderPayCustomer::getStatus,customerListReq.getStatus() ); - return this.list(queryWrapper); + List orderPayCustomerList = this.list(queryWrapper); + + return orderPayCustomerList.stream() + .map(CustomerResp::customerBuild) + .toList(); } }