mirror of
https://codeup.aliyun.com/67c68d4e484ca2f0a13ac3c1/ydc/jsowell-charger-web.git
synced 2026-04-20 11:05:18 +08:00
update
This commit is contained in:
@@ -1184,4 +1184,16 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils {
|
||||
return halfYearAgo.toString();
|
||||
}
|
||||
|
||||
/**
|
||||
* 将HH:mm格式的时间字符串转换为yyyy-MM-dd HH:mm:ss格式的时间字符串
|
||||
* @param timeStr
|
||||
* @return
|
||||
*/
|
||||
public static String formatTime(String timeStr) {
|
||||
return LocalDateTime.of(
|
||||
LocalDate.now(),
|
||||
LocalTime.parse(timeStr, DateTimeFormatter.ofPattern("HH:mm")).withSecond(0)
|
||||
).format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -3374,9 +3374,9 @@ public class OrderBasicInfoServiceImpl implements OrderBasicInfoService {
|
||||
String orderCode = dto.getStartChargeSeq();
|
||||
//2025.5.23发现生成的订单为425010765000000000273551033向对方平台推送订单信息接口,对方平台反差错误,使用MA1JLFUU8成功
|
||||
//但是在启动充电接口中只能使用425010765运营商id,才能启动成功,使用MA1JLFUU8错误
|
||||
if(orderCode.substring(0,9).equals(ThirdPartyOperatorIdEnum.LIAN_LIAN_PLATFORM.getOperatorId())){
|
||||
/* if(orderCode.substring(0,9).equals(ThirdPartyOperatorIdEnum.LIAN_LIAN_PLATFORM.getOperatorId())){
|
||||
orderCode = "MA1JLFUU8" + orderCode.substring(9);
|
||||
}
|
||||
}*/
|
||||
String pileConnectorCode = dto.getConnectorID();
|
||||
// String pileSn = StringUtils.substring(pileConnectorCode, 0, 14);
|
||||
String pileSn = YKCUtils.getPileSn(pileConnectorCode);
|
||||
|
||||
@@ -1001,6 +1001,15 @@ public class LianLianPlatformServiceImpl implements ThirdPartyPlatformService {
|
||||
List<ChargeDetail> chargeDetails = new ArrayList<>();
|
||||
for (BillingPriceVO billingPriceVO : billingList) {
|
||||
detail = new ChargeDetail();
|
||||
//改为YYYY-MM-DD HH:mm:ss格式
|
||||
//拼接 开始时间和结束时间
|
||||
String startTime = billingPriceVO.getStartTime();
|
||||
String endTime = billingPriceVO.getEndTime();
|
||||
|
||||
billingPriceVO.setStartTime(DateUtils.formatTime(startTime));
|
||||
billingPriceVO.setEndTime(DateUtils.formatTime(endTime));
|
||||
|
||||
billingPriceVO.getStartTime();
|
||||
if (StringUtils.equals(billingPriceVO.getTimeType(), "1")) {
|
||||
// 尖时段
|
||||
detail.setDetailStartTime(billingPriceVO.getStartTime());
|
||||
|
||||
Reference in New Issue
Block a user