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
e7b98198
Commit
e7b98198
authored
Jun 06, 2023
by
jianshuqin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
FBA百论处理费调整为0
parent
ae0fea56
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
2 deletions
+3
-2
OrderSyncJob.java
...s-order/src/main/java/com/bailuntec/job/OrderSyncJob.java
+3
-2
No files found.
data-base/base-sync-oms-order/src/main/java/com/bailuntec/job/OrderSyncJob.java
View file @
e7b98198
...
@@ -205,7 +205,7 @@ public class OrderSyncJob extends PointJob {
...
@@ -205,7 +205,7 @@ public class OrderSyncJob extends PointJob {
}
}
}
}
bailunSkuStructure
.
setBailunSku
(
bailunSkuObj
.
getBailunSku
());
bailunSkuStructure
.
setBailunSku
(
bailunSkuObj
.
getBailunSku
());
bailunSkuStructure
.
setBailunSkuUnitPrice
(((
bailunSkuObj
.
getBailunSkuUnitPrice
()
!=
null
&&
bailunSkuObj
.
getBailunSkuUnitPrice
().
getAmount
()
!=
null
)
?
bailunSkuObj
.
getBailunSkuUnitPrice
().
getAmount
()
:
BigDecimal
.
ZERO
).
multiply
(
bailunSkuObj
.
getBailunSkuUnitPrice
().
getExchangeRate
()
!=
null
?
bailunSkuObj
.
getBailunSkuUnitPrice
().
getExchangeRate
()
:
BigDecimal
.
ONE
));
bailunSkuStructure
.
setBailunSkuUnitPrice
(((
bailunSkuObj
.
getBailunSkuUnitPrice
()
!=
null
&&
bailunSkuObj
.
getBailunSkuUnitPrice
().
getAmount
()
!=
null
)
?
bailunSkuObj
.
getBailunSkuUnitPrice
().
getAmount
()
:
BigDecimal
.
ZERO
).
multiply
(
bailunSkuObj
.
getBailunSkuUnitPrice
().
getExchangeRate
()
!=
null
&&
bailunSkuObj
.
getBailunSkuUnitPrice
().
getExchangeRate
().
compareTo
(
BigDecimal
.
ZERO
)
==
1
?
bailunSkuObj
.
getBailunSkuUnitPrice
().
getExchangeRate
()
:
BigDecimal
.
ONE
));
bailunSkuStructure
.
setBailunSkuWeight
(
bailunSkuObj
.
getBailunSkuWeight
()
!=
null
?
bailunSkuObj
.
getBailunSkuWeight
()
:
BigDecimal
.
ZERO
);
bailunSkuStructure
.
setBailunSkuWeight
(
bailunSkuObj
.
getBailunSkuWeight
()
!=
null
?
bailunSkuObj
.
getBailunSkuWeight
()
:
BigDecimal
.
ZERO
);
bailunSkuStructure
.
setSkuCostRatio
(
dcBaseOmsOrder
.
getCostProduct
().
compareTo
(
BigDecimal
.
ZERO
)
==
1
?
bailunSkuStructure
.
getBailunSkuUnitPrice
().
multiply
(
BigDecimal
.
valueOf
(
bailunSkuObj
.
getBailunSkuQuantityOrdered
())).
divide
(
dcBaseOmsOrder
.
getCostProduct
(),
5
,
RoundingMode
.
HALF_EVEN
)
:
BigDecimal
.
ONE
);
bailunSkuStructure
.
setSkuCostRatio
(
dcBaseOmsOrder
.
getCostProduct
().
compareTo
(
BigDecimal
.
ZERO
)
==
1
?
bailunSkuStructure
.
getBailunSkuUnitPrice
().
multiply
(
BigDecimal
.
valueOf
(
bailunSkuObj
.
getBailunSkuQuantityOrdered
())).
divide
(
dcBaseOmsOrder
.
getCostProduct
(),
5
,
RoundingMode
.
HALF_EVEN
)
:
BigDecimal
.
ONE
);
bailunSkuStructure
.
setSkuWeightRatio
(
bailunSkuCumulative
.
getTotalWeight
().
compareTo
(
BigDecimal
.
ZERO
)
==
1
?
bailunSkuStructure
.
getBailunSkuWeight
().
multiply
(
BigDecimal
.
valueOf
(
bailunSkuObj
.
getBailunSkuQuantityOrdered
())).
divide
(
bailunSkuCumulative
.
getTotalWeight
(),
5
,
RoundingMode
.
HALF_EVEN
)
:
BigDecimal
.
ONE
);
bailunSkuStructure
.
setSkuWeightRatio
(
bailunSkuCumulative
.
getTotalWeight
().
compareTo
(
BigDecimal
.
ZERO
)
==
1
?
bailunSkuStructure
.
getBailunSkuWeight
().
multiply
(
BigDecimal
.
valueOf
(
bailunSkuObj
.
getBailunSkuQuantityOrdered
())).
divide
(
bailunSkuCumulative
.
getTotalWeight
(),
5
,
RoundingMode
.
HALF_EVEN
)
:
BigDecimal
.
ONE
);
...
@@ -905,7 +905,8 @@ public class OrderSyncJob extends PointJob {
...
@@ -905,7 +905,8 @@ public class OrderSyncJob extends PointJob {
costBailunHandle
=
BigDecimal
.
ONE
;
//普货1元一个单
costBailunHandle
=
BigDecimal
.
ONE
;
//普货1元一个单
}
}
}
else
if
(
bailunSkuCumulative
.
getFbaWarehouse
())
{
}
else
if
(
bailunSkuCumulative
.
getFbaWarehouse
())
{
costBailunHandle
=
BigDecimal
.
valueOf
(
1.2
);
//FBA的1.2元一个单
//costBailunHandle = BigDecimal.valueOf(1.2); //FBA的1.2元一个单
costBailunHandle
=
BigDecimal
.
ZERO
;
//FBA改为0元一个单 2023.6.6 李静雯需求
}
}
dcBaseOmsOrder
.
setCostHandleBailun
(
costBailunHandle
);
dcBaseOmsOrder
.
setCostHandleBailun
(
costBailunHandle
);
}
}
...
...
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