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 2021-11-11 16:27:36 +08:00
parent 8b7c3a4d82
commit a968b77ccf
4 changed files with 32 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/api/XhpcPileOrderController.java
View File

@ -350,7 +350,7 @@ public class XhpcPileOrderController extends BaseController {
xhpcHistoryOrder.setMeterValueStartEvcs(cacheOrderData.getElectricMeterStart().doubleValue()); xhpcHistoryOrder.setMeterValueStartEvcs(cacheOrderData.getElectricMeterStart().doubleValue());
xhpcHistoryOrder.setMeterValueEndEvcs(cacheOrderData.getElectricMeterEnd().doubleValue()); xhpcHistoryOrder.setMeterValueEndEvcs(cacheOrderData.getElectricMeterEnd().doubleValue());
Map<String, Object> userMessage =new HashMap<>(); Map<String, Object> userMessage =new HashMap<>();
if(xhpcChargeOrder.getSource()==1 && xhpcChargeOrder.getInternetSerialNumber() !=null){ if(xhpcChargeOrder.getSource()==0){
userMessage = xhpcChargeOrderService.getUserMessage(userId); userMessage = xhpcChargeOrderService.getUserMessage(userId);
if (userMessage == null || userMessage.get("balance") == null) { if (userMessage == null || userMessage.get("balance") == null) {
//订单异常 //订单异常
@ -360,6 +360,9 @@ public class XhpcPileOrderController extends BaseController {
xhpcChargeOrderService.updateXhpcChargeOrder(xhpcChargeOrder); xhpcChargeOrderService.updateXhpcChargeOrder(xhpcChargeOrder);
R.ok(); R.ok();
} }
}else{
Map<String, Object> pushOrder = redisService.getCacheMap("pushOrder:"+orderNo);
xhpcHistoryOrder.setInternetSerialNumber(pushOrder.get("internetSerialNumber").toString());
} }
//结算 //结算

14
xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/controller/XhpcHistoryOrderController.java
View File

@ -452,14 +452,15 @@ public class XhpcHistoryOrderController extends BaseController {
BigDecimal number = new BigDecimal(endHour + 1 - startHour); BigDecimal number = new BigDecimal(endHour + 1 - startHour);
for (int i = startHour; i < endHour + 1; i++) { for (int i = startHour; i < endHour + 1; i++) {
String end = String.format("%02d", i);
//获取费率 //获取费率
if (i == startHour) { if (i == startHour) {
//开始时间、结束时间 //开始时间、结束时间
addStatis(xhpc, rateModelId, operatorId, chargingStationId, terminalId, historyOrderId, i, number, DateUtil.formatTime(startTime), i + ":59:59",yyyyMMdd,multiply); addStatis(xhpc, rateModelId, operatorId, chargingStationId, terminalId, historyOrderId, i, number, DateUtil.formatTime(startTime), end + ":59:59",yyyyMMdd,multiply);
} else if (i != endHour) { } else if (i != endHour) {
addStatis(xhpc, rateModelId, operatorId, chargingStationId, terminalId, historyOrderId, i, number, i + ":00:00", i + ":59:59",yyyyMMdd,multiply); addStatis(xhpc, rateModelId, operatorId, chargingStationId, terminalId, historyOrderId, i, number, end + ":00:00", end + ":59:59",yyyyMMdd,multiply);
} else { } else {
addStatis(xhpc, rateModelId, operatorId, chargingStationId, terminalId, historyOrderId, i, number, i + ":00:00", DateUtil.formatTime(endTime),yyyyMMdd,multiply); addStatis(xhpc, rateModelId, operatorId, chargingStationId, terminalId, historyOrderId, i, number, end + ":00:00", DateUtil.formatTime(endTime),yyyyMMdd,multiply);
} }
} }
} }
@ -622,5 +623,12 @@ public class XhpcHistoryOrderController extends BaseController {
System.out.println(date2.getTime()-date1.getTime()); System.out.println(date2.getTime()-date1.getTime());
int i =4;
int i1 =04;
String end = String.format("%02d", i);
System.out.println(end);
} }
} }

24
xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/impl/XhpcRealTimeOrderServiceImpl.java
View File

@ -238,15 +238,16 @@ public class XhpcRealTimeOrderServiceImpl implements IXhpcRealTimeOrderService {
if(operatorIdEvcs !=null){ if(operatorIdEvcs !=null){
//未完成 //未完成
if(operatorIdEvcs.get("operatorIdEvcs")!=null && operatorIdEvcs.get("commissionType")!=null && operatorIdEvcs.get("commissionRate")!=null){ if(operatorIdEvcs.get("operatorIdEvcs")!=null && operatorIdEvcs.get("commissionType")!=null && operatorIdEvcs.get("commissionRate")!=null){
Integer commissionType = Integer.parseInt(operatorIdEvcs.get("commissionType").toString());
BigDecimal commissionRate = new BigDecimal(operatorIdEvcs.get("commissionRate").toString()); BigDecimal commissionRate = new BigDecimal(operatorIdEvcs.get("commissionRate").toString());
//0总金额提成 1服务费提成 //0总金额提成 1服务费提成
if(commissionType==0){ if(new BigDecimal(0).compareTo(commissionRate)==-1){
internetCommission = actPrice.divide(commissionRate).setScale(2,BigDecimal.ROUND_DOWN); if("0".equals(operatorIdEvcs.get("commissionType").toString())){
actPrice = actPrice.multiply(internetCommission); internetCommission = actPrice.divide(commissionRate).setScale(2,BigDecimal.ROUND_DOWN);
}else{ actPrice = actPrice.multiply(internetCommission);
internetSvcCommission = actPrice.divide(commissionRate).setScale(2,BigDecimal.ROUND_DOWN); }else{
actPrice = actPrice.multiply(internetSvcCommission); internetSvcCommission = actPrice.divide(commissionRate).setScale(2,BigDecimal.ROUND_DOWN);
actPrice = actPrice.multiply(internetSvcCommission);
}
} }
} }
} }
@ -382,11 +383,12 @@ public class XhpcRealTimeOrderServiceImpl implements IXhpcRealTimeOrderService {
Date date = new Date(); Date date = new Date();
xhpcHistoryOrder.setCreateTime(date); xhpcHistoryOrder.setCreateTime(date);
xhpcHistoryOrder.setChargeModelEvcs(3); xhpcHistoryOrder.setChargeModelEvcs(3);
xhpcHistoryOrder.setUserNameEvcs(userMessage.get("phone").toString()); if(xhpcChargeOrder.getPower()!=null){
xhpcHistoryOrder.setPhone(userMessage.get("phone").toString()); xhpcHistoryOrder.setConnectorPowerEvcs(Double.parseDouble(xhpcChargeOrder.getPower()));
xhpcHistoryOrder.setConnectorPowerEvcs(Double.parseDouble(xhpcChargeOrder.getPower())); }
if(source==0){ if(source==0){
xhpcHistoryOrder.setUserNameEvcs(userMessage.get("phone").toString());
xhpcHistoryOrder.setPhone(userMessage.get("phone").toString());
//扣除用户实际消费金额，添加消费记录 //扣除用户实际消费金额，添加消费记录
Map<String, Object> user = xhpcChargeOrderService.getUserMessage(userId); Map<String, Object> user = xhpcChargeOrderService.getUserMessage(userId);
//剩余的钱 //剩余的钱

7
xhpc-modules/xhpc-order/src/main/resources/mapper/XhpcHistoryOrderMapper.xml
View File

@ -594,6 +594,7 @@
ho.internet_serial_number as internetSerialNumber, ho.internet_serial_number as internetSerialNumber,
ho.total_price as totalPrice, ho.total_price as totalPrice,
ho.act_price as actPrice, ho.act_price as actPrice,
ho.confirm_Result as confirmResult,
co.charging_time as chargingTime, co.charging_time as chargingTime,
co.charging_degree as chargingDegree, co.charging_degree as chargingDegree,
co.start_time as startTime, co.start_time as startTime,
@ -671,11 +672,11 @@
left join xhpc_rate ra on rt.rate_id =ra.rate_id left join xhpc_rate ra on rt.rate_id =ra.rate_id
where rt.rate_model_id=#{rateModelId} where rt.rate_model_id=#{rateModelId}
and ( and (
(rt.start_time &lt;= #{startTime} and replace(rt.end_time, '00:00:00', '23:59:59') &gt;= #{endTime} ) (rt.start_time &lt;= #{startTime} and replace(rt.end_time, '00:00:00', '23:59:59') &gt;= #{endTime} )
OR OR
(rt.start_time &lt;= #{startTime} and replace(rt.end_time, '00:00:00', '23:59:59') &gt;= #{startTime} and replace(rt.end_time, '00:00:00', '23:59:59') &lt;= #{endTime}) (rt.start_time &lt;= #{startTime} and replace(rt.end_time, '00:00:00', '23:59:59') &gt;= #{startTime} and replace(rt.end_time, '00:00:00', '23:59:59') &gt;= #{endTime} )
OR OR
(rt.start_time &lt;= #{endTime} and replace(rt.end_time, '00:00:00', '23:59:59') &gt;= #{endTime}) (rt.start_time &lt;= #{endTime} and replace(rt.end_time, '00:00:00', '23:59:59') &gt;= #{endTime} )
) )
</select> </select>