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

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

Browse Source
This commit is contained in:
Lemon
2025-01-02 14:09:27 +08:00
parent c053410b44 7842eea074
commit 4ca5af7f17
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/service/impl/GuangXiPlatformServiceImpl.java vendored
View File

@@ -643,9 +643,9 @@ public class GuangXiPlatformServiceImpl implements ThirdPartyPlatformService {
// 充电完成 // 充电完成
orderStatus = "4"; orderStatus = "4";
} }
BigDecimal current = realTimeMonitorData.getOutputCurrent() == null ? BigDecimal.ZERO : info.getCurrent(); BigDecimal current = realTimeMonitorData.getOutputCurrent() == null ? BigDecimal.ZERO : new BigDecimal(realTimeMonitorData.getOutputCurrent());
BigDecimal voltage = realTimeMonitorData.getOutputVoltage() == null ? BigDecimal.ZERO : info.getVoltage(); BigDecimal voltage = realTimeMonitorData.getOutputVoltage() == null ? BigDecimal.ZERO : new BigDecimal(realTimeMonitorData.getOutputVoltage());
String soc = realTimeMonitorData.getSOC() == null ? Constants.ZERO : info.getSOC(); String soc = realTimeMonitorData.getSOC() == null ? Constants.ZERO : realTimeMonitorData.getSOC();
String dateTime = DateUtils.getDateTime(); String dateTime = DateUtils.getDateTime();
// 拼装订单编号 // 拼装订单编号

4
jsowell-ui/src/views/pile/station/detail.vue
View File

@@ -220,9 +220,9 @@
<order-report ref="orderReport"></order-report> <order-report ref="orderReport"></order-report>
</el-tab-pane> </el-tab-pane>
<!-- <el-tab-pane label="分润配置" name="Config"> <el-tab-pane label="分润配置" name="Config">
<Config ref="orderReport"></Config> <Config ref="orderReport"></Config>
</el-tab-pane> --> </el-tab-pane>
</el-tabs> </el-tabs>
<el-dialog :title="dialogTitle" :visible.sync="dialogFormVisible"> <el-dialog :title="dialogTitle" :visible.sync="dialogFormVisible">