From 4224bdc51bf89dd8458a909d0f0b419e772200bc Mon Sep 17 00:00:00 2001
From: wenhui <1455474577@qq.com>
Date: Fri, 4 Mar 2022 17:23:03 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=9F=A5=E8=AF=A2=E5=8D=A1?=
 =?UTF-8?q?=E5=85=85=E5=80=BC=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../xhpc/card/domain/QueryRechargingRecordRequest.java    | 8 ++++----
 .../com/xhpc/card/service/impl/XhpcCardServiceImpl.java   | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/xhpc-modules/xhpc-card/src/main/java/com/xhpc/card/domain/QueryRechargingRecordRequest.java b/xhpc-modules/xhpc-card/src/main/java/com/xhpc/card/domain/QueryRechargingRecordRequest.java
index 22d2ef72..e63f47f7 100644
--- a/xhpc-modules/xhpc-card/src/main/java/com/xhpc/card/domain/QueryRechargingRecordRequest.java
+++ b/xhpc-modules/xhpc-card/src/main/java/com/xhpc/card/domain/QueryRechargingRecordRequest.java
@@ -33,11 +33,11 @@ public class QueryRechargingRecordRequest {
     @NotNull(message = "userType的参数名不正确或者userType的值为空，请检查传入参数")
     private Integer userType;
     /**
-     * 卡类型（0离线，1联网）
+     * 卡分类（0离线，1联网）
      */
-    @JsonProperty("cardType")
-    @NotNull(message = "cardType的参数名不正确或者cardType的值为空，请检查传入参数")
-    private Integer cardType;
+    @JsonProperty("classification")
+    @NotNull(message = "classification的参数名不正确或者cardType的值为空，请检查传入参数")
+    private Integer classification;
     /**
      * 卡号
      */
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 4281dc33..e04fb831 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
@@ -563,7 +563,7 @@ public class XhpcCardServiceImpl implements IXhpcCardService {
         QueryRechargingRecordResponse queryRechargingRecordResponse = new QueryRechargingRecordResponse();
         queryRechargingRecordResponse.setData(new ArrayList<>());
         queryRechargingRecordResponse.setTotalItems(0L);
-        Integer cardType = queryRechargingRecordRequest.getCardType();
+        Integer cardType = queryRechargingRecordRequest.getClassification();
         //如果卡是离线卡
         if (cardType == 0) {
             List<TIccardLog> tIccardLogList = tIccardLogMapper.selectRechargeLogByUniqueId(queryRechargingRecordRequest.getCardSerialNumber(), queryRechargingRecordRequest.getCurrentPage(), queryRechargingRecordRequest.getItems());
@@ -631,7 +631,7 @@ public class XhpcCardServiceImpl implements IXhpcCardService {
                     if (xhpcRechargeOrderList2.isEmpty()) {
                         return R.ok(queryRechargingRecordResponse);
                     }
-                    Long recordsCount2 = xhpcRechargeOrderMapper.selectCountByUserId(xhpcCustomersPersonnel.getCustomersId());
+                    Long recordsCount2 = xhpcRechargeOrderMapper.selectCountByUserId(xhpcCustomersPersonnel.getCustomersPersonnelId());
                     queryRechargingRecordResponse.setTotalItems(recordsCount2);
                     for (XhpcRechargeOrder xhpcRechargeOrder : xhpcRechargeOrderList2) {
                         QueryRechargingRecordResponse.DataDTO dataDTO = new QueryRechargingRecordResponse.DataDTO();