diff --git a/jsowell-netty/src/main/java/com/jsowell/netty/handler/TransactionRecordsRequestHandler.java b/jsowell-netty/src/main/java/com/jsowell/netty/handler/TransactionRecordsRequestHandler.java index e4de99d23..09932c68f 100644 --- a/jsowell-netty/src/main/java/com/jsowell/netty/handler/TransactionRecordsRequestHandler.java +++ b/jsowell-netty/src/main/java/com/jsowell/netty/handler/TransactionRecordsRequestHandler.java @@ -11,6 +11,7 @@ import com.jsowell.common.enums.parkplatform.ParkingEnum; import com.jsowell.common.enums.thirdparty.ThirdPlatformTypeEnum; import com.jsowell.common.enums.ykc.OrderStatusEnum; import com.jsowell.common.enums.ykc.ReturnCodeEnum; +import com.jsowell.common.enums.ykc.StartModeEnum; import com.jsowell.common.enums.ykc.YKCChargingStopReasonEnum; import com.jsowell.common.exception.BusinessException; import com.jsowell.common.util.BytesUtil; @@ -700,10 +701,12 @@ public class TransactionRecordsRequestHandler extends AbstractHandler { nrService.pushOrderInfo(orderBasicInfo.getOrderCode()); } if (StringUtils.equals(ThirdPlatformTypeEnum.YONG_CHENG_BO_CHE.getCode(), thirdPartyType)) { - // 甬城泊车 - log.info("甬城泊车平台 推送充电订单信息 param:{}", orderBasicInfo.getOrderCode()); - String result = ycbcService.pushChargeOrderInfo(orderBasicInfo.getOrderCode()); - log.info("甬城泊车平台 推送充电订单信息 result:{}", result); + if (StringUtils.equals(orderBasicInfo.getStartMode(), StartModeEnum.THIRD_PARTY_PLATFORM.getValue())) { + // 甬城泊车 + log.info("甬城泊车平台 推送充电订单信息 param:{}", orderBasicInfo.getOrderCode()); + String result = ycbcService.pushChargeOrderInfo(orderBasicInfo.getOrderCode()); + log.info("甬城泊车平台 推送充电订单信息 result:{}", result); + } } // 调用相关接口 } catch (Exception e) { diff --git a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/lianlian/service/impl/LianLianServiceImpl.java b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/lianlian/service/impl/LianLianServiceImpl.java index 07bc316de..893c5920e 100644 --- a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/lianlian/service/impl/LianLianServiceImpl.java +++ b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/lianlian/service/impl/LianLianServiceImpl.java @@ -29,6 +29,8 @@ import com.jsowell.pile.domain.ykcCommond.StartChargingCommand; import com.jsowell.pile.domain.ykcCommond.StopChargingCommand; import com.jsowell.pile.dto.*; import com.jsowell.pile.service.*; +import com.jsowell.pile.service.orderlogic.AbstractOrderLogic; +import com.jsowell.pile.service.orderlogic.OrderLogicFactory; import com.jsowell.pile.vo.base.ConnectorInfoVO; import com.jsowell.pile.vo.base.MerchantInfoVO; import com.jsowell.pile.vo.base.ThirdPartyStationRelationVO; @@ -1078,23 +1080,23 @@ public class LianLianServiceImpl implements LianLianService { // 推送启动充电结果(调用接口 notification_start_charge_result) String url = urlAddress + "notification_start_charge_result"; - String orderStatus = orderInfo.getOrderStatus(); - // 订单状态统一 - if (StringUtils.equals(OrderStatusEnum.IN_THE_CHARGING.getValue(), orderStatus)) { - // 充电中 - orderStatus = "2"; - } else if (StringUtils.equals(OrderStatusEnum.NOT_START.getValue(), orderStatus)) { - // 未启动 - orderStatus = "1"; - } else { - // 其他状态都为 未知 - orderStatus = "5"; - } + // String orderStatus = orderInfo.getOrderStatus(); + // // 订单状态统一 + // if (StringUtils.equals(OrderStatusEnum.IN_THE_CHARGING.getValue(), orderStatus)) { + // // 充电中 + // orderStatus = "2"; + // } else if (StringUtils.equals(OrderStatusEnum.NOT_START.getValue(), orderStatus)) { + // // 未启动 + // orderStatus = "1"; + // } else { + // // 其他状态都为 未知 + // orderStatus = "5"; + // } // 拼装参数 JSONObject json = new JSONObject(); json.put("StartChargeSeq", orderCode); json.put("ConnectorID", orderInfo.getPileConnectorCode()); - json.put("StartChargeSeqStat", Integer.valueOf(orderStatus)); + json.put("StartChargeSeqStat", 2); // 一定要给 2-充电中 json.put("StartTime", orderInfo.getChargeStartTime()); String jsonString = JSONObject.toJSONString(json); @@ -1221,25 +1223,25 @@ public class LianLianServiceImpl implements LianLianService { String url = urlAddress + "notification_stop_charge_result"; - String orderStatus = orderInfo.getOrderStatus(); - String successFlag = "1"; - if (StringUtils.equals(orderStatus, OrderStatusEnum.IN_THE_CHARGING.getValue())) { - // 充电中 - orderStatus = "2"; - } else if (StringUtils.equals(orderStatus, OrderStatusEnum.ORDER_COMPLETE.getValue())) { - // 订单完成 - orderStatus = "4"; - successFlag = "0"; - } else { - orderStatus = "5"; - } + // String orderStatus = orderInfo.getOrderStatus(); + // String successFlag = "0"; + // if (StringUtils.equals(orderStatus, OrderStatusEnum.IN_THE_CHARGING.getValue())) { + // // 充电中 + // orderStatus = "2"; + // } else if (StringUtils.equals(orderStatus, OrderStatusEnum.ORDER_COMPLETE.getValue())) { + // // 订单完成 + // orderStatus = "4"; + // successFlag = "0"; + // } else { + // orderStatus = "5"; + // } // 拼装联联平台参数 JSONObject json = new JSONObject(); json.put("StartChargeSeq", orderCode); - json.put("StartChargeSeqStat", Integer.valueOf(orderStatus)); + json.put("StartChargeSeqStat", 4); // 只能给 4-已结束 json.put("ConnectorID", orderInfo.getPileConnectorCode()); - json.put("SuccStat", successFlag); + json.put("SuccStat", 0); json.put("FailReason", 0); String jsonString = JSONObject.toJSONString(json); @@ -1307,6 +1309,9 @@ public class LianLianServiceImpl implements LianLianService { json.put("StopReason", 2); // 2:BMS 停止充电 String jsonString = JSONObject.toJSONString(json); + + + // 获取令牌 String token = ""; String result = "";