|
@@ -68,7 +68,7 @@ public class DelegationService {
|
|
|
SalesBatchExtension extension = extensionService.getDetailByBathIdAndPrice(saleBatch.getId(), product.getCurrentPrice());
|
|
SalesBatchExtension extension = extensionService.getDetailByBathIdAndPrice(saleBatch.getId(), product.getCurrentPrice());
|
|
|
BigDecimal serviceCharge = extension.getServiceCharge();
|
|
BigDecimal serviceCharge = extension.getServiceCharge();
|
|
|
|
|
|
|
|
- if (!sysConfigService.getBigDecimal("delay_shelving_rate_enable").equals(BigDecimal.ZERO) && delayTime != null) {
|
|
|
|
|
|
|
+ if (!sysConfigService.getBigDecimal("delay_shelving_rate_enable").equals(BigDecimal.ZERO) && delayTime != null && !delayTime.equals(1L)) {
|
|
|
serviceCharge = serviceCharge.multiply(getDelayShelvingRate(delayTime));
|
|
serviceCharge = serviceCharge.multiply(getDelayShelvingRate(delayTime));
|
|
|
}
|
|
}
|
|
|
//.multiply(saleBatch.getServiceCharge())
|
|
//.multiply(saleBatch.getServiceCharge())
|
|
@@ -120,7 +120,7 @@ public class DelegationService {
|
|
|
BigDecimal riseRate = extension.getRiseRate();
|
|
BigDecimal riseRate = extension.getRiseRate();
|
|
|
//BigDecimal riseRate = saleBatch.getRiseRate();
|
|
//BigDecimal riseRate = saleBatch.getRiseRate();
|
|
|
|
|
|
|
|
- if (!sysConfigService.getBigDecimal("delay_shelving_rate_enable").equals(BigDecimal.ZERO) && delayTime != null) {
|
|
|
|
|
|
|
+ if (!sysConfigService.getBigDecimal("delay_shelving_rate_enable").equals(BigDecimal.ZERO) && delayTime != null && !delayTime.equals(1L)) {
|
|
|
BigDecimal delayShelvingRate = getDelayShelvingRate(delayTime);
|
|
BigDecimal delayShelvingRate = getDelayShelvingRate(delayTime);
|
|
|
extensionServiceCharge = extensionServiceCharge.multiply(delayShelvingRate);
|
|
extensionServiceCharge = extensionServiceCharge.multiply(delayShelvingRate);
|
|
|
commissionRate = commissionRate.multiply(delayShelvingRate);
|
|
commissionRate = commissionRate.multiply(delayShelvingRate);
|