From 52be3c7f4c0099d16cb25d69db977e2db73957d2 Mon Sep 17 00:00:00 2001
From: wenhui <1455474577@qq.com>
Date: Fri, 11 Mar 2022 11:14:14 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8D=A1=E5=88=97=E8=A1=A8=E7=BB=99=E8=81=94?=
 =?UTF-8?q?=E7=BD=91=E5=8D=A1=E7=94=A8=E6=88=B7=E5=A2=9E=E5=8A=A0=E7=94=A8?=
 =?UTF-8?q?=E6=88=B7id=EF=BC=8C=E4=BF=AE=E5=A4=8D=E7=BB=91=E5=AE=9A?=
 =?UTF-8?q?=E6=97=B6=EF=BC=8CB=E7=AB=AF=E7=94=A8=E6=88=B7id=E8=8E=B7?=
 =?UTF-8?q?=E5=8F=96=E6=88=90B=E7=AB=AF=E7=94=A8=E6=88=B7=E7=BB=84id?=
 =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/xhpc/card/domain/CardList.java       | 7 +++++++
 .../com/xhpc/card/service/impl/XhpcCardServiceImpl.java    | 7 +++++--
 .../src/main/resources/mapper/TIccardInfoMapper.xml        | 1 +
 3 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/xhpc-modules/xhpc-card/src/main/java/com/xhpc/card/domain/CardList.java b/xhpc-modules/xhpc-card/src/main/java/com/xhpc/card/domain/CardList.java
index 6bf4a736..8622f422 100644
--- a/xhpc-modules/xhpc-card/src/main/java/com/xhpc/card/domain/CardList.java
+++ b/xhpc-modules/xhpc-card/src/main/java/com/xhpc/card/domain/CardList.java
@@ -91,8 +91,15 @@ public class CardList {
         /**
          * 卡押金
          */
+        @JsonProperty("cashPledge")
         private Integer cashPledge;
 
+        /**
+         * 用户id，联网卡才有，用于查询联网卡用户充值记录
+         */
+        @JsonProperty("userId")
+        private Long userId;
+
     }
 
 }
diff --git a/xhpc-modules/xhpc-card/src/main/java/com/xhpc/card/service/impl/XhpcCardServiceImpl.java b/xhpc-modules/xhpc-card/src/main/java/com/xhpc/card/service/impl/XhpcCardServiceImpl.java
index 4da7f137..5525f495 100644
--- a/xhpc-modules/xhpc-card/src/main/java/com/xhpc/card/service/impl/XhpcCardServiceImpl.java
+++ b/xhpc-modules/xhpc-card/src/main/java/com/xhpc/card/service/impl/XhpcCardServiceImpl.java
@@ -225,6 +225,9 @@ public class XhpcCardServiceImpl implements IXhpcCardService {
                 dataDTO.setUserAccount(phone);
             } else {
                 dataDTO.setUserType((Long) data.get("user_type"));
+                if (data.get("user_id") != null) {
+                    dataDTO.setUserId(Long.valueOf((Integer) data.get("user_id")));
+                }
             }
             cardList.getData().add(dataDTO);
 
@@ -380,8 +383,8 @@ public class XhpcCardServiceImpl implements IXhpcCardService {
                 break;
             case 3:
                 XhpcCustomersPersonnel xhpcCustomersPersonnel = xhpcCustomersPersonnelMapper.selectByAccount(bindCardInfo.getUserAccount());
-                Long customersId = xhpcCustomersPersonnel.getCustomersId();
-                xhpcIcCardInfo.setUserId(customersId);
+                Long customersPersonnelId = xhpcCustomersPersonnel.getCustomersPersonnelId();
+                xhpcIcCardInfo.setUserId(customersPersonnelId);
                 break;
             default:
                 return R.fail("没有此用户类型");
diff --git a/xhpc-modules/xhpc-card/src/main/resources/mapper/TIccardInfoMapper.xml b/xhpc-modules/xhpc-card/src/main/resources/mapper/TIccardInfoMapper.xml
index 2c1a8733..837842c8 100644
--- a/xhpc-modules/xhpc-card/src/main/resources/mapper/TIccardInfoMapper.xml
+++ b/xhpc-modules/xhpc-card/src/main/resources/mapper/TIccardInfoMapper.xml
@@ -47,6 +47,7 @@
         xhpc_card.ic_card_info_id,
         xhpc_card.t_iccard_info_id,
         xhpc_card.use_status,
+        xhpc_card.user_id,
         xhpc_card.user_account,
         xhpc_card.user_type
         FROM