From 06ac5197a89f9b3f7912371d324f1d1f81b63601 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E8=85=BE?= <3467447354@qq.com> Date: Sun, 4 Aug 2024 11:17:29 +0800 Subject: [PATCH] 666 --- cloud-pay-common/pom.xml | 11 ++++ .../cloud/pay/domain/OrderPayCustomer.java | 50 +++++++++++++++++++ .../cloud/pay/domain/req/CustomerListReq.java | 44 ++++++++++++++++ cloud-pay-server/pom.xml | 6 ++- .../OrderPayCustomerController.java | 44 ++++++++++++++++ .../cloud/pay/controller/TestController.java | 30 ----------- .../pay/mapper/OrderPayCustomerMapper.java | 17 +++++++ .../pay/service/OrderPayCustomerService.java | 24 +++++++++ .../impl/OrderPayCustomerServiceImpl.java | 42 ++++++++++++++++ 9 files changed, 237 insertions(+), 31 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 7c92cb4..880763e 100644 --- a/cloud-pay-common/pom.xml +++ b/cloud-pay-common/pom.xml @@ -22,6 +22,17 @@ com.muyu cloud-common-core + 1.0.0 + + + + com.muyu + cloud-common-api-doc + + + + io.swagger.core.v3 + swagger-annotations-jakarta 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..5cf8226 --- /dev/null +++ b/cloud-pay-common/src/main/java/com/muyu/cloud/pay/domain/OrderPayCustomer.java @@ -0,0 +1,50 @@ +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; + +/** + * @Author：张腾 + * @Package：com.muyu.cloud.pay.domain + * @Project：cloud-pay + * @name：OrderPayCustomer + * @Date：2024/7/31 19:41 + */ +@Data +@SuperBuilder +@AllArgsConstructor +@NoArgsConstructor +@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 appDesc; + + /** + * 状态 + */ + 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..cd0d8de --- /dev/null +++ b/cloud-pay-common/src/main/java/com/muyu/cloud/pay/domain/req/CustomerListReq.java @@ -0,0 +1,44 @@ +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.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +/** + * @Author：张腾 + * @Package：com.muyu.cloud.pay.domain.req + * @Project：cloud-pay + * @name：CustomerListReq + * @Date：2024/7/31 20:37 + */ +@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",defaultValue = "客户状态,Y是开启,N是关闭") + @IsSystemYesNo + private String status; +} diff --git a/cloud-pay-server/pom.xml b/cloud-pay-server/pom.xml index 93c20da..a46846b 100644 --- a/cloud-pay-server/pom.xml +++ b/cloud-pay-server/pom.xml @@ -19,12 +19,16 @@ - com.muyu cloud-common-rabbit + + com.muyu + cloud-pay-common + + com.alibaba.cloud 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..3f950bf --- /dev/null +++ b/cloud-pay-server/src/main/java/com/muyu/cloud/pay/controller/OrderPayCustomerController.java @@ -0,0 +1,44 @@ +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.RequiredArgsConstructor; +import lombok.extern.log4j.Log4j2; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * @Author：张腾 + * @Package：com.muyu.cloud.pay.controller + * @Project：cloud-pay + * @name：OrderPayCustomerController + * @Date：2024/7/31 20:12 + */ +@Log4j2 +@RestController +@RequestMapping("/customer") +@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/cloud/pay/controller/TestController.java b/cloud-pay-server/src/main/java/com/muyu/cloud/pay/controller/TestController.java deleted file mode 100644 index 257ae38..0000000 --- a/cloud-pay-server/src/main/java/com/muyu/cloud/pay/controller/TestController.java +++ /dev/null @@ -1,30 +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：TestConroller - * @Date：2024/7/29 21:25 - */ -@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..3107083 --- /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 com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.muyu.cloud.pay.domain.OrderPayCustomer; +import org.apache.ibatis.annotations.Mapper; + +/** + * @Author：张腾 + * @Package：com.muyu.cloud.pay.mapper + * @Project：cloud-pay + * @name：OrderPayCustomerMapper + * @Date：2024/7/31 19:58 + */ +@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..017e671 --- /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：张腾 + * @Package：com.muyu.cloud.pay.service + * @Project：cloud-pay + * @name：OrderPayCustomerService + * @Date：2024/7/31 20:03 + */ +public interface OrderPayCustomerService extends IService { + + /** + * + * @param req 请求参数 + * @return 客户集合 + */ + public List selectList(CustomerListReq req); +} 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..00a403b --- /dev/null +++ b/cloud-pay-server/src/main/java/com/muyu/cloud/pay/service/impl/OrderPayCustomerServiceImpl.java @@ -0,0 +1,42 @@ +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 org.springframework.stereotype.Service; + +import java.util.List; + +/** + * @Author：张腾 + * @Package：com.muyu.cloud.pay.service.impl + * @Project：cloud-pay + * @name：OrderPayCustomerServiceImpl + * @Date：2024/7/31 20:03 + */ +@Service +public class OrderPayCustomerServiceImpl + extends ServiceImpl + implements OrderPayCustomerService { + @Override + public List selectList(CustomerListReq req) { + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.like( + StringUtils.isNotEmpty(req.getAppName()), + OrderPayCustomer::getAppName, req.getAppName() + ); + queryWrapper.like( + StringUtils.isNotEmpty(req.getAppCode()), + OrderPayCustomer::getAppCode,req.getAppCode() + ); + queryWrapper.eq( + StringUtils.isNotEmpty(req.getStatus()), + OrderPayCustomer::getStatus,req.getStatus() + ); + return this.list(queryWrapper); + } +}