diff --git a/daxpay-single-channel/daxpay-single-wechat/src/main/java/org/dromara/daxpay/channel/wechat/service/reconcile/WechatPayReconcileService.java b/daxpay-single-channel/daxpay-single-wechat/src/main/java/org/dromara/daxpay/channel/wechat/service/reconcile/WechatPayReconcileService.java index ee948746..d2782f45 100644 --- a/daxpay-single-channel/daxpay-single-wechat/src/main/java/org/dromara/daxpay/channel/wechat/service/reconcile/WechatPayReconcileService.java +++ b/daxpay-single-channel/daxpay-single-wechat/src/main/java/org/dromara/daxpay/channel/wechat/service/reconcile/WechatPayReconcileService.java @@ -140,14 +140,12 @@ public class WechatPayReconcileService { case WxPayConstants.ResultCode.FAIL -> tradeBo.setTradeStatus(TradeStatusEnum.FAIL.getCode()); case WxPayConstants.RefundStatus.CHANGE -> tradeBo.setTradeStatus(TradeStatusEnum.EXCEPTION.getCode()); } - tradeBo.setTradeStatus(TradeStatusEnum.SUCCESS.getCode()); } // 撤销状态 if (Objects.equals(billDetail.getTradeState(), WxPayConstants.WxpayTradeStatus.REVOKED)) { tradeBo.setTradeType(TradeTypeEnum.PAY.getCode()) .setTradeStatus(TradeStatusEnum.REVOKED.getCode()); } - return tradeBo; } diff --git a/daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/service/reconcile/ReconcileDiscrepancyService.java b/daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/service/reconcile/ReconcileDiscrepancyService.java index e4e3b43d..35787965 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/service/reconcile/ReconcileDiscrepancyService.java +++ b/daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/service/reconcile/ReconcileDiscrepancyService.java @@ -92,8 +92,8 @@ public class ReconcileDiscrepancyService { discrepancies.add(reconcileAssistService.buildDiscrepancy(statement,channelDetail)); continue; } - // 如果远程和本地都存在, 比对差异 - if (this.reconcileDiff(channelDetail, localTrade)) { + // 如果远程和本地都存在, 判断是否有差异 + if (!this.reconcileDiff(channelDetail, localTrade)) { discrepancies.add(reconcileAssistService.buildDiscrepancy(statement, localTrade, channelDetail)); } } @@ -109,7 +109,7 @@ public class ReconcileDiscrepancyService { } /** - * 判断订单之间存是否有差异 + * 判断订单之间存是否有差异, 没有差异返回true, 有差异返回false * @param outDetail 下载的对账订单(通道交易) * @param localTrade 本地交易订单(平台交易) */