Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Q
qk_backend
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
quanku
qk_backend
Commits
ac418c19
Commit
ac418c19
authored
Jul 16, 2024
by
shiyu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
完成订单结款计算2
parent
6ff04b0d
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
2 deletions
+4
-2
ch-admin-api/src/main/java/com/wwdz/ch/admin/impl/SysFinanceServiceImpl.java
...in/java/com/wwdz/ch/admin/impl/SysFinanceServiceImpl.java
+2
-2
ch-admin-api/src/main/java/com/wwdz/ch/admin/impl/SysUserBillServiceImpl.java
...n/java/com/wwdz/ch/admin/impl/SysUserBillServiceImpl.java
+2
-0
No files found.
ch-admin-api/src/main/java/com/wwdz/ch/admin/impl/SysFinanceServiceImpl.java
View file @
ac418c19
...
@@ -237,8 +237,8 @@ public class SysFinanceServiceImpl implements SysFinanceService {
...
@@ -237,8 +237,8 @@ public class SysFinanceServiceImpl implements SysFinanceService {
public
Result
exportUserBillDetail
(
UserAccountDetailRequestDto
dto
)
{
public
Result
exportUserBillDetail
(
UserAccountDetailRequestDto
dto
)
{
try
{
try
{
UserBillRequestDto
userBillRequestDto
=
new
UserBillRequestDto
();
UserBillRequestDto
userBillRequestDto
=
new
UserBillRequestDto
();
d
to
.
setUserId
(
dto
.
getUserId
());
userBillRequestD
to
.
setUserId
(
dto
.
getUserId
());
d
to
.
setAccountPeriod
(
dto
.
getAccountPeriod
());
userBillRequestD
to
.
setAccountPeriod
(
dto
.
getAccountPeriod
());
//查询某一个藏家的账单
//查询某一个藏家的账单
Result
result
=
findUserBill
(
userBillRequestDto
);
Result
result
=
findUserBill
(
userBillRequestDto
);
if
(!
result
.
getSuccess
())
{
if
(!
result
.
getSuccess
())
{
...
...
ch-admin-api/src/main/java/com/wwdz/ch/admin/impl/SysUserBillServiceImpl.java
View file @
ac418c19
...
@@ -16,6 +16,7 @@ import org.slf4j.Logger;
...
@@ -16,6 +16,7 @@ import org.slf4j.Logger;
import
org.slf4j.LoggerFactory
;
import
org.slf4j.LoggerFactory
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.stereotype.Service
;
import
org.springframework.stereotype.Service
;
import
org.springframework.transaction.annotation.Propagation
;
import
org.springframework.transaction.annotation.Transactional
;
import
org.springframework.transaction.annotation.Transactional
;
import
org.springframework.transaction.interceptor.TransactionAspectSupport
;
import
org.springframework.transaction.interceptor.TransactionAspectSupport
;
...
@@ -39,6 +40,7 @@ public class SysUserBillServiceImpl implements SysUserBillService {
...
@@ -39,6 +40,7 @@ public class SysUserBillServiceImpl implements SysUserBillService {
@Autowired
@Autowired
DistributorProfitDao
distributorProfitDao
;
DistributorProfitDao
distributorProfitDao
;
@Transactional
(
propagation
=
Propagation
.
REQUIRES_NEW
)
@Override
@Override
public
Result
finishCalculate
(
DistributionOrder
distributionOrder
)
throws
Exception
{
public
Result
finishCalculate
(
DistributionOrder
distributionOrder
)
throws
Exception
{
SimpleDateFormat
formatter
=
new
SimpleDateFormat
(
"yyyy-MM"
);
SimpleDateFormat
formatter
=
new
SimpleDateFormat
(
"yyyy-MM"
);
...
...
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