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
51c1df6a
Commit
51c1df6a
authored
Nov 26, 2020
by
yu.sun
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
sunyu::update::fix bug about material about originPrice
parent
f07cd9f5
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
3 deletions
+6
-3
shopping-cart-application-service/src/main/java/cn/freemud/service/impl/mcoffee/calculation/CalculationServiceImpl.java
+6
-3
No files found.
shopping-cart-application-service/src/main/java/cn/freemud/service/impl/mcoffee/calculation/CalculationServiceImpl.java
View file @
51c1df6a
...
@@ -412,7 +412,8 @@ public class CalculationServiceImpl {
...
@@ -412,7 +412,8 @@ public class CalculationServiceImpl {
material
.
setType
(
2
);
material
.
setType
(
2
);
material
.
setGoodsId
(
materialGoods
.
getGoodsId
());
material
.
setGoodsId
(
materialGoods
.
getGoodsId
());
material
.
setGoodsQuantity
(
materialGoods
.
getQty
());
material
.
setGoodsQuantity
(
materialGoods
.
getQty
());
material
.
setOriginalPrice
(
materialGoods
.
getFinalPrice
());
material
.
setOriginalPrice
(
null
!=
materialGoods
.
getFinalPrice
()
?
materialGoods
.
getFinalPrice
()
:
0
);
materials
.
add
(
material
);
materials
.
add
(
material
);
}
}
}
}
...
@@ -430,7 +431,8 @@ public class CalculationServiceImpl {
...
@@ -430,7 +431,8 @@ public class CalculationServiceImpl {
material
.
setType
(
1
);
material
.
setType
(
1
);
material
.
setGoodsId
(
materialGoods2
.
getSpuId
());
material
.
setGoodsId
(
materialGoods2
.
getSpuId
());
material
.
setGoodsQuantity
(
1
);
material
.
setGoodsQuantity
(
1
);
material
.
setOriginalPrice
(
materialGoods2
.
getFinalPrice
());
material
.
setOriginalPrice
(
null
!=
materialGoods2
.
getFinalPrice
()
?
materialGoods2
.
getFinalPrice
()
:
0
);
materials
.
add
(
material
);
materials
.
add
(
material
);
}
}
}
}
...
@@ -444,7 +446,8 @@ public class CalculationServiceImpl {
...
@@ -444,7 +446,8 @@ public class CalculationServiceImpl {
material
.
setType
(
1
);
material
.
setType
(
1
);
material
.
setGoodsId
(
materialGoods
.
getSpuId
());
material
.
setGoodsId
(
materialGoods
.
getSpuId
());
material
.
setGoodsQuantity
(
1
);
material
.
setGoodsQuantity
(
1
);
material
.
setOriginalPrice
(
materialGoods
.
getOriginalPrice
());
material
.
setOriginalPrice
(
null
!=
materialGoods
.
getOriginalPrice
()
?
materialGoods
.
getOriginalPrice
()
:
0
);
material
.
setNowPrice
(
materialGoods
.
getFinalPrice
().
intValue
());
material
.
setNowPrice
(
materialGoods
.
getFinalPrice
().
intValue
());
materials
.
add
(
material
);
materials
.
add
(
material
);
}
}
...
...
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