From c1100322f24d260700efb3f3b67644e3bb7e950e Mon Sep 17 00:00:00 2001
From: "kaixiang.xia" <kaixiang.xia@supwisdom.com>
Date: Thu, 3 Dec 2020 15:54:21 +0800
Subject: [PATCH] =?utf8?q?=E5=BE=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 .../api/controller/user_api_controller.kt     |  4 ----
 .../com/supwisdom/dlpay/mobile/MobileApi.kt   | 21 +++++++------------
 2 files changed, 7 insertions(+), 18 deletions(-)

diff --git a/payapi/src/main/kotlin/com/supwisdom/dlpay/api/controller/user_api_controller.kt b/payapi/src/main/kotlin/com/supwisdom/dlpay/api/controller/user_api_controller.kt
index c1d15fe6..0171cede 100644
--- a/payapi/src/main/kotlin/com/supwisdom/dlpay/api/controller/user_api_controller.kt
+++ b/payapi/src/main/kotlin/com/supwisdom/dlpay/api/controller/user_api_controller.kt
@@ -318,10 +318,6 @@ class UserAPIController {
         }
         if (resp.sinstatus == YnrccUtil.TRANSTYPE_SIGNCARD ) {
             signed = TradeDict.STATUS_YES
-            if(!card.signed){
-                card.signed = true
-                mobileApiService.saveCard(card)
-            }
             //绑卡返回已签约，保存UserSecret
             mobileApiService.signBxy(card,SignBxyParam().apply {
                 this.userid = person.userid
diff --git a/payapi/src/main/kotlin/com/supwisdom/dlpay/mobile/MobileApi.kt b/payapi/src/main/kotlin/com/supwisdom/dlpay/mobile/MobileApi.kt
index 0abec967..1214614a 100644
--- a/payapi/src/main/kotlin/com/supwisdom/dlpay/mobile/MobileApi.kt
+++ b/payapi/src/main/kotlin/com/supwisdom/dlpay/mobile/MobileApi.kt
@@ -428,22 +428,18 @@ class ApiV1 {
         var needupdate = false
         if (resp.sinstatus == YnrccUtil.TRANSTYPE_SIGNCARD ) {
             signed = TradeDict.STATUS_YES
-            if(!card.signed){
-                card.signed = true
-                mobileApiService.saveCard(card)
-            }
-            user.signedtime = DateUtil.getNow();
-            mobileApiService.saveUser(user)
             //  如果银行返回已签约，保存密钥到UserSecret表
             mobileApiService.signBxy(card, SignBxyParam().apply {
-                this.uid=user.uid
+                this.uid = user.uid
                 this.userid = user.userid
                 this.secertkey = user.secertkey
                 this.rsapublic = user.rsapublic
                 this.rsaprivate = user.rsaprivate
             })
-            needupdate = true;
 
+            user.signedtime = DateUtil.getNow()
+            mobileApiService.saveUser(user)
+            needupdate = true;
         }
         if( user.userid.isNullOrEmpty()){
             user.userid = person.userid
@@ -489,12 +485,6 @@ class ApiV1 {
 
         if (resp.sinstatus == YnrccUtil.TRANSTYPE_SIGNCARD ) {
             signed = TradeDict.STATUS_YES
-            if(!card.signed){
-                card.signed = true
-                mobileApiService.saveCard(card)
-            }
-            user.signedtime = DateUtil.getNow();
-            mobileApiService.saveUser(user)
             //  如果银行返回已签约，保存密钥到UserSecret表
             mobileApiService.signBxy(card, SignBxyParam().apply {
                 this.uid=user.uid
@@ -503,6 +493,9 @@ class ApiV1 {
                 this.rsapublic = user.rsapublic
                 this.rsaprivate = user.rsaprivate
             })
+            user.signedtime = DateUtil.getNow()
+            mobileApiService.saveUser(user)
+
         }
 
         return JsonResult.ok("OK")
-- 
2.17.1