From 3a704dc54e33e59ed173dfab4596947c3b6d5841 Mon Sep 17 00:00:00 2001
From: Xia Kaixiang <kaixiang.xia@supwisdom.com>
Date: Mon, 23 Sep 2019 17:53:44 +0800
Subject: [PATCH] =?utf8?q?=E6=A0=B9=E6=8D=AEuserid=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 .../api/controller/user_api_controller.kt     |  5 ++-
 .../dlpay/api/service/card_service.kt         |  3 ++
 .../api/service/impl/card_service_impl.kt     | 39 +++++++++++++++++++
 3 files changed, 46 insertions(+), 1 deletion(-)

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 b2dac9a9..36881910 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
@@ -129,7 +129,10 @@ class UserAPIController {
     }
     @PostMapping("/querybycardno")
     fun querybycardno(@RequestBody param: QueryUserParam): ResponseEntity<Any> {
-        val ret = cardService.getPersonByCardno(param.citizencardno, param.bankcardno)
+        val ret = when (!param.userid.isNullOrEmpty()) {
+            true -> cardService.getPersonByUserid(param.userid)
+            false -> cardService.getPersonByCardno(param.citizencardno, param.bankcardno)
+        }
         return if(ret.retcode==0){
             ResponseEntity.ok(ResponseBodyBuilder.create()
                     .success(ret,"ok"))
diff --git a/payapi/src/main/kotlin/com/supwisdom/dlpay/api/service/card_service.kt b/payapi/src/main/kotlin/com/supwisdom/dlpay/api/service/card_service.kt
index 75405781..b262bbb9 100644
--- a/payapi/src/main/kotlin/com/supwisdom/dlpay/api/service/card_service.kt
+++ b/payapi/src/main/kotlin/com/supwisdom/dlpay/api/service/card_service.kt
@@ -19,4 +19,7 @@ interface CardService {
 
     @Transactional(rollbackFor = arrayOf(Exception::class), readOnly = true)
     fun getCardsByLastsaveDate(startdate: String, enddate:String): CardsResponse
+
+    @Transactional(rollbackFor = arrayOf(Exception::class), readOnly = true)
+    fun getPersonByUserid(userid: String): UserInforResponse
 }
\ No newline at end of file
diff --git a/payapi/src/main/kotlin/com/supwisdom/dlpay/api/service/impl/card_service_impl.kt b/payapi/src/main/kotlin/com/supwisdom/dlpay/api/service/impl/card_service_impl.kt
index 12fb6e64..4981023b 100644
--- a/payapi/src/main/kotlin/com/supwisdom/dlpay/api/service/impl/card_service_impl.kt
+++ b/payapi/src/main/kotlin/com/supwisdom/dlpay/api/service/impl/card_service_impl.kt
@@ -106,4 +106,43 @@ class CardServiceImpl : CardService {
         resp.cards = list
         return resp
     }
+
+    override fun getPersonByUserid(userid: String): UserInforResponse {
+        var resp = UserInforResponse()
+        val person = personDao.findByUserid(userid.trim())
+        if (null == person) {
+            resp.retcode = 1
+            resp.retmsg = "用户不存在"
+            return resp
+        }
+        val bankcard = cardDao.findCardByUseridAndCardtype(person.userid, ConstantUtil.CARDTYPE_BANKCARD)
+        if (null == bankcard) {
+            resp.retcode = 1
+            resp.retmsg = "用户绑定的银行卡状态异常"
+            return resp
+        }
+        val cityCard = cardDao.findBankcardByCitizencard(person.userid, ConstantUtil.CARDTYPE_CITIZENCARD, bankcard.cardphyid)
+        if (null == cityCard) {
+            resp.retcode = 1
+            resp.retmsg = "市民卡不存在"
+            return resp
+        }
+        resp.cardno = cityCard.cardno
+        resp.cardphyid = cityCard.cardphyid
+        resp.expiredate = cityCard.expiredate
+        resp.cardstatus = cityCard.status
+        resp.transstatus = cityCard.transStatus
+        resp.bankcardno = bankcard.cardno
+
+        resp.username = person.name
+        resp.userid = person.userid
+        resp.sex = person.sex
+        resp.idtype = person.idtype
+        resp.idno = person.idno
+        resp.phone = person.mobile
+
+        resp.retcode = 0
+        resp.retmsg = "查询成功"
+        return resp
+    }
 }
\ No newline at end of file
-- 
2.17.1