Commit 9ea3c937 by yinyong

根据销量做线性回归数据计算修复

parent b7f75b54
...@@ -134,7 +134,7 @@ public interface DcAutoSalesMapper { ...@@ -134,7 +134,7 @@ public interface DcAutoSalesMapper {
SalesVolumeWeekDTO getSalesVolumeWeekDTO(@Param("bailunSku") String bailunSku, @Param("warehouseCode") String warehouseCode); SalesVolumeWeekDTO getSalesVolumeWeekDTO(@Param("bailunSku") String bailunSku, @Param("warehouseCode") String warehouseCode);
SalesVolumeDTO getSalesVolumeDTO(@Param("queryTime") String queryTime, @Param("bailunSku") String bailunSku, @Param("warehouseCode") String warehouseCode, @Param("compareSales") BigDecimal compareSales); SalesVolumeDTO getSalesVolumeDTO(@Param("queryTime") String queryTime, @Param("bailunSku") String bailunSku, @Param("warehouseCode") String warehouseCode, @Param("compareSales") int compareSales);
SalesVolumeAvgDTO getPlatformHistorySales( @Param("bailunSku") String bailunSku,@Param("warehouseCode") String warehouseCode,@Param("platform") String platform); SalesVolumeAvgDTO getPlatformHistorySales( @Param("bailunSku") String bailunSku,@Param("warehouseCode") String warehouseCode,@Param("platform") String platform);
} }
\ No newline at end of file
...@@ -149,7 +149,7 @@ public class AutoTurnoverJob extends PointJob { ...@@ -149,7 +149,7 @@ public class AutoTurnoverJob extends PointJob {
DcBaseWarehouseMapper baseWarehouseMapper = SessionUtil.getSession().getMapper(DcBaseWarehouseMapper.class); DcBaseWarehouseMapper baseWarehouseMapper = SessionUtil.getSession().getMapper(DcBaseWarehouseMapper.class);
dcBaseWarehouse = baseWarehouseMapper.selectOneByExample(DcBaseWarehouseExample.newAndCreateCriteria().andWarehouseCodeEqualTo(warehouseCode).example()); dcBaseWarehouse = baseWarehouseMapper.selectOneByExample(DcBaseWarehouseExample.newAndCreateCriteria().andWarehouseCodeEqualTo(warehouseCode).example());
BigDecimal incrementalRatio = BigDecimal.ONE; BigDecimal incrementalRatio = BigDecimal.ONE;
BigDecimal compareSales = BigDecimal.ZERO; int compareSales = 0;
DcAutoSalesMapper autoSalesMapper = null; DcAutoSalesMapper autoSalesMapper = null;
SalesVolumeDTO salesVolumeDTO = null; SalesVolumeDTO salesVolumeDTO = null;
autoSalesMapper = SessionUtil.getSession().getMapper(DcAutoSalesMapper.class); autoSalesMapper = SessionUtil.getSession().getMapper(DcAutoSalesMapper.class);
...@@ -161,10 +161,10 @@ public class AutoTurnoverJob extends PointJob { ...@@ -161,10 +161,10 @@ public class AutoTurnoverJob extends PointJob {
} }
if(dcAutoUprushConfig != null && map != null) { if(dcAutoUprushConfig != null && map != null) {
incrementalRatio = incrementalRatio.add(dcAutoUprushConfig.getPercentage()); incrementalRatio = incrementalRatio.add(dcAutoUprushConfig.getPercentage());
compareSales = (map.get("seven_sales").add(map.get("fourteen_sales"))).divide(BigDecimal.valueOf(2), RoundingMode.HALF_EVEN).multiply(incrementalRatio); compareSales = (map.get("seven_sales").add(map.get("fourteen_sales"))).divide(BigDecimal.valueOf(2), RoundingMode.HALF_EVEN).multiply(incrementalRatio).intValue();
} }
autoSalesMapper = SessionUtil.getSession().getMapper(DcAutoSalesMapper.class); autoSalesMapper = SessionUtil.getSession().getMapper(DcAutoSalesMapper.class);
if(compareSales.compareTo(BigDecimal.ZERO) == 0) { if(compareSales == 0) {
salesVolumeDTO = autoSalesMapper.getSalesVolumeDTONoCompare(queryTime, bailunSku, warehouseCode); salesVolumeDTO = autoSalesMapper.getSalesVolumeDTONoCompare(queryTime, bailunSku, warehouseCode);
}else { }else {
salesVolumeDTO = autoSalesMapper.getSalesVolumeDTO(queryTime, bailunSku, warehouseCode, compareSales); salesVolumeDTO = autoSalesMapper.getSalesVolumeDTO(queryTime, bailunSku, warehouseCode, compareSales);
......
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