optimize bug

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

@@ -219,7 +219,7 @@ 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);
 
         //动态费用
@@ -229,6 +229,9 @@ public class ComputeFeeSMOImpl implements IComputeFeeSMO {
             feeDto.setAmountOwed(feeDto.getFeePrice() + "");
             //feeDto.setDeadlineTime(DateUtil.getCurrentDate()); 欠费日期不对先注释
         }
+
+        //考虑租金递增
+        dealRentRate(feeDto);
     }
 
     /**

service-api/src/main/java/com/java110/api/smo/payment/impl/ToPayOweFeeSMOImpl.java

@@ -122,7 +122,7 @@ public class ToPayOweFeeSMOImpl extends AppAbstractComponentSMO implements IToPa
         BigDecimal tmpMoney = new BigDecimal(money);
         BigDecimal feePrice = null;
         for (int feeIndex = 0; feeIndex < fees.size(); feeIndex++) {
-            feePrice = new BigDecimal(fees.getJSONObject(feeIndex).getDouble("feePrice"));
+            feePrice = new BigDecimal(fees.getJSONObject(feeIndex).getDouble("feeTotalPrice"));
             tmpMoney = tmpMoney.add(feePrice);
         }
 

service-api/src/main/java/com/java110/api/smo/payment/impl/ToQrPayOweFeeSMOImpl.java

@@ -94,7 +94,7 @@ public class ToQrPayOweFeeSMOImpl extends AppAbstractComponentSMO implements ITo
         BigDecimal tmpMoney = new BigDecimal(money);
         BigDecimal feePrice = null;
         for (int feeIndex = 0; feeIndex < fees.size(); feeIndex++) {
-            feePrice = new BigDecimal(fees.getJSONObject(feeIndex).getDouble("feePrice"));
+            feePrice = new BigDecimal(fees.getJSONObject(feeIndex).getDouble("feeTotalPrice"));
             tmpMoney = tmpMoney.add(feePrice);
         }
         money = tmpMoney.setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue();

springboot/src/main/java/com/java110/boot/smo/payment/impl/ToPayOweFeeSMOImpl.java

@@ -122,7 +122,7 @@ public class ToPayOweFeeSMOImpl extends AppAbstractComponentSMO implements IToPa
         BigDecimal tmpMoney = new BigDecimal(money);
         BigDecimal feePrice = null;
         for (int feeIndex = 0; feeIndex < fees.size(); feeIndex++) {
-            feePrice = new BigDecimal(fees.getJSONObject(feeIndex).getDouble("feePrice"));
+            feePrice = new BigDecimal(fees.getJSONObject(feeIndex).getDouble("feeTotalPrice"));
             tmpMoney = tmpMoney.add(feePrice);
         }
 

springboot/src/main/java/com/java110/boot/smo/payment/impl/ToQrPayOweFeeSMOImpl.java

@@ -93,7 +93,7 @@ public class ToQrPayOweFeeSMOImpl extends AppAbstractComponentSMO implements ITo
         BigDecimal tmpMoney = new BigDecimal(money);
         BigDecimal feePrice = null;
         for (int feeIndex = 0; feeIndex < fees.size(); feeIndex++) {
-            feePrice = new BigDecimal(fees.getJSONObject(feeIndex).getDouble("feePrice"));
+            feePrice = new BigDecimal(fees.getJSONObject(feeIndex).getDouble("feeTotalPrice"));
             tmpMoney = tmpMoney.add(feePrice);
         }
         money = tmpMoney.setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue();