Commit e1db2e73 by huluobin

# update

parent d8bbd0d5
...@@ -403,6 +403,7 @@ public class AutoTurnoverJob extends PointJob { ...@@ -403,6 +403,7 @@ public class AutoTurnoverJob extends PointJob {
long time = System.currentTimeMillis(); long time = System.currentTimeMillis();
log.info(Long.toString(time)); log.info(Long.toString(time));
forecastSalesList = autoTurnoverService.getAutoTurnoverSaleDetails(dcAutoTurnover, turnoverDays, autoForecastDay); forecastSalesList = autoTurnoverService.getAutoTurnoverSaleDetails(dcAutoTurnover, turnoverDays, autoForecastDay);
List<String> forecastSalesListFormula = autoTurnoverService.getAutoTurnoverSaleDetailsFormula(dcAutoTurnover, turnoverDays, autoForecastDay);
log.info(Long.toString(System.currentTimeMillis() - time)); log.info(Long.toString(System.currentTimeMillis() - time));
AtomicReference<LocalDate> localDate = new AtomicReference<>(LocalDate.now()); AtomicReference<LocalDate> localDate = new AtomicReference<>(LocalDate.now());
...@@ -447,7 +448,6 @@ public class AutoTurnoverJob extends PointJob { ...@@ -447,7 +448,6 @@ public class AutoTurnoverJob extends PointJob {
// dcAutoTurnover.setSalesDetails("[" + salesDetailItemList.stream().map(SalesDetailItem::getShowSales).map(BigDecimal::toString).collect(Collectors.joining(",")) + "]"); // dcAutoTurnover.setSalesDetails("[" + salesDetailItemList.stream().map(SalesDetailItem::getShowSales).map(BigDecimal::toString).collect(Collectors.joining(",")) + "]");
/*周系数end*/ /*周系数end*/
List<String> forecastSalesListFormula = autoTurnoverService.getAutoTurnoverSaleDetailsFormula(dcAutoTurnover, turnoverDays, autoForecastDay);
// forecastSalesList = salesDetailItemList.stream().map(SalesDetailItem::getShowSales).collect(Collectors.toList()); // forecastSalesList = salesDetailItemList.stream().map(SalesDetailItem::getShowSales).collect(Collectors.toList());
......
...@@ -125,8 +125,8 @@ public class AutoTurnoverServiceImpl implements AutoTurnoverService { ...@@ -125,8 +125,8 @@ public class AutoTurnoverServiceImpl implements AutoTurnoverService {
.multiply(dcAutoSalesForecastStageConfig.getThreeN2()) .multiply(dcAutoSalesForecastStageConfig.getThreeN2())
.add(dcBaseOmsSkuMapper.omsSkuSellerCount(midNight.minusDays(dcAutoSalesForecastStageConfig.getThreeN3().intValue()), midNight, bailunSku, warehouseCode, threeN3 == 0 ? 1 : threeN3, dcAutoSalesForecastConfig.getDataSourcePlatform()) .add(dcBaseOmsSkuMapper.omsSkuSellerCount(midNight.minusDays(dcAutoSalesForecastStageConfig.getThreeN3().intValue()), midNight, bailunSku, warehouseCode, threeN3 == 0 ? 1 : threeN3, dcAutoSalesForecastConfig.getDataSourcePlatform())
.multiply(dcAutoSalesForecastStageConfig.getThreeN4())) .multiply(dcAutoSalesForecastStageConfig.getThreeN4()))
.add(dcBaseOmsSkuMapper.omsSkuSellerCount(midNight.minusDays(dcAutoSalesForecastStageConfig.getThreeN5().intValue()), midNight, bailunSku, warehouseCode, threeN5 == 0 ? 1 : threeN5, dcAutoSalesForecastConfig.getDataSourcePlatform())) .add(dcBaseOmsSkuMapper.omsSkuSellerCount(midNight.minusDays(dcAutoSalesForecastStageConfig.getThreeN5().intValue()), midNight, bailunSku, warehouseCode, threeN5 == 0 ? 1 : threeN5, dcAutoSalesForecastConfig.getDataSourcePlatform())
.multiply(dcAutoSalesForecastStageConfig.getThreeN6()); .multiply(dcAutoSalesForecastStageConfig.getThreeN6()));
for (int i = 0; i < duration3; i++) { for (int i = 0; i < duration3; i++) {
if (autoForecastDay >= forecastSalesDetails.size()) { if (autoForecastDay >= forecastSalesDetails.size()) {
......
...@@ -262,7 +262,7 @@ public class AutoTurnoverTest { ...@@ -262,7 +262,7 @@ public class AutoTurnoverTest {
public void testXX2() { public void testXX2() {
DcBaseStock dcBaseStock = SessionUtil.getSession().getMapper(DcBaseStockMapper.class) DcBaseStock dcBaseStock = SessionUtil.getSession().getMapper(DcBaseStockMapper.class)
.selectOneByExample(DcBaseStockExample.newAndCreateCriteria() .selectOneByExample(DcBaseStockExample.newAndCreateCriteria()
.andBailunSkuEqualTo("951467301") .andBailunSkuEqualTo("950875101")
.andWarehouseCodeEqualTo("GZBLWH") .andWarehouseCodeEqualTo("GZBLWH")
.example()); .example());
try { try {
......
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