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
cafe4aac
Commit
cafe4aac
authored
Sep 16, 2020
by
liudong1993
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
司导结算页面
parent
1d551281
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
0 deletions
+4
-0
GuideCarModule.cs
Mall.Module.Product/GuideCarModule.cs
+4
-0
No files found.
Mall.Module.Product/GuideCarModule.cs
View file @
cafe4aac
...
...
@@ -1916,6 +1916,7 @@ namespace Mall.Module.Product
bool
IsPointsDeduction
=
false
;
//是否有商品可使用积分抵扣
bool
address_enable
=
true
;
//地址Ok
bool
date_enable
=
true
;
//日期ok
string
date_remark
=
""
;
//日期无法下单备注
List
<
object
>
goods_list
=
new
List
<
object
>();
var
guidebaseModel
=
guideCar_BaseRepository
.
GetList
(
new
RB_GuideCar_Base_Extend
()
{
TenantId
=
demodel
.
TenantId
,
MallBaseId
=
demodel
.
MallBaseId
}).
FirstOrDefault
();
if
(
demodel
.
DetailList
.
Any
())
...
...
@@ -2399,11 +2400,13 @@ namespace Mall.Module.Product
if
(!
targetList
.
Any
())
{
date_enable
=
false
;
date_remark
=
"出发日期不在可预定日期内,请重新选择出发日期"
;
}
var
targetModel
=
targetList
.
FirstOrDefault
();
if
(
targetModel
==
null
||
targetModel
.
ReserveNum
+
(
item
.
Number
??
0
)
>
(
gmodel
.
RideNum
??
0
))
{
date_enable
=
false
;
date_remark
=
"剩余座位数不足,请重新选择出发日期"
;
}
string
SiteName
=
sitelist
.
Where
(
x
=>
x
.
ID
==
gmodel
.
SiteId
).
FirstOrDefault
()?.
SiteName
??
""
;
...
...
@@ -2580,6 +2583,7 @@ namespace Mall.Module.Product
promptNoSuperiorFY
=
PromptNoSuperiorFY
,
total_price
=
TotalGoodsMoney
+
InsuranceMoney
,
date_enable
,
date_remark
,
insurance_description
=
guidebaseModel
?.
InsuranceDescription
,
address
=
new
{
...
...
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