卡列表给联网卡用户增加用户id，修复绑定时，B端用户id获取成B端用户组id的问题

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;
+
     }
 
 }

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();
+                Long customersPersonnelId = xhpcCustomersPersonnel.getCustomersPersonnelId();
-                xhpcIcCardInfo.setUserId(customersId);
+                xhpcIcCardInfo.setUserId(customersPersonnelId);
                 break;
             default:
                 return R.fail("没有此用户类型");

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