Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
J
jiedao-api-boot-master
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
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
lanbaoming
jiedao-api-boot-master
Commits
3dfa7aba
Commit
3dfa7aba
authored
Aug 30, 2024
by
huyf
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
空运提单计算总金额错误bug
(cherry picked from commit
9e1f0f99
)
parent
fecfe8e5
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
1 deletion
+4
-1
MakeBillOfLadingServiceImpl.java
...service/makeBillOfLading/MakeBillOfLadingServiceImpl.java
+1
-1
ReceivableOrderPayedFeeTypeVO.java
...e/wealth/vo/receivable/ReceivableOrderPayedFeeTypeVO.java
+3
-0
No files found.
yudao-module-shipment/yudao-module-shipment-core/src/main/java/cn/iocoder/yudao/module/shipment/service/makeBillOfLading/MakeBillOfLadingServiceImpl.java
View file @
3dfa7aba
...
@@ -1184,7 +1184,7 @@ public class MakeBillOfLadingServiceImpl extends AbstractService<MakeBillOfLadin
...
@@ -1184,7 +1184,7 @@ public class MakeBillOfLadingServiceImpl extends AbstractService<MakeBillOfLadin
BigDecimal
totalLeft
=
new
BigDecimal
(
"0"
);
BigDecimal
totalLeft
=
new
BigDecimal
(
"0"
);
BigDecimal
totalRight
=
new
BigDecimal
(
"0"
);
BigDecimal
totalRight
=
new
BigDecimal
(
"0"
);
StringBuffer
stringBuffer
=
new
StringBuffer
();
StringBuffer
stringBuffer
=
new
StringBuffer
();
List
<
ReceivableOrderPayedFeeTypeVO
>
receivableYunFeiList
=
payedFeeTypeVOList
.
stream
().
filter
(
i
->
i
.
getFeeType
()
==
1
).
collect
(
Collectors
.
toList
());
List
<
ReceivableOrderPayedFeeTypeVO
>
receivableYunFeiList
=
payedFeeTypeVOList
.
stream
().
filter
(
i
->
i
.
getFeeType
()
==
1
&&
i
.
getFeeSource
()
==
1
).
collect
(
Collectors
.
toList
());
for
(
ReceivableOrderPayedFeeTypeVO
i
:
receivableYunFeiList
)
{
for
(
ReceivableOrderPayedFeeTypeVO
i
:
receivableYunFeiList
)
{
if
(
i
.
getCurrencyId
()
!=
1L
)
{
if
(
i
.
getCurrencyId
()
!=
1L
)
{
totalLeft
=
totalLeft
.
add
(
changeAmountToDestCurrency
(
i
.
getCurrencyId
(),
1L
,
i
.
getTotalAmount
()));
totalLeft
=
totalLeft
.
add
(
changeAmountToDestCurrency
(
i
.
getCurrencyId
(),
1L
,
i
.
getTotalAmount
()));
...
...
yudao-module-wealth/yudao-module-wealth-core/src/main/java/cn/iocoder/yudao/module/wealth/vo/receivable/ReceivableOrderPayedFeeTypeVO.java
View file @
3dfa7aba
...
@@ -43,6 +43,9 @@ public class ReceivableOrderPayedFeeTypeVO {
...
@@ -43,6 +43,9 @@ public class ReceivableOrderPayedFeeTypeVO {
@ApiModelProperty
(
value
=
"收款单id"
)
@ApiModelProperty
(
value
=
"收款单id"
)
private
Long
receiptId
;
private
Long
receiptId
;
@ApiModelProperty
(
value
=
"费用来源:1 订单计算 2 费用申请 3 特需费用"
)
private
Integer
feeSource
;
...
...
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