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
3d323cae
Commit
3d323cae
authored
Sep 11, 2020
by
吴春
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
提交diam
parent
09500f51
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
16 additions
and
2 deletions
+16
-2
RB_GuideCar_Car_Extend.cs
Mall.Model/Extend/GuideCar/RB_GuideCar_Car_Extend.cs
+2
-0
AppletGuideCarController.cs
Mall.WebApi/Controllers/Product/AppletGuideCarController.cs
+14
-2
No files found.
Mall.Model/Extend/GuideCar/RB_GuideCar_Car_Extend.cs
View file @
3d323cae
...
...
@@ -29,5 +29,7 @@ namespace Mall.Model.Extend.GuideCar
/// 车辆品牌
/// </summary>
public
string
CarBrand
{
get
;
set
;
}
public
string
CarClassStr
{
get
;
set
;
}
}
}
Mall.WebApi/Controllers/Product/AppletGuideCarController.cs
View file @
3d323cae
...
...
@@ -60,7 +60,7 @@ namespace Mall.WebApi.Controllers.Product
var
parms
=
JsonConvert
.
DeserializeObject
<
RequestParm
>(
requestMsg
.
ToString
());
JObject
parm
=
JObject
.
Parse
(
parms
.
msg
.
ToString
());
var
list
=
destinationModule
.
GetAllList
();
var
result
=
list
.
Where
(
x
=>
x
.
CodeLevel
==
Common
.
Enum
.
AreaRegionEnum
.
CityEnum
).
Select
(
x
=>
new
{
x
.
ID
,
x
.
Name
,
x
.
CodeLevel
,
x
.
PinYin
,
x
.
ParentID
});
var
result
=
list
.
Where
(
x
=>
x
.
CodeLevel
==
Common
.
Enum
.
AreaRegionEnum
.
CityEnum
).
Select
(
x
=>
new
{
x
.
ID
,
x
.
Name
,
x
.
CodeLevel
,
x
.
PinYin
,
x
.
ParentID
});
return
ApiResult
.
Success
(
""
,
result
);
}
...
...
@@ -280,7 +280,7 @@ namespace Mall.WebApi.Controllers.Product
name
=
model
.
Name
,
cover_pic
=
model
.
CoverImage
,
video_url
=
model
.
VideoAddress
,
guidecartype
=
model
.
GuideCarType
,
guidecartype
=
model
.
GuideCarType
,
original_price
=
model
.
OriginalPrice
,
unit
=
model
.
Unit
,
page_url
=
"/pages/goods/goods?id="
+
model
.
Id
,
...
...
@@ -443,6 +443,10 @@ namespace Mall.WebApi.Controllers.Product
var
query
=
JsonConvert
.
DeserializeObject
<
RB_GuideCar_Guide_Extend
>(
parms
.
msg
.
ToString
());
query
.
TenantId
=
parms
.
TenantId
;
query
.
MallBaseId
=
parms
.
MallBaseId
;
if
(
query
.
ID
==
0
)
{
return
ApiResult
.
Failed
(
"请传入您要查询的导游ID"
);
}
var
oldLogisticsModel
=
guideCarModule
.
GetGuideCarGuideOrderInfo
(
query
);
if
(
oldLogisticsModel
==
null
)
{
...
...
@@ -492,11 +496,19 @@ namespace Mall.WebApi.Controllers.Product
var
query
=
JsonConvert
.
DeserializeObject
<
RB_GuideCar_Car_Extend
>(
parms
.
msg
.
ToString
());
query
.
TenantId
=
parms
.
TenantId
;
query
.
MallBaseId
=
parms
.
MallBaseId
;
if
(
query
.
ID
==
0
)
{
return
ApiResult
.
Failed
(
"请传入您要查询的车辆ID"
);
}
var
oldLogisticsModel
=
guideCarModule
.
GetGuideCarModel
(
query
);
if
(
oldLogisticsModel
==
null
)
{
oldLogisticsModel
=
new
RB_GuideCar_Car_Extend
();
}
if
((
int
)
oldLogisticsModel
.
CarClass
>
0
)
{
oldLogisticsModel
.
CarClassStr
=
EnumHelper
.
GetEnumName
(
oldLogisticsModel
.
CarClass
);
}
return
ApiResult
.
Success
(
""
,
oldLogisticsModel
);
}
...
...
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