From f9fde508f39f4078033a925f535581158b355db9 Mon Sep 17 00:00:00 2001
From: qiaowei <jov123@163.com>
Date: Wed, 10 Jul 2019 13:43:57 +0800
Subject: [PATCH] =?utf8?q?=E6=B7=BB=E5=8A=A0=E5=8D=A1=E7=89=87=E6=9F=A5?=
 =?utf8?q?=E8=AF=A2=E6=96=B9=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 .../java/com/supwisdom/dlpay/api/dao/CardDao.java  |  3 +++
 .../dlpay/mobile/service/MobileApiService.kt       |  4 ++++
 .../mobile/service/impl/MobileApiServiceImpl.kt    | 14 ++++++++++++++
 3 files changed, 21 insertions(+)

diff --git a/payapi/src/main/java/com/supwisdom/dlpay/api/dao/CardDao.java b/payapi/src/main/java/com/supwisdom/dlpay/api/dao/CardDao.java
index 74473d8a..3b7d7f4e 100644
--- a/payapi/src/main/java/com/supwisdom/dlpay/api/dao/CardDao.java
+++ b/payapi/src/main/java/com/supwisdom/dlpay/api/dao/CardDao.java
@@ -13,4 +13,7 @@ public interface CardDao extends JpaRepository<TCard, String> {
   @Modifying
   @Query("update TCard set status='closed' where userid=?1 and cardtype='bankcard' ")
   void closedBankcardStatusByUserid(String userid);
+
+  @Query("from TCard t where t.userid=?1 and t.cardtype=?2 and t.status='normal' ")
+  TCard findCardByUseridAndCardtype(String userid, String cardtype);
 }
diff --git a/payapi/src/main/kotlin/com/supwisdom/dlpay/mobile/service/MobileApiService.kt b/payapi/src/main/kotlin/com/supwisdom/dlpay/mobile/service/MobileApiService.kt
index 6ddc123e..e5eaa5fa 100644
--- a/payapi/src/main/kotlin/com/supwisdom/dlpay/mobile/service/MobileApiService.kt
+++ b/payapi/src/main/kotlin/com/supwisdom/dlpay/mobile/service/MobileApiService.kt
@@ -1,5 +1,6 @@
 package com.supwisdom.dlpay.mobile.service
 
+import com.supwisdom.dlpay.api.domain.TCard
 import com.supwisdom.dlpay.mobile.domain.TBMobileUser
 import com.supwisdom.dlpay.mobile.domain.TBPages
 
@@ -12,4 +13,7 @@ interface MobileApiService {
 
     fun findUserById(id: String): TBMobileUser?
 
+    fun findCardByNo(cardno: String):TCard?
+
+    fun findCardByUserid(userid :String) :TCard?
 }
\ No newline at end of file
diff --git a/payapi/src/main/kotlin/com/supwisdom/dlpay/mobile/service/impl/MobileApiServiceImpl.kt b/payapi/src/main/kotlin/com/supwisdom/dlpay/mobile/service/impl/MobileApiServiceImpl.kt
index 1dfea564..fe600e45 100644
--- a/payapi/src/main/kotlin/com/supwisdom/dlpay/mobile/service/impl/MobileApiServiceImpl.kt
+++ b/payapi/src/main/kotlin/com/supwisdom/dlpay/mobile/service/impl/MobileApiServiceImpl.kt
@@ -1,10 +1,13 @@
 package com.supwisdom.dlpay.mobile.service.impl
 
+import com.supwisdom.dlpay.api.dao.CardDao
+import com.supwisdom.dlpay.api.domain.TCard
 import com.supwisdom.dlpay.mobile.dao.MobileUserDao
 import com.supwisdom.dlpay.mobile.dao.PagesDao
 import com.supwisdom.dlpay.mobile.domain.TBMobileUser
 import com.supwisdom.dlpay.mobile.domain.TBPages
 import com.supwisdom.dlpay.mobile.service.MobileApiService
+import com.supwisdom.dlpay.util.ConstantUtil
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.stereotype.Service
 
@@ -13,6 +16,9 @@ class MobileApiServiceImpl : MobileApiService {
     @Autowired
     lateinit var mobileUserDao: MobileUserDao
 
+    @Autowired
+    lateinit var cardDao: CardDao
+
     @Autowired
     lateinit var pagesDao: PagesDao
 
@@ -35,4 +41,12 @@ class MobileApiServiceImpl : MobileApiService {
             if (it.isPresent) it.get() else null
         }
     }
+
+    override fun findCardByNo(cardno: String): TCard? {
+        return cardDao.findCardByCardnoAndCardtype(cardno,ConstantUtil.CARDTYPE_CITIZENCARD)
+    }
+
+    override fun findCardByUserid(userid: String): TCard? {
+        return cardDao.findCardByUseridAndCardtype(userid,ConstantUtil.CARDTYPE_CITIZENCARD)
+    }
 }
\ No newline at end of file
-- 
2.17.1