diff --git a/cloud-pay-common/pom.xml b/cloud-pay-common/pom.xml index add9550..4b6edaa 100644 --- a/cloud-pay-common/pom.xml +++ b/cloud-pay-common/pom.xml @@ -23,6 +23,7 @@ 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..e97ccea --- /dev/null +++ b/cloud-pay-common/src/main/java/com/muyu/cloud/pay/domain/OrderPayCustomer.java @@ -0,0 +1,42 @@ +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..cf54e8b --- /dev/null +++ b/cloud-pay-common/src/main/java/com/muyu/cloud/pay/domain/req/CustomerListReq.java @@ -0,0 +1,35 @@ +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; + +@Tag(name = "客户列表请求对象") +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +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 5e19920..8aaa7ca 100644 --- a/cloud-pay-server/pom.xml +++ b/cloud-pay-server/pom.xml @@ -18,6 +18,10 @@ + + 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..c700758 --- /dev/null +++ b/cloud-pay-server/src/main/java/com/muyu/cloud/pay/controller/OrderPayCustomerController.java @@ -0,0 +1,42 @@ +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.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) + ); + } +} 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 47843e4..0000000 --- a/cloud-pay-server/src/main/java/com/muyu/cloud/pay/controller/TestController.java +++ /dev/null @@ -1,22 +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; - -@RequestMapping("/text") -@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..a807200 --- /dev/null +++ b/cloud-pay-server/src/main/java/com/muyu/cloud/pay/mapper/OrderPayCustomerMapper.java @@ -0,0 +1,11 @@ +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; + + +@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..f695378 --- /dev/null +++ b/cloud-pay-server/src/main/java/com/muyu/cloud/pay/service/OrderPayCustomerService.java @@ -0,0 +1,16 @@ +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 返回集合 + */ + 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..0df6611 --- /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 com.muyu.common.core.utils.StringUtils; +import org.springframework.stereotype.Service; + +import java.util.List; + +@Service +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); + } +}