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
huluobin
dc-java
Commits
df97de0a
Commit
df97de0a
authored
Sep 03, 2020
by
huluobin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
订单sku
parent
8322a5c4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
54 additions
and
4 deletions
+54
-4
OrderSyncJob.java
...s-order/src/main/java/com/bailuntec/job/OrderSyncJob.java
+10
-2
job.properties
...ase/base-sync-oms-order/src/main/resources/job.properties
+2
-2
OrderSyncJobTest.java
...der/src/test/java/com/bailuntec/job/OrderSyncJobTest.java
+16
-0
DcDailySalesMapperTest.java
...est/java/com/bailuntec/mapper/DcDailySalesMapperTest.java
+26
-0
No files found.
data-base/base-sync-oms-order/src/main/java/com/bailuntec/job/OrderSyncJob.java
View file @
df97de0a
...
@@ -592,7 +592,11 @@ public class OrderSyncJob extends PointJob {
...
@@ -592,7 +592,11 @@ public class OrderSyncJob extends PointJob {
* @param totalCostFirst
* @param totalCostFirst
* @return
* @return
*/
*/
private
BigDecimal
caculateCostFirst
(
DcBaseWarehouse
dcBaseWarehouse
,
DcBaseOmsSku
dcBaseOmsSku
,
BailunSkuStructure
bailunSkuStructure
,
BigDecimal
totalCostFirst
,
DcBaseOmsOrder
dcBaseOmsOrder
)
{
private
BigDecimal
caculateCostFirst
(
DcBaseWarehouse
dcBaseWarehouse
,
DcBaseOmsSku
dcBaseOmsSku
,
BailunSkuStructure
bailunSkuStructure
,
BigDecimal
totalCostFirst
,
DcBaseOmsOrder
dcBaseOmsOrder
)
{
//MARKETING平台 如果是耗材仓的,产品成本和头程费不参与利润统计
//MARKETING平台 如果是耗材仓的,产品成本和头程费不参与利润统计
if
(
dcBaseOmsOrder
.
getPlatformType
().
toUpperCase
().
equals
(
PlatformType
.
Marketing
.
value
())
&&
((
dcBaseWarehouse
!=
null
&&
Constant
.
CONSUMABLES_WAREHOUSE
.
equals
(
dcBaseWarehouse
.
getHqType
()))
||
dcBaseOmsOrder
.
getHasTransferOrder
()))
{
if
(
dcBaseOmsOrder
.
getPlatformType
().
toUpperCase
().
equals
(
PlatformType
.
Marketing
.
value
())
&&
((
dcBaseWarehouse
!=
null
&&
Constant
.
CONSUMABLES_WAREHOUSE
.
equals
(
dcBaseWarehouse
.
getHqType
()))
||
dcBaseOmsOrder
.
getHasTransferOrder
()))
{
...
@@ -610,7 +614,11 @@ public class OrderSyncJob extends PointJob {
...
@@ -610,7 +614,11 @@ public class OrderSyncJob extends PointJob {
}
}
}*/
}*/
DcMidCostFirstMapper
mapper
=
SessionUtil
.
getSession
().
getMapper
(
DcMidCostFirstMapper
.
class
);
DcMidCostFirstMapper
mapper
=
SessionUtil
.
getSession
().
getMapper
(
DcMidCostFirstMapper
.
class
);
DcMidCostFirst
dcMidCostFirst
=
mapper
.
selectOneByExample
(
DcMidCostFirstExample
.
newAndCreateCriteria
().
andBailunSkuEqualTo
(
dcBaseOmsSku
.
getBailunSku
()).
andWarehouseCodeEqualTo
(
dcBaseWarehouse
.
getWarehouseCode
()).
example
());
DcMidCostFirst
dcMidCostFirst
=
mapper
.
selectOneByExample
(
DcMidCostFirstExample
.
newAndCreateCriteria
()
.
andBailunSkuEqualTo
(
dcBaseOmsSku
.
getBailunSku
())
.
andWarehouseCodeEqualTo
(
dcBaseWarehouse
.
getWarehouseCode
())
.
example
());
//如果dcMidCostFirst查不到,铭哥那边商量好了,头程0的,先跑调拨单,若是真是之前的SKU无法找到的,那就取值38元1KG来计算。
//如果dcMidCostFirst查不到,铭哥那边商量好了,头程0的,先跑调拨单,若是真是之前的SKU无法找到的,那就取值38元1KG来计算。
if
(
dcMidCostFirst
==
null
)
{
if
(
dcMidCostFirst
==
null
)
{
dcMidCostFirst
=
new
DcMidCostFirst
();
dcMidCostFirst
=
new
DcMidCostFirst
();
...
...
data-base/base-sync-oms-order/src/main/resources/job.properties
View file @
df97de0a
...
@@ -17,6 +17,6 @@ JOB_NAME30=base-sync-oms-skus30
...
@@ -17,6 +17,6 @@ JOB_NAME30=base-sync-oms-skus30
#JOB_NAME=base-sync-oms-order
#JOB_NAME=base-sync-oms-order
JOB_CRON30
=
0 0 22,23,00 * * ? *
JOB_CRON30
=
0 0 22,23,00 * * ? *
JOB_COROUTINE_NAME
=
base-sync-oms-order-
coroutine
JOB_COROUTINE_NAME
=
base-sync-oms-order-
task
JOB_COROUTINE_CRON
=
0
1
16 * * ?
JOB_COROUTINE_CRON
=
0
30
16 * * ?
SHARDING_TOTAL_COUNT
=
1
SHARDING_TOTAL_COUNT
=
1
data-base/base-sync-oms-order/src/test/java/com/bailuntec/job/OrderSyncJobTest.java
View file @
df97de0a
...
@@ -11,6 +11,7 @@ import com.dangdang.ddframe.job.executor.ShardingContexts;
...
@@ -11,6 +11,7 @@ import com.dangdang.ddframe.job.executor.ShardingContexts;
import
org.apache.ibatis.session.SqlSession
;
import
org.apache.ibatis.session.SqlSession
;
import
org.junit.jupiter.api.Test
;
import
org.junit.jupiter.api.Test
;
import
java.math.BigDecimal
;
import
java.util.HashMap
;
import
java.util.HashMap
;
/**
/**
...
@@ -53,4 +54,19 @@ public class OrderSyncJobTest {
...
@@ -53,4 +54,19 @@ public class OrderSyncJobTest {
}
}
@Test
public
void
testBigDecimal
()
{
BigDecimal
totalCost
=
BigDecimal
.
ONE
;
totalCost
=
this
.
calc
(
totalCost
);
System
.
out
.
println
(
totalCost
);
}
private
BigDecimal
calc
(
BigDecimal
totalCost
)
{
totalCost
=
totalCost
.
add
(
BigDecimal
.
TEN
);
return
totalCost
;
}
}
}
data-common/src/test/java/com/bailuntec/mapper/DcDailySalesMapperTest.java
0 → 100644
View file @
df97de0a
package
com
.
bailuntec
.
mapper
;
import
com.bailuntec.utils.SessionUtil
;
import
org.junit.jupiter.api.Test
;
/**
* <p>
*
* </p>
*
* @author robbendev
* @since 2020/9/3 4:04 下午
*/
class
DcDailySalesMapperTest
{
@Test
void
calculateSales
()
{
try
{
DcDailySalesMapper
dcDailySalesMapper
=
SessionUtil
.
getSession
().
getMapper
(
DcDailySalesMapper
.
class
);
dcDailySalesMapper
.
calculateSales
();
}
finally
{
SessionUtil
.
closeSession
();
}
}
}
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