From 4b5a0c24a32f9869552ea304383581c50b1ae7c3 Mon Sep 17 00:00:00 2001
From: "kaixiang.xia" <kaixiang.xia@supwisdom.com>
Date: Thu, 14 Jan 2021 17:22:47 +0800
Subject: [PATCH] =?utf8?q?=E4=B8=AA=E4=BA=BA=E6=B5=81=E6=B0=B4=E6=9F=A5?=
 =?utf8?q?=E8=AF=A2=E9=9A=90=E8=97=8F=E5=B8=82=E6=B0=91=E5=8D=A1=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/UserDataServiceImpl.java     | 27 +++++++++++++------
 .../impl/dali_datasync_service_impl.kt        |  4 +--
 .../templates/system/dtl/userdtl.html         |  2 +-
 3 files changed, 22 insertions(+), 11 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 33d8df20..c1371e9f 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
@@ -537,11 +537,17 @@ public class UserDataServiceImpl implements UserDataService {
           cityCard.setStatus(TradeDict.STATUS_CLOSED);
           cardUpdate = true;
         }
-      } else if (!cardstatus.trim().equals(cityCard.getTransStatus())) {
-        cityCard.setStatus(TradeDict.STATUS_NORMAL);
-        cityCard.setTransStatus(cardstatus.trim());
-        cardUpdate = true;
+      } else {
+        if (!TradeDict.STATUS_NORMAL.equals(cityCard.getStatus())) {
+          cityCard.setStatus(TradeDict.STATUS_NORMAL);
+          cardUpdate = true;
+        }
+        if (!cardstatus.trim().equals(cityCard.getTransStatus())) {
+          cityCard.setTransStatus(cardstatus.trim());
+          cardUpdate = true;
+        }
       }
+
       if(!cityCard.getUserid().equals(owner.getUserid())){
         cityCard.setUserid(owner.getUserid());
         cardUpdate = true;
@@ -571,10 +577,15 @@ public class UserDataServiceImpl implements UserDataService {
           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;
+      } else {
+        if (!TradeDict.STATUS_NORMAL.equals(bankCard.getStatus())) {
+          bankCard.setStatus(TradeDict.STATUS_NORMAL);
+          bankcardUpdate = true;
+        }
+        if (!cardstatus.trim().equals(bankCard.getTransStatus())) {
+          bankCard.setTransStatus(cardstatus.trim());
+          bankcardUpdate = true;
+        }
       }
 
       if(!bankCard.getSigned().equals("1".equals(signstatus.trim()))){
diff --git a/payapi/src/main/kotlin/com/supwisdom/dlpay/api/service/impl/dali_datasync_service_impl.kt b/payapi/src/main/kotlin/com/supwisdom/dlpay/api/service/impl/dali_datasync_service_impl.kt
index ff322354..fdf08de7 100644
--- a/payapi/src/main/kotlin/com/supwisdom/dlpay/api/service/impl/dali_datasync_service_impl.kt
+++ b/payapi/src/main/kotlin/com/supwisdom/dlpay/api/service/impl/dali_datasync_service_impl.kt
@@ -147,7 +147,7 @@ class DaliDatasyncServiceImpl : DaliDatasyncService {
                 }
             } else {
                 //卡片的其他状态,代表交易状态。主状态改为正常，交易状态覆盖
-                if (TradeDict.STATUS_NORMAL != cityCard.transStatus) {
+                if (TradeDict.STATUS_NORMAL != cityCard.status) {
                     cardUpdateFlag = true
                     cityCard.status = TradeDict.STATUS_NORMAL
                 }
@@ -236,7 +236,7 @@ class DaliDatasyncServiceImpl : DaliDatasyncService {
                     }
                 } else {
                     //卡片的其他状态,代表交易状态。主状态改为正常，交易状态覆盖
-                    if (TradeDict.STATUS_NORMAL != bankCard.transStatus) {
+                    if (TradeDict.STATUS_NORMAL != bankCard.status) {
                         bankUpdate = true
                         bankCard.status = TradeDict.STATUS_NORMAL
                     }
diff --git a/payapi/src/main/resources/templates/system/dtl/userdtl.html b/payapi/src/main/resources/templates/system/dtl/userdtl.html
index dfd35260..e84fa700 100644
--- a/payapi/src/main/resources/templates/system/dtl/userdtl.html
+++ b/payapi/src/main/resources/templates/system/dtl/userdtl.html
@@ -84,7 +84,7 @@
             </div>
 
             <div class="layui-form-item" style="margin-bottom: 0;">
-                <div class="layui-inline" style="margin-right: 20px;">
+                <div class="layui-inline" style="margin-right: 20px;display: none;">
                     <label class="layui-form-label">市民卡号</label>
                     <div class="layui-input-block" style="width: 265px;">
                         <input type="text" name="cardno" id="userdtl-search-cardno" placeholder="市民卡号"
-- 
2.17.1