From 7b523dc95b58e6ba05b85fcbf7cc795e03f973ea Mon Sep 17 00:00:00 2001 From: LQS <2506203757@qq.com> Date: Sun, 4 Aug 2024 14:43:19 +0800 Subject: [PATCH] =?UTF-8?q?feat():=E5=A2=9E=E5=8A=A0=E5=AE=A2=E6=88=B7?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- cloud-pay-common/pom.xml | 13 +++++ .../cloud/pay/domain/OrderPayCustomer.java | 36 ++++++++++++++ .../cloud/pay/domain/req/CustomerListReq.java | 36 ++++++++++++++ cloud-pay-server/pom.xml | 6 +++ .../OrderPayCustomerController.java | 49 +++++++++++++++++++ .../cloud/pay/controller/TestController.java | 32 ------------ .../pay/mapper/OrderPayCustomerMapper.java | 15 ++++++ .../pay/service/OrderPayCustomerService.java | 20 ++++++++ .../impl/OrderPayCustomerServiceImpl.java | 39 +++++++++++++++ 9 files changed, 214 insertions(+), 32 deletions(-) create mode 100644 cloud-pay-common/src/main/java/com/muyu/cloud/pay/domain/OrderPayCustomer.java create mode 100644 cloud-pay-common/src/main/java/com/muyu/cloud/pay/domain/req/CustomerListReq.java create mode 100644 cloud-pay-server/src/main/java/com/muyu/cloud/pay/controller/OrderPayCustomerController.java delete mode 100644 cloud-pay-server/src/main/java/com/muyu/cloud/pay/controller/TestController.java create mode 100644 cloud-pay-server/src/main/java/com/muyu/cloud/pay/mapper/OrderPayCustomerMapper.java create mode 100644 cloud-pay-server/src/main/java/com/muyu/cloud/pay/service/OrderPayCustomerService.java create mode 100644 cloud-pay-server/src/main/java/com/muyu/cloud/pay/service/impl/OrderPayCustomerServiceImpl.java diff --git a/cloud-pay-common/pom.xml b/cloud-pay-common/pom.xml index add9550..0deacee 100644 --- a/cloud-pay-common/pom.xml +++ b/cloud-pay-common/pom.xml @@ -23,6 +23,19 @@ com.muyu cloud-common-core + + + + + + + + + + + + + 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 new file mode 100644 index 0000000..79eae1e --- /dev/null +++ b/cloud-pay-common/src/main/java/com/muyu/cloud/pay/domain/OrderPayCustomer.java @@ -0,0 +1,36 @@ +package com.muyu.cloud.pay.domain; + + +import com.baomidou.mybatisplus.annotation.IdType; +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; + +@Data +@SuperBuilder +@NoArgsConstructor +@AllArgsConstructor +@EqualsAndHashCode(callSuper = true ) +@TableName(value = "order_pay_customer", autoResultMap = true) +public class OrderPayCustomer extends BaseEntity { + /** + * 主键 + */ + @TableId(value = "id",type = IdType.AUTO) + private Long id ; + /** + * 服务/客户名称 + */ + private String appName; + /** + * 服务/客户编码 + */ + private String appCode; + /** + * 状态 + */ + private String status; + +} 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 new file mode 100644 index 0000000..4f80729 --- /dev/null +++ b/cloud-pay-common/src/main/java/com/muyu/cloud/pay/domain/req/CustomerListReq.java @@ -0,0 +1,36 @@ +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; +import lombok.NoArgsConstructor; + +@Tag(name = "客户列表请求对象") +@Data +@Builder +@AllArgsConstructor +@NoArgsConstructor +public class CustomerListReq { + /** + * 服务/客户名称 + */ + @Schema(name = "服务/客户名称",type = "String",description = "客户名称，为微服务中文名称") + private String appName; + /** + * 服务/客户编码 + */ + @Schema(name = "服务/客户编码",type = "String",description = "客户名称，为微服务名称") + private String appCode; + /** + * 状态 - sys_yes_no + */ + @Schema(name = "是否开启",type = "String",description = "客户状态，Y是开启，N是关闭") + @IsSystemYesNo + private String status; + +} diff --git a/cloud-pay-server/pom.xml b/cloud-pay-server/pom.xml index 4e779a8..571aeef 100644 --- a/cloud-pay-server/pom.xml +++ b/cloud-pay-server/pom.xml @@ -86,6 +86,12 @@ cloud-common-rabbit + + + com.muyu + cloud-pay-common + + 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 new file mode 100644 index 0000000..b6f4596 --- /dev/null +++ b/cloud-pay-server/src/main/java/com/muyu/cloud/pay/controller/OrderPayCustomerController.java @@ -0,0 +1,49 @@ +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.service.OrderPayCustomerService; +import com.muyu.common.core.domain.Result; +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.stereotype.Controller; +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; + +@Log4j2 +@RestController +@RequestMapping("/customer") +@RequiredArgsConstructor +@Tag(name = "客户控制层" , description = "进行客户管理、查看等相关操作") +public class OrderPayCustomerController { + + /** + * 客户业务层 + */ + 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) + ); //客户lei + } + +} diff --git a/cloud-pay-server/src/main/java/com/muyu/cloud/pay/controller/TestController.java b/cloud-pay-server/src/main/java/com/muyu/cloud/pay/controller/TestController.java deleted file mode 100644 index 9a1749f..0000000 --- a/cloud-pay-server/src/main/java/com/muyu/cloud/pay/controller/TestController.java +++ /dev/null @@ -1,32 +0,0 @@ -package com.muyu.cloud.pay.controller; - -import com.muyu.common.core.domain.Result; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - - -/** - * @Author：作者姓名 - * @Package：com.muyu.cloud.pay.controller - * @Project：cloud-pay - * @name：TestController - * @Date：2024/7/31 8:48 - */ -@RequestMapping("/test") -@RestController -public class TestController { - - @PostMapping - public Result post() { - return Result.success("测试Post成功"); - } - - @GetMapping - public Result get() { - return Result.success("测试Get成功"); - } - - -} diff --git a/cloud-pay-server/src/main/java/com/muyu/cloud/pay/mapper/OrderPayCustomerMapper.java b/cloud-pay-server/src/main/java/com/muyu/cloud/pay/mapper/OrderPayCustomerMapper.java new file mode 100644 index 0000000..4f9b442 --- /dev/null +++ b/cloud-pay-server/src/main/java/com/muyu/cloud/pay/mapper/OrderPayCustomerMapper.java @@ -0,0 +1,15 @@ +package com.muyu.cloud.pay.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.muyu.cloud.pay.domain.OrderPayCustomer; +import com.muyu.cloud.pay.domain.req.CustomerListReq; +import org.apache.ibatis.annotations.Mapper; + +import java.util.List; + + +@Mapper +public interface OrderPayCustomerMapper extends BaseMapper { + + +} 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 new file mode 100644 index 0000000..f89143b --- /dev/null +++ b/cloud-pay-server/src/main/java/com/muyu/cloud/pay/service/OrderPayCustomerService.java @@ -0,0 +1,20 @@ +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 java.util.List; + +public interface OrderPayCustomerService extends IService { + + /** + * 查询客户集合 + * @param customerListReq 请求参数 + * @return 客户集合 + */ + 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 new file mode 100644 index 0000000..d2fabf7 --- /dev/null +++ b/cloud-pay-server/src/main/java/com/muyu/cloud/pay/service/impl/OrderPayCustomerServiceImpl.java @@ -0,0 +1,39 @@ +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 lombok.extern.log4j.Log4j2; +import org.apache.commons.lang3.StringUtils; +import org.springframework.stereotype.Service; + +import java.util.List; + +@Log4j2 +@Service +public class OrderPayCustomerServiceImpl + extends ServiceImpl + implements OrderPayCustomerService +{ + @Override //查询客户集合 + public List selectList(CustomerListReq customerListReq) { + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.like( + StringUtils.isNoneEmpty(customerListReq.getAppName()), + OrderPayCustomer::getAppName,customerListReq.getAppName() + ); + queryWrapper.like( + StringUtils.isNoneEmpty(customerListReq.getAppCode()), + OrderPayCustomer::getAppCode,customerListReq.getAppCode() + ); + queryWrapper.eq( + StringUtils.isNoneEmpty(customerListReq.getStatus()), + OrderPayCustomer::getStatus,customerListReq.getStatus() + ); + return this.list(queryWrapper); + } +}