yuyang/XH-Power-Cloud
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修复查询卡充值接口

Browse Source
This commit is contained in:
wenhui 2022-03-04 17:23:03 +08:00
parent ee07b0953a
commit 4224bdc51b
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
xhpc-modules/xhpc-card/src/main/java/com/xhpc/card/domain/QueryRechargingRecordRequest.java
View File

@ -33,11 +33,11 @@ public class QueryRechargingRecordRequest {
@NotNull(message = "userType的参数名不正确或者userType的值为空，请检查传入参数") @NotNull(message = "userType的参数名不正确或者userType的值为空，请检查传入参数")
private Integer userType; private Integer userType;
/** /**
* 卡类型（0离线，1联网） * 卡分类（0离线，1联网）
*/ */
@JsonProperty("cardType") @JsonProperty("classification")
@NotNull(message = "cardType的参数名不正确或者cardType的值为空，请检查传入参数") @NotNull(message = "classification的参数名不正确或者cardType的值为空，请检查传入参数")
private Integer cardType; private Integer classification;
/** /**
* 卡号 * 卡号
*/ */

4
xhpc-modules/xhpc-card/src/main/java/com/xhpc/card/service/impl/XhpcCardServiceImpl.java
View File

@ -563,7 +563,7 @@ public class XhpcCardServiceImpl implements IXhpcCardService {
QueryRechargingRecordResponse queryRechargingRecordResponse = new QueryRechargingRecordResponse(); QueryRechargingRecordResponse queryRechargingRecordResponse = new QueryRechargingRecordResponse();
queryRechargingRecordResponse.setData(new ArrayList<>()); queryRechargingRecordResponse.setData(new ArrayList<>());
queryRechargingRecordResponse.setTotalItems(0L); queryRechargingRecordResponse.setTotalItems(0L);
Integer cardType = queryRechargingRecordRequest.getCardType(); Integer cardType = queryRechargingRecordRequest.getClassification();
//如果卡是离线卡 //如果卡是离线卡
if (cardType == 0) { if (cardType == 0) {
List<TIccardLog> tIccardLogList = tIccardLogMapper.selectRechargeLogByUniqueId(queryRechargingRecordRequest.getCardSerialNumber(), queryRechargingRecordRequest.getCurrentPage(), queryRechargingRecordRequest.getItems()); List<TIccardLog> tIccardLogList = tIccardLogMapper.selectRechargeLogByUniqueId(queryRechargingRecordRequest.getCardSerialNumber(), queryRechargingRecordRequest.getCurrentPage(), queryRechargingRecordRequest.getItems());
@ -631,7 +631,7 @@ public class XhpcCardServiceImpl implements IXhpcCardService {
if (xhpcRechargeOrderList2.isEmpty()) { if (xhpcRechargeOrderList2.isEmpty()) {
return R.ok(queryRechargingRecordResponse); return R.ok(queryRechargingRecordResponse);
} }
Long recordsCount2 = xhpcRechargeOrderMapper.selectCountByUserId(xhpcCustomersPersonnel.getCustomersId()); Long recordsCount2 = xhpcRechargeOrderMapper.selectCountByUserId(xhpcCustomersPersonnel.getCustomersPersonnelId());
queryRechargingRecordResponse.setTotalItems(recordsCount2); queryRechargingRecordResponse.setTotalItems(recordsCount2);
for (XhpcRechargeOrder xhpcRechargeOrder : xhpcRechargeOrderList2) { for (XhpcRechargeOrder xhpcRechargeOrder : xhpcRechargeOrderList2) {
QueryRechargingRecordResponse.DataDTO dataDTO = new QueryRechargingRecordResponse.DataDTO(); QueryRechargingRecordResponse.DataDTO dataDTO = new QueryRechargingRecordResponse.DataDTO();