Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
D
dc-java
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
bltdc
dc-java
Commits
9ea3c937
Commit
9ea3c937
authored
Nov 21, 2019
by
yinyong
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
根据销量做线性回归数据计算修复
parent
b7f75b54
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
4 deletions
+5
-4
DcAutoSalesMapper.java
...src/main/java/com/bailuntec/mapper/DcAutoSalesMapper.java
+2
-1
AutoTurnoverJob.java
...over/src/main/java/com/bailuntec/job/AutoTurnoverJob.java
+3
-3
No files found.
data-common/src/main/java/com/bailuntec/mapper/DcAutoSalesMapper.java
View file @
9ea3c937
...
@@ -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
data-show/show-auto-turnover/src/main/java/com/bailuntec/job/AutoTurnoverJob.java
View file @
9ea3c937
...
@@ -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
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment