From 15883a6b089447569691fc9a0d3ad854509e67c8 Mon Sep 17 00:00:00 2001 From: WeiRan <2392355487@qq.com> Date: Mon, 5 Aug 2024 22:35:00 +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 | 3 +- .../src/main/java/com/muyu/Main.java | 14 ----- .../cloud/pay/domin/OrderPayCustomer.java | 47 +++++++++++++++++ .../cloud/pay/domin/req/CustomerListReq.java | 43 +++++++++++++++ cloud-pay-server/pom.xml | 4 ++ .../OrderPayCustomerController.java | 52 +++++++++++++++++++ .../pay/mapper/OrderPayCustomerMapper.java | 16 ++++++ .../pay/service/OrderPayCustomerService.java | 24 +++++++++ .../impl/OrderPayCustomerServiceImpl.java | 41 +++++++++++++++ 9 files changed, 229 insertions(+), 15 deletions(-) delete mode 100644 cloud-pay-common/src/main/java/com/muyu/Main.java create mode 100644 cloud-pay-common/src/main/java/com/muyu/cloud/pay/domin/OrderPayCustomer.java create mode 100644 cloud-pay-common/src/main/java/com/muyu/cloud/pay/domin/req/CustomerListReq.java create mode 100644 cloud-pay-server/src/main/java/com/muyu/cloud/pay/controller/OrderPayCustomerController.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 bc4fc49..1f96018 100644 --- a/cloud-pay-common/pom.xml +++ b/cloud-pay-common/pom.xml @@ -23,7 +23,8 @@ com.muyu cloud-common-core - + + diff --git a/cloud-pay-common/src/main/java/com/muyu/Main.java b/cloud-pay-common/src/main/java/com/muyu/Main.java deleted file mode 100644 index 74e2e56..0000000 --- a/cloud-pay-common/src/main/java/com/muyu/Main.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.muyu; - -/** - * @Author：weiran - * @Package：com.muyu - * @Project：Default (Template) Project - * @name：${NAME} - * @Date：2024/7/31 9:14 - */ -public class Main { - public static void main(String[] args) { - System.out.println("Hello world!"); - } -} diff --git a/cloud-pay-common/src/main/java/com/muyu/cloud/pay/domin/OrderPayCustomer.java b/cloud-pay-common/src/main/java/com/muyu/cloud/pay/domin/OrderPayCustomer.java new file mode 100644 index 0000000..b1fa8f1 --- /dev/null +++ b/cloud-pay-common/src/main/java/com/muyu/cloud/pay/domin/OrderPayCustomer.java @@ -0,0 +1,47 @@ +package com.muyu.cloud.pay.domin; + +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：weiran + * @Package：com.muyu.cloud.pay + * @Project：cloud-pay + * @name：OrderPayCustomer + * @Date：2024/8/5 19:29 + */ + + +@EqualsAndHashCode(callSuper = true) +@Data +@SuperBuilder +@AllArgsConstructor +@NoArgsConstructor +@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/domin/req/CustomerListReq.java b/cloud-pay-common/src/main/java/com/muyu/cloud/pay/domin/req/CustomerListReq.java new file mode 100644 index 0000000..e8c442c --- /dev/null +++ b/cloud-pay-common/src/main/java/com/muyu/cloud/pay/domin/req/CustomerListReq.java @@ -0,0 +1,43 @@ +package com.muyu.cloud.pay.domin.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：weiran + * @Package：com.muyu.cloud.pay.domin.req + * @Project：cloud-pay + * @name：CustomerListReq + * @Date：2024/8/5 19:52 + */ +@Tag(name = "客户列表请求对象") +@Data +@AllArgsConstructor +@NoArgsConstructor +@Builder +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 abf6eb0..473047b 100644 --- a/cloud-pay-server/pom.xml +++ b/cloud-pay-server/pom.xml @@ -86,6 +86,10 @@ com.muyu 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..0072a6e --- /dev/null +++ b/cloud-pay-server/src/main/java/com/muyu/cloud/pay/controller/OrderPayCustomerController.java @@ -0,0 +1,52 @@ +package com.muyu.cloud.pay.controller; + +import com.muyu.cloud.pay.domin.OrderPayCustomer; +import com.muyu.cloud.pay.domin.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.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：weiran + * @Package：com.muyu.cloud.pay.controller + * @Project：cloud-pay + * @name：OrderPayCustomerController + * @Date：2024/8/5 19:47 + */ + +@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/mapper/OrderPayCustomerMapper.java b/cloud-pay-server/src/main/java/com/muyu/cloud/pay/mapper/OrderPayCustomerMapper.java new file mode 100644 index 0000000..9ba854d --- /dev/null +++ b/cloud-pay-server/src/main/java/com/muyu/cloud/pay/mapper/OrderPayCustomerMapper.java @@ -0,0 +1,16 @@ +package com.muyu.cloud.pay.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.muyu.cloud.pay.domin.OrderPayCustomer; +import org.apache.ibatis.annotations.Mapper; + +/** + * @Author：weiran + * @Package：com.muyu.cloud.pay.mapper + * @Project：cloud-pay + * @name：OrderPayCustomerMapper + * @Date：2024/8/5 19:38 + */ +@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..4e2c1b7 --- /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.domin.OrderPayCustomer; +import com.muyu.cloud.pay.domin.req.CustomerListReq; + +import java.util.List; + +/** + * @Author：weiran + * @Package：com.muyu.cloud.pay.service + * @Project：cloud-pay + * @name：OrderPayCustomerService + * @Date：2024/8/5 19:41 + */ +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..64f4b58 --- /dev/null +++ b/cloud-pay-server/src/main/java/com/muyu/cloud/pay/service/impl/OrderPayCustomerServiceImpl.java @@ -0,0 +1,41 @@ +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.domin.OrderPayCustomer; +import com.muyu.cloud.pay.domin.req.CustomerListReq; +import com.muyu.cloud.pay.mapper.OrderPayCustomerMapper; +import com.muyu.cloud.pay.service.OrderPayCustomerService; +import com.muyu.common.core.utils.StringUtils; +import io.jsonwebtoken.lang.Strings; +import lombok.extern.log4j.Log4j2; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * @Author：weiran + * @Package：com.muyu.cloud.pay.service.impl + * @Project：cloud-pay + * @name：OrderPayCustomerServiceImpl + * @Date：2024/8/5 19:42 + */ +@Service +@Log4j2 +public class OrderPayCustomerServiceImpl extends ServiceImpl implements OrderPayCustomerService { + + @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); + } +}