autumn/jsowell-charger-web
1
0
Fork 0
mirror of https://codeup.aliyun.com/67c68d4e484ca2f0a13ac3c1/ydc/jsowell-charger-web.git synced 2026-04-21 03:25:12 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev-new' into dev-new-rabbitmq

Browse Source 
# Conflicts:
#	jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java
This commit is contained in:
Guoqs
2024-12-30 13:58:40 +08:00
parent 25d0daa116 eff073a4ce
commit 729c47cc0c
8 changed files with 86 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java
View File

@@ -2,7 +2,6 @@ package com.jsowell.pile.service.impl;
import com.alibaba.fastjson2.JSON;
import com.alibaba.fastjson2.JSONObject;
import com.alipay.api.domain.ChargeOrderInfo;
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
import com.google.common.collect.Sets;
@@ -3564,6 +3563,7 @@ public class OrderBasicInfoServiceImpl implements OrderBasicInfoService {
orderInfo.setRemedialAmount(remedialAmount.subtract(payAmount));
}
// 更新订单信息
this.updateOrderBasicInfo(orderInfo);
}

15
jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileBasicInfoServiceImpl.java
View File

@@ -1245,6 +1245,9 @@ public class PileBasicInfoServiceImpl implements PileBasicInfoService {
equipmentInfo.setNewNationalStandard(1);
equipmentInfo.setVinFlag(1);
equipmentInfo.setEquipmentName(pileSn);
equipmentInfo.setEquipmentInvestment(new BigDecimal("0.0"));
equipmentInfo.setProductSN(pileSn);
equipmentInfo.setOpenDate(DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, pileDetailInfoVO.getCreateTime()));
equipmentInfo.setPower(new BigDecimal(pileDetailInfoVO.getRatedPower()).setScale(1, BigDecimal.ROUND_HALF_UP));
// 枪口列表
@@ -1371,15 +1374,19 @@ public class PileBasicInfoServiceImpl implements PileBasicInfoService {
if (StringUtils.isNotBlank(pileConnectorInfo.getParkNo())) {
connectorInfo.setParkNo(pileConnectorInfo.getParkNo());
}
connectorInfo.setVoltageUpperLimits(Integer.valueOf(pileDetailInfoVO.getRatedVoltage()));
connectorInfo.setVoltageUpperLimits(Integer.parseInt(pileDetailInfoVO.getRatedVoltage()));
connectorInfo.setEquipmentClassification(1);
connectorInfo.setVoltageLowerLimits(Integer.valueOf(pileDetailInfoVO.getRatedVoltage()));
connectorInfo.setCurrent(Integer.valueOf(pileDetailInfoVO.getRatedCurrent()));
connectorInfo.setVoltageLowerLimits(Integer.parseInt(pileDetailInfoVO.getRatedVoltage()));
connectorInfo.setCurrent(Integer.parseInt(pileDetailInfoVO.getRatedCurrent()));
connectorInfo.setConnectorName(pileConnectorInfo.getPileConnectorCode());
connectorInfo.setOperateStatus(50); // 50-正常使用
connectorInfo.setOpreateStatus(50); // 50-正常使用
connectorInfo.setNationalStandard(2); // 2-2015
connectorInfo.setNationalStandard(StringUtils.equals("1", pileDetailInfoVO.getSpeedType()) ? 12 : 11); // 2-2015
connectorInfo.setAuxPower(3); // 3-兼容12V和24V
connectorInfo.setStatus(Integer.parseInt(pileConnectorInfo.getStatus()));
connectorInfo.setCurrentUpperLimits(Integer.parseInt(pileDetailInfoVO.getRatedCurrent()));
connectorInfo.setCurrentLowerLimits(Integer.parseInt(pileDetailInfoVO.getRatedCurrent()));
connectorInfo.setPowerType(StringUtils.equals(Constants.ONE, pileDetailInfoVO.getSpeedType()) ? 2 : 1);
if (!StringUtils.equals(pileDetailInfoVO.getConnectorNum(), "1")) {
// 如果不是单枪，则枪口功率需要除以枪口数量

3
jsowell-pile/src/main/java/com/jsowell/pile/service/programlogic/NotDelayMerchantProgramLogic.java
View File

@@ -256,6 +256,9 @@ public class NotDelayMerchantProgramLogic extends AbstractProgramLogic {
giftBalancePay = stringBigDecimalMap.get("giftBalancePay");
}
// 更新支付金额 = 本金支付金额 + 赠送金支付金额
chargeAmount = principalBalancePay.add(giftBalancePay);
// 更新会员钱包 全部金额都用于支付订单
UpdateMemberBalanceDTO updateMemberBalanceDTO = UpdateMemberBalanceDTO.builder()
.memberId(memberId)

24
jsowell-pile/src/main/java/com/jsowell/pile/thirdparty/ConnectorInfo.java vendored
View File

@@ -47,6 +47,12 @@ public class ConnectorInfo {
@JSONField(name = "ConnectorType")
private Integer connectorType;
/**
* 枪口状态
*/
@JSONField(name = "Status")
private Integer status;
/**
* 额定电压上限(单位：V) Y
*/
@@ -83,6 +89,18 @@ public class ConnectorInfo {
@JSONField(name = "ConstantCurrentUpperLimits")
private Integer ConstantCurrentUpperLimits;
/**
* 额 定 电 流 上限
*/
@JSONField(name = "CurrentUpperLimits")
private Integer currentUpperLimits;
/**
* 额 定 电 流 下限
*/
@JSONField(name = "CurrentLowerLimits")
private Integer currentLowerLimits;
/**
*恒功率电流下限
*/
@@ -95,6 +113,12 @@ public class ConnectorInfo {
@JSONField(name = "Power")
private BigDecimal power;
/**
* 接口功率类型
*/
@JSONField(name = "PowerType")
private Integer powerType;
/**
* 车位号 N
* 停车场车位编号

18
jsowell-pile/src/main/java/com/jsowell/pile/thirdparty/EquipmentInfo.java vendored
View File

@@ -140,6 +140,24 @@ public class EquipmentInfo {
@JSONField(name = "Power")
private BigDecimal power;
/**
* 设备开通时间
*/
@JSONField(name = "OpenDate")
private String openDate;
/**
* 设备投资金额
*/
@JSONField(name = "EquipmentInvestment")
private BigDecimal equipmentInvestment;
/**
* 设备出厂序号
*/
@JSONField(name = "ProductSN")
private String productSN;
/**
* 站点额定功率