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
45507a1b
Commit
45507a1b
authored
Nov 08, 2019
by
yinyong
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
更改头程费规则重跑10月份数据
parent
2491e787
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
4 deletions
+5
-4
OrderSyncJob.java
...s-order/src/main/java/com/bailuntec/job/OrderSyncJob.java
+2
-2
job.properties
...ase/base-sync-oms-order/src/main/resources/job.properties
+3
-2
No files found.
data-base/base-sync-oms-order/src/main/java/com/bailuntec/job/OrderSyncJob.java
View file @
45507a1b
...
@@ -514,7 +514,7 @@ public class OrderSyncJob extends PointJob {
...
@@ -514,7 +514,7 @@ public class OrderSyncJob extends PointJob {
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
)
{
if
(
dcBaseWarehouse
!=
null
&&
!
dcBaseWarehouse
.
getHqType
().
equals
(
Constant
.
DOMESTIC_WAREHOUSE
)
&&
dcBaseOmsSku
.
getBailunSkuQuantityShipped
()
>
0
)
{
if
(
dcBaseWarehouse
!=
null
&&
!
dcBaseWarehouse
.
getHqType
().
equals
(
Constant
.
DOMESTIC_WAREHOUSE
)
&&
dcBaseOmsSku
.
getBailunSkuQuantityShipped
()
>
0
)
{
//如果存在不更新头程费
//如果存在不更新头程费
DcBaseOmsOrderMapper
omsOrderMapper
=
SessionUtil
.
getSession
().
getMapper
(
DcBaseOmsOrderMapper
.
class
);
/*
DcBaseOmsOrderMapper omsOrderMapper = SessionUtil.getSession().getMapper(DcBaseOmsOrderMapper.class);
DcBaseOmsOrder dcBaseOmsOrder1 = omsOrderMapper.selectOneByExample(DcBaseOmsOrderExample.newAndCreateCriteria().andOriginOrderIdEqualTo(dcBaseOmsOrder.getOriginOrderId()).andBailunAccountIdEqualTo(dcBaseOmsOrder.getBailunAccountId()).example());
DcBaseOmsOrder dcBaseOmsOrder1 = omsOrderMapper.selectOneByExample(DcBaseOmsOrderExample.newAndCreateCriteria().andOriginOrderIdEqualTo(dcBaseOmsOrder.getOriginOrderId()).andBailunAccountIdEqualTo(dcBaseOmsOrder.getBailunAccountId()).example());
if(dcBaseOmsOrder1 != null && dcBaseOmsOrder1.getCostFirst().compareTo(BigDecimal.ZERO) == 1) {
if(dcBaseOmsOrder1 != null && dcBaseOmsOrder1.getCostFirst().compareTo(BigDecimal.ZERO) == 1) {
DcBaseOmsSkuMapper omsSkuMapper = SessionUtil.getSession().getMapper(DcBaseOmsSkuMapper.class);
DcBaseOmsSkuMapper omsSkuMapper = SessionUtil.getSession().getMapper(DcBaseOmsSkuMapper.class);
...
@@ -523,7 +523,7 @@ public class OrderSyncJob extends PointJob {
...
@@ -523,7 +523,7 @@ public class OrderSyncJob extends PointJob {
dcBaseOmsSku.setCostFirst(dcBaseOmsSku1.getCostFirst());
dcBaseOmsSku.setCostFirst(dcBaseOmsSku1.getCostFirst());
return dcBaseOmsOrder1.getCostFirst();
return dcBaseOmsOrder1.getCostFirst();
}
}
}
}
*/
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来计算。
...
...
data-base/base-sync-oms-order/src/main/resources/job.properties
View file @
45507a1b
...
@@ -9,7 +9,7 @@ EVENT_RDB_STORAGE_USERNAME=root
...
@@ -9,7 +9,7 @@ EVENT_RDB_STORAGE_USERNAME=root
EVENT_RDB_STORAGE_PASSWORD
=
#7kfnymAM$Y9-Ntf
EVENT_RDB_STORAGE_PASSWORD
=
#7kfnymAM$Y9-Ntf
ZOOKEEPER_SERVER=172.31.255.120:2181
ZOOKEEPER_SERVER=172.31.255.120:2181
NAME_SPACE
=
data-center
NAME_SPACE
=
data-center
JOB_NAME
=
base-sync-oms-order-coroutine
#
JOB_NAME=base-sync-oms-order-coroutine
#
JOB_NAME=base-sync-oms-order
JOB_NAME
=
base-sync-oms-order
JOB_CRON
=
0/1 * * * * ? *
JOB_CRON
=
0/1 * * * * ? *
SHARDING_TOTAL_COUNT
=
1
SHARDING_TOTAL_COUNT
=
1
\ No newline at end of file
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