From 98b6ea7f3ec2731938c0e48abfbc389527ec24ba Mon Sep 17 00:00:00 2001 From: wenhui <1455474577@qq.com> Date: Thu, 10 Mar 2022 17:15:45 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=9F=A5=E7=9C=8B=E5=8D=A1?= =?UTF-8?q?=E5=85=85=E5=80=BC=E8=AE=B0=E5=BD=95=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/xhpc/card/domain/QueryRechargingRecordResponse.java | 2 +- .../java/com/xhpc/card/service/impl/XhpcCardServiceImpl.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/xhpc-modules/xhpc-card/src/main/java/com/xhpc/card/domain/QueryRechargingRecordResponse.java b/xhpc-modules/xhpc-card/src/main/java/com/xhpc/card/domain/QueryRechargingRecordResponse.java index fb9e1bea..c8ede510 100644 --- a/xhpc-modules/xhpc-card/src/main/java/com/xhpc/card/domain/QueryRechargingRecordResponse.java +++ b/xhpc-modules/xhpc-card/src/main/java/com/xhpc/card/domain/QueryRechargingRecordResponse.java @@ -51,7 +51,7 @@ public class QueryRechargingRecordResponse { @JsonProperty("rechargeMoney") private Long rechargeMoney; /** - * 充值方式（1 微信 2 支付宝 3 平台) + * 充值方式（1 微信 2 支付宝 3 平台 4 卡机设备) */ @JsonProperty("rechargeMethod") private String rechargeMethod; 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 6a3475bb..4da7f137 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 @@ -651,8 +651,8 @@ public class XhpcCardServiceImpl implements IXhpcCardService { //Get rechargeMoney dataDTO.setRechargeMoney(Long.valueOf(cardInfo.getPrepay())); //Get rechargeMethod (not found in the MySQL database) - dataDTO.setRechargeMethod(null); - dataDTO.setOrderStatus(null); + dataDTO.setRechargeMethod("4"); + dataDTO.setOrderStatus(1); dataDTO.setCreateTime(MyDateUtil.parseDateToStr(tIccardLog.getCreatetime())); queryRechargingRecordResponse.getData().add(dataDTO); }