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
2f529aeb
Commit
2f529aeb
authored
Sep 01, 2020
by
吴春
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'sdzq' of
http://gitlab.oytour.com/Kui2/mall.oytour.com
into sdzq
parents
37866975
8ef1c357
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
183 additions
and
6 deletions
+183
-6
RB_GuideCar_Base.cs
Mall.Model/Entity/GuideCar/RB_GuideCar_Base.cs
+91
-0
RB_GuideCar_Base_Extend.cs
Mall.Model/Extend/GuideCar/RB_GuideCar_Base_Extend.cs
+15
-0
GuideCarModule.cs
Mall.Module.Product/GuideCarModule.cs
+29
-6
RB_GuideCar_BaseRepository.cs
Mall.Repository/GuideCar/RB_GuideCar_BaseRepository.cs
+36
-0
GuideCarController.cs
Mall.WebApi/Controllers/Product/GuideCarController.cs
+12
-0
No files found.
Mall.Model/Entity/GuideCar/RB_GuideCar_Base.cs
0 → 100644
View file @
2f529aeb
using
VT.FW.DB
;
using
Mall.Common.Enum.MallBase
;
using
System
;
using
System.Collections.Generic
;
using
System.Text
;
namespace
Mall.Model.Entity.GuideCar
{
/// <summary>
/// 司导专区基础
/// </summary>
[
Serializable
]
[
DB
(
ConnectionName
=
"DefaultConnection"
)]
public
class
RB_GuideCar_Base
{
/// <summary>
/// id
/// </summary>
public
int
Id
{
get
;
set
;
}
/// <summary>
/// 详情页面链接
/// </summary>
public
string
PagePath
{
get
;
set
;
}
/// <summary>
/// 是否需要确认 1是 2否
/// </summary>
public
int
IsConfirm
{
get
;
set
;
}
/// <summary>
/// 提前预定天数
/// </summary>
public
int
AdvanceDay
{
get
;
set
;
}
/// <summary>
/// 取消提前小时
/// </summary>
public
int
CancelHour
{
get
;
set
;
}
/// <summary>
/// 订单状态变更
/// </summary>
public
string
OrderStateJson
{
get
;
set
;
}
/// <summary>
/// 保险名称
/// </summary>
public
string
InsuranceName
{
get
;
set
;
}
/// <summary>
/// 成本价格
/// </summary>
public
decimal
CostPrice
{
get
;
set
;
}
/// <summary>
/// 销售价格
/// </summary>
public
decimal
SalePrice
{
get
;
set
;
}
/// <summary>
/// 保险描述(富文本)
/// </summary>
public
string
InsuranceDescription
{
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/GuideCar/RB_GuideCar_Base_Extend.cs
0 → 100644
View file @
2f529aeb
using
Mall.Model.Entity.GuideCar
;
using
System
;
using
System.Collections.Generic
;
using
System.Text
;
namespace
Mall.Model.Extend.GuideCar
{
/// <summary>
/// 司导专区基础扩展表
/// </summary>
public
class
RB_GuideCar_Base_Extend
:
RB_GuideCar_Base
{
}
}
Mall.Module.Product/GuideCarModule.cs
View file @
2f529aeb
...
...
@@ -41,7 +41,6 @@ namespace Mall.Module.Product
/// 商品分类
/// </summary>
private
readonly
RB_Product_CategoryRepository
product_CategoryRepository
=
new
RB_Product_CategoryRepository
();
/// <summary>
/// 商品
/// </summary>
...
...
@@ -58,7 +57,6 @@ namespace Mall.Module.Product
/// 商品分类
/// </summary>
private
readonly
RB_Goods_CategoryRepository
goods_CategoryRepository
=
new
RB_Goods_CategoryRepository
();
/// <summary>
/// 分销商等级
/// </summary>
...
...
@@ -87,7 +85,6 @@ namespace Mall.Module.Product
/// 商品会员价格
/// </summary>
private
readonly
RB_Goods_MemberPriceRepository
goods_MemberPriceRepository
=
new
RB_Goods_MemberPriceRepository
();
/// <summary>
/// 商户仓储层对象
/// </summary>
...
...
@@ -108,7 +105,6 @@ namespace Mall.Module.Product
/// 地区处理
/// </summary>
private
readonly
Rb_destinationRepository
destinationRepository
=
new
Rb_destinationRepository
();
/// <summary>
/// 商品分销
/// </summary>
...
...
@@ -121,7 +117,6 @@ namespace Mall.Module.Product
/// 粉象VIP返佣比例
/// </summary>
private
readonly
RB_Distributor_FXCommissionRepository
distributor_FXCommissionRepository
=
new
RB_Distributor_FXCommissionRepository
();
/// <summary>
/// 微店基础
/// </summary>
...
...
@@ -134,7 +129,6 @@ namespace Mall.Module.Product
/// 微店商品价格
/// </summary>
private
RB_SmallShops_PriceRepository
smallShops_PriceRepository
=
new
RB_SmallShops_PriceRepository
();
/// <summary>
/// 司导站点
/// </summary>
...
...
@@ -143,9 +137,38 @@ namespace Mall.Module.Product
/// 司导站点地区
/// </summary>
private
RB_GuideCar_SiteRegionRepository
SiteRegionRepository
=
new
RB_GuideCar_SiteRegionRepository
();
/// <summary>
/// 司导基础配置
/// </summary>
private
RB_GuideCar_BaseRepository
guideCar_BaseRepository
=
new
RB_GuideCar_BaseRepository
();
#
region
基础配置
/// <summary>
/// 获取基础配置
/// </summary>
/// <param name="tenantId"></param>
/// <param name="mallBaseId"></param>
/// <returns></returns>
public
RB_GuideCar_Base_Extend
GetGuideCarInfo
(
int
tenantId
,
int
mallBaseId
)
{
var
model
=
guideCar_BaseRepository
.
GetList
(
new
RB_GuideCar_Base_Extend
()
{
TenantId
=
tenantId
,
MallBaseId
=
mallBaseId
}).
FirstOrDefault
();
if
(
model
==
null
)
{
model
=
new
RB_GuideCar_Base_Extend
()
{
AdvanceDay
=
1
,
MallBaseId
=
mallBaseId
,
CancelHour
=
1
,
CostPrice
=
0
,
Id
=
0
,
InsuranceDescription
=
""
,
InsuranceName
=
""
,
IsConfirm
=
1
,
PagePath
=
""
,
};
}
return
model
;
}
#
endregion
...
...
Mall.Repository/GuideCar/RB_GuideCar_BaseRepository.cs
0 → 100644
View file @
2f529aeb
using
Mall.Model.Entity.GuideCar
;
using
Mall.Model.Extend.GuideCar
;
using
System
;
using
System.Collections.Generic
;
using
System.Linq
;
using
System.Text
;
namespace
Mall.Repository.GuideCar
{
public
class
RB_GuideCar_BaseRepository
:
BaseRepository
<
RB_GuideCar_Base
>
{
/// <summary>
/// 获取列表
/// </summary>
/// <param name="dmodel">查询条件</param>
/// <returns></returns>
public
List
<
RB_GuideCar_Base_Extend
>
GetList
(
RB_GuideCar_Base_Extend
dmodel
)
{
string
where
=
$" 1=1 "
;
if
(
dmodel
.
TenantId
>
0
)
{
where
+=
$@" and
{
nameof
(
RB_GuideCar_Base
.
TenantId
)}
=
{
dmodel
.
TenantId
}
"
;
}
if
(
dmodel
.
MallBaseId
>
0
)
{
where
+=
$@" and
{
nameof
(
RB_GuideCar_Base
.
MallBaseId
)}
=
{
dmodel
.
MallBaseId
}
"
;
}
string
sql
=
$@"
select * from RB_GuideCar_Base where
{
where
}
"
;
return
Get
<
RB_GuideCar_Base_Extend
>(
sql
).
ToList
();
}
}
}
Mall.WebApi/Controllers/Product/GuideCarController.cs
View file @
2f529aeb
...
...
@@ -29,6 +29,18 @@ namespace Mall.WebApi.Controllers.MallBase
private
readonly
GuideCarModule
guideCarModule
=
new
GuideCarModule
();
#
region
基础配置
/// <summary>
/// 获取司导专区基础配置
/// </summary>
/// <returns></returns>
[
HttpPost
]
public
ApiResult
GetGuideCarInfo
()
{
var
req
=
RequestParm
;
var
model
=
guideCarModule
.
GetGuideCarInfo
(
req
.
TenantId
,
req
.
MallBaseId
);
return
ApiResult
.
Success
();
}
#
endregion
...
...
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