diff --git a/jsowell-common/src/main/java/com/jsowell/common/enums/thirdparty/ThirdPlatformTypeEnum.java b/jsowell-common/src/main/java/com/jsowell/common/enums/thirdparty/ThirdPlatformTypeEnum.java index 31f874dca..d308031c5 100644 --- a/jsowell-common/src/main/java/com/jsowell/common/enums/thirdparty/ThirdPlatformTypeEnum.java +++ b/jsowell-common/src/main/java/com/jsowell/common/enums/thirdparty/ThirdPlatformTypeEnum.java @@ -10,7 +10,6 @@ import com.jsowell.common.util.StringUtils; */ public enum ThirdPlatformTypeEnum { LIAN_LIAN_PLATFORM("1", "上海联联平台", "425010765"), - LIAN_LIAN_TEST_PLATFORM("66", "上海联联平台", "425010765"), NING_BO_PLATFORM("2", "宁波平台", "14405899X"), // (原本名称为中电联平台) JIANG_SU_PLATFORM("3", "江苏省平台", "726079387"), YONG_CHENG_BO_CHE("4", "甬城泊车平台", "330205020"), diff --git a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/service/impl/LianLianPlatformServiceImpl.java b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/service/impl/LianLianPlatformServiceImpl.java index bb7c303a4..b46b2b5f8 100644 --- a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/service/impl/LianLianPlatformServiceImpl.java +++ b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/service/impl/LianLianPlatformServiceImpl.java @@ -72,7 +72,7 @@ import java.util.stream.Collectors; public class LianLianPlatformServiceImpl implements ThirdPartyPlatformService { Logger logger = LoggerFactory.getLogger(this.getClass()); // 平台类型 - private final String thirdPlatformType = ThirdPlatformTypeEnum.LIAN_LIAN_TEST_PLATFORM.getTypeCode(); + private final String thirdPlatformType = ThirdPlatformTypeEnum.LIAN_LIAN_PLATFORM.getTypeCode(); @Autowired private PileMerchantInfoService pileMerchantInfoService; @@ -315,13 +315,14 @@ public class LianLianPlatformServiceImpl implements ThirdPartyPlatformService { stationInfo.setStationLat(new BigDecimal(pileStationInfo.getStationLat())); stationInfo.setConstruction(Integer.valueOf(pileStationInfo.getConstruction())); stationInfo.setOpenAllDay(Integer.valueOf(pileStationInfo.getOpenAllDay())); - // stationInfo.setMinElectricityPrice(pileStationInfo); // 最低充电电费率 - // stationInfo.setElectricityFee(); // 电费 xx元/度 - // stationInfo.setServiceFee(); // 服务费 xx元/度 + stationInfo.setStationStatus(Integer.valueOf(pileStationInfo.getStationStatus())); + stationInfo.setMinElectricityPrice(BigDecimal.ZERO); // 最低充电电费率 + stationInfo.setElectricityFee(Constants.ZERO); // 电费 xx元/度 + stationInfo.setServiceFee(Constants.ZERO); // 服务费 xx元/度 stationInfo.setParkFree(Integer.valueOf(pileStationInfo.getParkFree())); stationInfo.setPayment(pileStationInfo.getPayment()); stationInfo.setSupportOrder(Integer.valueOf(pileStationInfo.getSupportOrder())); - // stationInfo.setParkFeeType(pileStationInfo); // 停车收费类型 + stationInfo.setParkFeeType(0); // 停车收费类型 stationInfo.setToiletFlag(Integer.valueOf(pileStationInfo.getToiletFlag())); stationInfo.setStoreFlag(Integer.valueOf(pileStationInfo.getStoreFlag())); stationInfo.setRestaurantFlag(Integer.valueOf(pileStationInfo.getRestaurantFlag())); @@ -670,9 +671,6 @@ public class LianLianPlatformServiceImpl implements ThirdPartyPlatformService { String result = HttpRequestUtil.sendPost(token, jsonString, url, dataSecret , dataSecretIv, operatorId, signSecret); - // 新增数据库 - // thirdPartyStationRelationService.insertInfo2DataBase(thirdPlatformType, stationId); - // return thirdPlatformType + ":" + result; return result; } @@ -1906,7 +1904,7 @@ public class LianLianPlatformServiceImpl implements ThirdPartyPlatformService { */ private ThirdPartySecretInfoVO getLianLianPlatformSecretInfo() { // 通过第三方平台类型查询相关配置信息 - ThirdPartySecretInfoVO thirdPartySecretInfoVO = thirdpartySecretInfoService.queryByThirdPlatformType(ThirdPlatformTypeEnum.LIAN_LIAN_TEST_PLATFORM.getTypeCode()); + ThirdPartySecretInfoVO thirdPartySecretInfoVO = thirdpartySecretInfoService.queryByThirdPlatformType(ThirdPlatformTypeEnum.LIAN_LIAN_PLATFORM.getTypeCode()); if (thirdPartySecretInfoVO == null) { throw new BusinessException(ReturnCodeEnum.CODE_SELECT_INFO_IS_NULL); }