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
43d8d00d
Commit
43d8d00d
authored
Sep 16, 2020
by
liudong1993
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
1
parent
736497e7
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
18 additions
and
2 deletions
+18
-2
RB_Goods.cs
Mall.Model/Entity/Product/RB_Goods.cs
+16
-0
GuideCarModule.cs
Mall.Module.Product/GuideCarModule.cs
+2
-2
No files found.
Mall.Model/Entity/Product/RB_Goods.cs
View file @
43d8d00d
...
...
@@ -519,5 +519,21 @@ namespace Mall.Model.Entity.Product
/// 视频填充方式(0默认,1-填充)
/// </summary>
public
int
VideoType
{
get
;
set
;
}
/// <summary>
/// 评论积分赠送
/// </summary>
public
int
?
IntegralComment
{
get
;
set
;
}
/// <summary>
/// 评论赠送类型 2固定值 1百分比
/// </summary>
public
int
?
IntegralCommentType
{
get
;
set
;
}
}
}
Mall.Module.Product/GuideCarModule.cs
View file @
43d8d00d
...
...
@@ -2383,7 +2383,7 @@ namespace Mall.Module.Product
date_enable
=
false
;
}
var
targetModel
=
targetList
.
FirstOrDefault
();
if
(
targetModel
.
ReserveNum
+
(
item
.
Number
??
0
)
>
(
gmodel
.
RideNum
??
0
))
if
(
targetModel
==
null
||
targetModel
.
ReserveNum
+
(
item
.
Number
??
0
)
>
(
gmodel
.
RideNum
??
0
))
{
date_enable
=
false
;
}
...
...
@@ -2412,7 +2412,7 @@ namespace Mall.Module.Product
name
=
gmodel
.
Name
,
categoryIdList
=
item
.
CategoryIdList
,
num
=
item
.
Number
,
surplus_num
=
(
gmodel
.
RideNum
??
0
)
-
targetModel
.
ReserveNum
,
surplus_num
=
(
gmodel
.
RideNum
??
0
)
-
(
targetModel
?.
ReserveNum
??
0
)
,
forehead_integral
=
gmodel
.
PointsDeduction
,
forehead_integral_type
=
gmodel
.
PointsDeductionType
,
accumulative
=
gmodel
.
IsMultipleDeduction
,
//累计多件抵扣
...
...
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