oneos-03/yudao-asset-cloud
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1. 迁移交易订单的查询接口

Browse Source 
2. 支付服务，重新初始化结构
This commit is contained in:
YunaiV
2020-11-27 18:38:39 +08:00
parent db4ee1ed7e
commit fdc83d4550
100 changed files with 1241 additions and 3604 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
pay-service-project/pay-service-app/src/main/java/cn/iocoder/mall/payservice/PayServiceApplication.java
View File

@@ -1,4 +1,13 @@
package cn.iocoder.mall.payservice;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
@SpringBootApplication
public class PayServiceApplication {
public static void main(String[] args) {
SpringApplication.run(PayServiceApplication.class, args);
}
}

28
pay-service-project/pay-service-app/src/main/java/cn/iocoder/mall/payservice/config/DatabaseConfiguration.java Normal file
View File

@@ -0,0 +1,28 @@
package cn.iocoder.mall.payservice.config;
import com.baomidou.mybatisplus.core.injector.DefaultSqlInjector;
import com.baomidou.mybatisplus.core.injector.ISqlInjector;
import com.baomidou.mybatisplus.extension.plugins.PaginationInterceptor;
import org.mybatis.spring.annotation.MapperScan;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.transaction.annotation.EnableTransactionManagement;
@Configuration
@MapperScan("cn.iocoder.mall.payservice.dal.mysql.mapper") // 扫描对应的 Mapper 接口
@EnableTransactionManagement(proxyTargetClass = true) // 启动事务管理。
public class DatabaseConfiguration {
// 数据库连接池 Druid
@Bean
public ISqlInjector sqlInjector() {
return new DefaultSqlInjector(); // MyBatis Plus 逻辑删除
}
@Bean
public PaginationInterceptor paginationInterceptor() {
return new PaginationInterceptor(); // MyBatis Plus 分页插件
}
}

19
pay-service-project/pay-service-app/src/main/java/cn/iocoder/mall/payservice/convert/transaction/TransactionConvert.java
View File

@@ -1,31 +1,12 @@
package cn.iocoder.mall.payservice.convert.transaction;
import cn.iocoder.common.framework.vo.PageResult;
import cn.iocoder.mall.payservice.dal.mysql.dataobject.transaction.TransactionDO;
import cn.iocoder.mall.payservice.service.transaction.bo.TransactionBO;
import cn.iocoder.mall.payservice.service.transaction.bo.TransactionCreateBO;
import cn.iocoder.mall.payservice.service.transaction.bo.TransactionUpdateBO;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.mapstruct.Mapper;
import org.mapstruct.Mappings;
import org.mapstruct.factory.Mappers;
import java.util.List;
@Mapper
public interface TransactionConvert {
TransactionConvert INSTANCE = Mappers.getMapper(TransactionConvert.class);
TransactionDO convert(TransactionUpdateBO updateBO);
List<TransactionBO> convertList(List<TransactionDO> transactionDOs);
PageResult<TransactionBO> convertPage(IPage<TransactionDO> transactionDOPage);
TransactionDO convert(TransactionCreateBO createBO);
TransactionBO convert(TransactionDO transactionDO);
}

41
pay-service-project/pay-service-app/src/main/java/cn/iocoder/mall/payservice/dal/mysql/dataobject/app/PayAppDO.java Normal file
View File

@@ -0,0 +1,41 @@
package cn.iocoder.mall.payservice.dal.mysql.dataobject.app;
import cn.iocoder.mall.mybatis.core.dataobject.DeletableDO;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
/**
* 支付应用
*
* 每个接入的业务都是一个应用，进行个性化的配置
*/
@Data
@EqualsAndHashCode(callSuper = true)
@Accessors(chain = true)
public class PayAppDO extends DeletableDO {
/**
* 应用编号
*/
private String id;
/**
* 应用名
*/
private String name;
/**
* 异步通知地址
*/
private String payNotifyUrl;
/**
* 退款异步通知地址
*/
private String refundNotifyUrl;
/**
* 状态
*
* 枚举 {@link cn.iocoder.common.framework.enums.CommonStatusEnum}
*/
private Integer status;
}

18
pay-service-project/pay-service-app/src/main/java/cn/iocoder/mall/payservice/dal/mysql/dataobject/transaction/TransactionDO.java → pay-service-project/pay-service-app/src/main/java/cn/iocoder/mall/payservice/dal/mysql/dataobject/transaction/PayTransactionDO.java
View File

@@ -1,20 +1,22 @@
package cn.iocoder.mall.payservice.dal.mysql.dataobject.transaction;
import cn.iocoder.mall.mybatis.core.dataobject.BaseDO;
import cn.iocoder.mall.mybatis.core.dataobject.DeletableDO;
import com.baomidou.mybatisplus.annotation.*;
import lombok.*;
import lombok.experimental.*;
import java.util.*;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import java.util.Date;
/**
* pay_transaction
* 支付交易表
*/
@TableName("transaction")
@TableName("pay_transaction")
@Data
@EqualsAndHashCode(callSuper = true)
@Accessors(chain = true)
public class TransactionDO extends DeletableDO {
public class PayTransactionDO extends DeletableDO {
/**
* 编号，自增

15
pay-service-project/pay-service-app/src/main/java/cn/iocoder/mall/payservice/dal/mysql/mapper/transaction/PayTransactionMapper.java Normal file
View File

@@ -0,0 +1,15 @@
package cn.iocoder.mall.payservice.dal.mysql.mapper.transaction;
import cn.iocoder.mall.payservice.dal.mysql.dataobject.transaction.PayTransactionDO;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.springframework.stereotype.Repository;
@Repository
public interface PayTransactionMapper extends BaseMapper<PayTransactionDO> {
// default IPage<PayTransactionDO> selectPage(TransactionPageBO pageBO) {
// return selectPage(new Page<>(pageBO.getPageNo(), pageBO.getPageSize()),
// new QueryWrapperX<PayTransactionDO>());
// }
}

19
pay-service-project/pay-service-app/src/main/java/cn/iocoder/mall/payservice/dal/mysql/mapper/transaction/TransactionMapper.java
View File

@@ -1,19 +0,0 @@
package cn.iocoder.mall.payservice.dal.mysql.mapper.transaction;
import cn.iocoder.mall.mybatis.core.query.QueryWrapperX;
import cn.iocoder.mall.payservice.dal.mysql.dataobject.transaction.TransactionDO;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import org.springframework.stereotype.Repository;
@Repository
public interface TransactionMapper extends BaseMapper<TransactionDO> {
default IPage<TransactionDO> selectPage(TransactionPageBO pageBO) {
return selectPage(new Page<>(pageBO.getPageNo(), pageBO.getPageSize()),
new QueryWrapperX<TransactionDO>());
}
}

4
pay-service-project/pay-service-app/src/main/java/cn/iocoder/mall/payservice/manager/transaction/TransactionManager.java
View File

@@ -1,4 +0,0 @@
package cn.iocoder.mall.payservice.manager.transaction;
public class TransactionManager {
}

2
pay-service-project/pay-service-app/src/main/java/cn/iocoder/mall/payservice/rpc/transaction/TransactionRpcImpl.java → pay-service-project/pay-service-app/src/main/java/cn/iocoder/mall/payservice/rpc/transaction/PayTransactionRpcImpl.java
View File

@@ -1,4 +1,4 @@
package cn.iocoder.mall.payservice.rpc.transaction;
public class TransactionRpcImpl {
public class PayTransactionRpcImpl {
}

10
pay-service-project/pay-service-app/src/main/java/cn/iocoder/mall/payservice/service/app/PayAppService.java Normal file
View File

@@ -0,0 +1,10 @@
package cn.iocoder.mall.payservice.service.app;
/**
* 支付应用 Service 接口
*/
public interface PayAppService {
}

25
pay-service-project/pay-service-app/src/main/java/cn/iocoder/mall/payservice/service/app/impl/PayAppServiceImpl.java Normal file
View File

@@ -0,0 +1,25 @@
package cn.iocoder.mall.payservice.service.app.impl;
import cn.iocoder.mall.payservice.service.app.PayAppService;
/**
* 支付应用 Service 实现类
*/
public class PayAppServiceImpl implements PayAppService {
// public PayAppDO validPayApp(String appId) {
// PayAppDO payAppDO = payAppMapper.selectById(appId);
// // 校验是否存在
// if (payAppDO == null) {
// throw ServiceExceptionUtil.exception(PayErrorCodeEnum.PAY_APP_NOT_FOUND.getCode());
// }
// // 校验是否禁用
// if (CommonStatusEnum.DISABLE.getValue().equals(payAppDO.getStatus())) {
// throw ServiceExceptionUtil.exception(PayErrorCodeEnum.PAY_APP_IS_DISABLE.getCode());
// }
// return payAppDO;
// }
}

10
pay-service-project/pay-service-app/src/main/java/cn/iocoder/mall/payservice/service/transaction/PayTransactionService.java Normal file
View File

@@ -0,0 +1,10 @@
package cn.iocoder.mall.payservice.service.transaction;
/**
* 支付交易单 Service 接口
*/
public interface PayTransactionService {
}

107
pay-service-project/pay-service-app/src/main/java/cn/iocoder/mall/payservice/service/transaction/TransactionService.java
View File

@@ -1,107 +0,0 @@
package cn.iocoder.mall.payservice.service.transaction;
import cn.iocoder.common.framework.exception.util.ServiceExceptionUtil;
import cn.iocoder.common.framework.vo.PageResult;
import cn.iocoder.mall.payservice.convert.transaction.TransactionConvert;
import cn.iocoder.mall.payservice.dal.mysql.dataobject.transaction.TransactionDO;
import cn.iocoder.mall.payservice.dal.mysql.mapper.transaction.TransactionMapper;
import cn.iocoder.mall.payservice.service.transaction.bo.TransactionBO;
import cn.iocoder.mall.payservice.service.transaction.bo.TransactionCreateBO;
import cn.iocoder.mall.payservice.service.transaction.bo.TransactionPageBO;
import cn.iocoder.mall.payservice.service.transaction.bo.TransactionUpdateBO;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.validation.annotation.Validated;
import javax.validation.*;
import java.util.*;
/**
* pay_transaction Service
*/
@Service
@Validated
public class TransactionService {
@Autowired
private TransactionMapper transactionMapper;
/**
* 创建pay_transaction
*
* @param createBO 创建pay_transaction BO
* @return pay_transaction
*/
public TransactionBO createTransaction(@Valid TransactionCreateBO createBO) {
// 插入到数据库
TransactionDO transactionDO = TransactionConvert.INSTANCE.convert(createBO);
transactionMapper.insert(transactionDO);
// 返回
return TransactionConvert.INSTANCE.convert(transactionDO);
}
/**
* 更新pay_transaction
*
* @param updateBO 更新pay_transaction BO
*/
public void updateTransaction(@Valid TransactionUpdateBO updateBO) {
// 校验更新的pay_transaction是否存在
if (transactionMapper.selectById(updateBO.getId()) == null) {
throw ServiceExceptionUtil.exception(AuthErrorCodeConstants.TRANSACTION_NOT_FOUND);
}
// 更新到数据库
TransactionDO updateObject = TransactionConvert.INSTANCE.convert(updateBO);
transactionMapper.updateById(updateObject);
}
/**
* 删除pay_transaction
*
* @param transactionId pay_transaction编号
*/
public void deleteTransaction(Integer transactionId) {
// 校验删除的pay_transaction是否存在
if (transactionMapper.selectById(transactionId) == null) {
throw ServiceExceptionHelper.exception(AuthErrorCodeConstants.TRANSACTION_NOT_FOUND);
}
// 标记删除
transactionMapper.deleteById(transactionId);
}
/**
* 获得pay_transaction
*
* @param transactionId pay_transaction编号
* @return pay_transaction
*/
public TransactionBO getTransaction(Integer transactionId) {
TransactionDO transactionDO = transactionMapper.selectById(transactionId);
return TransactionConvert.INSTANCE.convert(transactionDO);
}
/**
* 获得pay_transaction列表
*
* @param transactionIds pay_transaction编号列表
* @return pay_transaction列表
*/
public List<TransactionBO> listTransactions(List<Integer> transactionIds) {
List<TransactionDO> transactionDOs = transactionMapper.selectBatchIds(transactionIds);
return TransactionConvert.INSTANCE.convertList(transactionDOs);
}
/**
* 获得pay_transaction分页
*
* @param pageBO pay_transaction分页查询
* @return pay_transaction分页结果
*/
public PageResult<TransactionBO> pageTransaction(TransactionPageBO pageBO) {
IPage<TransactionDO> transactionDOPage = transactionMapper.selectPage(pageBO);
return TransactionConvert.INSTANCE.convertPage(transactionDOPage);
}
}

96
pay-service-project/pay-service-app/src/main/java/cn/iocoder/mall/payservice/service/transaction/bo/TransactionBO.java
View File

@@ -1,96 +0,0 @@
package cn.iocoder.mall.payservice.service.transaction.bo;
import lombok.*;
import lombok.experimental.*;
import io.swagger.annotations.*;
import java.util.*;
/**
* pay_transaction BO
*/
@Data
@Accessors(chain = true)
public class TransactionBO {
/**
* 编号，自增
*/
private Integer id;
/**
* 应用编号
*/
private String appId;
/**
* 发起交易的 IP
*/
private String createIp;
/**
* 业务线的订单编号
*/
private String orderId;
/**
* 订单商品名
*/
private String orderSubject;
/**
* 订单商品描述
*/
private String orderDescription;
/**
* 订单备注
*/
private String orderMemo;
/**
* 支付金额，单位：分。
*/
private Integer price;
/**
* 订单状态
*/
private Integer status;
/**
* 交易过期时间
*/
private Date expireTime;
/**
* 回调业务线完成时间
*/
private Date finishTime;
/**
* 异步通知地址
*/
private String notifyUrl;
/**
* 成功支付的交易拓展编号
*/
private Integer extensionId;
/**
* 支付成功的支付渠道
*/
private Integer payChannel;
/**
* 第三方支付成功的时间
*/
private Date paymentTime;
/**
* 收到第三方系统通知的时间
*/
private Date notifyTime;
/**
* 第三方的流水号
*/
private String tradeNo;
/**
* 退款总金额
*/
private Integer refundTotal;
/**
* 创建时间
*/
private Date createTime;
/**
* 最后更新时间
*/
private Date updateTime;
}

93
pay-service-project/pay-service-app/src/main/java/cn/iocoder/mall/payservice/service/transaction/bo/TransactionCreateBO.java
View File

@@ -1,93 +0,0 @@
package cn.iocoder.mall.payservice.service.transaction.bo;
import lombok.*;
import lombok.experimental.*;
import io.swagger.annotations.*;
import java.util.*;
import javax.validation.constraints.*;
/**
* pay_transaction创建 BO
*/
@Data
@Accessors(chain = true)
public class TransactionCreateBO {
/**
* 应用编号
*/
@NotEmpty(message = "应用编号不能为空")
private String appId;
/**
* 发起交易的 IP
*/
@NotEmpty(message = "发起交易的 IP不能为空")
private String createIp;
/**
* 业务线的订单编号
*/
@NotEmpty(message = "业务线的订单编号不能为空")
private String orderId;
/**
* 订单商品名
*/
@NotEmpty(message = "订单商品名不能为空")
private String orderSubject;
/**
* 订单商品描述
*/
@NotEmpty(message = "订单商品描述不能为空")
private String orderDescription;
/**
* 订单备注
*/
private String orderMemo;
/**
* 支付金额，单位：分。
*/
@NotNull(message = "支付金额，单位：分。不能为空")
private Integer price;
/**
* 订单状态
*/
@NotNull(message = "订单状态不能为空")
private Integer status;
/**
* 交易过期时间
*/
private Date expireTime;
/**
* 回调业务线完成时间
*/
private Date finishTime;
/**
* 异步通知地址
*/
@NotEmpty(message = "异步通知地址不能为空")
private String notifyUrl;
/**
* 成功支付的交易拓展编号
*/
private Integer extensionId;
/**
* 支付成功的支付渠道
*/
private Integer payChannel;
/**
* 第三方支付成功的时间
*/
private Date paymentTime;
/**
* 收到第三方系统通知的时间
*/
private Date notifyTime;
/**
* 第三方的流水号
*/
private String tradeNo;
/**
* 退款总金额
*/
private Integer refundTotal;
}

99
pay-service-project/pay-service-app/src/main/java/cn/iocoder/mall/payservice/service/transaction/bo/TransactionPageBO.java
View File

@@ -1,99 +0,0 @@
package cn.iocoder.mall.payservice.service.transaction.bo;
import cn.iocoder.common.framework.vo.PageParam;
import lombok.*;
import lombok.experimental.*;
import io.swagger.annotations.*;
import java.util.*;
import javax.validation.constraints.*;
/**
* pay_transaction分页 BO
*/
@Data
@EqualsAndHashCode(callSuper = true)
@Accessors(chain = true)
public class TransactionPageBO extends PageParam {
/**
* 编号，自增
*/
private Integer id;
/**
* 应用编号
*/
private String appId;
/**
* 发起交易的 IP
*/
private String createIp;
/**
* 业务线的订单编号
*/
private String orderId;
/**
* 订单商品名
*/
private String orderSubject;
/**
* 订单商品描述
*/
private String orderDescription;
/**
* 订单备注
*/
private String orderMemo;
/**
* 支付金额，单位：分。
*/
private Integer price;
/**
* 订单状态
*/
private Integer status;
/**
* 交易过期时间
*/
private Date expireTime;
/**
* 回调业务线完成时间
*/
private Date finishTime;
/**
* 异步通知地址
*/
private String notifyUrl;
/**
* 成功支付的交易拓展编号
*/
private Integer extensionId;
/**
* 支付成功的支付渠道
*/
private Integer payChannel;
/**
* 第三方支付成功的时间
*/
private Date paymentTime;
/**
* 收到第三方系统通知的时间
*/
private Date notifyTime;
/**
* 第三方的流水号
*/
private String tradeNo;
/**
* 退款总金额
*/
private Integer refundTotal;
/**
* 创建时间
*/
private Date createTime;
/**
* 最后更新时间
*/
private Date updateTime;
}

98
pay-service-project/pay-service-app/src/main/java/cn/iocoder/mall/payservice/service/transaction/bo/TransactionUpdateBO.java
View File

@@ -1,98 +0,0 @@
package cn.iocoder.mall.payservice.service.transaction.bo;
import lombok.*;
import lombok.experimental.*;
import io.swagger.annotations.*;
import java.util.*;
import javax.validation.constraints.*;
/**
* pay_transaction更新 BO
*/
@Data
@Accessors(chain = true)
public class TransactionUpdateBO {
/**
* 编号，自增
*/
@NotNull(message = "编号，自增不能为空")
private Integer id;
/**
* 应用编号
*/
@NotEmpty(message = "应用编号不能为空")
private String appId;
/**
* 发起交易的 IP
*/
@NotEmpty(message = "发起交易的 IP不能为空")
private String createIp;
/**
* 业务线的订单编号
*/
@NotEmpty(message = "业务线的订单编号不能为空")
private String orderId;
/**
* 订单商品名
*/
@NotEmpty(message = "订单商品名不能为空")
private String orderSubject;
/**
* 订单商品描述
*/
@NotEmpty(message = "订单商品描述不能为空")
private String orderDescription;
/**
* 订单备注
*/
private String orderMemo;
/**
* 支付金额，单位：分。
*/
@NotNull(message = "支付金额，单位：分。不能为空")
private Integer price;
/**
* 订单状态
*/
@NotNull(message = "订单状态不能为空")
private Integer status;
/**
* 交易过期时间
*/
private Date expireTime;
/**
* 回调业务线完成时间
*/
private Date finishTime;
/**
* 异步通知地址
*/
@NotEmpty(message = "异步通知地址不能为空")
private String notifyUrl;
/**
* 成功支付的交易拓展编号
*/
private Integer extensionId;
/**
* 支付成功的支付渠道
*/
private Integer payChannel;
/**
* 第三方支付成功的时间
*/
private Date paymentTime;
/**
* 收到第三方系统通知的时间
*/
private Date notifyTime;
/**
* 第三方的流水号
*/
private String tradeNo;
/**
* 退款总金额
*/
private Integer refundTotal;
}

97
pay-service-project/pay-service-app/src/main/java/cn/iocoder/mall/payservice/service/transaction/impl/PayTransactionServiceImpl.java Normal file
View File

@@ -0,0 +1,97 @@
package cn.iocoder.mall.payservice.service.transaction.impl;
import cn.iocoder.mall.payservice.dal.mysql.mapper.transaction.PayTransactionMapper;
import cn.iocoder.mall.payservice.service.transaction.PayTransactionService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.validation.annotation.Validated;
/**
* 支付交易单 Service 实现类
*/
@Service
@Validated
public class PayTransactionServiceImpl implements PayTransactionService {
@Autowired
private PayTransactionMapper transactionMapper;
// /**
// * 创建pay_transaction
// *
// * @param createBO 创建pay_transaction BO
// * @return pay_transaction
// */
// public TransactionBO createTransaction(@Valid TransactionCreateBO createBO) {
// // 插入到数据库
// PayTransactionDO transactionDO = TransactionConvert.INSTANCE.convert(createBO);
// transactionMapper.insert(transactionDO);
// // 返回
// return TransactionConvert.INSTANCE.convert(transactionDO);
// }
//
// /**
// * 更新pay_transaction
// *
// * @param updateBO 更新pay_transaction BO
// */
// public void updateTransaction(@Valid TransactionUpdateBO updateBO) {
// // 校验更新的pay_transaction是否存在
// if (transactionMapper.selectById(updateBO.getId()) == null) {
// throw ServiceExceptionUtil.exception(AuthErrorCodeConstants.TRANSACTION_NOT_FOUND);
// }
// // 更新到数据库
// PayTransactionDO updateObject = TransactionConvert.INSTANCE.convert(updateBO);
// transactionMapper.updateById(updateObject);
// }
//
// /**
// * 删除pay_transaction
// *
// * @param transactionId pay_transaction编号
// */
// public void deleteTransaction(Integer transactionId) {
// // 校验删除的pay_transaction是否存在
// if (transactionMapper.selectById(transactionId) == null) {
// throw ServiceExceptionHelper.exception(AuthErrorCodeConstants.TRANSACTION_NOT_FOUND);
// }
// // 标记删除
// transactionMapper.deleteById(transactionId);
// }
//
// /**
// * 获得pay_transaction
// *
// * @param transactionId pay_transaction编号
// * @return pay_transaction
// */
// public TransactionBO getTransaction(Integer transactionId) {
// PayTransactionDO transactionDO = transactionMapper.selectById(transactionId);
// return TransactionConvert.INSTANCE.convert(transactionDO);
// }
//
// /**
// * 获得pay_transaction列表
// *
// * @param transactionIds pay_transaction编号列表
// * @return pay_transaction列表
// */
// public List<TransactionBO> listTransactions(List<Integer> transactionIds) {
// List<PayTransactionDO> transactionDOs = transactionMapper.selectBatchIds(transactionIds);
// return TransactionConvert.INSTANCE.convertList(transactionDOs);
// }
//
// /**
// * 获得pay_transaction分页
// *
// * @param pageBO pay_transaction分页查询
// * @return pay_transaction分页结果
// */
// public PageResult<TransactionBO> pageTransaction(TransactionPageBO pageBO) {
// IPage<PayTransactionDO> transactionDOPage = transactionMapper.selectPage(pageBO);
// return TransactionConvert.INSTANCE.convertPage(transactionDOPage);
// }
}