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-05-05 16:05:09 +08:00
parent c95150946a
commit 7bf2c90aca
1 changed files with 38 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -408,8 +408,6 @@ public class XhpcPileOrderController extends BaseController {
BigDecimal powerPrice =new BigDecimal(0); BigDecimal powerPrice =new BigDecimal(0);
Integer totalPower =0; Integer totalPower =0;
BigDecimal servicePrice =new BigDecimal(0); BigDecimal servicePrice =new BigDecimal(0);
if(xhpcChargeOrder.getUserId()==4 && xhpcChargeOrder.getSource()==1){
//因桩有误差，电费和服务费重新计算 //因桩有误差，电费和服务费重新计算
if(!"0".equals(cacheOrderData.getT1PowerQuantity().toString())){ if(!"0".equals(cacheOrderData.getT1PowerQuantity().toString())){
totalPower =totalPower+cacheOrderData.getT1PowerQuantity(); totalPower =totalPower+cacheOrderData.getT1PowerQuantity();
@ -450,36 +448,8 @@ public class XhpcPileOrderController extends BaseController {
}else{ }else{
servicePrice = money.subtract(powerPrice); servicePrice = money.subtract(powerPrice);
} }
}
}else{ }else{
if(!"0".equals(cacheOrderData.getT1PowerQuantity().toString())){ money = powerPrice.add(servicePrice);
BigDecimal multiply = new BigDecimal(cacheOrderData.getT1PowerQuantity()).divide(bigDecimal).multiply(t1powerFee).setScale(2, BigDecimal.ROUND_HALF_UP);
totalPower =totalPower+cacheOrderData.getT1PowerQuantity();
powerPrice=powerPrice.add(multiply);
}
if(!"0".equals(cacheOrderData.getT2PowerQuantity().toString())){
BigDecimal multiply = new BigDecimal(cacheOrderData.getT2PowerQuantity()).divide(bigDecimal).multiply(t2powerFee).setScale(2, BigDecimal.ROUND_HALF_UP);
totalPower =totalPower+cacheOrderData.getT2PowerQuantity();
powerPrice=powerPrice.add(multiply);
}
if(!"0".equals(cacheOrderData.getT3PowerQuantity().toString())){
BigDecimal multiply = new BigDecimal(cacheOrderData.getT3PowerQuantity()).divide(bigDecimal).multiply(t3powerFee).setScale(2, BigDecimal.ROUND_HALF_UP);
totalPower =totalPower+cacheOrderData.getT3PowerQuantity();
powerPrice=powerPrice.add(multiply);
}
if(!"0".equals(cacheOrderData.getT4PowerQuantity().toString())){
BigDecimal multiply = new BigDecimal(cacheOrderData.getT4PowerQuantity()).divide(bigDecimal).multiply(t4powerFee).setScale(2, BigDecimal.ROUND_HALF_UP);
totalPower =totalPower+cacheOrderData.getT4PowerQuantity();
powerPrice=powerPrice.add(multiply);
}
powerPrice =powerPrice.setScale(2,BigDecimal.ROUND_HALF_UP);
//总服务费
servicePrice = money.subtract(powerPrice);
//防止出现负数
if(powerPrice.compareTo(money)==1){
powerPrice =money;
servicePrice = money.subtract(powerPrice);
}
} }
//剩余的电费 //剩余的电费
BigDecimal surplusPowerPrice = powerPrice; BigDecimal surplusPowerPrice = powerPrice;