dromara/dax-pay
1
0
Fork 0
mirror of https://gitee.com/dromara/dax-pay.git synced 2025-09-06 04:27:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat 交易流水联调

Browse Source
This commit is contained in:
bootx
2024-06-02 18:32:11 +08:00
parent d673362577
commit 0c8bebb080
7 changed files with 73 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
daxpay-single/daxpay-single-service/src/main/java/cn/daxpay/single/service/common/context/AllocationLocal.java
View File

@@ -12,6 +12,6 @@ import lombok.experimental.Accessors;
@Accessors(chain = true)
public class AllocationLocal {
/** 三方系统分账号 */
/** 通道分账号 */
private String outAllocationNo;
}

6
daxpay-single/daxpay-single-service/src/main/java/cn/daxpay/single/service/core/record/flow/entity/TradeFlowRecord.java
View File

@@ -48,15 +48,15 @@ public class TradeFlowRecord extends MpCreateEntity implements EntityBaseFunctio
private String channel;
/** 本地交易号 */
@DbColumn(comment = "本地订单号")
@DbColumn(comment = "本地交易号")
private String tradeNo;
/** 商户交易号 */
@DbColumn(comment = "商户交易号")
private String bizTradeNo;
/** 三方系统交易号 */
@DbColumn(comment = "三方系统交易号")
/** 通道交易号 */
@DbColumn(comment = "通道交易号")
private String outTradeNo;
@Override

2
daxpay-single/daxpay-single-service/src/main/java/cn/daxpay/single/service/core/record/flow/service/TradeFlowRecordService.java
View File

@@ -66,7 +66,7 @@ public class TradeFlowRecordService {
.setOutTradeNo(refundOrder.getOutRefundNo())
.setChannel(refundOrder.getChannel())
.setTitle(refundOrder.getTitle())
.setType(TradeFlowRecordTypeEnum.PAY.getCode())
.setType(TradeFlowRecordTypeEnum.REFUND.getCode())
.setAmount(refundOrder.getAmount());
tradeFlowRecordManager.save(tradeFlowRecord);
}

9
daxpay-single/daxpay-single-service/src/main/java/cn/daxpay/single/service/dto/record/flow/TradeFlowRecordDto.java
View File

@@ -1,10 +1,12 @@
package cn.daxpay.single.service.dto.record.flow;
import cn.bootx.platform.common.core.rest.dto.BaseDto;
import cn.bootx.table.modify.annotation.DbColumn;
import cn.daxpay.single.code.PayChannelEnum;
import cn.daxpay.single.service.code.TradeFlowRecordTypeEnum;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
/**
@@ -12,10 +14,11 @@ import lombok.experimental.Accessors;
* @author xxm
* @since 2024/5/17
*/
@EqualsAndHashCode(callSuper = true)
@Data
@Accessors(chain = true)
@Schema(title = "资金流水记录")
public class TradeFlowRecordDto {
public class TradeFlowRecordDto extends BaseDto {
/** 订单标题 */
@DbColumn(comment = "标题")
@@ -47,7 +50,7 @@ public class TradeFlowRecordDto {
@DbColumn(comment = "商户交易号")
private String bizTradeNo;
/** 三方系统交易号 */
@DbColumn(comment = "三方系统交易号")
/** 通道交易号 */
@DbColumn(comment = "通道交易号")
private String outTradeNo;
}

38
daxpay-single/daxpay-single-service/src/main/java/cn/daxpay/single/service/param/record/TradeFlowRecordQuery.java
View File

@@ -1,5 +1,8 @@
package cn.daxpay.single.service.param.record;
import cn.bootx.platform.common.core.annotation.QueryParam;
import cn.daxpay.single.code.PayChannelEnum;
import cn.daxpay.single.service.code.TradeFlowRecordTypeEnum;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import lombok.experimental.Accessors;
@@ -10,9 +13,44 @@ import lombok.experimental.Accessors;
* @since 2024/5/17
*/
@Data
@QueryParam(type = QueryParam.CompareTypeEnum.LIKE)
@Accessors(chain = true)
@Schema(title = "流水记录查询类")
public class TradeFlowRecordQuery {
/** 订单标题 */
@Schema(description = "订单标题")
private String title;
/** 金额 */
@Schema(description = "金额")
private Integer amount;
/**
* 业务类型
* @see TradeFlowRecordTypeEnum
*/
@QueryParam(type = QueryParam.CompareTypeEnum.EQ)
@Schema(description = "业务类型")
private String type;
/**
* 支付通道
* @see PayChannelEnum
*/
@Schema(description = "支付通道")
private String channel;
/** 本地交易号 */
@Schema(description = "本地交易号")
private String tradeNo;
/** 商户交易号 */
@Schema(description = "商户交易号")
private String bizTradeNo;
/** 通道交易号 */
@Schema(description = "通道交易号")
private String outTradeNo;
}