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

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

@@ -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);
     }
 }

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

@@ -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)
+                .le(RefundOrder::getCreateTime,now)
-                .eq(RefundOrder::getStatus, RefundStatusEnum.PROGRESS)
+                .eq(RefundOrder::getStatus, RefundStatusEnum.PROGRESS.getCode())
                 .list();
     }
 }

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

@@ -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);
     }

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

@@ -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 {

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

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