Skip to content

D
dc-java
Commit 1e7b8395 by yinyong
Options

Merge remote-tracking branch 'origin/master'

parents 02ae5ae6 0c4e6d82
Showing with 6 additions and 6 deletions
data-show/show-auto-turnover/src/main/java/com/bailuntec/job/AutoTurnoverJob.java
...@@ -1089,7 +1089,7 @@ public class AutoTurnoverJob extends PointJob { ...@@ -1089,7 +1089,7 @@ public class AutoTurnoverJob extends PointJob {
add(BigDecimal.valueOf(historySalesList.get(16+j)).multiply(BigDecimal.valueOf(0.3))). add(BigDecimal.valueOf(historySalesList.get(16+j)).multiply(BigDecimal.valueOf(0.3))).
add(BigDecimal.valueOf(historySalesList.get(23+j)).multiply(BigDecimal.valueOf(0.5))); add(BigDecimal.valueOf(historySalesList.get(23+j)).multiply(BigDecimal.valueOf(0.5)));
if(hasValue) { if(hasValue) {
forecastSales = forecastSales.multiply(BigDecimal.valueOf(weekRateList.get(weekTime-1)).compareTo(BigDecimal.ZERO) == 0 ? BigDecimal.ONE : BigDecimal.valueOf(weekRateList.get(weekTime-1))); forecastSales = forecastSales.multiply(BigDecimal.valueOf(weekRateList.get(weekTime)).compareTo(BigDecimal.ZERO) == 0 ? BigDecimal.ONE : BigDecimal.valueOf(weekRateList.get(weekTime)));
} }
}else if(7 <= j && j < 14) { }else if(7 <= j && j < 14) {
forecastSales = (BigDecimal.valueOf(historySalesList.get(2+j)).multiply(BigDecimal.valueOf(0.1))). forecastSales = (BigDecimal.valueOf(historySalesList.get(2+j)).multiply(BigDecimal.valueOf(0.1))).
...@@ -1100,10 +1100,10 @@ public class AutoTurnoverJob extends PointJob { ...@@ -1100,10 +1100,10 @@ public class AutoTurnoverJob extends PointJob {
if(weekTime > 51) { if(weekTime > 51) {
weekTime = weekTime - 51; weekTime = weekTime - 51;
} }
forecastSales = forecastSales.multiply(BigDecimal.valueOf(weekRateList.get(weekTime-1)).compareTo(BigDecimal.ZERO) == 0 ? BigDecimal.ONE : BigDecimal.valueOf(weekRateList.get(weekTime-1))); forecastSales = forecastSales.multiply(BigDecimal.valueOf(weekRateList.get(weekTime)).compareTo(BigDecimal.ZERO) == 0 ? BigDecimal.ONE : BigDecimal.valueOf(weekRateList.get(weekTime)));
} }
}else if(14 <= j && j < 21) { }else if(14 <= j && j < 21) {
forecastSales = (BigDecimal.valueOf(historySalesList.get(2+j)).multiply(BigDecimal.valueOf(0.1))). forecastSales = (BigDecimal.valueOf(historySalesList.get(2+j)).multiply(BigDecimal.valueOf(0.1))).
add(BigDecimal.valueOf(historySalesList.get(9+j)).multiply(BigDecimal.valueOf(0.1))). add(BigDecimal.valueOf(historySalesList.get(9+j)).multiply(BigDecimal.valueOf(0.1))).
add(forecastSalesList.get(j-14).multiply(BigDecimal.valueOf(0.3))). add(forecastSalesList.get(j-14).multiply(BigDecimal.valueOf(0.3))).
add(forecastSalesList.get(j-7).multiply(BigDecimal.valueOf(0.5))); add(forecastSalesList.get(j-7).multiply(BigDecimal.valueOf(0.5)));
...@@ -1111,7 +1111,7 @@ public class AutoTurnoverJob extends PointJob { ...@@ -1111,7 +1111,7 @@ public class AutoTurnoverJob extends PointJob {
if(weekTime > 50) { if(weekTime > 50) {
weekTime = weekTime - 50; weekTime = weekTime - 50;
} }
forecastSales = forecastSales.multiply(BigDecimal.valueOf(weekRateList.get(weekTime-1)).compareTo(BigDecimal.ZERO) == 0 ? BigDecimal.ONE : BigDecimal.valueOf(weekRateList.get(weekTime-1))); forecastSales = forecastSales.multiply(BigDecimal.valueOf(weekRateList.get(weekTime)).compareTo(BigDecimal.ZERO) == 0 ? BigDecimal.ONE : BigDecimal.valueOf(weekRateList.get(weekTime)));
} }
}else if(21 <= j && j < 27) { }else if(21 <= j && j < 27) {
forecastSales = (BigDecimal.valueOf(historySalesList.get(2+j)).multiply(BigDecimal.valueOf(0.1))). forecastSales = (BigDecimal.valueOf(historySalesList.get(2+j)).multiply(BigDecimal.valueOf(0.1))).
...@@ -1122,7 +1122,7 @@ public class AutoTurnoverJob extends PointJob { ...@@ -1122,7 +1122,7 @@ public class AutoTurnoverJob extends PointJob {
if(weekTime > 49) { if(weekTime > 49) {
weekTime = weekTime - 49; weekTime = weekTime - 49;
} }
forecastSales = forecastSales.multiply(BigDecimal.valueOf(weekRateList.get(weekTime-1)).compareTo(BigDecimal.ZERO) == 0 ? BigDecimal.ONE : BigDecimal.valueOf(weekRateList.get(weekTime-1))); forecastSales = forecastSales.multiply(BigDecimal.valueOf(weekRateList.get(weekTime)).compareTo(BigDecimal.ZERO) == 0 ? BigDecimal.ONE : BigDecimal.valueOf(weekRateList.get(weekTime)));
} }
}else if(27 <= j && j < autoForecastDay) { }else if(27 <= j && j < autoForecastDay) {
forecastSales = (forecastSalesList.get(j-27).multiply(BigDecimal.valueOf(0.1))). forecastSales = (forecastSalesList.get(j-27).multiply(BigDecimal.valueOf(0.1))).
...@@ -1133,7 +1133,7 @@ public class AutoTurnoverJob extends PointJob { ...@@ -1133,7 +1133,7 @@ public class AutoTurnoverJob extends PointJob {
if(weekTime > 48) { if(weekTime > 48) {
weekTime = weekTime - 48; weekTime = weekTime - 48;
} }
forecastSales = forecastSales.multiply(BigDecimal.valueOf(weekRateList.get(weekTime-1)).compareTo(BigDecimal.ZERO) == 0 ? BigDecimal.ONE : BigDecimal.valueOf(weekRateList.get(weekTime-1))); forecastSales = forecastSales.multiply(BigDecimal.valueOf(weekRateList.get(weekTime)).compareTo(BigDecimal.ZERO) == 0 ? BigDecimal.ONE : BigDecimal.valueOf(weekRateList.get(weekTime)));
} }
} }
forecastSalesList.set(j, forecastSales.compareTo(salesUpperLimit) == 1 ? salesUpperLimit : forecastSales); forecastSalesList.set(j, forecastSales.compareTo(salesUpperLimit) == 1 ? salesUpperLimit : forecastSales);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment