Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
M
mall.oytour.com
Project
Project
Details
Activity
Releases
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
黄奎
mall.oytour.com
Commits
4f5d8843
Commit
4f5d8843
authored
Aug 28, 2020
by
liudong1993
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
1
parent
5bf7c754
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
7 additions
and
7 deletions
+7
-7
FinanceModule.cs
Mall.WindowsService/Module/FinanceModule.cs
+7
-7
No files found.
Mall.WindowsService/Module/FinanceModule.cs
View file @
4f5d8843
...
...
@@ -1808,18 +1808,18 @@ and DATE_FORMAT(b.PaymentTime,'%y-%m-%d')<DATE_FORMAT('{endDate}','%y-%m-%d') A
decimal
TotalCommission
=
0
,
OldCommission
=
0
;
foreach
(
var
qcitem
in
ssList
.
Where
(
x
=>
x
.
CommissionState
==
1
))
{
TotalCommission
+=
(
qcitem
.
Commission
??
0
);
//查询是否有申请退款
var
afterSaleList
=
goods_OrderAfterSaleRepository
.
GetList
(
new
RB_Goods_OrderAfterSale_Extend
()
{
OrderDetialId
=
qcitem
.
OrderDetailId
,
Type
=
1
,
MallBaseId
=
item
.
MallBaseId
,
TenantId
=
item
.
TenantId
});
if
(!
afterSaleList
.
Any
())
{
TotalCommission
+=
(
qcitem
.
Commission
??
0
);
}
}
#
region
看微店佣金是否是负数
是的话
需要走总佣金里减去
OldCommission
=
TotalCommission
;
if
((
smallModel
.
Commission
??
0
)
<
0
)
{
//查询是否有申请退款
var
afterSaleList
=
goods_OrderAfterSaleRepository
.
GetList
(
new
RB_Goods_OrderAfterSale_Extend
()
{
OrderDetialId
=
qitem
.
OrderDetailId
,
Type
=
1
,
MallBaseId
=
item
.
MallBaseId
,
TenantId
=
item
.
TenantId
});
if
(!
afterSaleList
.
Any
())
{
TotalCommission
+=
(
smallModel
?.
Commission
??
0
);
}
TotalCommission
+=
(
smallModel
?.
Commission
??
0
);
}
#
endregion
if
(
TotalCommission
>
0
)
...
...
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