From 9aaf3696d063b30ba37d03ff18a5073d1799e9e0 Mon Sep 17 00:00:00 2001 From: panshuling321 Date: Wed, 13 Jul 2022 10:47:22 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=90=8C=E6=AD=A5=E6=B8=85?= =?UTF-8?q?=E5=88=86=E8=AE=A2=E5=8D=95=E4=BB=BB=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/xhpc/activity/task/SyncHistoryOrderTask.java | 12 ++++++++++++ 1 file changed, 12 insertions(+) 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()); }