java110 лет назад: 5
Родитель
Сommit
ee8a712a52

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

@@ -441,10 +441,10 @@ public class ComputeFeeSMOImpl implements IComputeFeeSMO {
         Calendar endCalender = Calendar.getInstance();
         endCalender.setTime(endTime);
         endCalender.add(Calendar.MONTH, new Double(Math.floor(cycle)).intValue());
-        Calendar futureDate = Calendar.getInstance();
-        futureDate.setTime(endCalender.getTime());
-        futureDate.add(Calendar.MONTH, 1);
-        int futureDay = futureDate.getActualMaximum(Calendar.DAY_OF_MONTH);
+//        Calendar futureDate = Calendar.getInstance();
+//        futureDate.setTime(endCalender.getTime());
+//        futureDate.add(Calendar.MONTH, 1);
+        int futureDay = endCalender.getActualMaximum(Calendar.DAY_OF_MONTH);
         int hours = new Double((cycle - Math.floor(cycle)) * futureDay * 24).intValue();
         endCalender.add(Calendar.HOUR, hours);
         if (FeeDto.FEE_FLAG_ONCE.equals(feeDto.getFeeFlag())) {
@@ -464,10 +464,10 @@ public class ComputeFeeSMOImpl implements IComputeFeeSMO {
         Calendar endCalender = Calendar.getInstance();
         endCalender.setTime(endTime);
         endCalender.add(Calendar.MONTH, new Double(Math.floor(cycle)).intValue());
-        Calendar futureDate = Calendar.getInstance();
-        futureDate.setTime(endCalender.getTime());
-        futureDate.add(Calendar.MONTH, 1);
-        int futureDay = futureDate.getActualMaximum(Calendar.DAY_OF_MONTH);
+//        Calendar futureDate = Calendar.getInstance();
+//        futureDate.setTime(endCalender.getTime());
+//        futureDate.add(Calendar.MONTH, 1);
+        int futureDay = endCalender.getActualMaximum(Calendar.DAY_OF_MONTH);
         int hours = new Double((cycle - Math.floor(cycle)) * futureDay * 24).intValue();
         endCalender.add(Calendar.HOUR, hours);
         if (FeeDto.FEE_FLAG_ONCE.equals(feeDto.getFeeFlag())) {
@@ -784,10 +784,10 @@ public class ComputeFeeSMOImpl implements IComputeFeeSMO {
         if (doubleMonth <= 0) {
             return endDate.getTime();
         }
-        Calendar futureDate = Calendar.getInstance();
-        futureDate.setTime(endDate.getTime());
-        futureDate.add(Calendar.MONTH, 1);
-        int futureDay = futureDate.getActualMaximum(Calendar.DAY_OF_MONTH);
+//        Calendar futureDate = Calendar.getInstance();
+//        futureDate.setTime(endDate.getTime());
+//        futureDate.add(Calendar.MONTH, 1);
+        int futureDay = endDate.getActualMaximum(Calendar.DAY_OF_MONTH);
         Double hour = doubleMonth * futureDay * 24;
         endDate.add(Calendar.HOUR_OF_DAY, hour.intValue());
         return endDate.getTime();

+ 1 - 4
service-api/src/main/java/com/java110/api/bmo/fee/impl/FeeBMOImpl.java

@@ -199,10 +199,7 @@ public class FeeBMOImpl extends ApiBaseBMO implements IFeeBMO {
             cycles = cycles - Math.floor(cycles);
         }
         //int hours = new Double(cycles * DateUtil.getCurrentMonthDay() * 24).intValue();
-        Calendar futureDate = Calendar.getInstance();
-        futureDate.setTime(endCalender.getTime());
-        futureDate.add(Calendar.MONTH, 1);
-        int futureDay = futureDate.getActualMaximum(Calendar.DAY_OF_MONTH);
+        int futureDay = endCalender.getActualMaximum(Calendar.DAY_OF_MONTH);
         int hours = new Double(cycles * futureDay * 24).intValue();
         endCalender.add(Calendar.HOUR, hours);
 

+ 4 - 4
service-fee/src/main/java/com/java110/fee/listener/fee/UpdateFeeInfoListener.java

@@ -215,10 +215,10 @@ public class UpdateFeeInfoListener extends AbstractFeeBusinessServiceDataFlowLis
             endCalender.add(Calendar.MONTH, new Double(Math.floor(cycles)).intValue());
             cycles = cycles - Math.floor(cycles);
         }
-        Calendar futureDate = Calendar.getInstance();
-        futureDate.setTime(endCalender.getTime());
-        futureDate.add(Calendar.MONTH, 1);
-        int futureDay = futureDate.getActualMaximum(Calendar.DAY_OF_MONTH);
+//        Calendar futureDate = Calendar.getInstance();
+//        futureDate.setTime(endCalender.getTime());
+//        futureDate.add(Calendar.MONTH, 1);
+        int futureDay = endCalender.getActualMaximum(Calendar.DAY_OF_MONTH);
         int hours = new Double(cycles * futureDay * 24).intValue();
         endCalender.add(Calendar.HOUR, hours);