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
fbb616e1
Commit
fbb616e1
authored
Jun 17, 2020
by
liudong1993
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
1
parent
53741b29
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
10 additions
and
2 deletions
+10
-2
OrderModule.cs
Mall.Module.Product/OrderModule.cs
+10
-2
No files found.
Mall.Module.Product/OrderModule.cs
View file @
fbb616e1
...
...
@@ -672,6 +672,14 @@ namespace Mall.Module.Product
return
ApiResult
.
Failed
(
"未查询到订单商品信息"
);
}
dModel
.
CoverImagePath
=
dModel
.
CoverImage
;
var
omodel
=
goods_OrderRepository
.
GetEntity
(
dModel
.
OrderId
);
if
(
omodel
==
null
)
{
return
ApiResult
.
Failed
(
"未查询到订单信息"
);
}
decimal
Final_Price
=
dModel
.
Final_Price
??
0
;
if
(
omodel
.
Income
<
dModel
.
Final_Price
)
{
Final_Price
=
omodel
.
Income
??
0
;
}
return
ApiResult
.
Success
(
""
,
new
{
DetailId
=
dModel
.
Id
,
...
...
@@ -680,7 +688,7 @@ namespace Mall.Module.Product
dModel
.
GoodsName
,
SpecificationList
=
JsonConvert
.
DeserializeObject
<
List
<
string
>>(
dModel
.
Specification
),
dModel
.
Number
,
dModel
.
Final_Price
,
Final_Price
,
dModel
.
FreightMoney
});
}
...
...
@@ -2574,7 +2582,7 @@ namespace Mall.Module.Product
{
continue
;
}
//item.SupplierId = gmodel.SpplierID
;
item
.
SupplierId
=
gmodel
.
SupplierId
;
item
.
CouponMoney
=
0
;
var
couponModel
=
GoodsCouponList
.
Where
(
x
=>
x
.
GoodsId
==
item
.
GoodsId
).
FirstOrDefault
();
if
(
couponModel
!=
null
)
...
...
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