计费价格修改

ems-cloud/ems-modules/ems-server/src/main/java/com/ruoyi/ems/domain/ChargingBill.java

@@ -45,14 +45,14 @@ public class ChargingBill {
     private Double meteredPrice;
 
     /**
-     * 是否公摊
+     * 公摊金额
      */
-    private boolean isShared;
+    private Double sharedPrice;
 
     /**
-     * 公摊金额
+     * 公摊计算方式
      */
-    private Double sharedPrice;
+    private Integer sharedComputeType;
 
     /**
      * 合计金额
@@ -107,14 +107,6 @@ public class ChargingBill {
         this.meteredPrice = meteredPrice;
     }
 
-    public boolean isShared() {
-        return isShared;
-    }
-
-    public void setShared(boolean shared) {
-        isShared = shared;
-    }
-
     public Double getSharedPrice() {
         return sharedPrice;
     }
@@ -123,6 +115,14 @@ public class ChargingBill {
         this.sharedPrice = sharedPrice;
     }
 
+    public Integer getSharedComputeType() {
+        return sharedComputeType;
+    }
+
+    public void setSharedComputeType(Integer sharedComputeType) {
+        this.sharedComputeType = sharedComputeType;
+    }
+
     public Double getTotalPrice() {
         return totalPrice;
     }
@@ -135,7 +135,7 @@ public class ChargingBill {
     public String toString() {
         return "ChargingBill{" + "objType=" + objType + ", objSubType=" + objSubType + ", objCode='" + objCode + '\''
             + ", meteredTime='" + meteredTime + '\'' + ", meteredValue=" + meteredValue + ", meteredPrice="
-            + meteredPrice + ", isShared=" + isShared + ", sharedPrice=" + sharedPrice + ", totalPrice=" + totalPrice
-            + '}';
+            + meteredPrice + ", sharedPrice=" + sharedPrice + ", sharedComputeType=" + sharedComputeType
+            + ", totalPrice=" + totalPrice + '}';
     }
 }

ems-cloud/ems-modules/ems-server/src/main/java/com/ruoyi/ems/service/impl/ChargingBillServiceImpl.java

@@ -115,16 +115,17 @@ public class ChargingBillServiceImpl implements IChargingBillService {
             if (null != chargingCfg) {
                 if (meterDevice.getMeterCls() == 45) {
                     bill.setMeteredPrice(calcPrice(rec.getIncrease(), chargingCfg.getElecUnitPrice()));
+                    bill.setSharedComputeType(chargingCfg.getElecGtComputeType());
                     clacElecSharedPrice(bill, meterDevice, chargingCfg, queryParam, coSet);
                 }
                 else if (meterDevice.getMeterCls() == 70) {
                     bill.setMeteredPrice(calcPrice(rec.getIncrease(), chargingCfg.getWaterUnitPrice()));
+                    bill.setSharedComputeType(chargingCfg.getWaterGtComputeType());
                     clacWaterSharedPrice(bill, meterDevice, chargingCfg, queryParam, coSet);
                 }
             }
 
             bill.setTotalPrice(clacTotalPrice(bill));
-
             retList.add(bill);
         }
 
@@ -147,6 +148,7 @@ public class ChargingBillServiceImpl implements IChargingBillService {
 
     private void clacElecSharedPrice(ChargingBill bill, MeterDevice meterDevice, CoChargingConfig chargingCfg,
         QueryChargingBill queryParam, Set<String> coSet) {
+
         // 电价公摊计算
         if (chargingCfg.getElecGtComputeType() > 0 && coSet.contains(meterDevice.getObjCode())) {
             QueryMeterReading param = new QueryMeterReading(meterDevice.getAreaCode(), MeterObjTag.SHARED.getTagValue(),
@@ -156,7 +158,6 @@ public class ChargingBillServiceImpl implements IChargingBillService {
                 chargingCfg.getElecGtComputeType(), chargingCfg.getElecUnitPrice());
 
             bill.setSharedPrice(price);
-            bill.setShared(true);
         }
     }
 
@@ -171,7 +172,6 @@ public class ChargingBillServiceImpl implements IChargingBillService {
                 chargingCfg.getWaterGtComputeType(), chargingCfg.getWaterUnitPrice());
 
             bill.setSharedPrice(price);
-            bill.setShared(true);
         }
     }
 
@@ -259,12 +259,13 @@ public class ChargingBillServiceImpl implements IChargingBillService {
     }
 
     private Double clacTotalPrice(ChargingBill bill) {
-        Double tmp = bill.getMeteredPrice();
+        BigDecimal bd1 = new BigDecimal(bill.getMeteredPrice().toString());
 
         if (null != bill.getSharedPrice()) {
-            tmp += bill.getSharedPrice();
+            BigDecimal bd2 = new BigDecimal(bill.getSharedPrice().toString());
+            bd1 = bd1.add(bd2);
         }
 
-        return tmp;
+        return bd1.setScale(3, RoundingMode.HALF_UP).doubleValue();
     }
 }