From 27df99cb776ba43a0e3c3e20c78025ced75e99d6 Mon Sep 17 00:00:00 2001 From: chaiyapeng <3535863041@qq.com> Date: Fri, 9 Aug 2024 20:23:44 +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 | 2 + .../main/java/com/muyu/cloud/pay/domain.java | 11 ---- .../cloud/pay/domain/OrderPayCustomer.java | 43 ++++++++++++++ .../cloud/pay/domain/req/CustomerListReq.java | 37 ++++++++++++ cloud-pay-server/pom.xml | 6 ++ .../OrderPayCustomerController.java | 51 ++++++++++++++++ .../cloud/pay/controller/TestController.java | 29 --------- .../pay/mapper/OrderPayCustomerMapper.java | 17 ++++++ .../pay/service/OrderPayCustomerService.java | 24 ++++++++ .../impl/OrderPayCustomerServiceImpl.java | 59 +++++++++++++++++++ 10 files changed, 239 insertions(+), 40 deletions(-) delete mode 100644 cloud-pay-common/src/main/java/com/muyu/cloud/pay/domain.java 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..2452b6b 100644 --- a/cloud-pay-common/pom.xml +++ b/cloud-pay-common/pom.xml @@ -23,6 +23,8 @@ com.muyu cloud-common-core + + diff --git a/cloud-pay-common/src/main/java/com/muyu/cloud/pay/domain.java b/cloud-pay-common/src/main/java/com/muyu/cloud/pay/domain.java deleted file mode 100644 index 3074c9b..0000000 --- a/cloud-pay-common/src/main/java/com/muyu/cloud/pay/domain.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.muyu.cloud.pay; - -/** - * @Author：chaiyapeng - * @Package：com.muyu.cloud.pay - * @Project：cloud-pay - * @name：domain - * @Date：2024/8/9 0:40 - */ -public class domain { -} 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..a9899a4 --- /dev/null +++ b/cloud-pay-common/src/main/java/com/muyu/cloud/pay/domain/OrderPayCustomer.java @@ -0,0 +1,43 @@ +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; +import org.apache.commons.logging.Log; + +/** + * @Author：chaiyapeng + * @Package：com.muyu.cloud.pay.domain + * @Project：cloud-pay + * @name：OrderPayCustomer + * @Date：2024/8/9 8:59 + */ +@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..3145bc0 --- /dev/null +++ b/cloud-pay-common/src/main/java/com/muyu/cloud/pay/domain/req/CustomerListReq.java @@ -0,0 +1,37 @@ +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 lombok.*; + +/** + * @Author：chaiyapeng + * @Package：com.muyu.cloud.pay.domain.req + * @Project：cloud-pay + * @name：CustomerListReq + * @Date：2024/8/9 16:49 + */ +@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 a3f4b89..a757ecc 100644 --- a/cloud-pay-server/pom.xml +++ b/cloud-pay-server/pom.xml @@ -86,6 +86,12 @@ cloud-common-rabbit 1.0.0 + + + + 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..68f2228 --- /dev/null +++ b/cloud-pay-server/src/main/java/com/muyu/cloud/pay/controller/OrderPayCustomerController.java @@ -0,0 +1,51 @@ +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.AllArgsConstructor; +import lombok.NonNull; +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; + +/** + * @Author：chaiyapeng + * @Package：com.muyu.cloud.pay.controller + * @Project：cloud-pay + * @name：OrderPayCustomerController + * @Date：2024/8/9 16:25 + */ +@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)); + } +} 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 3544239..0000000 --- a/cloud-pay-server/src/main/java/com/muyu/cloud/pay/controller/TestController.java +++ /dev/null @@ -1,29 +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：chaiyapeng - * @Package：com.muyu.cloud.pay.controller - * @Project：cloud-pay - * @name：TestController - * @Date：2024/8/8 16:09 - */ -@RestController -@RequestMapping("/test") -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..a45d651 --- /dev/null +++ b/cloud-pay-server/src/main/java/com/muyu/cloud/pay/mapper/OrderPayCustomerMapper.java @@ -0,0 +1,17 @@ +package com.muyu.cloud.pay.mapper; + +import cn.hutool.db.sql.Order; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.muyu.cloud.pay.domain.OrderPayCustomer; +import org.apache.ibatis.annotations.Mapper; + +/** + * @Author：chaiyapeng + * @Package：com.muyu.cloud.pay.mapper + * @Project：cloud-pay + * @name：OrderPayCustomerMapper + * @Date：2024/8/9 16:11 + */ +@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..e5f06df --- /dev/null +++ b/cloud-pay-server/src/main/java/com/muyu/cloud/pay/service/OrderPayCustomerService.java @@ -0,0 +1,24 @@ +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; + +/** + * @Author：chaiyapeng + * @Package：com.muyu.cloud.pay.service + * @Project：cloud-pay + * @name：OrderPayCustomerService + * @Date：2024/8/9 16:13 + */ +public interface OrderPayCustomerService extends IService { + + /** + * 查询客户集合 + * @param customerListReq 请求参数 + * @return 客户集合 + */ + 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 new file mode 100644 index 0000000..c3b653d --- /dev/null +++ b/cloud-pay-server/src/main/java/com/muyu/cloud/pay/service/impl/OrderPayCustomerServiceImpl.java @@ -0,0 +1,59 @@ +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 com.muyu.common.core.utils.StringUtils; +import lombok.extern.log4j.Log4j2; +import org.apache.catalina.mapper.Mapper; +import org.apache.poi.util.StringUtil; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * @Author：chaiyapeng + * @Package：com.muyu.cloud.pay.service.impl + * @Project：cloud-pay + * @name：OrderPayCustomerServiceImpl + * @Date：2024/8/9 16:15 + */ +@Service +@Log4j2 +public class OrderPayCustomerServiceImpl + extends ServiceImpl + implements OrderPayCustomerService { + + /** + * 查询客户集合 + * @param customerListReq 请求参数 + * + * @return 客户集合 + */ + @Override + public List selectList(CustomerListReq customerListReq) { + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.like(StringUtils.isNotEmpty(customerListReq.getAppName()), + OrderPayCustomer::getAppName, customerListReq.getAppName() + ); + queryWrapper.like( + StringUtils.isNotEmpty(customerListReq.getAppCode()), + OrderPayCustomer::getAppCode, customerListReq.getAppCode() + ); + queryWrapper.eq( + StringUtils.isNotEmpty(customerListReq.getStatus()), + OrderPayCustomer::getStatus, customerListReq.getStatus() + ); + return this.list(queryWrapper); + } +} + + + + + + +