dromara/dax-pay
1
0
Fork 0
mirror of https://gitee.com/dromara/dax-pay.git synced 2025-10-14 05:40:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix 退款同步任务查询条件限定错误

Browse Source
This commit is contained in:
xxm1995
2024-03-14 19:23:19 +08:00
parent c393ee6661
commit 034cedfbde
5 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/channel/union/entity/UnionPayRecord.java
View File

@@ -3,6 +3,7 @@ package cn.bootx.platform.daxpay.service.core.channel.union.entity;
import cn.bootx.platform.common.core.function.EntityBaseFunction;
import cn.bootx.platform.common.mybatisplus.base.MpCreateEntity;
import cn.bootx.platform.daxpay.service.code.UnionPayRecordTypeEnum;
import cn.bootx.platform.daxpay.service.core.channel.union.convert.UnionPayConvert;
import cn.bootx.platform.daxpay.service.dto.channel.union.UnionPayRecordDto;
import cn.bootx.table.modify.annotation.DbColumn;
import cn.bootx.table.modify.annotation.DbTable;
@@ -57,6 +58,6 @@ public class UnionPayRecord extends MpCreateEntity implements EntityBaseFunction
*/
@Override
public UnionPayRecordDto toDto() {
return null;
return UnionPayConvert.CONVERT.convert(this);
}
}

4
daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/order/refund/dao/RefundOrderManager.java
View File

@@ -56,8 +56,8 @@ public class RefundOrderManager extends BaseManager<RefundOrderMapper, RefundOrd
public List<RefundOrder> findAllByProgress() {
LocalDateTime now = LocalDateTime.now();
return lambdaQuery()
.le(RefundOrder::getRefundTime,now)
.eq(RefundOrder::getStatus, RefundStatusEnum.PROGRESS)
.le(RefundOrder::getCreateTime,now)
.eq(RefundOrder::getStatus, RefundStatusEnum.PROGRESS.getCode())
.list();
}
}

5
daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/payment/reconcile/strategy/UnionPayReconcileStrategy.java
View File

@@ -3,6 +3,7 @@ package cn.bootx.platform.daxpay.service.core.payment.reconcile.strategy;
import cn.bootx.platform.common.core.util.LocalDateTimeUtil;
import cn.bootx.platform.common.sequence.func.Sequence;
import cn.bootx.platform.daxpay.code.PayChannelEnum;
import cn.bootx.platform.daxpay.exception.pay.PayFailureException;
import cn.bootx.platform.daxpay.service.core.channel.union.convert.UnionPayConvert;
import cn.bootx.platform.daxpay.service.core.channel.union.dao.UnionPayRecordManager;
import cn.bootx.platform.daxpay.service.core.channel.union.entity.UnionPayConfig;
@@ -75,6 +76,10 @@ public class UnionPayReconcileStrategy extends AbsReconcileStrategy {
*/
@Override
public void downAndSave() {
if (true){
throw new PayFailureException("功能暂时未实现");
}
Date date = DateUtil.date(this.getRecordOrder().getDate());
reconcileService.downAndSave(date, this.getRecordOrder().getId(), this.unionPayKit);
}

2
daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/payment/sync/service/RefundSyncService.java
View File

@@ -103,7 +103,7 @@ public class RefundSyncService {
refundOrder.setGatewayOrderNo(syncResult.getGatewayOrderNo());
refundOrderManager.updateById(refundOrder);
}
// 判断网关状态是否和支付单一致, 同时特定情况下更新网关同步状态
// 判断网关状态是否和支付单一致
boolean statusSync = this.checkSyncStatus(syncResult, refundOrder);
RefundRepairResult repairResult = new RefundRepairResult();
try {

1
daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/task/service/RefundSyncTaskService.java
View File

@@ -35,6 +35,7 @@ public class RefundSyncTaskService {
refundSyncService.syncRefundOrder(refundOrder);
} catch (Exception e) {
log.warn("退款执行同步失败, ID: {}",refundOrder.getId());
log.warn("退款执行同步失败",e);
}
}
}