Bläddra i källkod

add community publicity

java110 3 år sedan
förälder
incheckning
0ee24f6075

+ 5 - 5
java110-core/src/main/java/com/java110/core/smo/impl/ComputeFeeSMOImpl.java

@@ -190,14 +190,14 @@ public class ComputeFeeSMOImpl implements IComputeFeeSMO {
         feeDto.setFeePrice(Double.parseDouble(feePriceAll.get("feePrice").toString()));
         BigDecimal price = new BigDecimal(feeDto.getFeePrice());
         price = price.multiply(new BigDecimal(oweMonth));
-        feeDto.setFeePrice(price.setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue());
+        feeDto.setFeeTotalPrice(price.setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue());
         feeDto.setDeadlineTime(targetEndDate);
 
         //动态费用
         if ("4004".equals(computingFormula)
                 && FeeDto.FEE_FLAG_ONCE.equals(feeDto.getFeeFlag())
                 && !FeeDto.STATE_FINISH.equals(feeDto.getState())) {
-            feeDto.setAmountOwed(feeDto.getFeePrice() + "");
+            feeDto.setAmountOwed(feeDto.getFeeTotalPrice() + "");
             //feeDto.setDeadlineTime(DateUtil.getCurrentDate()); 欠费日期不对先注释
         }
 
@@ -226,7 +226,7 @@ public class ComputeFeeSMOImpl implements IComputeFeeSMO {
         if ("4004".equals(computingFormula)
                 && FeeDto.FEE_FLAG_ONCE.equals(feeDto.getFeeFlag())
                 && !FeeDto.STATE_FINISH.equals(feeDto.getState())) {
-            feeDto.setAmountOwed(feeDto.getFeePrice() + "");
+            feeDto.setAmountOwed(feeDto.getFeeTotalPrice() + "");
             //feeDto.setDeadlineTime(DateUtil.getCurrentDate()); 欠费日期不对先注释
         }
 
@@ -250,14 +250,14 @@ public class ComputeFeeSMOImpl implements IComputeFeeSMO {
         //double month = dayCompare(feeDto.getEndTime(), DateUtil.getCurrentDate());
         BigDecimal price = new BigDecimal(feeDto.getFeePrice());
         price = price.multiply(new BigDecimal(oweMonth));
-        feeDto.setFeePrice(price.setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue());
+        feeDto.setFeeTotalPrice(price.setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue());
         feeDto.setDeadlineTime(targetEndDate);
 
         //动态费用
         if ("4004".equals(computingFormula)
                 && FeeDto.FEE_FLAG_ONCE.equals(feeDto.getFeeFlag())
                 && !FeeDto.STATE_FINISH.equals(feeDto.getState())) {
-            feeDto.setAmountOwed(feeDto.getFeePrice() + "");
+            feeDto.setAmountOwed(feeDto.getFeeTotalPrice() + "");
             //feeDto.setDeadlineTime(DateUtil.getCurrentDate()); 欠费日期不对先注释
         }
     }

+ 1 - 1
service-acct/src/main/java/com/java110/acct/payment/business/oweFee/OweFeePaymentBusiness.java

@@ -117,7 +117,7 @@ public class OweFeePaymentBusiness implements IPaymentBusiness {
                 //如果金额为0 就排除
                 //if (tmpFeeDto.getFeePrice() > 0 && tmpFeeDto.getEndTime().getTime() <= DateUtil.getCurrentDate().getTime()) {
                 tmpFeeDto.setVal(val);
-                if (tmpFeeDto.getFeePrice() > 0 && "Y".equals(tmpFeeDto.getPayOnline())) {
+                if (tmpFeeDto.getFeeTotalPrice() > 0 && "Y".equals(tmpFeeDto.getPayOnline())) {
                     tmpFeeDtos.add(tmpFeeDto);
                     feeTotalPrice = new BigDecimal(tmpFeeDto.getFeeTotalPrice());
                     tmpMoney = tmpMoney.add(feeTotalPrice);

+ 1 - 1
service-job/src/main/java/com/java110/job/task/fee/GenerateBillTemplate.java

@@ -217,7 +217,7 @@ public class GenerateBillTemplate extends TaskSystemQuartz {
             //throw new IllegalArgumentException("暂不支持该类型出账" + feeDto.getFeeId());
         }
 
-        if (feeDto.getFeePrice() <= 0) {
+        if (feeDto.getFeeTotalPrice() <= 0) {
             return;//这个没有欠费可算
         }
 

+ 1 - 1
service-job/src/main/java/com/java110/job/task/fee/GenerateOweFeeTemplate.java

@@ -193,7 +193,7 @@ public class GenerateOweFeeTemplate extends TaskSystemQuartz {
 
         //保存数据
         ReportOweFeePo reportOweFeePo = new ReportOweFeePo();
-        reportOweFeePo.setAmountOwed(feeDto.getFeePrice() + "");
+        reportOweFeePo.setAmountOwed(feeDto.getFeeTotalPrice() + "");
         reportOweFeePo.setCommunityId(feeDto.getCommunityId());
         reportOweFeePo.setConfigId(feeConfigDto.getConfigId());
         reportOweFeePo.setConfigName(feeConfigDto.getFeeName());