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
44ade3ea
Commit
44ade3ea
authored
Oct 29, 2020
by
黄奎
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
新增查询条件
parent
92a5c5a8
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
138 additions
and
5 deletions
+138
-5
ContentModule.cs
Mall.Module.User/ContentModule.cs
+3
-2
RB_StoresRepository.cs
Mall.Repository/User/RB_StoresRepository.cs
+8
-3
AppletStoresController.cs
Mall.WebApi/Controllers/Reserve/AppletStoresController.cs
+127
-0
No files found.
Mall.Module.User/ContentModule.cs
View file @
44ade3ea
...
...
@@ -261,10 +261,11 @@ namespace Mall.Module.User
/// 门店分类列表
/// </summary>
/// <param name="query"></param>
/// <param name="isFirst">是否取第一条</param>
/// <returns></returns>
public
List
<
RB_Stores_Extend
>
GetStoresListModule
(
RB_Stores_Extend
query
)
public
List
<
RB_Stores_Extend
>
GetStoresListModule
(
RB_Stores_Extend
query
,
bool
isFirst
=
false
)
{
return
storesRepository
.
GetStoresListRepository
(
query
);
return
storesRepository
.
GetStoresListRepository
(
query
,
isFirst
:
isFirst
);
}
/// <summary>
...
...
Mall.Repository/User/RB_StoresRepository.cs
View file @
44ade3ea
...
...
@@ -93,16 +93,16 @@ WHERE 1 = 1 AND Status = 0 ");
{
builder
.
Append
(
" ORDER BY Id DESC "
);
}
return
GetPage
<
RB_Stores_Extend
>(
pageIndex
,
pageSize
,
out
rowCount
,
builder
.
ToString
()).
ToList
();
}
/// <summary>
/// 门店
分类
列表
/// 门店列表
/// </summary>
/// <param name="query"></param>
/// <param name="isFirst">是否取第一条</param>
/// <returns></returns>
public
List
<
RB_Stores_Extend
>
GetStoresListRepository
(
RB_Stores_Extend
query
)
public
List
<
RB_Stores_Extend
>
GetStoresListRepository
(
RB_Stores_Extend
query
,
bool
isFirst
=
false
)
{
StringBuilder
builder
=
new
StringBuilder
();
float
lng
=
0
;
...
...
@@ -176,6 +176,11 @@ WHERE 1 = 1 AND Status = 0 ");
{
builder
.
Append
(
" ORDER BY Id DESC "
);
}
if
(
isFirst
)
{
builder
.
Append
(
" LIMIT 1; "
);
}
return
Get
<
RB_Stores_Extend
>(
builder
.
ToString
()).
ToList
();
}
}
...
...
Mall.WebApi/Controllers/Reserve/AppletStoresController.cs
0 → 100644
View file @
44ade3ea
using
System
;
using
System.Linq
;
using
Mall.AOP
;
using
Mall.Common.API
;
using
Mall.Common.Plugin
;
using
Mall.Model.Entity.User
;
using
Mall.Module.User
;
using
Mall.WebApi.Filter
;
using
Microsoft.AspNetCore.Cors
;
using
Microsoft.AspNetCore.Mvc
;
using
Newtonsoft.Json
;
using
Newtonsoft.Json.Linq
;
namespace
Mall.WebApi.Controllers.Reserve
{
/// <summary>
/// 小程序门店商品
/// </summary>
[
Route
(
"api/[controller]/[action]"
)]
[
ApiExceptionFilter
]
[
ApiController
]
[
EnableCors
(
"AllowCors"
)]
public
class
AppletStoresController
:
BaseController
{
/// <summary>
/// 门店处理类对象
/// </summary>
private
readonly
ContentModule
contentModule
=
AOPHelper
.
CreateAOPObject
<
ContentModule
>();
/// <summary>
/// 线下服务首页获取当前距离最近门店
/// </summary>
/// <param name="request"></param>
/// <returns></returns>
public
virtual
ApiResult
GetCurrentStore
(
object
requestMsg
)
{
var
parms
=
JsonConvert
.
DeserializeObject
<
RequestParm
>(
requestMsg
.
ToString
());
if
(
parms
.
MallBaseId
<=
0
)
{
return
ApiResult
.
ParamIsNull
();
}
JObject
parm
=
JObject
.
Parse
(
parms
.
msg
.
ToString
());
var
position
=
parm
.
GetStringValue
(
"position"
);
int
storeId
=
parm
.
GetInt
(
"storeId"
);
var
storeModel
=
contentModule
.
GetStoresListModule
(
new
RB_Stores_Extend
()
{
CurrentPosition
=
position
,
Id
=
storeId
,
MallBaseId
=
parms
.
MallBaseId
},
isFirst
:
true
)?.
FirstOrDefault
();
object
result
=
new
{
storeInfo
=
new
{
storeId
=
storeModel
?.
Id
,
storeName
=
storeModel
?.
Name
,
storeAddress
=
storeModel
?.
Address
,
storeTel
=
storeModel
?.
Tel
,
distance
=
storeModel
?.
KM
,
storeCoverImg
=
storeModel
?.
CoverImg
,
storeNavImg
=
storeModel
?.
NavImg
},
};
return
ApiResult
.
Success
(
data
:
result
);
}
/// <summary>
/// 小程序获取门店分页列表
/// </summary>
/// <param name="requestMsg"></param>
/// <returns></returns>
public
virtual
ApiResult
GetStorePage
(
object
requestMsg
)
{
var
parms
=
JsonConvert
.
DeserializeObject
<
RequestParm
>(
requestMsg
.
ToString
());
if
(
parms
.
MallBaseId
<=
0
)
{
return
ApiResult
.
ParamIsNull
();
}
ResultPageModel
pageModel
=
JsonConvert
.
DeserializeObject
<
ResultPageModel
>(
parms
.
msg
.
ToString
());
var
query
=
JsonConvert
.
DeserializeObject
<
RB_Stores_Extend
>(
parms
.
msg
.
ToString
());
query
.
TenantId
=
parms
.
TenantId
;
query
.
MallBaseId
=
parms
.
MallBaseId
;
var
list
=
contentModule
.
GetStoresPageListModule
(
pageModel
.
pageIndex
,
pageModel
.
pageSize
,
out
long
rowsCount
,
query
);
pageModel
.
pageData
=
list
;
pageModel
.
count
=
Convert
.
ToInt32
(
rowsCount
);
return
ApiResult
.
Success
(
data
:
pageModel
);
}
/// <summary>
/// 获取门店详情
/// </summary>
/// <param name="requestMsg"></param>
/// <returns></returns>
public
virtual
ApiResult
GetStoreInfo
(
object
requestMsg
)
{
var
parms
=
JsonConvert
.
DeserializeObject
<
RequestParm
>(
requestMsg
.
ToString
());
if
(
parms
.
MallBaseId
<=
0
)
{
return
ApiResult
.
ParamIsNull
();
}
JObject
parm
=
JObject
.
Parse
(
parms
.
msg
.
ToString
());
int
storeId
=
parm
.
GetInt
(
"storeId"
);
var
position
=
parm
.
GetStringValue
(
"position"
);
var
storeModel
=
contentModule
.
GetStoresListModule
(
new
RB_Stores_Extend
()
{
Id
=
storeId
,
MallBaseId
=
parms
.
MallBaseId
},
isFirst
:
true
)?.
FirstOrDefault
();
object
result
=
new
{
storeInfo
=
new
{
storeId
=
storeModel
?.
Id
,
storeName
=
storeModel
?.
Name
,
storeAddress
=
storeModel
?.
Address
,
storeTel
=
storeModel
?.
Tel
,
distance
=
storeModel
?.
KM
,
storeCoverImg
=
storeModel
?.
CoverImg
,
storeNavImg
=
storeModel
?.
NavImg
},
};
return
ApiResult
.
Success
(
data
:
result
);
}
}
}
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