Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
O
order-group
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
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
order-group-application
order-group
Commits
d59212aa
Commit
d59212aa
authored
May 23, 2022
by
周晓航
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改bug,存在赠品的情况会被计算2次
parent
a50adbe4
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
5 deletions
+6
-5
order-application-service/src/main/java/cn/freemud/utils/DemoMain.java
+0
-0
order-management/src/main/java/cn/freemud/management/adapter/DeliverySdkAdapter.java
+6
-5
No files found.
order-application-service/src/main/java/cn/freemud/utils/DemoMain.java
View file @
d59212aa
This diff is collapsed.
Click to expand it.
order-management/src/main/java/cn/freemud/management/adapter/DeliverySdkAdapter.java
View file @
d59212aa
...
...
@@ -84,14 +84,15 @@ public class DeliverySdkAdapter {
}
BigDecimal
result
=
BigDecimal
.
ZERO
;
for
(
ProductBeanV1
p
:
productList
)
{
if
(
p
.
getIsSendGoods
())
{
continue
;
}
//
if (p.getIsSendGoods()) {
//
continue;
//
}
BigDecimal
sum
=
p
.
getWeight
().
multiply
(
new
BigDecimal
(
p
.
getNumber
()));
BigDecimal
comboSum
=
this
.
sumWeightByProduct
(
p
.
getComboProduct
());
BigDecimal
materSum
=
this
.
sumWeightByProduct
(
p
.
getMaterialProduct
());
BigDecimal
sendSum
=
this
.
sumWeightByProduct
(
p
.
getSendProduct
());
result
=
result
.
add
(
sum
).
add
(
comboSum
).
add
(
materSum
).
add
(
sendSum
);
// BigDecimal sendSum = this.sumWeightByProduct(p.getSendProduct());
// result = result.add(sum).add(comboSum).add(materSum).add(sendSum);
result
=
result
.
add
(
sum
).
add
(
comboSum
).
add
(
materSum
);
}
if
(
result
.
compareTo
(
BigDecimal
.
ZERO
)
<=
0
)
{
return
new
BigDecimal
(
"0.5"
);
...
...
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