mirror of
https://codeup.aliyun.com/67c68d4e484ca2f0a13ac3c1/ydc/jsowell-charger-web.git
synced 2026-06-20 15:19:52 +08:00
update
This commit is contained in:
@@ -10,7 +10,6 @@ import com.jsowell.common.util.StringUtils;
|
|||||||
*/
|
*/
|
||||||
public enum ThirdPlatformTypeEnum {
|
public enum ThirdPlatformTypeEnum {
|
||||||
LIAN_LIAN_PLATFORM("1", "上海联联平台", "425010765"),
|
LIAN_LIAN_PLATFORM("1", "上海联联平台", "425010765"),
|
||||||
LIAN_LIAN_TEST_PLATFORM("66", "上海联联平台", "425010765"),
|
|
||||||
NING_BO_PLATFORM("2", "宁波平台", "14405899X"), // (原本名称为中电联平台)
|
NING_BO_PLATFORM("2", "宁波平台", "14405899X"), // (原本名称为中电联平台)
|
||||||
JIANG_SU_PLATFORM("3", "江苏省平台", "726079387"),
|
JIANG_SU_PLATFORM("3", "江苏省平台", "726079387"),
|
||||||
YONG_CHENG_BO_CHE("4", "甬城泊车平台", "330205020"),
|
YONG_CHENG_BO_CHE("4", "甬城泊车平台", "330205020"),
|
||||||
|
|||||||
@@ -72,7 +72,7 @@ import java.util.stream.Collectors;
|
|||||||
public class LianLianPlatformServiceImpl implements ThirdPartyPlatformService {
|
public class LianLianPlatformServiceImpl implements ThirdPartyPlatformService {
|
||||||
Logger logger = LoggerFactory.getLogger(this.getClass());
|
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
|
@Autowired
|
||||||
private PileMerchantInfoService pileMerchantInfoService;
|
private PileMerchantInfoService pileMerchantInfoService;
|
||||||
@@ -315,13 +315,14 @@ public class LianLianPlatformServiceImpl implements ThirdPartyPlatformService {
|
|||||||
stationInfo.setStationLat(new BigDecimal(pileStationInfo.getStationLat()));
|
stationInfo.setStationLat(new BigDecimal(pileStationInfo.getStationLat()));
|
||||||
stationInfo.setConstruction(Integer.valueOf(pileStationInfo.getConstruction()));
|
stationInfo.setConstruction(Integer.valueOf(pileStationInfo.getConstruction()));
|
||||||
stationInfo.setOpenAllDay(Integer.valueOf(pileStationInfo.getOpenAllDay()));
|
stationInfo.setOpenAllDay(Integer.valueOf(pileStationInfo.getOpenAllDay()));
|
||||||
// stationInfo.setMinElectricityPrice(pileStationInfo); // 最低充电电费率
|
stationInfo.setStationStatus(Integer.valueOf(pileStationInfo.getStationStatus()));
|
||||||
// stationInfo.setElectricityFee(); // 电费 xx元/度
|
stationInfo.setMinElectricityPrice(BigDecimal.ZERO); // 最低充电电费率
|
||||||
// stationInfo.setServiceFee(); // 服务费 xx元/度
|
stationInfo.setElectricityFee(Constants.ZERO); // 电费 xx元/度
|
||||||
|
stationInfo.setServiceFee(Constants.ZERO); // 服务费 xx元/度
|
||||||
stationInfo.setParkFree(Integer.valueOf(pileStationInfo.getParkFree()));
|
stationInfo.setParkFree(Integer.valueOf(pileStationInfo.getParkFree()));
|
||||||
stationInfo.setPayment(pileStationInfo.getPayment());
|
stationInfo.setPayment(pileStationInfo.getPayment());
|
||||||
stationInfo.setSupportOrder(Integer.valueOf(pileStationInfo.getSupportOrder()));
|
stationInfo.setSupportOrder(Integer.valueOf(pileStationInfo.getSupportOrder()));
|
||||||
// stationInfo.setParkFeeType(pileStationInfo); // 停车收费类型
|
stationInfo.setParkFeeType(0); // 停车收费类型
|
||||||
stationInfo.setToiletFlag(Integer.valueOf(pileStationInfo.getToiletFlag()));
|
stationInfo.setToiletFlag(Integer.valueOf(pileStationInfo.getToiletFlag()));
|
||||||
stationInfo.setStoreFlag(Integer.valueOf(pileStationInfo.getStoreFlag()));
|
stationInfo.setStoreFlag(Integer.valueOf(pileStationInfo.getStoreFlag()));
|
||||||
stationInfo.setRestaurantFlag(Integer.valueOf(pileStationInfo.getRestaurantFlag()));
|
stationInfo.setRestaurantFlag(Integer.valueOf(pileStationInfo.getRestaurantFlag()));
|
||||||
@@ -670,9 +671,6 @@ public class LianLianPlatformServiceImpl implements ThirdPartyPlatformService {
|
|||||||
String result = HttpRequestUtil.sendPost(token, jsonString, url, dataSecret
|
String result = HttpRequestUtil.sendPost(token, jsonString, url, dataSecret
|
||||||
, dataSecretIv, operatorId, signSecret);
|
, dataSecretIv, operatorId, signSecret);
|
||||||
|
|
||||||
// 新增数据库
|
|
||||||
// thirdPartyStationRelationService.insertInfo2DataBase(thirdPlatformType, stationId);
|
|
||||||
// return thirdPlatformType + ":" + result;
|
|
||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -1906,7 +1904,7 @@ public class LianLianPlatformServiceImpl implements ThirdPartyPlatformService {
|
|||||||
*/
|
*/
|
||||||
private ThirdPartySecretInfoVO getLianLianPlatformSecretInfo() {
|
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) {
|
if (thirdPartySecretInfoVO == null) {
|
||||||
throw new BusinessException(ReturnCodeEnum.CODE_SELECT_INFO_IS_NULL);
|
throw new BusinessException(ReturnCodeEnum.CODE_SELECT_INFO_IS_NULL);
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user