|
@@ -1890,10 +1890,6 @@ public class ComputeFeeSMOImpl implements IComputeFeeSMO {
|
|
|
return;
|
|
return;
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
- if (!FeeDto.STATE_DOING.equals(feeDto.getState())) {
|
|
|
|
|
- return;
|
|
|
|
|
- }
|
|
|
|
|
-
|
|
|
|
|
//查询递增信息
|
|
//查询递增信息
|
|
|
FeeAttrDto feeAttrDto = new FeeAttrDto();
|
|
FeeAttrDto feeAttrDto = new FeeAttrDto();
|
|
|
feeAttrDto.setFeeId(feeDto.getFeeId());
|
|
feeAttrDto.setFeeId(feeDto.getFeeId());
|
|
@@ -1917,6 +1913,7 @@ public class ComputeFeeSMOImpl implements IComputeFeeSMO {
|
|
|
rateCycle = Integer.parseInt(tmpFeeAttrDto.getValue());
|
|
rateCycle = Integer.parseInt(tmpFeeAttrDto.getValue());
|
|
|
}
|
|
}
|
|
|
if (FeeAttrDto.SPEC_CD_RATE_START_TIME.equals(tmpFeeAttrDto.getSpecCd())) {
|
|
if (FeeAttrDto.SPEC_CD_RATE_START_TIME.equals(tmpFeeAttrDto.getSpecCd())) {
|
|
|
|
|
+ feeDto.setRateStartTime(tmpFeeAttrDto.getValue());
|
|
|
rateStartTime = DateUtil.getDateFromString(tmpFeeAttrDto.getValue(), DateUtil.DATE_FORMATE_STRING_B);
|
|
rateStartTime = DateUtil.getDateFromString(tmpFeeAttrDto.getValue(), DateUtil.DATE_FORMATE_STRING_B);
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
@@ -1925,6 +1922,10 @@ public class ComputeFeeSMOImpl implements IComputeFeeSMO {
|
|
|
return;
|
|
return;
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|
|
+ if (!FeeDto.STATE_DOING.equals(feeDto.getState())) {
|
|
|
|
|
+ return;
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
if (rateCycle == 0 || rate == 0) {
|
|
if (rateCycle == 0 || rate == 0) {
|
|
|
return;
|
|
return;
|
|
|
}
|
|
}
|