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
9e9a8fab
Commit
9e9a8fab
authored
Jul 01, 2020
by
liudong1993
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
付款单排除手续费
parent
751f6769
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
17 additions
and
15 deletions
+17
-15
OrderModule.cs
Mall.Module.Product/OrderModule.cs
+17
-15
No files found.
Mall.Module.Product/OrderModule.cs
View file @
9e9a8fab
...
...
@@ -5027,13 +5027,13 @@ namespace Mall.Module.Product
try
{
decimal
Money
=
dmodel
.
Refund
??
0
;
decimal
Rate
=
Convert
.
ToDecimal
(
Config
.
SettlementRate
);
decimal
Fee
=
0
;
if
(
Rate
>
0
)
{
Fee
=
Math
.
Round
(
Money
*
Rate
/
1000
,
2
,
MidpointRounding
.
AwayFromZero
);
Money
-=
Fee
;
}
//
decimal Rate = Convert.ToDecimal(Config.SettlementRate);
//
decimal Fee = 0;
//
if (Rate > 0)
//
{
//
Fee = Math.Round(Money * Rate / 1000, 2, MidpointRounding.AwayFromZero);
//
Money -= Fee;
//
}
//查询用户
var
umodel
=
member_UserRepository
.
GetEntity
(
dmodel
.
UserId
);
if
(
umodel
==
null
)
{
return
false
;
}
...
...
@@ -5042,7 +5042,8 @@ namespace Mall.Module.Product
//先查询规则
var
financeConfigurineList
=
financeConfigurineRepository
.
GetList
(
new
Model
.
Extend
.
Finance
.
RB_Finance_Configurine_Extend
{
Type
=
3
});
string
dstr
=
"已收货,客人付款:"
+
(
dmodel
.
Income
??
0
)
+
"金额,申请退款:"
+
(
dmodel
.
Refund
??
0
)+
",手续费:"
+
Fee
;
//string dstr = "已收货,客人付款:" + (dmodel.Income ?? 0) + "金额,申请退款:" + (dmodel.Refund ?? 0)+",手续费:"+ Fee;
string
dstr
=
"已收货,客人付款:"
+
(
dmodel
.
Income
??
0
)
+
"金额,申请退款:"
+
(
dmodel
.
Refund
??
0
);
if
(
financeConfigurineList
!=
null
&&
financeConfigurineList
.
Any
())
{
var
item
=
financeConfigurineList
.
FirstOrDefault
();
...
...
@@ -5971,20 +5972,21 @@ namespace Mall.Module.Product
var
flag
=
false
;
try
{
decimal
Rate
=
Convert
.
ToDecimal
(
Config
.
SettlementRate
);
//
decimal Rate = Convert.ToDecimal(Config.SettlementRate);
decimal
Money
=
omodel
.
Income
??
0
;
decimal
Fee
=
0
;
if
(
Rate
>
0
)
{
Fee
=
Math
.
Round
(
Money
*
Rate
/
1000
,
2
,
MidpointRounding
.
AwayFromZero
);
Money
-=
Fee
;
}
//
decimal Fee = 0;
//
if (Rate > 0) {
//
Fee = Math.Round(Money * Rate / 1000, 2, MidpointRounding.AwayFromZero);
//
Money -= Fee;
//
}
//查询用户
var
umodel
=
member_UserRepository
.
GetEntity
(
omodel
.
UserId
);
if
(
umodel
==
null
)
{
return
false
;
}
//先查询规则
var
financeConfigurineList
=
financeConfigurineRepository
.
GetList
(
new
Model
.
Extend
.
Finance
.
RB_Finance_Configurine_Extend
{
Type
=
3
});
string
dstr
=
"客人付款:"
+
(
omodel
.
Income
??
0
)
+
"金额,退款:"
+
(
omodel
.
Income
??
0
)
+
",手续费:"
+
Fee
;
//string dstr = "客人付款:" + (omodel.Income ?? 0) + "金额,退款:" + (omodel.Income ?? 0) + ",手续费:" + Fee;
string
dstr
=
"客人付款:"
+
(
omodel
.
Income
??
0
)
+
"金额,退款:"
+
(
omodel
.
Income
??
0
);
if
(
financeConfigurineList
!=
null
&&
financeConfigurineList
.
Any
())
{
var
item
=
financeConfigurineList
.
FirstOrDefault
();
...
...
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