diff --git a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/controller/ChargingController.java b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/controller/ChargingController.java
index 2a00c49b..e7b9d383 100644
--- a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/controller/ChargingController.java
+++ b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/controller/ChargingController.java
@@ -148,7 +148,7 @@ public class ChargingController {
         if (!REGISTERED.equals(status)) {
             r = R.fail("充电桩离线");
         }
-        String gunkey = pkey.concat(gunId);
+        String gunkey = pkey.concat(gunId).replace("pile", "gun");
         final Map<String, Object> cacheGun = REDIS.getCacheMap(gunkey);
         if (cacheGun.get("orderkey") == null || !cacheGun.get("orderkey").toString().endsWith(orderNo) || !orderNo.contains(pileNo)) {
             r = R.fail("错误的订单号");
diff --git a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/RealtimeDataLogic.java b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/RealtimeDataLogic.java
index a9cbe150..2f0b8624 100644
--- a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/RealtimeDataLogic.java
+++ b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/RealtimeDataLogic.java
@@ -121,11 +121,12 @@ public class RealtimeDataLogic implements ServiceLogic {
             Integer cacheStartSoc = (Integer) cacheOrder.get("startSoc");
             if (cacheStartSoc == null) cacheOrder.put("startSoc", socInt);
             cacheOrder.put("endSoc", socInt);
-            cacheOrder.put("tp", realtimeData.getChargingDegree());
 //            cacheOrder.put("em", realtimeData.()); //todo 实时时段明细数据是否由桩直接上传?
             cacheOrder.put("rbalance", balance);
             cacheOrder.put("remainingTime", tr);
             cacheOrder.put("status", statusplain);
+            cacheOrder.put("totalPower", cacheRealtimeData.getChargingDegree() / 10000.0);
+            cacheOrder.put("totalMoney", cacheRealtimeData.getAmountCharged() / 10000.0);
             cacheOrder.put("realtimeDataList", realtimeDataList);
             REDIS.setCacheMap(orderkey, cacheOrder);
             pileOrderService.pileRimeOrder(orderNo);