diff --git a/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/task/SyncHistoryOrderTask.java b/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/task/SyncHistoryOrderTask.java index b1cae958..30d0fecd 100644 --- a/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/task/SyncHistoryOrderTask.java +++ b/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/task/SyncHistoryOrderTask.java @@ -51,6 +51,7 @@ public class SyncHistoryOrderTask { for (XhpcHistoryOrderDomain domain : unClearingDomainList) { XhpcClearingHistoryOrderDomain clearingDomain = clearingHistoryOrderMapper.selectByPrimaryKey(domain.getHistoryOrderId()); + if(clearingDomain == null){ clearingDomain = new XhpcClearingHistoryOrderDomain(); @@ -58,6 +59,17 @@ public class SyncHistoryOrderTask { clearingDomain.setClearingOrderId(domain.getHistoryOrderId()); clearingDomain.setCheckStatus(0); clearingHistoryOrderDomainList.add(clearingDomain); + } else { + // 如果订单未审核且未清分提现,则删除原订单,并重新插入 + if(clearingDomain.getCheckStatus() == 0 && clearingDomain.getClearingCheckoutId() == null){ + clearingHistoryOrderMapper.deleteByPrimaryKey(clearingDomain.getClearingOrderId()); + + clearingDomain = new XhpcClearingHistoryOrderDomain(); + BeanUtils.copyProperties(domain, clearingDomain); + clearingDomain.setClearingOrderId(domain.getHistoryOrderId()); + clearingDomain.setCheckStatus(0); + clearingHistoryOrderDomainList.add(clearingDomain); + } } orderIds.append(",").append(domain.getHistoryOrderId()); }