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
bf6ee4b0
Commit
bf6ee4b0
authored
Nov 22, 2024
by
zhangfeng
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
feat(wealth): 创建收款单-应收明细
parent
9e33546a
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
27 additions
and
5 deletions
+27
-5
ReceivableDO.java
...module/wealth/dal/dataobject/receivable/ReceivableDO.java
+5
-0
ReceivableService.java
...o/module/wealth/service/receivable/ReceivableService.java
+2
-2
ReceivableServiceImpl.java
...dule/wealth/service/receivable/ReceivableServiceImpl.java
+9
-1
ReceivableBackVO.java
...r/yudao/module/wealth/vo/receivable/ReceivableBackVO.java
+8
-2
ReceivableBaseVO.java
...r/yudao/module/wealth/vo/receivable/ReceivableBaseVO.java
+3
-0
No files found.
yudao-module-wealth/yudao-module-wealth-core/src/main/java/cn/iocoder/yudao/module/wealth/dal/dataobject/receivable/ReceivableDO.java
View file @
bf6ee4b0
...
...
@@ -153,6 +153,11 @@ public class ReceivableDO extends BaseDO {
*/
private
BigDecimal
taxAmount
;
/**
* 基准金额
*/
private
BigDecimal
baseAmount
;
/**
* 备注
*/
...
...
yudao-module-wealth/yudao-module-wealth-core/src/main/java/cn/iocoder/yudao/module/wealth/service/receivable/ReceivableService.java
View file @
bf6ee4b0
...
...
@@ -135,10 +135,10 @@ public interface ReceivableService extends IService<ReceivableDO> {
List
<
WealthMoneyAmountVO
>
receivablePageAmount
(
@Valid
ReceivableQueryVO
query
);
/**
*
获得应收款分页
*
根据订单id获得应收款
*
* @param orderId 订单ID
* @return 应收款
分页
* @return 应收款
列表
*/
List
<
ReceivableBackVO
>
getReceivableByOrderId
(
Long
orderId
);
...
...
yudao-module-wealth/yudao-module-wealth-core/src/main/java/cn/iocoder/yudao/module/wealth/service/receivable/ReceivableServiceImpl.java
View file @
bf6ee4b0
...
...
@@ -254,7 +254,15 @@ public class ReceivableServiceImpl extends AbstractService<ReceivableMapper, Rec
@Override
public
List
<
ReceivableBackVO
>
getReceivableByOrderId
(
Long
orderId
)
{
return
receivableMapper
.
getReceivableByOrderId
(
orderId
);
List
<
ReceivableBackVO
>
receivableBackVOList
=
receivableMapper
.
getReceivableByOrderId
(
orderId
);
receivableBackVOList
.
forEach
(
receivableBackVO
->
{
if
(
receivableBackVO
.
getDiscountTotal
()
==
null
)
{
receivableBackVO
.
setDiscountTotal
(
BigDecimal
.
ZERO
);
}
receivableBackVO
.
setNotIncludedTaxAmount
(
receivableBackVO
.
getTotalAmount
());
receivableBackVO
.
setActualAmount
(
receivableBackVO
.
getTaxAmount
().
subtract
(
receivableBackVO
.
getDiscountTotal
()));
});
return
receivableBackVOList
;
}
...
...
yudao-module-wealth/yudao-module-wealth-core/src/main/java/cn/iocoder/yudao/module/wealth/vo/receivable/ReceivableBackVO.java
View file @
bf6ee4b0
...
...
@@ -213,10 +213,16 @@ public class ReceivableBackVO {
@ApiModelProperty
(
value
=
"含税金额"
)
private
BigDecimal
taxAmount
;
@ApiModelProperty
(
value
=
"不含税金额"
)
private
BigDecimal
notIncludedTaxAmount
;
@ApiModelProperty
(
value
=
"核销比例"
)
private
BigDecimal
writeOffProportion
;
//@ApiModelProperty(value = "基准币种汇率")
//private String exchangeRate;
@ApiModelProperty
(
value
=
"基准金额"
)
private
BigDecimal
baseAmount
;
@ApiModelProperty
(
value
=
"实际金额"
)
private
BigDecimal
actualAmount
;
}
yudao-module-wealth/yudao-module-wealth-core/src/main/java/cn/iocoder/yudao/module/wealth/vo/receivable/ReceivableBaseVO.java
View file @
bf6ee4b0
...
...
@@ -102,6 +102,9 @@ public class ReceivableBaseVO {
@ApiModelProperty
(
value
=
"含税金额"
)
private
BigDecimal
taxAmount
;
@ApiModelProperty
(
value
=
"基准金额"
)
private
BigDecimal
baseAmount
;
@ApiModelProperty
(
value
=
"备注"
)
private
String
remark
;
...
...
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