yuyang/XH-Power-Cloud
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改历史订单查询

Browse Source
This commit is contained in:
yuyang 2022-02-14 14:33:07 +08:00
parent 06db1ee370
commit aa43ef7e3a
1 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/impl/XhpcHistoryOrderServiceImpl.java
View File

@ -767,7 +767,7 @@ public class XhpcHistoryOrderServiceImpl extends BaseService implements IXhpcHis
if(chargingDegree.compareTo(new BigDecimal(0))==0){ if(chargingDegree.compareTo(new BigDecimal(0))==0){
Map<String, Object> map1 = new HashMap<>(); Map<String, Object> map1 = new HashMap<>();
map1.put("time", 0); map1.put("time", 0);
map1.put("powerPrice", 0); map1.put("powerPrice", actPrice);
map1.put("servicePrice", 0); map1.put("servicePrice", 0);
map1.put("chargingDegree", chargeOrder.getChargingDegree()); map1.put("chargingDegree", chargeOrder.getChargingDegree());
map1.put("actPrice", actPrice); map1.put("actPrice", actPrice);
@ -778,6 +778,18 @@ public class XhpcHistoryOrderServiceImpl extends BaseService implements IXhpcHis
//算出相差时间,分 //算出相差时间,分
BigDecimal decimal = new BigDecimal((updateTime2.getTime() - startTime2.getTime()) / 60000).setScale(2); BigDecimal decimal = new BigDecimal((updateTime2.getTime() - startTime2.getTime()) / 60000).setScale(2);
if(decimal.compareTo(new BigDecimal(0))==0){
Map<String, Object> map1 = new HashMap<>();
map1.put("time", 0);
map1.put("powerPrice", actPrice);
map1.put("servicePrice", 0);
map1.put("chargingDegree", chargeOrder.getChargingDegree());
map1.put("actPrice", actPrice);
list.add(map1);
map.put("list", list);//数据列表
return map;
}
//每分钟多少度 //每分钟多少度
BigDecimal degree = chargingDegree.divide(decimal, 2, BigDecimal.ROUND_DOWN); BigDecimal degree = chargingDegree.divide(decimal, 2, BigDecimal.ROUND_DOWN);
//获取费率时间段 //获取费率时间段