From 9e2e415f7579aa4e621b1b5d9ec18893ca64c794 Mon Sep 17 00:00:00 2001 From: Cui YongXing <2835316714@qq.com> Date: Wed, 31 Jul 2024 20:34:50 +0800 Subject: [PATCH] =?UTF-8?q?feat():=E5=A2=9E=E5=8A=A0=E4=BA=86=E5=AE=A2?= =?UTF-8?q?=E6=88=B7=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pay/common/domain/OrderPayCustomer.java | 49 +++++++++++++++ .../muyu/pay/common/domain/OrderPayInfo.java | 61 ++++++++++++++++++ .../pay/common/domain/OrderPayRefund.java | 63 +++++++++++++++++++ .../common/domain/req/CustomerListReq.java | 36 +++++++++++ cloud-pay-server/pom.xml | 4 ++ .../OrderPayCustomerController.java | 38 +++++++++++ .../controller/OrderPayInfoController.java | 11 ++++ .../controller/OrderPayRefundController.java | 12 ++++ .../pay/server/controller/TestController.java | 23 ------- .../server/mapper/OrderPayCustomerMapper.java | 9 +++ .../pay/server/mapper/OrderPayInfoMapper.java | 11 ++++ .../server/mapper/OrderPayRefundMapper.java | 10 +++ .../service/OrderPayCustomerService.java | 14 +++++ .../server/service/OrderPayInfoService.java | 10 +++ .../server/service/OrderPayRefundService.java | 7 +++ .../impl/OrderPayCustomerServiceImpl.java | 41 ++++++++++++ .../service/impl/OrderPayInfoServiceImpl.java | 13 ++++ .../impl/OrderPayRefundServiceImpl.java | 16 +++++ .../src/main/resources/bootstrap.yml | 1 + 19 files changed, 406 insertions(+), 23 deletions(-) create mode 100644 cloud-pay-common/src/main/java/com/muyu/pay/common/domain/OrderPayCustomer.java create mode 100644 cloud-pay-common/src/main/java/com/muyu/pay/common/domain/OrderPayInfo.java create mode 100644 cloud-pay-common/src/main/java/com/muyu/pay/common/domain/OrderPayRefund.java create mode 100644 cloud-pay-common/src/main/java/com/muyu/pay/common/domain/req/CustomerListReq.java create mode 100644 cloud-pay-server/src/main/java/com/muyu/pay/server/controller/OrderPayCustomerController.java create mode 100644 cloud-pay-server/src/main/java/com/muyu/pay/server/controller/OrderPayInfoController.java create mode 100644 cloud-pay-server/src/main/java/com/muyu/pay/server/controller/OrderPayRefundController.java delete mode 100644 cloud-pay-server/src/main/java/com/muyu/pay/server/controller/TestController.java create mode 100644 cloud-pay-server/src/main/java/com/muyu/pay/server/mapper/OrderPayCustomerMapper.java create mode 100644 cloud-pay-server/src/main/java/com/muyu/pay/server/mapper/OrderPayInfoMapper.java create mode 100644 cloud-pay-server/src/main/java/com/muyu/pay/server/mapper/OrderPayRefundMapper.java create mode 100644 cloud-pay-server/src/main/java/com/muyu/pay/server/service/OrderPayCustomerService.java create mode 100644 cloud-pay-server/src/main/java/com/muyu/pay/server/service/OrderPayInfoService.java create mode 100644 cloud-pay-server/src/main/java/com/muyu/pay/server/service/OrderPayRefundService.java create mode 100644 cloud-pay-server/src/main/java/com/muyu/pay/server/service/impl/OrderPayCustomerServiceImpl.java create mode 100644 cloud-pay-server/src/main/java/com/muyu/pay/server/service/impl/OrderPayInfoServiceImpl.java create mode 100644 cloud-pay-server/src/main/java/com/muyu/pay/server/service/impl/OrderPayRefundServiceImpl.java diff --git a/cloud-pay-common/src/main/java/com/muyu/pay/common/domain/OrderPayCustomer.java b/cloud-pay-common/src/main/java/com/muyu/pay/common/domain/OrderPayCustomer.java new file mode 100644 index 0000000..6b3e298 --- /dev/null +++ b/cloud-pay-common/src/main/java/com/muyu/pay/common/domain/OrderPayCustomer.java @@ -0,0 +1,49 @@ +package com.muyu.pay.common.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 +@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/pay/common/domain/OrderPayInfo.java b/cloud-pay-common/src/main/java/com/muyu/pay/common/domain/OrderPayInfo.java new file mode 100644 index 0000000..f1049a4 --- /dev/null +++ b/cloud-pay-common/src/main/java/com/muyu/pay/common/domain/OrderPayInfo.java @@ -0,0 +1,61 @@ +package com.muyu.pay.common.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; + +@EqualsAndHashCode(callSuper = true) +@Data +@AllArgsConstructor +@NoArgsConstructor +@SuperBuilder +@TableName(value = "order_pay_info" ,autoResultMap = true) +public class OrderPayInfo extends BaseEntity { + + /** + * 主键 + */ + @TableId(value = "id",type = IdType.AUTO) + private Long id; + + /** + * 客户名称 + */ + private String appName; + + /** + * 客户编号 + */ + private String appCode; + + /** + * 客户单号 + */ + private String cusOrderNumber; + + /** + * 支付单号 + */ + private String payOrderNumber; + + /** + * 渠道商类型 + */ + private String channelType; + + /** + * 渠道商单号 + */ + private String channelOrderNumber; + + /** + * 支付单状态 + */ + private String status; + + + +} diff --git a/cloud-pay-common/src/main/java/com/muyu/pay/common/domain/OrderPayRefund.java b/cloud-pay-common/src/main/java/com/muyu/pay/common/domain/OrderPayRefund.java new file mode 100644 index 0000000..990d9de --- /dev/null +++ b/cloud-pay-common/src/main/java/com/muyu/pay/common/domain/OrderPayRefund.java @@ -0,0 +1,63 @@ +package com.muyu.pay.common.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 java.math.BigDecimal; +import java.util.Date; + +@EqualsAndHashCode(callSuper = true) +@Data +@AllArgsConstructor +@NoArgsConstructor +@SuperBuilder +@TableName(value = "order_pay_refund",autoResultMap = true) +public class OrderPayRefund extends BaseEntity { + + /** + * 主键 + */ + @TableId(value = "id",type = IdType.AUTO) + private Long id; + + /** + * 客户退单号 + */ + private String cusOrderNumber; + + /** + *支付退单号 + */ + private String payOrderNumber; + + /** + * 渠道商退单号 + */ + private String channelOrderNumber; + + /** + * 退款金额 + */ + private BigDecimal price; + + /** + * 支付单号 + */ + private String payInfoNumber; + + /** + * 到账时间 + */ + private Date toAccountTIme; + + /** + * 状态 + */ + private String status; + +} diff --git a/cloud-pay-common/src/main/java/com/muyu/pay/common/domain/req/CustomerListReq.java b/cloud-pay-common/src/main/java/com/muyu/pay/common/domain/req/CustomerListReq.java new file mode 100644 index 0000000..8e76cde --- /dev/null +++ b/cloud-pay-common/src/main/java/com/muyu/pay/common/domain/req/CustomerListReq.java @@ -0,0 +1,36 @@ +package com.muyu.pay.common.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; + +@Data +@AllArgsConstructor +@NoArgsConstructor +@Builder +@Tag(name = "客户列表请求对象" ) +public class CustomerListReq { + /** + * 服务/客户名称 + */ + @Schema(description = "客户名称 为微服务名称",type = "Long") + private String appName; + /** + * 服务/客户编码 + */ + @Schema(description = "客户编吗 为微服务名称",type = "String") + private String appCode; + + /** + * 状态 + * + */ + @Schema(description = "客户状态 Y是开启 N是关闭",type = "String") + @IsSystemYesNo + private String status; + +} diff --git a/cloud-pay-server/pom.xml b/cloud-pay-server/pom.xml index 5c5c575..ffe90c9 100644 --- a/cloud-pay-server/pom.xml +++ b/cloud-pay-server/pom.xml @@ -82,6 +82,10 @@ com.muyu cloud-common-rabbit + + com.muyu + cloud-pay-common + diff --git a/cloud-pay-server/src/main/java/com/muyu/pay/server/controller/OrderPayCustomerController.java b/cloud-pay-server/src/main/java/com/muyu/pay/server/controller/OrderPayCustomerController.java new file mode 100644 index 0000000..cd76759 --- /dev/null +++ b/cloud-pay-server/src/main/java/com/muyu/pay/server/controller/OrderPayCustomerController.java @@ -0,0 +1,38 @@ +package com.muyu.pay.server.controller; + +import com.muyu.common.core.domain.Result; +import com.muyu.pay.common.domain.OrderPayCustomer; +import com.muyu.pay.common.domain.req.CustomerListReq; +import com.muyu.pay.server.service.OrderPayCustomerService; +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.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +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; + + @PostMapping("/list") + @Operation(summary = "查看客户",description = "根据客户名称 编号 状态 查询") + public Result> selectList( + @Validated @RequestBody CustomerListReq req){ + return Result.success(orderPayCustomerService.selectList(req)); + } + + + +} diff --git a/cloud-pay-server/src/main/java/com/muyu/pay/server/controller/OrderPayInfoController.java b/cloud-pay-server/src/main/java/com/muyu/pay/server/controller/OrderPayInfoController.java new file mode 100644 index 0000000..a708121 --- /dev/null +++ b/cloud-pay-server/src/main/java/com/muyu/pay/server/controller/OrderPayInfoController.java @@ -0,0 +1,11 @@ +package com.muyu.pay.server.controller; + +import lombok.extern.log4j.Log4j2; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +@Log4j2 +@RestController +@RequestMapping("info") +public class OrderPayInfoController { +} diff --git a/cloud-pay-server/src/main/java/com/muyu/pay/server/controller/OrderPayRefundController.java b/cloud-pay-server/src/main/java/com/muyu/pay/server/controller/OrderPayRefundController.java new file mode 100644 index 0000000..524d54f --- /dev/null +++ b/cloud-pay-server/src/main/java/com/muyu/pay/server/controller/OrderPayRefundController.java @@ -0,0 +1,12 @@ +package com.muyu.pay.server.controller; + +import lombok.extern.log4j.Log4j2; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +@Log4j2 +@RestController +@RequestMapping("refund") +public class OrderPayRefundController { + +} diff --git a/cloud-pay-server/src/main/java/com/muyu/pay/server/controller/TestController.java b/cloud-pay-server/src/main/java/com/muyu/pay/server/controller/TestController.java deleted file mode 100644 index 76b3dfa..0000000 --- a/cloud-pay-server/src/main/java/com/muyu/pay/server/controller/TestController.java +++ /dev/null @@ -1,23 +0,0 @@ -package com.muyu.pay.server.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("test") -@RestController -public class TestController { - - @PostMapping("post") - public Result post(){ - return Result.success("post成功"); - } - - @GetMapping("get") - public Result get(){ - return Result.success("get成功"); - } - -} diff --git a/cloud-pay-server/src/main/java/com/muyu/pay/server/mapper/OrderPayCustomerMapper.java b/cloud-pay-server/src/main/java/com/muyu/pay/server/mapper/OrderPayCustomerMapper.java new file mode 100644 index 0000000..7247863 --- /dev/null +++ b/cloud-pay-server/src/main/java/com/muyu/pay/server/mapper/OrderPayCustomerMapper.java @@ -0,0 +1,9 @@ +package com.muyu.pay.server.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.muyu.pay.common.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/pay/server/mapper/OrderPayInfoMapper.java b/cloud-pay-server/src/main/java/com/muyu/pay/server/mapper/OrderPayInfoMapper.java new file mode 100644 index 0000000..7309373 --- /dev/null +++ b/cloud-pay-server/src/main/java/com/muyu/pay/server/mapper/OrderPayInfoMapper.java @@ -0,0 +1,11 @@ +package com.muyu.pay.server.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.muyu.pay.common.domain.OrderPayInfo; +import org.apache.ibatis.annotations.Mapper; + +@Mapper +public interface OrderPayInfoMapper extends BaseMapper { + + +} diff --git a/cloud-pay-server/src/main/java/com/muyu/pay/server/mapper/OrderPayRefundMapper.java b/cloud-pay-server/src/main/java/com/muyu/pay/server/mapper/OrderPayRefundMapper.java new file mode 100644 index 0000000..f9c2a61 --- /dev/null +++ b/cloud-pay-server/src/main/java/com/muyu/pay/server/mapper/OrderPayRefundMapper.java @@ -0,0 +1,10 @@ +package com.muyu.pay.server.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.muyu.pay.common.domain.OrderPayRefund; +import org.apache.ibatis.annotations.Mapper; + +@Mapper +public interface OrderPayRefundMapper extends BaseMapper { + +} diff --git a/cloud-pay-server/src/main/java/com/muyu/pay/server/service/OrderPayCustomerService.java b/cloud-pay-server/src/main/java/com/muyu/pay/server/service/OrderPayCustomerService.java new file mode 100644 index 0000000..53d410a --- /dev/null +++ b/cloud-pay-server/src/main/java/com/muyu/pay/server/service/OrderPayCustomerService.java @@ -0,0 +1,14 @@ +package com.muyu.pay.server.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.muyu.pay.common.domain.OrderPayCustomer; +import com.muyu.pay.common.domain.req.CustomerListReq; + +import java.util.List; + +public interface OrderPayCustomerService extends IService { + + + public List selectList(CustomerListReq req); + +} diff --git a/cloud-pay-server/src/main/java/com/muyu/pay/server/service/OrderPayInfoService.java b/cloud-pay-server/src/main/java/com/muyu/pay/server/service/OrderPayInfoService.java new file mode 100644 index 0000000..296e5e1 --- /dev/null +++ b/cloud-pay-server/src/main/java/com/muyu/pay/server/service/OrderPayInfoService.java @@ -0,0 +1,10 @@ +package com.muyu.pay.server.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.muyu.pay.common.domain.OrderPayInfo; +import com.muyu.pay.server.mapper.OrderPayInfoMapper; + +public interface OrderPayInfoService extends IService { + +} diff --git a/cloud-pay-server/src/main/java/com/muyu/pay/server/service/OrderPayRefundService.java b/cloud-pay-server/src/main/java/com/muyu/pay/server/service/OrderPayRefundService.java new file mode 100644 index 0000000..9782de5 --- /dev/null +++ b/cloud-pay-server/src/main/java/com/muyu/pay/server/service/OrderPayRefundService.java @@ -0,0 +1,7 @@ +package com.muyu.pay.server.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.muyu.pay.common.domain.OrderPayRefund; + +public interface OrderPayRefundService extends IService { +} diff --git a/cloud-pay-server/src/main/java/com/muyu/pay/server/service/impl/OrderPayCustomerServiceImpl.java b/cloud-pay-server/src/main/java/com/muyu/pay/server/service/impl/OrderPayCustomerServiceImpl.java new file mode 100644 index 0000000..1cc10b2 --- /dev/null +++ b/cloud-pay-server/src/main/java/com/muyu/pay/server/service/impl/OrderPayCustomerServiceImpl.java @@ -0,0 +1,41 @@ +package com.muyu.pay.server.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.muyu.common.core.utils.StringUtils; +import com.muyu.pay.common.domain.OrderPayCustomer; +import com.muyu.pay.common.domain.req.CustomerListReq; +import com.muyu.pay.server.mapper.OrderPayCustomerMapper; +import com.muyu.pay.server.service.OrderPayCustomerService; +import lombok.extern.log4j.Log4j2; +import org.springframework.stereotype.Service; + +import java.util.List; + +@Log4j2 +@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); + } +} diff --git a/cloud-pay-server/src/main/java/com/muyu/pay/server/service/impl/OrderPayInfoServiceImpl.java b/cloud-pay-server/src/main/java/com/muyu/pay/server/service/impl/OrderPayInfoServiceImpl.java new file mode 100644 index 0000000..242010e --- /dev/null +++ b/cloud-pay-server/src/main/java/com/muyu/pay/server/service/impl/OrderPayInfoServiceImpl.java @@ -0,0 +1,13 @@ +package com.muyu.pay.server.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.muyu.pay.common.domain.OrderPayInfo; +import com.muyu.pay.server.mapper.OrderPayInfoMapper; +import com.muyu.pay.server.service.OrderPayInfoService; +import lombok.extern.log4j.Log4j2; +import org.springframework.stereotype.Service; + +@Log4j2 +@Service +public class OrderPayInfoServiceImpl extends ServiceImpl implements OrderPayInfoService { +} diff --git a/cloud-pay-server/src/main/java/com/muyu/pay/server/service/impl/OrderPayRefundServiceImpl.java b/cloud-pay-server/src/main/java/com/muyu/pay/server/service/impl/OrderPayRefundServiceImpl.java new file mode 100644 index 0000000..019c8c8 --- /dev/null +++ b/cloud-pay-server/src/main/java/com/muyu/pay/server/service/impl/OrderPayRefundServiceImpl.java @@ -0,0 +1,16 @@ +package com.muyu.pay.server.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.muyu.pay.common.domain.OrderPayRefund; +import com.muyu.pay.server.mapper.OrderPayRefundMapper; +import com.muyu.pay.server.service.OrderPayInfoService; +import com.muyu.pay.server.service.OrderPayRefundService; +import lombok.extern.log4j.Log4j2; +import org.springframework.stereotype.Service; + +@Log4j2 +@Service +public class OrderPayRefundServiceImpl + extends ServiceImpl + implements OrderPayRefundService { +} diff --git a/cloud-pay-server/src/main/resources/bootstrap.yml b/cloud-pay-server/src/main/resources/bootstrap.yml index 649e759..c265502 100644 --- a/cloud-pay-server/src/main/resources/bootstrap.yml +++ b/cloud-pay-server/src/main/resources/bootstrap.yml @@ -49,6 +49,7 @@ spring: - application-config-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} # xxl-job 配置文件 - application-xxl-config-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} + # rabbit 配置文件 - application-rabbit-config-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} logging: level: