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