diff --git a/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/impl/XhpcHistoryOrderServiceImpl.java b/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/impl/XhpcHistoryOrderServiceImpl.java index 08914e7d..0434da5d 100644 --- a/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/impl/XhpcHistoryOrderServiceImpl.java +++ b/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/impl/XhpcHistoryOrderServiceImpl.java @@ -68,6 +68,7 @@ public class XhpcHistoryOrderServiceImpl extends BaseService implements IXhpcHis SM.put("44", "充电时间满足设定条件"); SM.put("45", "手动停止充电"); SM.put("72", "急停按钮停止充电(0X72)"); + SM.put("91", "平台结算(0X91)"); } @@ -80,15 +81,8 @@ public class XhpcHistoryOrderServiceImpl extends BaseService implements IXhpcHis String tenantId = loginUser.getTenantId(); Integer userType = loginUser.getUserType(); - logger.info("+++++++++++++++++++++++++++++++++++"); - logger.info("++++++++++++++++userid+++++++++++++++++++"+userid); - logger.info("++++++++++++++++tenantId+++++++++++++++++++"+tenantId); - logger.info("++++++++++++++++++userType+++++++++++++++++"+userType); - logger.info("+++++++++++++++++++++++++++++++++++"); R user = userTypeService.getUser(null, userid, userType, null, tenantId); - logger.info("+++++++++++++++++++++++++++++++++++"); - logger.info("+++++++++++++++++++++++++++++++++++"); - logger.info("+++++++++++++++++++++++++++++++++++"); + if(user !=null && user.getData() !=null){ Map userMessage = (Map)user.getData(); if (userMessage != null) { 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 bc8f418f..7f7fc0cc 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 @@ -45,6 +45,7 @@ public class OrderDataLogic implements ServiceLogic { SM.put("44", "充电时间满足设定条件"); SM.put("45", "手动停止充电"); SM.put("72", "急停按钮停止充电(0X72)"); + SM.put("91", "平台结算(0X91)"); } @Override