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
759adbfa
Commit
759adbfa
authored
Jul 16, 2020
by
liudong1993
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master' of
http://gitlab.oytour.com/Kui2/mall.oytour.com
parents
7b10eee0
b3de5963
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
14 additions
and
7 deletions
+14
-7
OrderModule.cs
Mall.Module.Product/OrderModule.cs
+4
-4
UserController.cs
Mall.WebApi/Controllers/User/UserController.cs
+10
-3
No files found.
Mall.Module.Product/OrderModule.cs
View file @
759adbfa
...
...
@@ -7069,8 +7069,8 @@ namespace Mall.Module.Product
};
List
<
WhereHelper
>
wheres1
=
new
List
<
WhereHelper
>()
{
new
WhereHelper
(){
FiledName
=
nameof
(
RB_Goods_OrderDetail
.
Order
Id
),
FiledValue
=
orderModel
.
Order
Id
,
FiledName
=
nameof
(
RB_Goods_OrderDetail
.
Id
),
FiledValue
=
orderModel
.
Id
,
OperatorEnum
=
OperatorEnum
.
Equal
},
new
WhereHelper
(){
...
...
@@ -7125,8 +7125,8 @@ namespace Mall.Module.Product
};
List
<
WhereHelper
>
wheres1
=
new
List
<
WhereHelper
>()
{
new
WhereHelper
(){
FiledName
=
nameof
(
RB_Goods_OrderDetail
.
Order
Id
),
FiledValue
=
orderModel
.
Order
Id
,
FiledName
=
nameof
(
RB_Goods_OrderDetail
.
Id
),
FiledValue
=
orderModel
.
Id
,
OperatorEnum
=
OperatorEnum
.
Equal
},
new
WhereHelper
(){
...
...
Mall.WebApi/Controllers/User/UserController.cs
View file @
759adbfa
...
...
@@ -2968,12 +2968,18 @@ namespace Mall.WebApi.Controllers.User
public
ApiResult
SetFXFxCommissionInfo
()
{
var
req
=
RequestParm
;
RB_Distributor_FXGrade_Extend
demodel
=
JsonConvert
.
DeserializeObject
<
RB_Distributor_FXGrade_Extend
>(
req
.
msg
.
ToString
());
if
(
demodel
.
FXCommissionList
.
Any
(
x
=>
x
.
CommissionPrice
<
0
))
List
<
RB_Distributor_FXGrade_Extend
>
demodel
=
JsonConvert
.
DeserializeObject
<
List
<
RB_Distributor_FXGrade_Extend
>>(
req
.
msg
.
ToString
());
List
<
RB_Distributor_FXCommission_Extend
>
list
=
new
List
<
RB_Distributor_FXCommission_Extend
>();
foreach
(
var
item
in
demodel
)
{
list
.
AddRange
(
item
.
FXCommissionList
);
}
if
(
list
.
Any
(
x
=>
x
.
CommissionPrice
<
0
))
{
return
ApiResult
.
Failed
(
"返佣价格不能小于0"
);
}
bool
flag
=
userModule
.
AddOrUpdateFxCommission
(
demodel
.
FXCommissionL
ist
);
bool
flag
=
userModule
.
AddOrUpdateFxCommission
(
l
ist
);
if
(
flag
)
{
return
ApiResult
.
Success
();
...
...
@@ -2985,6 +2991,7 @@ namespace Mall.WebApi.Controllers.User
}
#
endregion
}
}
\ No newline at end of file
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