diff --git a/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/controller/XhpcChargingPileController.java b/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/controller/XhpcChargingPileController.java index cb48a7a6..74836ef6 100644 --- a/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/controller/XhpcChargingPileController.java +++ b/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/controller/XhpcChargingPileController.java @@ -100,7 +100,6 @@ public class XhpcChargingPileController extends BaseController { @Log(title = "桩-停用", businessType = BusinessType.UPDATE) @PostMapping(value = "/updateStatus") public AjaxResult updateStatus(@RequestBody XhpcChargingPile xhpcChargingPile) { - return xhpcChargingPileService.updateStatus(xhpcChargingPile.getChargingPileId(), xhpcChargingPile.getStatus()); } diff --git a/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/mapper/XhpcChargingPileMapper.java b/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/mapper/XhpcChargingPileMapper.java index cdb2bbbe..d7e64557 100644 --- a/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/mapper/XhpcChargingPileMapper.java +++ b/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/mapper/XhpcChargingPileMapper.java @@ -120,4 +120,11 @@ public interface XhpcChargingPileMapper { */ List selectXhpcChargingPilesBy(@Param("chargingStationId") Long chargingStationId, @Param("chargingPileId") Long chargingPileId, @Param("tenantId") String tenantId); + /** + * 修改桩的终端 + * + * @param chargingPileId + * @return + */ + int xhpcTerminalSataus(@Param("chargingPileId") Long chargingPileId,@Param("status") Integer status); } diff --git a/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/service/XhpcChargingPileServiceImpl.java b/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/service/XhpcChargingPileServiceImpl.java index 85354fb4..36ad9fb7 100644 --- a/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/service/XhpcChargingPileServiceImpl.java +++ b/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/service/XhpcChargingPileServiceImpl.java @@ -315,10 +315,15 @@ public class XhpcChargingPileServiceImpl extends BaseService implements IXhpcCha @Override @Transactional public AjaxResult updateStatus(Long chargingPileId, Integer status) { - XhpcChargingPile xhpc = xhpcChargingPileMapper.selectXhpcChargingPileById(chargingPileId); - xhpc.setStatus(status); - xhpcChargingPileMapper.updaeXhpcChargingPile(xhpc); - return AjaxResult.success(); + if(status ==0 || status ==1){ + XhpcChargingPile xhpc = xhpcChargingPileMapper.selectXhpcChargingPileById(chargingPileId); + xhpc.setStatus(status); + xhpcChargingPileMapper.updaeXhpcChargingPile(xhpc); + //修改枪状态 0正常 1停用 + xhpcChargingPileMapper.xhpcTerminalSataus(chargingPileId,status); + return AjaxResult.success(); + } + return AjaxResult.error("修改状态不对请重新编辑"); } @Override diff --git a/xhpc-modules/xhpc-charging-station/src/main/resources/mapper/XhpcChargingPileMapper.xml b/xhpc-modules/xhpc-charging-station/src/main/resources/mapper/XhpcChargingPileMapper.xml index 06ab095e..5149d7e0 100644 --- a/xhpc-modules/xhpc-charging-station/src/main/resources/mapper/XhpcChargingPileMapper.xml +++ b/xhpc-modules/xhpc-charging-station/src/main/resources/mapper/XhpcChargingPileMapper.xml @@ -517,4 +517,10 @@ + + + update xhpc_terminal + set status = #{status} + where charging_pile_id = #{chargingPileId} + diff --git a/xhpc-modules/xhpc-general/src/main/java/com/xhpc/general/controller/XhpcServiceDataUpdateController.java b/xhpc-modules/xhpc-general/src/main/java/com/xhpc/general/controller/XhpcServiceDataUpdateController.java index b045b116..708fab5b 100644 --- a/xhpc-modules/xhpc-general/src/main/java/com/xhpc/general/controller/XhpcServiceDataUpdateController.java +++ b/xhpc-modules/xhpc-general/src/main/java/com/xhpc/general/controller/XhpcServiceDataUpdateController.java @@ -41,4 +41,15 @@ public class XhpcServiceDataUpdateController { String tenantId = loginUser.getTenantId(); return xhpcServiceDataUpdateService.update(SOC, version, phone, aliyunMessageCount,tenantId); } + + /** + * 桩停止充电提示语 + * @param prompt + * @return + */ + @GetMapping("/pilePromptUpdate") + public AjaxResult pilePromptUpdate(String prompt){ + return xhpcServiceDataUpdateService.pilePromptUpdate(prompt); + } + } diff --git a/xhpc-modules/xhpc-general/src/main/java/com/xhpc/general/service/IXhpcServiceDataUpdateService.java b/xhpc-modules/xhpc-general/src/main/java/com/xhpc/general/service/IXhpcServiceDataUpdateService.java index c8fdb991..def9b126 100644 --- a/xhpc-modules/xhpc-general/src/main/java/com/xhpc/general/service/IXhpcServiceDataUpdateService.java +++ b/xhpc-modules/xhpc-general/src/main/java/com/xhpc/general/service/IXhpcServiceDataUpdateService.java @@ -32,4 +32,5 @@ public interface IXhpcServiceDataUpdateService { AjaxResult update(String SOC, String version, String phone, String aliyunMessageCount,String tenantId); + AjaxResult pilePromptUpdate(String prompt); } diff --git a/xhpc-modules/xhpc-general/src/main/java/com/xhpc/general/service/XhpcServiceDataUpdateServiceImpl.java b/xhpc-modules/xhpc-general/src/main/java/com/xhpc/general/service/XhpcServiceDataUpdateServiceImpl.java index bbd7374e..c5646b5b 100644 --- a/xhpc-modules/xhpc-general/src/main/java/com/xhpc/general/service/XhpcServiceDataUpdateServiceImpl.java +++ b/xhpc-modules/xhpc-general/src/main/java/com/xhpc/general/service/XhpcServiceDataUpdateServiceImpl.java @@ -66,4 +66,17 @@ public class XhpcServiceDataUpdateServiceImpl implements IXhpcServiceDataUpdateS return AjaxResult.success(); } + + @Override + public AjaxResult pilePromptUpdate(String prompt) { + LoginUser loginUser = tokenService.getLoginUser(); + String tenantId = loginUser.getTenantId(); + if("".equals(prompt) || prompt ==null){ + String pilePrompts = redisService.getCacheObject("pilePrompt:"+tenantId); + return AjaxResult.success(pilePrompts); + }else{ + redisService.setCacheObject("pilePrompt:"+tenantId, prompt); + return AjaxResult.success(); + } + } } diff --git a/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/impl/XhpcChargeOrderServiceImpl.java b/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/impl/XhpcChargeOrderServiceImpl.java index fe6dc11a..e580bdc7 100644 --- a/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/impl/XhpcChargeOrderServiceImpl.java +++ b/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/impl/XhpcChargeOrderServiceImpl.java @@ -159,6 +159,10 @@ public class XhpcChargeOrderServiceImpl extends BaseService implements IXhpcChar //终端信息 XhpcTerminal xhpcTerminal = xhpcChargeOrderMapper.getXhpcTerminalSerialNumber(terminalSerialNumber,tenantId); if (xhpcTerminal == null || xhpcTerminal.getTerminalId() == null || xhpcTerminal.getChargingPileId() == null || xhpcTerminal.getPileSerialNumber() == null) { + String pilePrompt = redisService.getCacheObject("pilePrompt:"+tenantId); + if(!"".equals(pilePrompt) && pilePrompt !=null){ + return AjaxResult.error(1104, pilePrompt); + } return AjaxResult.error(1104, "因限电该桩已停用,请选择其他桩进行充电"); } //查看充电用户金额是否大于5元 @@ -336,6 +340,10 @@ public class XhpcChargeOrderServiceImpl extends BaseService implements IXhpcChar //终端信息 XhpcTerminal xhpcTerminal = xhpcChargeOrderMapper.getXhpcTerminalSerialNumber(serialNumber,tenantId); if (xhpcTerminal == null || xhpcTerminal.getTerminalId() == null || xhpcTerminal.getChargingPileId() == null || xhpcTerminal.getPileSerialNumber() == null) { + String pilePrompt = redisService.getCacheObject("pilePrompt:"+tenantId); + if(!"".equals(pilePrompt) && pilePrompt !=null){ + return AjaxResult.error(1104, pilePrompt); + } return AjaxResult.error(1104, "因限电该桩已停用,请选择其他桩进行充电"); } @@ -349,6 +357,10 @@ public class XhpcChargeOrderServiceImpl extends BaseService implements IXhpcChar //获取充电订单号 XhpcChargeOrder order = xhpcChargeOrderMapper.getChargingOrderId(chargingOrderId); if(order ==null){ + String pilePrompt = redisService.getCacheObject("pilePrompt:"+tenantId); + if(!"".equals(pilePrompt) && pilePrompt !=null){ + return AjaxResult.error(1104, pilePrompt); + } return AjaxResult.error(1104, "因限电该桩已停用,请选择其他桩进行充电"); }else{ if(order.getSource()==1){ @@ -487,11 +499,18 @@ public class XhpcChargeOrderServiceImpl extends BaseService implements IXhpcChar startChargingData.setTel(driverId); startChargingData.setPileNo(connectorId.substring(0, connectorId.length() - 3)); + logger.info("<<<<<<<<<<<<<<<<<<<<<<<<第三方启动>>>>>>connectorId>>>>>>>>>>>"+connectorId); + logger.info("<<<<<<<<<<<<<<<<<<<<<<<<第三方启动>>>>>>>connectorId>>>>>>>>>>"+connectorId); //终端信息 XhpcTerminal xhpcTerminal = xhpcChargeOrderMapper.getXhpcTerminalSerialNumber(connectorId,null); if (xhpcTerminal == null || xhpcTerminal.getTerminalId() == null || xhpcTerminal.getChargingPileId() == null || xhpcTerminal.getPileSerialNumber() == null) { r.setCode(1); - r.setMsg("因限电该桩已停用,请选择其他桩进行充电"); + String pilePrompt = redisService.getCacheObject("pilePrompt:000000"); + if(!"".equals(pilePrompt) && pilePrompt !=null){ + r.setMsg(pilePrompt); + }else{ + r.setMsg("因限电该桩已停用,请选择其他桩进行充电"); + } return r; } //终端状态是否空闲 diff --git a/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/impl/XhpcRealTimeOrderServiceImpl.java b/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/impl/XhpcRealTimeOrderServiceImpl.java index 2a565cad..33a84926 100644 --- a/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/impl/XhpcRealTimeOrderServiceImpl.java +++ b/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/impl/XhpcRealTimeOrderServiceImpl.java @@ -552,88 +552,88 @@ public class XhpcRealTimeOrderServiceImpl extends BaseService implements IXhpcRe xhpcHistoryOrder.setInternetSerialNumber(xhpcChargeOrder.getInternetSerialNumber()); Double totalPower = xhpcHistoryOrder.getTotalPower(); - Map judgeActivity= getRateOrActivityFormul(xhpcChargeOrder.getSerialNumber(), internetUserId, startTime, endTime, chargingStationId, tenantId, xhpcChargeOrder.getRateModelId()); - - Map params1 =new HashMap<>(); - if("1".equals(judgeActivity.get("status").toString())){ - judge =true; - logger.info("<<<<<<<<<<<<<<<价格、时间、公式都相同>>>>>>>>>>>>>>>>>"); - params1.put("T",money.doubleValue()); - params1.put("P",powerPrice.doubleValue()); - params1.put("S",servicePrice.doubleValue()); - params1.put("E",totalPower); - String computeFormula = judgeActivity.get("computeFormula").toString(); - computeType = (int)judgeActivity.get("computeType"); - BigDecimal eval = new BigDecimal(Calc.eval(computeFormula, params1)).setScale(2, BigDecimal.ROUND_HALF_UP); - //活动总服务费 - activityServicePriceTotal = servicePrice.setScale(2, BigDecimal.ROUND_HALF_UP); - //活动总电费 - activityPowerPriceTotal = powerPrice.setScale(2, BigDecimal.ROUND_HALF_UP); - //活动总金额 - activityTotalPriceTotal = money; - if(computeType==1){ - BigDecimal decimal1 = eval.multiply(new BigDecimal(0.5)).setScale(2, BigDecimal.ROUND_HALF_UP); - internetCommission = internetCommission.add(eval); - activityPowerPrice =activityPowerPrice.add(activityPowerPriceTotal.subtract(decimal1)); - activityServicePrice =activityServicePrice.add(activityServicePriceTotal.subtract(decimal1)); - }else if(computeType==2){ - internetSvcCommission = internetSvcCommission.add(eval); - activityServicePrice =activityServicePrice.add(activityServicePriceTotal.subtract(eval)); - activityPowerPrice =activityPowerPrice.add(activityPowerPriceTotal); - }else{ - //电量抽成 - internetDegreeCommission = internetDegreeCommission.add(eval); - //减服务费 - activityServicePrice =activityServicePrice.add(activityServicePriceTotal.subtract(eval)); - activityPowerPrice =activityPowerPrice.add(activityPowerPriceTotal); - } - promotionDiscount = money.subtract(activityTotalPriceTotal); - xhpcHistoryOrder.setActivityId(judgeActivity.get("activityId").toString()); - }else if("2".equals(judgeActivity.get("status").toString())){ - judge =true; - logger.info("<<<<<<<<<<<<<<<价格、时间都相同>>>>>>>>>>>>>>>>>"); - String computeFormula = judgeActivity.get("computeFormula").toString(); - BigDecimal powerPrice1 = new BigDecimal(judgeActivity.get("powerPrice").toString()); - BigDecimal servicePrice1 = new BigDecimal(judgeActivity.get("servicePrice").toString()); - //活动总服务费 - activityServicePriceTotal = servicePrice1.multiply(new BigDecimal(totalPower)).setScale(2, BigDecimal.ROUND_HALF_UP); - //活动总电费 - activityPowerPriceTotal = powerPrice1.multiply(new BigDecimal(totalPower)).setScale(2, BigDecimal.ROUND_HALF_UP); - //活动总金额 - activityTotalPriceTotal = activityServicePriceTotal.add(activityPowerPriceTotal); - params1.put("T",activityTotalPriceTotal.doubleValue()); - params1.put("P",activityPowerPriceTotal.doubleValue()); - params1.put("S",activityServicePriceTotal.doubleValue()); - params1.put("E",totalPower); - - computeType = (int)judgeActivity.get("computeType"); - BigDecimal eval = new BigDecimal(Calc.eval(computeFormula, params1)).setScale(2, BigDecimal.ROUND_HALF_UP); - if(computeType==1){ - BigDecimal decimal1 = eval.multiply(new BigDecimal(0.5)).setScale(2, BigDecimal.ROUND_HALF_UP); - internetCommission = internetCommission.add(eval); - activityPowerPrice =activityPowerPrice.add(activityPowerPriceTotal.subtract(decimal1)); - activityServicePrice =activityServicePrice.add(activityServicePriceTotal.subtract(decimal1)); - }else if(computeType==2){ - internetSvcCommission = internetSvcCommission.add(eval); - activityServicePrice =activityServicePrice.add(activityServicePriceTotal.subtract(eval)); - activityPowerPrice =activityPowerPrice.add(activityPowerPriceTotal); - }else{ - //电量抽成 - internetDegreeCommission = internetDegreeCommission.add(eval); - //减服务费 - activityServicePrice =activityServicePrice.add(activityServicePriceTotal.subtract(eval)); - activityPowerPrice =activityPowerPrice.add(activityPowerPriceTotal); - } - promotionDiscount = money.subtract(activityTotalPriceTotal); - xhpcHistoryOrder.setActivityId(judgeActivity.get("activityId").toString()); - }else{ +// Map judgeActivity= getRateOrActivityFormul(xhpcChargeOrder.getSerialNumber(), internetUserId, startTime, endTime, chargingStationId, tenantId, xhpcChargeOrder.getRateModelId()); +// +// Map params1 =new HashMap<>(); +// if("1".equals(judgeActivity.get("status").toString())){ +// judge =true; +// logger.info("<<<<<<<<<<<<<<<价格、时间、公式都相同>>>>>>>>>>>>>>>>>"); +// params1.put("T",money.doubleValue()); +// params1.put("P",powerPrice.doubleValue()); +// params1.put("S",servicePrice.doubleValue()); +// params1.put("E",totalPower); +// String computeFormula = judgeActivity.get("computeFormula").toString(); +// computeType = (int)judgeActivity.get("computeType"); +// BigDecimal eval = new BigDecimal(Calc.eval(computeFormula, params1)).setScale(2, BigDecimal.ROUND_HALF_UP); +// //活动总服务费 +// activityServicePriceTotal = servicePrice.setScale(2, BigDecimal.ROUND_HALF_UP); +// //活动总电费 +// activityPowerPriceTotal = powerPrice.setScale(2, BigDecimal.ROUND_HALF_UP); +// //活动总金额 +// activityTotalPriceTotal = money; +// if(computeType==1){ +// BigDecimal decimal1 = eval.multiply(new BigDecimal(0.5)).setScale(2, BigDecimal.ROUND_HALF_UP); +// internetCommission = internetCommission.add(eval); +// activityPowerPrice =activityPowerPrice.add(activityPowerPriceTotal.subtract(decimal1)); +// activityServicePrice =activityServicePrice.add(activityServicePriceTotal.subtract(decimal1)); +// }else if(computeType==2){ +// internetSvcCommission = internetSvcCommission.add(eval); +// activityServicePrice =activityServicePrice.add(activityServicePriceTotal.subtract(eval)); +// activityPowerPrice =activityPowerPrice.add(activityPowerPriceTotal); +// }else{ +// //电量抽成 +// internetDegreeCommission = internetDegreeCommission.add(eval); +// //减服务费 +// activityServicePrice =activityServicePrice.add(activityServicePriceTotal.subtract(eval)); +// activityPowerPrice =activityPowerPrice.add(activityPowerPriceTotal); +// } +// promotionDiscount = money.subtract(activityTotalPriceTotal); +// xhpcHistoryOrder.setActivityId(judgeActivity.get("activityId").toString()); +// }else if("2".equals(judgeActivity.get("status").toString())){ +// judge =true; +// logger.info("<<<<<<<<<<<<<<<价格、时间都相同>>>>>>>>>>>>>>>>>"); +// String computeFormula = judgeActivity.get("computeFormula").toString(); +// BigDecimal powerPrice1 = new BigDecimal(judgeActivity.get("powerPrice").toString()); +// BigDecimal servicePrice1 = new BigDecimal(judgeActivity.get("servicePrice").toString()); +// //活动总服务费 +// activityServicePriceTotal = servicePrice1.multiply(new BigDecimal(totalPower)).setScale(2, BigDecimal.ROUND_HALF_UP); +// //活动总电费 +// activityPowerPriceTotal = powerPrice1.multiply(new BigDecimal(totalPower)).setScale(2, BigDecimal.ROUND_HALF_UP); +// //活动总金额 +// activityTotalPriceTotal = activityServicePriceTotal.add(activityPowerPriceTotal); +// params1.put("T",activityTotalPriceTotal.doubleValue()); +// params1.put("P",activityPowerPriceTotal.doubleValue()); +// params1.put("S",activityServicePriceTotal.doubleValue()); +// params1.put("E",totalPower); +// +// computeType = (int)judgeActivity.get("computeType"); +// BigDecimal eval = new BigDecimal(Calc.eval(computeFormula, params1)).setScale(2, BigDecimal.ROUND_HALF_UP); +// if(computeType==1){ +// BigDecimal decimal1 = eval.multiply(new BigDecimal(0.5)).setScale(2, BigDecimal.ROUND_HALF_UP); +// internetCommission = internetCommission.add(eval); +// activityPowerPrice =activityPowerPrice.add(activityPowerPriceTotal.subtract(decimal1)); +// activityServicePrice =activityServicePrice.add(activityServicePriceTotal.subtract(decimal1)); +// }else if(computeType==2){ +// internetSvcCommission = internetSvcCommission.add(eval); +// activityServicePrice =activityServicePrice.add(activityServicePriceTotal.subtract(eval)); +// activityPowerPrice =activityPowerPrice.add(activityPowerPriceTotal); +// }else{ +// //电量抽成 +// internetDegreeCommission = internetDegreeCommission.add(eval); +// //减服务费 +// activityServicePrice =activityServicePrice.add(activityServicePriceTotal.subtract(eval)); +// activityPowerPrice =activityPowerPrice.add(activityPowerPriceTotal); +// } +// promotionDiscount = money.subtract(activityTotalPriceTotal); +// xhpcHistoryOrder.setActivityId(judgeActivity.get("activityId").toString()); +// }else{ boolean activityInternet =false; //yyyy-mm-dd(当前时间) String parse2 = DateUtil.formatDate(startTime); long time1 = startTime.getTime(); long time2 = endTime.getTime(); - if( time1 != time2 && time2>time1){ + if(time2>time1){ List activityStationTime = xhpcRealTimeOrderMapper.getActivityStationTime(internetUserId, DateUtil.formatDateTime(startTime), DateUtil.formatDateTime(endTime), chargingStationId, tenantId); //1时间没有跨天 DateTime parse = DateUtil.parse(DateUtil.format(startTime, "yyyy-MM-dd"), "yyyy-MM-dd"); @@ -650,15 +650,20 @@ public class XhpcRealTimeOrderServiceImpl extends BaseService implements IXhpcRe Map params =new HashMap<>(); List activityFormulaTime1 =new ArrayList<>(); List activityFormulaTime2 =new ArrayList<>(); + List> reatTimeList1 =new ArrayList<>(); + List> reatTimeList2 =new ArrayList<>(); XhpcActivityInternetDomainDto activityInternet1 =new XhpcActivityInternetDomainDto(); if(betweenDay>0){ activityInternet1 = activityStationTime.get(0); activityFormulaTime1 = xhpcRealTimeOrderMapper.getActivityFormulaTime(activityInternet1.getActivityId(), start, "24:00:00"); activityFormulaTime2 = xhpcRealTimeOrderMapper.getActivityFormulaTime(activityInternet1.getActivityId(), "00:00:00", end); + reatTimeList1 = xhpcHistoryOrderService.getReatTimeList(start,"23:59:59",xhpcChargeOrder.getRateModelId()); + reatTimeList2 = xhpcHistoryOrderService.getReatTimeList("00:00:00", end,xhpcChargeOrder.getRateModelId()); activityId =activityInternet1.getActivityId()+""; }else{ activityInternet1 = activityStationTime.get(0); activityFormulaTime1 = xhpcRealTimeOrderMapper.getActivityFormulaTime(activityInternet1.getActivityId(), start, end); + reatTimeList1 = xhpcHistoryOrderService.getReatTimeList(start,end,xhpcChargeOrder.getRateModelId()); activityId =activityInternet1.getActivityId()+""; } for (int j = 0; j < activityFormulaTime1.size(); j++) { @@ -666,7 +671,8 @@ public class XhpcRealTimeOrderServiceImpl extends BaseService implements IXhpcRe //计费类型 computeType = activityInternet1.getComputeType(); BigDecimal activityServicePriceFormula = activityFormula.getServicePrice(); - BigDecimal activityPowerPriceFormula = activityFormula.getPowerPrice(); + //BigDecimal activityPowerPriceFormula = activityFormula.getPowerPrice(); + BigDecimal activityPowerPriceFormula = new BigDecimal(reatTimeList1.get(j).get("powerFee").toString()); //计算公式 String computeFormula = activityFormula.getComputeFormula(); BigDecimal degree =new BigDecimal(0); @@ -715,7 +721,8 @@ public class XhpcRealTimeOrderServiceImpl extends BaseService implements IXhpcRe computeType = activityInternet1.getComputeType(); XhpcActivityFormulaDomainDto activityFormula = activityFormulaTime2.get(j); BigDecimal activityServicePriceFormula = activityFormula.getServicePrice(); - BigDecimal activityPowerPriceFormula = activityFormula.getPowerPrice(); + //BigDecimal activityPowerPriceFormula = activityFormula.getPowerPrice(); + BigDecimal activityPowerPriceFormula = new BigDecimal(reatTimeList2.get(j).get("powerFee").toString()); //计算公式 String computeFormula = activityFormula.getComputeFormula(); BigDecimal degree =new BigDecimal(0); @@ -813,7 +820,7 @@ public class XhpcRealTimeOrderServiceImpl extends BaseService implements IXhpcRe } } - } +// } } // if ( !UserTypeUtil.INTERNET_TYPE.equals(source) && xhpcChargeOrder.getStartTime()!=null && xhpcChargeOrder.getEndTime()!=null && money.compareTo(new BigDecimal(0))>=1) {