wuyi 2 år sedan
förälder
incheckning
9a0456e981

+ 2 - 2
src/main/java/com/izouma/awesomeAdmin/service/DelegationService.java

@@ -68,7 +68,7 @@ public class DelegationService {
         SalesBatchExtension extension = extensionService.getDetailByBathIdAndPrice(saleBatch.getId(), product.getCurrentPrice());
         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));
         }
         //.multiply(saleBatch.getServiceCharge())
@@ -120,7 +120,7 @@ public class DelegationService {
         BigDecimal riseRate = extension.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);
             extensionServiceCharge = extensionServiceCharge.multiply(delayShelvingRate);
             commissionRate = commissionRate.multiply(delayShelvingRate);