Merge tag '1.0.30' into develop
验收材料前修改
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 33d8df2..c1371e9 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 @@
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 @@
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 ff32235..fdf08de 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 @@
}
} else {
//卡片的其他状态,代表交易状态。主状态改为正常，交易状态覆盖
- if (TradeDict.STATUS_NORMAL != cityCard.transStatus) {
+ if (TradeDict.STATUS_NORMAL != cityCard.status) {
cardUpdateFlag = true
cityCard.status = TradeDict.STATUS_NORMAL
}
@@ -236,7 +236,7 @@
}
} 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 dfd3526..e84fa70 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="市民卡号"