From 2719a274153fcd74048cc7f092d38a9744ef4e1b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E8=B1=AA?= <1437200870@qq.com> Date: Sun, 4 Aug 2024 09:14:16 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- cloud-pay-common/pom.xml | 3 ++ .../com/muyu/domain/req/CustomerListReq.java | 17 +++++++---- .../OrderPayCustomerController.java | 30 +++++++++++++++++++ .../pay/service/OrderPayCustomerService.java | 8 +++++ .../impl/OrderPayCustomerServiceImpl.java | 25 ++++++++++++++++ 5 files changed, 78 insertions(+), 5 deletions(-) diff --git a/cloud-pay-common/pom.xml b/cloud-pay-common/pom.xml index 360af12..413711d 100644 --- a/cloud-pay-common/pom.xml +++ b/cloud-pay-common/pom.xml @@ -26,6 +26,9 @@ + + + diff --git a/cloud-pay-common/src/main/java/com/muyu/domain/req/CustomerListReq.java b/cloud-pay-common/src/main/java/com/muyu/domain/req/CustomerListReq.java index 9bc1071..cbe8512 100644 --- a/cloud-pay-common/src/main/java/com/muyu/domain/req/CustomerListReq.java +++ b/cloud-pay-common/src/main/java/com/muyu/domain/req/CustomerListReq.java @@ -1,15 +1,19 @@ package com.muyu.domain.req; -//import io.swagger.v3.oas.annotations.media.Schema; -//import io.swagger.v3.oas.annotations.tags.Tag; + +import com.muyu.common.core.validation.custom.IsSystemYesNo; +import io.swagger.v3.oas.annotations.media.Schema; +import io.swagger.v3.oas.annotations.tags.Tag; +import jakarta.validation.constraints.NotNull; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; import lombok.experimental.SuperBuilder; + @Data -//@Tag(name = "客户列表") +@Tag(name = "客户列表") @Builder @AllArgsConstructor @NoArgsConstructor @@ -19,18 +23,21 @@ public class CustomerListReq { /** * 服务/客户名称 */ -// @Schema(name = "服务/客户名称",type = "String" , description = "客户的名称") + @Schema(name = "服务/客户名称",type = "String" , description = "客户的名称") private String appName; /** * 服务/客户编号 */ + @Schema(name = "服务/客户编码",type = "String" , description = "客户的编码") private String appCode; /** * 是否开启 */ - private Integer status; + @Schema(name = "是否开启",type = "String" , description = "客户状态，Y是对，N关闭") + @IsSystemYesNo + private String status; diff --git a/cloud-pay-server/src/main/java/com/muyu/pay/controller/OrderPayCustomerController.java b/cloud-pay-server/src/main/java/com/muyu/pay/controller/OrderPayCustomerController.java index b3bd3a5..33f80b4 100644 --- a/cloud-pay-server/src/main/java/com/muyu/pay/controller/OrderPayCustomerController.java +++ b/cloud-pay-server/src/main/java/com/muyu/pay/controller/OrderPayCustomerController.java @@ -1,11 +1,41 @@ package com.muyu.pay.controller; +import com.muyu.common.core.domain.Result; +import com.muyu.domain.OrderPayCustomer; +import com.muyu.domain.req.CustomerListReq; +import com.muyu.pay.service.OrderPayCustomerService; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; +import lombok.RequiredArgsConstructor; +import lombok.extern.log4j.Log4j2; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RestController; +import java.util.List; + @RestController @RequestMapping("/customer") +@Log4j2 +@RequiredArgsConstructor +@Tag(name = "客户控制层",description = "进行客户管理，查看等相关操作") public class OrderPayCustomerController { + private final OrderPayCustomerService orderPayCustomerService; + + /** + * 查询所有用户 + */ + @RequestMapping(path = "/list",method = RequestMethod.POST) + @Operation(summary = "查看客户" , description = "根据客户的名称，编码，是否开启等可以镜像客户的筛选") + public Result> selectList(@Validated @RequestBody CustomerListReq customerListReq){ + return Result.success( + orderPayCustomerService.selectList(customerListReq) + ); + } + + } diff --git a/cloud-pay-server/src/main/java/com/muyu/pay/service/OrderPayCustomerService.java b/cloud-pay-server/src/main/java/com/muyu/pay/service/OrderPayCustomerService.java index 49a782f..a8623c0 100644 --- a/cloud-pay-server/src/main/java/com/muyu/pay/service/OrderPayCustomerService.java +++ b/cloud-pay-server/src/main/java/com/muyu/pay/service/OrderPayCustomerService.java @@ -2,6 +2,14 @@ package com.muyu.pay.service; import com.baomidou.mybatisplus.extension.service.IService; import com.muyu.domain.OrderPayCustomer; +import com.muyu.domain.req.CustomerListReq; + +import java.util.List; public interface OrderPayCustomerService extends IService { + + /** + * 客户列表 + */ + public List selectList(CustomerListReq customerListReq); } diff --git a/cloud-pay-server/src/main/java/com/muyu/pay/service/impl/OrderPayCustomerServiceImpl.java b/cloud-pay-server/src/main/java/com/muyu/pay/service/impl/OrderPayCustomerServiceImpl.java index 1dcee6b..f591149 100644 --- a/cloud-pay-server/src/main/java/com/muyu/pay/service/impl/OrderPayCustomerServiceImpl.java +++ b/cloud-pay-server/src/main/java/com/muyu/pay/service/impl/OrderPayCustomerServiceImpl.java @@ -1,15 +1,40 @@ package com.muyu.pay.service.impl; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.muyu.common.core.utils.StringUtils; import com.muyu.domain.OrderPayCustomer; +import com.muyu.domain.req.CustomerListReq; import com.muyu.pay.controller.OrderPayCustomerController; import com.muyu.pay.mapper.OrderPayCustomerMapper; import com.muyu.pay.service.OrderPayCustomerService; import org.springframework.stereotype.Service; +import java.util.ArrayList; +import java.util.List; + + + @Service public class OrderPayCustomerServiceImpl extends ServiceImpl implements OrderPayCustomerService { + @Override + public List selectList(CustomerListReq customerListReq) { + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.like( + StringUtils.isNotEmpty(customerListReq.getAppCode()), + OrderPayCustomer::getAppCode, customerListReq.getAppCode() + ); + queryWrapper.like( + StringUtils.isNotEmpty(customerListReq.getAppName()), + OrderPayCustomer::getAppName, customerListReq.getAppName() + ); + queryWrapper.eq( + StringUtils.isNotEmpty(customerListReq.getStatus()), + OrderPayCustomer::getStatus, customerListReq.getStatus() + ); + return this.list(queryWrapper); + } }