diff --git a/cloud-pay-common/src/main/java/com/muyu/cloud/pay/domin/OrderPayInfo.java b/cloud-pay-common/src/main/java/com/muyu/cloud/pay/domin/OrderPayInfo.java new file mode 100644 index 0000000..3dbb116 --- /dev/null +++ b/cloud-pay-common/src/main/java/com/muyu/cloud/pay/domin/OrderPayInfo.java @@ -0,0 +1,79 @@ +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.cloud.pay.domin.resp.CustomerOrderPaySimpleResp; +import com.muyu.common.core.enums.SysPayType; +import com.muyu.common.core.web.domain.BaseEntity; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; +import lombok.experimental.SuperBuilder; + +import java.math.BigDecimal; + +/** + * @Author：weiran + * @Package：com.muyu.cloud.pay.domin + * @Project：cloud-pay + * @name：OrderPayInfo + * @Date：2024/8/8 0:10 + + */ + +@EqualsAndHashCode(callSuper = true) +@Data +@SuperBuilder +@NoArgsConstructor +@AllArgsConstructor +@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 BigDecimal price; + /** + *渠道商类型 + */ + private String channelType; + /** + *渠道商单号 + */ + private String channelOrderNumber; + /** + *支付单状态 + */ + private String status; + + + public CustomerOrderPaySimpleResp buildCustomerOrderPaySimpleResp(){ + return CustomerOrderPaySimpleResp.builder() + .cusOrderNumber(this.cusOrderNumber) + .channelTypeName(SysPayType.getInfoByCode(this.channelType)) + .price(this.price) + .build(); + } +} diff --git a/cloud-pay-common/src/main/java/com/muyu/cloud/pay/domin/resp/CustomerOrderPaySimpleResp.java b/cloud-pay-common/src/main/java/com/muyu/cloud/pay/domin/resp/CustomerOrderPaySimpleResp.java new file mode 100644 index 0000000..5822202 --- /dev/null +++ b/cloud-pay-common/src/main/java/com/muyu/cloud/pay/domin/resp/CustomerOrderPaySimpleResp.java @@ -0,0 +1,43 @@ +package com.muyu.cloud.pay.domin.resp; + +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; + +import java.math.BigDecimal; + +/** + * @Author：weiran + * @Package：com.muyu.cloud.pay.domin.resp + * @Project：cloud-pay + * @name：CustomerOrderPaySimpleResp + * @Date：2024/8/8 0:25 + */ + +@Data +@Builder +@AllArgsConstructor +@NoArgsConstructor +@Tag(name = "客户支付单", description = "客户支付单简略信息") +public class CustomerOrderPaySimpleResp { + + /** + *客户单号 + */ + @Schema(name = "客户单号",type = "String",defaultValue = "OIEJSO798DOE9DIL",description = "客户传入的支付单信息") + private String cusOrderNumber; + + /** + * 支付金额 + */ + @Schema(name = "支付金额",type = "BigDecimal",defaultValue = "36.56",description = "客户传入的支付金额") + private BigDecimal price; + /** + *渠道商类型 + */ + @Schema(name = "支付渠道商",type = "String",defaultValue = "支付宝",description = "用户支付的时候选择的渠道商") + private String channelTypeName; +} diff --git a/cloud-pay-common/src/main/java/com/muyu/cloud/pay/domin/resp/CustomerResp.java b/cloud-pay-common/src/main/java/com/muyu/cloud/pay/domin/resp/CustomerResp.java index fa4262b..25591f5 100644 --- a/cloud-pay-common/src/main/java/com/muyu/cloud/pay/domin/resp/CustomerResp.java +++ b/cloud-pay-common/src/main/java/com/muyu/cloud/pay/domin/resp/CustomerResp.java @@ -12,6 +12,9 @@ import lombok.Data; import lombok.NoArgsConstructor; import java.util.Date; +import java.util.List; +import java.util.function.Function; +import java.util.function.Supplier; /** * @Author：weiran @@ -62,12 +65,19 @@ public class CustomerResp { private Date createTime; + /** + * 客户最近5条支付单 + */ + + private List orderPaySimpleRespList; + + /** * 数据库对象构建为返回结果对象 * @param orderPayCustomer * @return */ - public static CustomerResp customerBuild(OrderPayCustomer orderPayCustomer){ + public static CustomerResp customerBuild(OrderPayCustomer orderPayCustomer, Supplier> function){ return CustomerResp.builder() .id(orderPayCustomer.getId()) .appName(orderPayCustomer.getAppName()) @@ -75,6 +85,7 @@ public class CustomerResp { .status(orderPayCustomer.getStatus()) .createBy(orderPayCustomer.getCreateBy()) .createTime(orderPayCustomer.getCreateTime()) + .orderPaySimpleRespList(function.get()) .build(); } } diff --git a/cloud-pay-common/src/main/java/com/muyu/cloud/pay/domin/resp/OrderPayResp.java b/cloud-pay-common/src/main/java/com/muyu/cloud/pay/domin/resp/OrderPayResp.java new file mode 100644 index 0000000..4b8aa87 --- /dev/null +++ b/cloud-pay-common/src/main/java/com/muyu/cloud/pay/domin/resp/OrderPayResp.java @@ -0,0 +1,20 @@ +package com.muyu.cloud.pay.domin.resp; + +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +/** + * @Author：weiran + * @Package：com.muyu.cloud.pay.domin.resp + * @Project：cloud-pay + * @name：OrderPayResp + * @Date：2024/8/8 0:22 + */ +@Data +@Builder +@AllArgsConstructor +@NoArgsConstructor +public class OrderPayResp { +} diff --git a/cloud-pay-server/src/main/java/com/muyu/cloud/pay/mapper/OrderPayMapper.java b/cloud-pay-server/src/main/java/com/muyu/cloud/pay/mapper/OrderPayMapper.java new file mode 100644 index 0000000..f8460b2 --- /dev/null +++ b/cloud-pay-server/src/main/java/com/muyu/cloud/pay/mapper/OrderPayMapper.java @@ -0,0 +1,16 @@ +package com.muyu.cloud.pay.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.muyu.cloud.pay.domin.OrderPayInfo; +import org.apache.ibatis.annotations.Mapper; + +/** + * @Author：weiran + * @Package：com.muyu.cloud.pay.mapper + * @Project：cloud-pay + * @name：OrderPayMapper + * @Date：2024/8/8 10:02 + */ +@Mapper +public interface OrderPayMapper extends BaseMapper { +} diff --git a/cloud-pay-server/src/main/java/com/muyu/cloud/pay/service/OrderPayService.java b/cloud-pay-server/src/main/java/com/muyu/cloud/pay/service/OrderPayService.java new file mode 100644 index 0000000..eb04e04 --- /dev/null +++ b/cloud-pay-server/src/main/java/com/muyu/cloud/pay/service/OrderPayService.java @@ -0,0 +1,25 @@ +package com.muyu.cloud.pay.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.muyu.cloud.pay.domin.OrderPayInfo; + +import java.util.List; + +/** + * @Author：weiran + * @Package：com.muyu.cloud.pay.service + * @Project：cloud-pay + * @name：OrderPayService + * @Date：2024/8/8 10:05 + */ +public interface OrderPayService extends IService { + + + /** + * 根据客户code和分页限制，查询结果 + * @param appCode + * @param limit + * @return + */ + List selectOrderPayByAppCodeAndLimit(String appCode, int limit); +} 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 index 9304b8d..8d2f1d5 100644 --- 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 @@ -3,17 +3,23 @@ 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.OrderPayInfo; import com.muyu.cloud.pay.domin.req.CustomerListReq; +import com.muyu.cloud.pay.domin.resp.CustomerOrderPaySimpleResp; import com.muyu.cloud.pay.domin.resp.CustomerResp; import com.muyu.cloud.pay.mapper.OrderPayCustomerMapper; import com.muyu.cloud.pay.service.OrderPayCustomerService; +import com.muyu.cloud.pay.service.OrderPayService; +import com.muyu.common.core.enums.SysPayType; import com.muyu.common.core.utils.StringUtils; import io.jsonwebtoken.lang.Strings; import lombok.extern.log4j.Log4j2; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.ArrayList; import java.util.List; +import java.util.function.Function; /** * @Author：weiran @@ -26,6 +32,9 @@ import java.util.List; @Log4j2 public class OrderPayCustomerServiceImpl extends ServiceImpl implements OrderPayCustomerService { + @Autowired + private OrderPayService orderPayService; + @Override public List selectList(CustomerListReq customerListReq) { LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); @@ -39,7 +48,13 @@ public class OrderPayCustomerServiceImpl extends ServiceImpl orderPayCustomerList = this.list(queryWrapper); - return orderPayCustomerList.stream().map(CustomerResp::customerBuild).toList(); + return orderPayCustomerList.stream() + .map(orderPayCustomer -> CustomerResp.customerBuild(orderPayCustomer, + ()-> orderPayService.selectOrderPayByAppCodeAndLimit(orderPayCustomer.getAppCode(), 5) + .stream() + .map(OrderPayInfo::buildCustomerOrderPaySimpleResp) + .toList())) + .toList(); } } diff --git a/cloud-pay-server/src/main/java/com/muyu/cloud/pay/service/impl/OrderPayServiceImpl.java b/cloud-pay-server/src/main/java/com/muyu/cloud/pay/service/impl/OrderPayServiceImpl.java new file mode 100644 index 0000000..6a37cd8 --- /dev/null +++ b/cloud-pay-server/src/main/java/com/muyu/cloud/pay/service/impl/OrderPayServiceImpl.java @@ -0,0 +1,38 @@ +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.OrderPayInfo; +import com.muyu.cloud.pay.mapper.OrderPayMapper; +import com.muyu.cloud.pay.service.OrderPayService; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * @Author：weiran + * @Package：com.muyu.cloud.pay.service.impl + * @Project：cloud-pay + * @name：OrderPayServiceImpl + * @Date：2024/8/8 10:06 + */ +@Service +public class OrderPayServiceImpl extends ServiceImpl implements OrderPayService{ + + /** + * 根据客户code和分页限制，查询结果 + * @param appCode + * @param limit + * @return + */ + @Override + public List selectOrderPayByAppCodeAndLimit(String appCode, int limit) { + + LambdaQueryWrapper orderPayInfoQueryWrapper = new LambdaQueryWrapper<>(); + orderPayInfoQueryWrapper.eq(OrderPayInfo::getAppCode,appCode); + orderPayInfoQueryWrapper.orderBy(true, false, OrderPayInfo::getCreateTime); + orderPayInfoQueryWrapper.last("limit "+limit); + List orderPayInfoList = this.list(orderPayInfoQueryWrapper); + return this.list(orderPayInfoQueryWrapper); + } +} diff --git a/doc/sql/cloud-pay-init.sql b/doc/sql/cloud-pay-init.sql new file mode 100644 index 0000000..fce49fb --- /dev/null +++ b/doc/sql/cloud-pay-init.sql @@ -0,0 +1,48 @@ +CREATE TABLE order_pay_info( + `id` bigint NOT NULL AUTO_INCREMENT COMMENT '主键' , + `app_name` VARCHAR(16) NOT NULL COMMENT '客户名称' , + `app_code` VARCHAR(16) COMMENT '客户编号' , + `cus_order_number` VARCHAR(32) COMMENT '客户单号' , + `pay_order_number` VARCHAR(32) COMMENT '支付单号' , + `channel_type` VARCHAR(32) COMMENT '渠道商类型' , + `channel_order_number` VARCHAR(64) COMMENT '渠道商单号' , + `status` VARCHAR(32) COMMENT '支付单状态' , + `create_by` bigint COMMENT '创建人' , + `create_time` DATETIME COMMENT '创建时间' , + `update_by` bigint COMMENT '更新人' , + `update_time` DATETIME COMMENT '更新时间' , + PRIMARY KEY (id) +) COMMENT = '订单支付信息'; + + +CREATE TABLE order_pay_customer( + `id` bigint NOT NULL AUTO_INCREMENT COMMENT '主键' , + `app_name` VARCHAR(16) NOT NULL COMMENT '服务/客户名称' , + `app_code` VARCHAR(16) NOT NULL COMMENT '客户编号' , + `app_desc` TEXT COMMENT '客户描述' , + `status` VARCHAR(32) COMMENT '是否开启' , + `create_by` bigint COMMENT '创建人' , + `create_time` DATETIME COMMENT '创建时间' , + `update_by` bigint COMMENT '更新人' , + `update_time` DATETIME COMMENT '更新时间' , + `remark` VARCHAR(64) COMMENT '备注' , + PRIMARY KEY (id) +) COMMENT = '支付单客户'; + + +CREATE TABLE order_pay_refund( + `id` bigint NOT NULL AUTO_INCREMENT COMMENT '主键' , + `cus_order_number` VARCHAR(32) NOT NULL COMMENT '客户退单号' , + `pay_order_number` VARCHAR(32) NOT NULL COMMENT '支付退单号' , + `channel_order_number` VARCHAR(64) NOT NULL COMMENT '渠道商退单号' , + `price` DECIMAL(24,6) NOT NULL COMMENT '退款金额' , + `pay_info_number` VARCHAR(32) COMMENT '支付单号' , + `to_account_time` DATETIME COMMENT '到账时间' , + `status` VARCHAR(255) COMMENT '退单状态' , + `create_by` bigint COMMENT '创建人' , + `create_time` DATETIME COMMENT '创建时间' , + `update_by` bigint COMMENT '更新人' , + `update_time` DATETIME COMMENT '更新时间' , + PRIMARY KEY (id) +) COMMENT = '订单支付退款表'; + diff --git a/doc/sql/update-sql-202408072002.sql b/doc/sql/update-sql-202408072002.sql new file mode 100644 index 0000000..3a40941 --- /dev/null +++ b/doc/sql/update-sql-202408072002.sql @@ -0,0 +1,8 @@ +-- order_pay_customer 支付单客户 增加备注字段 You, 4minutes ago Uncommitted chages +ALTER TABLE `order_pay_customer` ADD COLUMN `remark` varchar(64) NULL COMMENT '备注'; + +-- order_pay_info 支付订单记录表 增加备注字段 +ALTER TABLE `order_pay_info` ADD COLUMN `remark` varchar(64) NULL COMMENT '备注'; + +-- order_pay_refund 支付退款表 增加备注字段 +ALTER TABLE `order_pay_refund` ADD COLUMN `remark` varchar(64) NULL COMMENT '备注'; diff --git a/doc/sql/update-sql-202408080938.sql b/doc/sql/update-sql-202408080938.sql new file mode 100644 index 0000000..fdeb600 --- /dev/null +++ b/doc/sql/update-sql-202408080938.sql @@ -0,0 +1,2 @@ +-- order_pay_info 支付记录订单表 添加支付金额字段 +ALTER TABLE `order_pay_info` ADD COLUMN `price` decimal(24, 6) NULL COMMENT '支付金额'