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
6df8e2a8
Commit
6df8e2a8
authored
Jun 17, 2020
by
liudong1993
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
1
parent
88ab3ade
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
3 additions
and
3 deletions
+3
-3
RB_Goods_OrderDetail.cs
Mall.Model/Entity/Product/RB_Goods_OrderDetail.cs
+1
-1
OrderModule.cs
Mall.Module.Product/OrderModule.cs
+1
-1
RB_Distributor_HPCommissionRepository.cs
....Repository/User/RB_Distributor_HPCommissionRepository.cs
+1
-1
No files found.
Mall.Model/Entity/Product/RB_Goods_OrderDetail.cs
View file @
6df8e2a8
...
...
@@ -108,7 +108,7 @@ namespace Mall.Model.Entity.Product
set
;
}
/// <summary>
/// 最终价格
/// 最终价格
(不包含运费)
/// </summary>
public
decimal
?
Final_Price
{
...
...
Mall.Module.Product/OrderModule.cs
View file @
6df8e2a8
...
...
@@ -2198,7 +2198,7 @@ namespace Mall.Module.Product
item
.
InventoryNum
=
gmodel
.
InventoryNum
??
0
;
item
.
CostMoney
=
gmodel
.
CostPrice
??
0
;
item
.
ProductCode
=
gmodel
.
GoodsNumbers
;
item
.
CategoryIdList
=
c
list
.
Where
(
x
=>
x
.
GoodsId
==
item
.
Id
)
.
Select
(
x
=>
x
.
CategoryId
??
0
).
ToList
();
item
.
CategoryIdList
=
c
ategoryList
.
Select
(
x
=>
x
.
CategoryId
??
0
).
ToList
();
int
GoodsWeight
=
gmodel
.
GoodsWeight
??
0
;
//商品重量
#
region
规格
//验证规格是否已失效
...
...
Mall.Repository/User/RB_Distributor_HPCommissionRepository.cs
View file @
6df8e2a8
...
...
@@ -83,7 +83,7 @@ where {where} group by h.Id order by h.Id desc";
}
if
(!
string
.
IsNullOrEmpty
(
dmodel
.
CategoryIdsT
))
{
where
+=
$@" and (c.
{
nameof
(
RB_Distributor_HPCategory
.
CategoryId
)}
in(
{
dmodel
.
CategoryIdsT
}
) or
c.
{
nameof
(
RB_Distributor_HPCategory
.
CategoryId
)}
=-
1)"
;
where
+=
$@" and (c.
{
nameof
(
RB_Distributor_HPCategory
.
CategoryId
)}
in(
{
dmodel
.
CategoryIdsT
}
) or
h.
{
nameof
(
RB_Distributor_HPCommission
.
IsCommon
)}
=
1)"
;
}
if
(!
string
.
IsNullOrEmpty
(
dmodel
.
Name
))
{
...
...
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