diff --git a/xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/data/redis/CacheOrderData.java b/xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/data/redis/CacheOrderData.java index b8ba1374..e0323f06 100644 --- a/xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/data/redis/CacheOrderData.java +++ b/xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/data/redis/CacheOrderData.java @@ -36,9 +36,9 @@ public class CacheOrderData extends BaseData { private String transactionDatetime; //交易日期、时间CP56Time2a格式 private String stopReason; //停止原因 private String cardNo; //物理卡号 - private int startSoc; - private int endSoc; - private int status;//1自动结算,2异常 + private Integer startSoc; + private Integer endSoc; + private Integer status;//1自动结算,2异常 public String getOrderNo() { @@ -350,32 +350,32 @@ public class CacheOrderData extends BaseData { this.cardNo = cardNo; } - public int getStartSoc() { + public Integer getStartSoc() { return startSoc; } - public void setStartSoc(int startSoc) { + public void setStartSoc(Integer startSoc) { this.startSoc = startSoc; } - public int getEndSoc() { + public Integer getEndSoc() { return endSoc; } - public void setEndSoc(int endSoc) { + public void setEndSoc(Integer endSoc) { this.endSoc = endSoc; } - public int getStatus() { + public Integer getStatus() { return status; } - public void setStatus(int status) { + public void setStatus(Integer status) { this.status = status; } diff --git a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/OrderDataLogic.java b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/OrderDataLogic.java index 1bd799d4..ebbde6b1 100644 --- a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/OrderDataLogic.java +++ b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/OrderDataLogic.java @@ -42,7 +42,8 @@ public class OrderDataLogic implements ServiceLogic { String orderkey = "order:".concat(orderNo); Map cacheOrder = REDIS.getCacheMap(orderkey); CacheOrderData cacheOrderData = translate(orderData); - cacheOrderData.setStartSoc((Integer) cacheOrder.get("startSoc")); + Integer startSoc = (Integer) cacheOrder.get("startSoc"); + cacheOrderData.setStartSoc(startSoc); cacheOrderData.setEndSoc((Integer) cacheOrder.get("endSoc")); cacheOrderData.setStatus(1); cacheOrderData.setCreateTime(DateUtil.now());