From 3e7511d8ed2990f6db92bde671af2e9dbbc47877 Mon Sep 17 00:00:00 2001 From: "kaixiang.xia" Date: Fri, 6 Nov 2020 15:22:12 +0800 Subject: [PATCH] =?utf8?q?=E5=85=B3=E8=81=94=E9=93=B6=E8=A1=8C=E5=8D=A1?= =?utf8?q?=E7=8A=B6=E6=80=81=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- .../system/service/impl/UserDataServiceImpl.java | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/payapi/src/main/java/com/supwisdom/dlpay/system/service/impl/UserDataServiceImpl.java b/payapi/src/main/java/com/supwisdom/dlpay/system/service/impl/UserDataServiceImpl.java index a7ed10ef..e493e5e7 100644 --- a/payapi/src/main/java/com/supwisdom/dlpay/system/service/impl/UserDataServiceImpl.java +++ b/payapi/src/main/java/com/supwisdom/dlpay/system/service/impl/UserDataServiceImpl.java @@ -394,9 +394,10 @@ public class UserDataServiceImpl implements UserDataService { bankCard.setCardtype(ConstantUtil.CARDTYPE_BANKCARD); bankCard.setCardphyid(cardphyid.trim()); bankCard.setStatus(TradeDict.STATUS_NORMAL); - bankCard.setTransStatus(TradeDict.STATUS_NORMAL); + bankCard.setTransStatus(cardstatus.trim()); if (TradeDict.STATUS_CLOSED.equals(cardstatus.trim())) { bankCard.setStatus(TradeDict.STATUS_CLOSED); + bankCard.setTransStatus(TradeDict.STATUS_ABNORMAL); } bankCard.setExpiredate("21991231"); bankCard.setSigned("1".equals(signstatus.trim())); @@ -535,6 +536,7 @@ public class UserDataServiceImpl implements UserDataService { cardUpdate = true; } } else if (!cardstatus.trim().equals(cityCard.getTransStatus())) { + cityCard.setStatus(TradeDict.STATUS_NORMAL); cityCard.setTransStatus(cardstatus.trim()); cardUpdate = true; } @@ -562,10 +564,17 @@ public class UserDataServiceImpl implements UserDataService { bankCard.setCardphyid(cityCard.getCardphyid()); bankcardUpdate = true; } - if(TradeDict.STATUS_CLOSED.equals(cardstatus.trim()) && !TradeDict.STATUS_CLOSED.equals(bankCard.getStatus())){ - bankCard.setStatus(TradeDict.STATUS_CLOSED); + if (TradeDict.STATUS_CLOSED.equals(cardstatus.trim())) { + if (!TradeDict.STATUS_CLOSED.equals(bankCard.getStatus())) { + bankCard.setStatus(TradeDict.STATUS_CLOSED); + bankcardUpdate = true; + } + } else if (!cardstatus.trim().equals(bankCard.getTransStatus())) { + bankCard.setStatus(TradeDict.STATUS_NORMAL); + bankCard.setTransStatus(cardstatus.trim()); bankcardUpdate = true; } + if(!bankCard.getSigned().equals("1".equals(signstatus.trim()))){ bankCard.setSigned("1".equals(signstatus.trim())); bankcardUpdate = true; -- 2.17.1