From: Xia Kaixiang <kaixiang.xia@supwisdom.com>
Date: Mon, 23 Dec 2019 06:50:03 +0000 (+0800)
Subject: 同步卡信息时返回更新时间
X-Git-Tag: 1.0.11^2
X-Git-Url: https://source.supwisdom.com/gerrit/gitweb?a=commitdiff_plain;h=37c91b54b0cfa19ecbf30dcd2b4480e6259cbefe;p=epayment%2Ffood_payapi.git

同步卡信息时返回更新时间
---

diff --git a/payapi-common/build.gradle b/payapi-common/build.gradle
index a1776a5d..0b8b7ddb 100644
--- a/payapi-common/build.gradle
+++ b/payapi-common/build.gradle
@@ -39,6 +39,7 @@ dependencies {
     implementation 'commons-codec:commons-codec:1.13'
     implementation('org.springframework.boot:spring-boot-starter-validation:2.1.6.RELEASE')
 
+    implementation 'com.fasterxml.jackson.core:jackson-annotations:2.10.1'
     implementation 'org.hibernate:hibernate-validator:6.0.2.Final'
     compile 'javax.el:javax.el-api:3.0.0'
     compile 'org.glassfish.web:javax.el:2.2.6'
diff --git a/payapi-common/src/main/java/com/supwisdom/dlpay/api/bean/CitizenCardInfo.java b/payapi-common/src/main/java/com/supwisdom/dlpay/api/bean/CitizenCardInfo.java
index d99daf70..d32a42f2 100644
--- a/payapi-common/src/main/java/com/supwisdom/dlpay/api/bean/CitizenCardInfo.java
+++ b/payapi-common/src/main/java/com/supwisdom/dlpay/api/bean/CitizenCardInfo.java
@@ -1,14 +1,17 @@
 package com.supwisdom.dlpay.api.bean;
 
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
+import org.springframework.boot.jackson.JsonComponent;
 
 @Getter
 @Setter
 @AllArgsConstructor
 @NoArgsConstructor
+@JsonIgnoreProperties(value = { "hibernateLazyInitializer", "handler" })
 public class CitizenCardInfo {
   private String cardno;
   private String cardphyid;
@@ -23,4 +26,5 @@ public class CitizenCardInfo {
   private String idno;
   private String phone;
   private String bankcardno;
+  private String updtime;
 }
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 210c3316..095115de 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
@@ -110,7 +110,7 @@ class CardServiceImpl : CardService {
     override fun getCardsByLastsaveDate(startdate: String, enddate: String): CardsResponse {
         var resp = CardsResponse()
 //        var ret = cardDao.findCitizencardByLastsaved(startdate,enddate)
-        val query = entityManager.createNativeQuery("select a.cardno,a.cardphyid,a.expiredate,a.status as cardstatus,a.trans_status as transstatus,a.userid,b.name as username,b.sex,b.idtype,b.idno,b.mobile as phone,c.cardno as bankcardno \n" +
+        val query = entityManager.createNativeQuery("select a.cardno,a.cardphyid,a.expiredate,a.status as cardstatus,a.trans_status as transstatus,a.userid,b.name as username,b.sex,b.idtype,b.idno,b.mobile as phone,c.cardno as bankcardno,a.lastsaved as updtime \n" +
                 "from tb_card a left join tb_person b on a.userid=b.userid left join tb_card c on a.userid=c.userid and a.cardphyid=c.cardphyid and c.cardtype='bankcard' \n" +
                 "where a.cardtype='citizencard' and a.lastsaved>:starttime and a.lastsaved<=:endtime order by a.lastsaved ")
         query.setParameter("starttime", startdate)