diff --git a/cloud-pay-common/src/main/java/com/muyu/cloud/pay/domain/OrderPayCustomer.java b/cloud-pay-common/src/main/java/com/muyu/cloud/pay/domain/OrderPayCustomer.java index 0082952..3d583ab 100644 --- a/cloud-pay-common/src/main/java/com/muyu/cloud/pay/domain/OrderPayCustomer.java +++ b/cloud-pay-common/src/main/java/com/muyu/cloud/pay/domain/OrderPayCustomer.java @@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.muyu.common.core.web.domain.BaseEntity; import lombok.*; +import lombok.experimental.SuperBuilder; /** * @Author:yang @@ -14,7 +15,7 @@ import lombok.*; * @Date:2024/8/5 19:02 */ @Data -@Builder +@SuperBuilder @NoArgsConstructor @AllArgsConstructor @EqualsAndHashCode(callSuper = true) 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 b13b192..e9552cf 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 @@ -1,7 +1,9 @@ package com.muyu.cloud.pay.domain.req; +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; @@ -35,8 +37,10 @@ public class CustomerListReq { private String appCode; /** - *是否开启 + *是否开启 sys_yes_no */ @Schema(name = "是否开启",type = "String",description = "客户状态,Y是开启 N是关闭") + @NotNull + @IsSystemYesNo private String status; } 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 302fdba..6e6ef76 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 @@ -1,9 +1,23 @@ 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.service.OrderPayCustomerService; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; +import jakarta.validation.constraints.NotNull; +import lombok.AllArgsConstructor; +import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; +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; + /** * @Author:yang * @Package:com.muyu.cloud.pay.controller @@ -14,9 +28,27 @@ import org.springframework.web.bind.annotation.RestController; @Slf4j @RestController @RequestMapping("/customer") +@RequiredArgsConstructor +@Tag(name = "客户控制层",description = "进行客户管理,查看等相关操作") public class OrderPayCustomerController { + /** + * 客户业务层 + */ + @NotNull + private final OrderPayCustomerService orderPayCustomerService; - + /** + * 查询所有客户 + * @param customerListReq 客户列表请求参数 + * @return 客户列表 + */ + @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/cloud/pay/service/OrderPayCustomerService.java b/cloud-pay-server/src/main/java/com/muyu/cloud/pay/service/OrderPayCustomerService.java index 3d97570..453da69 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 @@ -2,8 +2,11 @@ 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 org.springframework.stereotype.Service; +import java.util.List; + /** * @Author:yang * @Package:com.muyu.cloud.pay.service.impl @@ -13,4 +16,6 @@ import org.springframework.stereotype.Service; */ @Service public interface OrderPayCustomerService extends IService { + + 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 f4fec93..163d99c 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 @@ -1,10 +1,15 @@ package com.muyu.cloud.pay.service.impl; +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.mapper.OrderPayCustomerMapper; import com.muyu.cloud.pay.service.OrderPayCustomerService; import org.apache.catalina.mapper.Mapper; +import org.apache.commons.lang3.StringUtils; + +import java.util.List; /** * @Author:yang @@ -18,4 +23,22 @@ public class OrderPayCustomerServiceImpl implements OrderPayCustomerService { + @Override + public List selectList(CustomerListReq customerListReq) { + + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.like( + StringUtils.isNotEmpty(customerListReq.getAppName()), + OrderPayCustomer::getAppName,customerListReq.getClass() + ); + queryWrapper.like( + StringUtils.isNotEmpty(customerListReq.getAppName()), + OrderPayCustomer::getAppCode,customerListReq.getClass() + ); + queryWrapper.eq( + StringUtils.isNotEmpty(customerListReq.getAppName()), + OrderPayCustomer::getStatus,customerListReq.getClass() + ); + return this.list(queryWrapper); + } }