Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
P
precision-effect
Project
Project
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
耿迪迪
precision-effect
Commits
4d008b3e
Commit
4d008b3e
authored
Aug 28, 2023
by
耿迪迪
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
操作记录修改
parent
21bf1281
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
4 deletions
+4
-4
SettlementDebit.java
.../system/service/impl/debitSettlement/SettlementDebit.java
+2
-2
SettlementTrade.java
.../system/service/impl/tradeSettlement/SettlementTrade.java
+2
-2
No files found.
precision-effect-system/src/main/java/com/zehong/system/service/impl/debitSettlement/SettlementDebit.java
View file @
4d008b3e
...
@@ -89,6 +89,8 @@ public class SettlementDebit {
...
@@ -89,6 +89,8 @@ public class SettlementDebit {
*/
*/
private
void
debitDeptSettlement
(
Long
deptId
,
BigDecimal
amount
,
String
operatorType
){
private
void
debitDeptSettlement
(
Long
deptId
,
BigDecimal
amount
,
String
operatorType
){
TAccount
account
=
getAccountInfo
(
deptId
);
TAccount
account
=
getAccountInfo
(
deptId
);
//更新可用额度
updateAccount
(
account
,
amount
,
operatorType
);
//结算本部尾款
//结算本部尾款
if
(
"0"
.
equals
(
account
.
getTransferSwitch
())){
if
(
"0"
.
equals
(
account
.
getTransferSwitch
())){
List
<
TTradeProject
>
pendingPaymentInfo
=
tTradeProjectMapper
.
getTradePendingPaymentInfo
(
deptId
);
List
<
TTradeProject
>
pendingPaymentInfo
=
tTradeProjectMapper
.
getTradePendingPaymentInfo
(
deptId
);
...
@@ -101,8 +103,6 @@ public class SettlementDebit {
...
@@ -101,8 +103,6 @@ public class SettlementDebit {
amount
=
amount
.
subtract
(
changeAmount
);
amount
=
amount
.
subtract
(
changeAmount
);
}
}
}
}
//更新可用额度
updateAccount
(
account
,
amount
,
operatorType
);
}
}
...
...
precision-effect-system/src/main/java/com/zehong/system/service/impl/tradeSettlement/SettlementTrade.java
View file @
4d008b3e
...
@@ -87,6 +87,8 @@ public class SettlementTrade {
...
@@ -87,6 +87,8 @@ public class SettlementTrade {
TAccount
account
=
getAccountInfo
(
this
.
tradeProject
.
getApplyDeptId
());
TAccount
account
=
getAccountInfo
(
this
.
tradeProject
.
getApplyDeptId
());
//进账
//进账
BigDecimal
incomeAmount
=
this
.
tradeProject
.
getDealPrice
().
subtract
(
this
.
tradeProject
.
getPendingPayment
());
BigDecimal
incomeAmount
=
this
.
tradeProject
.
getDealPrice
().
subtract
(
this
.
tradeProject
.
getPendingPayment
());
//更新可用额度
updateAccount
(
account
,
incomeAmount
);
//判断是否有进账
//判断是否有进账
if
(
incomeAmount
.
compareTo
(
BigDecimal
.
ZERO
)
==
1
&&
"0"
.
equals
(
account
.
getTransferSwitch
())){
if
(
incomeAmount
.
compareTo
(
BigDecimal
.
ZERO
)
==
1
&&
"0"
.
equals
(
account
.
getTransferSwitch
())){
//结算本部尾款
//结算本部尾款
...
@@ -100,8 +102,6 @@ public class SettlementTrade {
...
@@ -100,8 +102,6 @@ public class SettlementTrade {
incomeAmount
=
incomeAmount
.
subtract
(
amount
);
incomeAmount
=
incomeAmount
.
subtract
(
amount
);
}
}
}
}
//更新可用额度
updateAccount
(
account
,
incomeAmount
);
}
}
/**
/**
...
...
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