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
29429cc1
Commit
29429cc1
authored
Oct 28, 2020
by
吴春
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
提交基础设置
parent
96142968
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
329 additions
and
0 deletions
+329
-0
RB_Reserve_Base.cs
Mall.Model/Entity/Reserve/RB_Reserve_Base.cs
+71
-0
RB_Reserve_Base_Extend.cs
Mall.Model/Extend/Reserve/RB_Reserve_Base_Extend.cs
+65
-0
ReserveModule.cs
Mall.Module.Reserve/ReserveModule.cs
+98
-0
RB_Reserve_BaseRepository.cs
Mall.Repository/Reserve/RB_Reserve_BaseRepository.cs
+35
-0
ReserveController.cs
Mall.WebApi/Controllers/Reserve/ReserveController.cs
+60
-0
No files found.
Mall.Model/Entity/Reserve/RB_Reserve_Base.cs
0 → 100644
View file @
29429cc1
using
VT.FW.DB
;
using
Mall.Common.Enum.MallBase
;
using
System
;
using
System.Collections.Generic
;
using
System.Text
;
namespace
Mall.Model.Entity.Reserve
{
/// <summary>
/// 预约专区基础
/// </summary>
[
Serializable
]
[
DB
(
ConnectionName
=
"DefaultConnection"
)]
public
class
RB_Reserve_Base
{
/// <summary>
/// id
/// </summary>
public
int
Id
{
get
;
set
;
}
/// <summary>
/// 提前预定分钟
/// </summary>
public
int
AdvanceMinute
{
get
;
set
;
}
/// <summary>
/// 订单状态变更
/// </summary>
public
string
OrderStateJson
{
get
;
set
;
}
/// <summary>
/// 营业时间
/// </summary>
public
string
BusinessHoursJson
{
get
;
set
;
}
/// <summary>
/// 付款方式
/// </summary>
public
string
PayTypeJson
{
get
;
set
;
}
/// <summary>
/// 商户id
/// </summary>
public
int
TenantId
{
get
;
set
;
}
/// <summary>
/// 小程序id
/// </summary>
public
int
MallBaseId
{
get
;
set
;
}
/// <summary>
/// 创建时间
/// </summary>
public
DateTime
CreateDate
{
get
;
set
;
}
/// <summary>
/// 修改人(员工id)
/// </summary>
public
int
UpdateBy
{
get
;
set
;
}
/// <summary>
/// 修改时间
/// </summary>
public
DateTime
UpdateDate
{
get
;
set
;
}
}
}
Mall.Model/Extend/Reserve/RB_Reserve_Base_Extend.cs
0 → 100644
View file @
29429cc1
using
Mall.Model.Entity.Reserve
;
using
System
;
using
System.Collections.Generic
;
using
System.Text
;
using
VT.FW.DB
;
namespace
Mall.Model.Extend.Reserve
{
/// <summary>
///基础设置扩展实体
/// </summary>
[
Serializable
]
[
DB
(
ConnectionName
=
"DefaultConnection"
)]
public
class
RB_Reserve_Base_Extend
:
RB_Reserve_Base
{
/// <summary>
/// 订单状态列表
/// </summary>
public
List
<
ReserveStateModel
>
OrderStateList
{
get
;
set
;
}
public
List
<
BusinessHoursModel
>
BusinessHoursList
{
get
;
set
;
}
/// <summary>
/// 付款方式
/// </summary>
public
List
<
int
>
PayTypeList
{
get
;
set
;
}
}
/// <summary>
/// 线下服务行业订单状态
/// </summary>
public
class
ReserveStateModel
{
/// <summary>
/// id
/// </summary>
public
int
Id
{
get
;
set
;
}
/// <summary>
/// 状态名称
/// </summary>
public
string
Name
{
get
;
set
;
}
}
/// <summary>
/// 线下服务行业订单状态
/// </summary>
public
class
BusinessHoursModel
{
/// <summary>
/// 营业开始时间
/// </summary>
public
string
StartTime
{
get
;
set
;
}
/// <summary>
/// 营业结束时间
/// </summary>
public
string
EndTime
{
get
;
set
;
}
/// <summary>
/// 0-否,1-是
/// </summary>
public
int
IsNextDay
{
get
;
set
;
}
}
}
Mall.Module.Reserve/ReserveModule.cs
View file @
29429cc1
...
...
@@ -3,6 +3,7 @@ using Mall.Model.Entity.Reserve;
using
Mall.Model.Extend.Reserve
;
using
Mall.Repository.Reserve
;
using
Mall.Repository.User
;
using
Newtonsoft.Json
;
using
System
;
using
System.Collections.Generic
;
using
System.Linq
;
...
...
@@ -37,6 +38,103 @@ namespace Mall.Module.Reserve
#
endregion
#
region
基础设置
private
readonly
RB_Reserve_BaseRepository
reserveBaseRepository
=
new
RB_Reserve_BaseRepository
();
#
endregion
#
region
基础配置
/// <summary>
/// 获取基础配置
/// </summary>
/// <param name="tenantId"></param>
/// <param name="mallBaseId"></param>
/// <returns></returns>
public
RB_Reserve_Base_Extend
GetReserveBaseInfo
(
int
tenantId
,
int
mallBaseId
)
{
var
model
=
reserveBaseRepository
.
GetList
(
new
RB_Reserve_Base_Extend
()
{
TenantId
=
tenantId
,
MallBaseId
=
mallBaseId
}).
FirstOrDefault
();
if
(
model
==
null
)
{
model
=
new
RB_Reserve_Base_Extend
()
{
MallBaseId
=
mallBaseId
,
AdvanceMinute
=
30
,
Id
=
0
,
TenantId
=
tenantId
,
};
}
if
(
model
.
OrderStateJson
==
null
||
model
.
OrderStateJson
==
""
||
model
.
OrderStateJson
==
"[]"
)
{
var
list
=
EnumHelper
.
GetEnumList
(
typeof
(
Common
.
Enum
.
Goods
.
OrderStatusEnum
));
model
.
OrderStateList
=
list
.
OrderBy
(
x
=>
Convert
.
ToInt32
(
x
.
Value
)).
Select
(
x
=>
new
ReserveStateModel
{
Name
=
x
.
Key
,
Id
=
Convert
.
ToInt32
(
x
.
Value
)
}).
ToList
();
}
else
{
model
.
OrderStateList
=
JsonConvert
.
DeserializeObject
<
List
<
ReserveStateModel
>>(
model
.
OrderStateJson
);
}
if
(!
string
.
IsNullOrWhiteSpace
(
model
.
BusinessHoursJson
))
{
try
{
model
.
BusinessHoursList
=
JsonConvert
.
DeserializeObject
<
List
<
BusinessHoursModel
>>(
model
.
BusinessHoursJson
);
}
catch
(
Exception
)
{
model
.
BusinessHoursList
=
new
List
<
BusinessHoursModel
>();
}
}
else
{
model
.
BusinessHoursList
=
new
List
<
BusinessHoursModel
>();
}
if
(!
string
.
IsNullOrWhiteSpace
(
model
.
PayTypeJson
))
{
try
{
model
.
PayTypeList
=
JsonConvert
.
DeserializeObject
<
List
<
int
>>(
model
.
PayTypeJson
);
}
catch
(
Exception
)
{
model
.
PayTypeList
=
new
List
<
int
>();
}
}
else
{
model
.
PayTypeList
=
new
List
<
int
>();
}
return
model
;
}
/// <summary>
/// 保存
/// </summary>
/// <param name="demodel"></param>
/// <returns></returns>
public
bool
SetReserveBaseInfo
(
RB_Reserve_Base_Extend
demodel
)
{
var
model
=
reserveBaseRepository
.
GetList
(
new
RB_Reserve_Base_Extend
()
{
TenantId
=
demodel
.
TenantId
,
MallBaseId
=
demodel
.
MallBaseId
}).
FirstOrDefault
();
if
(
model
==
null
)
{
return
reserveBaseRepository
.
Insert
(
demodel
)
>
0
;
}
else
{
model
.
UpdateBy
=
demodel
.
UpdateBy
;
model
.
AdvanceMinute
=
demodel
.
AdvanceMinute
;
model
.
OrderStateJson
=
demodel
.
OrderStateJson
;
model
.
BusinessHoursJson
=
demodel
.
BusinessHoursJson
;
model
.
PayTypeJson
=
demodel
.
PayTypeJson
;
model
.
OrderStateJson
=
demodel
.
OrderStateJson
;
model
.
UpdateDate
=
demodel
.
UpdateDate
;
return
reserveBaseRepository
.
Update
(
model
);
}
}
#
endregion
#
region
服务人员信息
/// <summary>
...
...
Mall.Repository/Reserve/RB_Reserve_BaseRepository.cs
0 → 100644
View file @
29429cc1
using
Mall.Model.Entity.Reserve
;
using
Mall.Model.Extend.Reserve
;
using
System
;
using
System.Collections.Generic
;
using
System.Linq
;
using
System.Text
;
namespace
Mall.Repository.Reserve
{
public
class
RB_Reserve_BaseRepository
:
BaseRepository
<
RB_Reserve_Base
>
{
/// <summary>
/// 获取列表
/// </summary>
/// <param name="dmodel">查询条件</param>
/// <returns></returns>
public
List
<
RB_Reserve_Base_Extend
>
GetList
(
RB_Reserve_Base_Extend
dmodel
)
{
string
where
=
$" 1=1 "
;
if
(
dmodel
.
TenantId
>
0
)
{
where
+=
$@" and
{
nameof
(
RB_Reserve_Base
.
TenantId
)}
=
{
dmodel
.
TenantId
}
"
;
}
if
(
dmodel
.
MallBaseId
>
0
)
{
where
+=
$@" and
{
nameof
(
RB_Reserve_Base
.
MallBaseId
)}
=
{
dmodel
.
MallBaseId
}
"
;
}
string
sql
=
$@"
select * from RB_Reserve_Base where
{
where
}
"
;
return
Get
<
RB_Reserve_Base_Extend
>(
sql
).
ToList
();
}
}
}
Mall.WebApi/Controllers/Reserve/ReserveController.cs
View file @
29429cc1
...
...
@@ -27,6 +27,66 @@ namespace Mall.WebApi.Controllers.Reserve
private
readonly
ReserveModule
reserveModule
=
new
ReserveModule
();
private
Module
.
User
.
UserModule
UserModule
=
new
Module
.
User
.
UserModule
();
#
region
基础配置
/// <summary>
/// 获取线下服务行业基础配置
/// </summary>
/// <returns></returns>
[
HttpPost
]
public
ApiResult
GetReserveBaseInfo
()
{
var
req
=
RequestParm
;
var
model
=
reserveModule
.
GetReserveBaseInfo
(
req
.
TenantId
,
req
.
MallBaseId
);
return
ApiResult
.
Success
(
""
,
model
);
}
/// <summary>
/// 保存线下服务行业基础配置
/// </summary>
/// <returns></returns>
public
ApiResult
SetReserveBaseInfo
()
{
var
req
=
RequestParm
;
RB_Reserve_Base_Extend
demodel
=
JsonConvert
.
DeserializeObject
<
RB_Reserve_Base_Extend
>(
req
.
msg
.
ToString
());
demodel
.
OrderStateJson
=
""
;
if
(
demodel
.
OrderStateList
!=
null
&&
demodel
.
OrderStateList
.
Any
())
{
demodel
.
OrderStateJson
=
JsonConvert
.
SerializeObject
(
demodel
.
OrderStateList
);
}
demodel
.
BusinessHoursJson
=
""
;
if
(
demodel
.
BusinessHoursList
!=
null
&&
demodel
.
BusinessHoursList
.
Any
())
{
demodel
.
BusinessHoursJson
=
JsonConvert
.
SerializeObject
(
demodel
.
BusinessHoursList
);
}
if
(
demodel
.
PayTypeList
==
null
||!
demodel
.
PayTypeList
.
Any
())
{
return
ApiResult
.
Failed
(
"请选择付款方式"
);
}
demodel
.
PayTypeJson
=
""
;
if
(
demodel
.
PayTypeList
!=
null
&&
demodel
.
PayTypeList
.
Any
())
{
demodel
.
PayTypeJson
=
JsonConvert
.
SerializeObject
(
demodel
.
PayTypeList
);
}
demodel
.
TenantId
=
req
.
TenantId
;
demodel
.
MallBaseId
=
req
.
MallBaseId
;
demodel
.
UpdateBy
=
req
.
EmpId
;
demodel
.
CreateDate
=
DateTime
.
Now
;
demodel
.
UpdateDate
=
DateTime
.
Now
;
bool
flag
=
reserveModule
.
SetReserveBaseInfo
(
demodel
);
if
(
flag
)
{
return
ApiResult
.
Success
();
}
else
{
return
ApiResult
.
Failed
();
}
}
#
endregion
#
region
服务人员
/// <summary>
/// 获取服务人员列表
...
...
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