|
|
@@ -66,8 +66,7 @@ public class CalculateCommissionUtils {
|
|
|
if (StringUtils.equals("2", grade)) {
|
|
|
PartnerCommissionRules administrator = rulesVo.getAdministrator();
|
|
|
if (isZero(gl) && isZero(hh)) {
|
|
|
- return subtractRatios(administrator.getSharedRatio(), administrator.getDefaultRatio())
|
|
|
- .add(subtractRatios(rulesVo.getPartner().getSharedRatio(), rulesVo.getPartner().getDefaultRatio()));
|
|
|
+ return new BigDecimal(administrator.getDefaultRatio());
|
|
|
} else if (isZero(hh)) {
|
|
|
return new BigDecimal(administrator.getSharedRatio()).subtract(gl)
|
|
|
.add(subtractRatios(rulesVo.getPartner().getSharedRatio(), rulesVo.getPartner().getDefaultRatio()));
|
|
|
@@ -192,9 +191,7 @@ public class CalculateCommissionUtils {
|
|
|
LocalDateTime targetDateTime = targetDate.toInstant()
|
|
|
.atZone(ZoneId.systemDefault())
|
|
|
.toLocalDateTime();
|
|
|
- LocalDateTime currentDateTime = LocalDateTime.now();
|
|
|
- LocalDateTime nDaysLater = currentDateTime.plusDays(days);
|
|
|
- return targetDateTime.isAfter(nDaysLater);
|
|
|
+ return LocalDateTime.now().isAfter(targetDateTime.plusDays(days));
|
|
|
}
|
|
|
|
|
|
public static Date addDays(Date date, int days) {
|