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
7136a547
Commit
7136a547
authored
Sep 02, 2020
by
liudong1993
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
商品导出
parent
d9d3e1e5
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
120 additions
and
102 deletions
+120
-102
RB_GuideCar_CarColor_Extend.cs
Mall.Model/Extend/GuideCar/RB_GuideCar_CarColor_Extend.cs
+4
-0
RB_GuideCar_Car_Extend.cs
Mall.Model/Extend/GuideCar/RB_GuideCar_Car_Extend.cs
+4
-0
RB_GuideCar_Guide_Extend.cs
Mall.Model/Extend/GuideCar/RB_GuideCar_Guide_Extend.cs
+4
-0
RB_Goods_Extend.cs
Mall.Model/Extend/Product/RB_Goods_Extend.cs
+21
-0
GuideCarModule.cs
Mall.Module.Product/GuideCarModule.cs
+61
-0
RB_GuideCar_CarRepository.cs
Mall.Repository/GuideCar/RB_GuideCar_CarRepository.cs
+4
-0
RB_GuideCar_GuideRepository.cs
Mall.Repository/GuideCar/RB_GuideCar_GuideRepository.cs
+4
-0
RB_GuideCar_SiteRepository.cs
Mall.Repository/GuideCar/RB_GuideCar_SiteRepository.cs
+1
-1
GuideCarController.cs
Mall.WebApi/Controllers/Product/GuideCarController.cs
+17
-101
No files found.
Mall.Model/Extend/GuideCar/RB_GuideCar_CarColor_Extend.cs
View file @
7136a547
...
...
@@ -10,5 +10,9 @@ namespace Mall.Model.Extend.GuideCar
public
List
<
string
>
PicList
{
get
;
set
;
}
public
string
CardIds
{
get
;
set
;
}
/// <summary>
/// 颜色ids
/// </summary>
public
string
CarColorIds
{
get
;
set
;
}
}
}
Mall.Model/Extend/GuideCar/RB_GuideCar_Car_Extend.cs
View file @
7136a547
...
...
@@ -19,5 +19,9 @@ namespace Mall.Model.Extend.GuideCar
/// 商品数
/// </summary>
public
int
GoodsNum
{
get
;
set
;
}
/// <summary>
/// ids
/// </summary>
public
string
GuideCarIds
{
get
;
set
;
}
}
}
Mall.Model/Extend/GuideCar/RB_GuideCar_Guide_Extend.cs
View file @
7136a547
...
...
@@ -15,6 +15,10 @@ namespace Mall.Model.Extend.GuideCar
[
DB
(
ConnectionName
=
"DefaultConnection"
)]
public
class
RB_GuideCar_Guide_Extend
:
RB_GuideCar_Guide
{
/// <summary>
/// 导游ids
/// </summary>
public
string
GuideIds
{
get
;
set
;
}
/// <summary>
/// 站点名称
/// </summary>
...
...
Mall.Model/Extend/Product/RB_Goods_Extend.cs
View file @
7136a547
...
...
@@ -23,6 +23,27 @@ namespace Mall.Model.Extend.Product
/// 线路描述list
/// </summary>
public
List
<
string
>
LineDescriptionList
{
get
;
set
;
}
#
region
司导信息
/// <summary>
/// 站点名称
/// </summary>
public
string
SiteName
{
get
;
set
;
}
/// <summary>
/// 导游名称
/// </summary>
public
string
GuideName
{
get
;
set
;
}
/// <summary>
/// 车辆名称
/// </summary>
public
string
CarName
{
get
;
set
;
}
/// <summary>
/// 车辆颜色
/// </summary>
public
string
CarColorName
{
get
;
set
;
}
#
endregion
/// <summary>
/// 微店id
/// </summary>
...
...
Mall.Module.Product/GuideCarModule.cs
View file @
7136a547
...
...
@@ -303,6 +303,67 @@ namespace Mall.Module.Product
return
list
;
}
/// <summary>
/// 获取后台商品分页列表
/// </summary>
/// <param name="pageIndex"></param>
/// <param name="pageSize"></param>
/// <param name="count"></param>
/// <param name="demodel"></param>
/// <returns></returns>
public
List
<
RB_Goods_Extend
>
GetProductGoodsPageListToExcel
(
int
pageIndex
,
int
pageSize
,
out
long
count
,
RB_Goods_Extend
demodel
)
{
var
list
=
goodsRepository
.
GetPageListForCar
(
pageIndex
,
pageSize
,
out
count
,
demodel
);
if
(
list
.
Any
())
{
//查询分类
string
ids
=
string
.
Join
(
","
,
list
.
Select
(
x
=>
x
.
Id
));
var
clist
=
goods_CategoryRepository
.
GetList
(
new
RB_Goods_Category_Extend
()
{
GoodsIds
=
ids
,
TenantId
=
demodel
.
TenantId
,
MallBaseId
=
demodel
.
MallBaseId
});
var
olist
=
goods_OrderRepository
.
GetGoodsOrderNum
(
ids
);
#
region
查询司导信息
string
siteIds
=
string
.
Join
(
","
,
list
.
Select
(
x
=>
x
.
SiteId
));
var
sitelist
=
SiteRepository
.
GetList
(
new
RB_GuideCar_Site_Extend
()
{
SiteIds
=
siteIds
});
string
guideIds
=
string
.
Join
(
","
,
list
.
Select
(
x
=>
x
.
GuideId
));
var
guidelist
=
GuideRepository
.
GetLogisticsRulesList
(
new
RB_GuideCar_Guide_Extend
()
{
GuideIds
=
guideIds
});
string
carids
=
string
.
Join
(
","
,
list
.
Select
(
x
=>
x
.
CarId
));
var
carlist
=
GuideCarRepository
.
GetGuideCarCarList
(
new
RB_GuideCar_Car_Extend
()
{
GuideCarIds
=
carids
});
string
colorIds
=
string
.
Join
(
","
,
list
.
Select
(
x
=>
x
.
CarColorId
));
var
carcolorlist
=
CarColorRepository
.
GetCarColorList
(
new
RB_GuideCar_CarColor_Extend
()
{
CarColorIds
=
colorIds
});
#
endregion
foreach
(
var
item
in
list
)
{
item
.
CategoryList
=
clist
.
Where
(
x
=>
x
.
GoodsId
==
item
.
Id
).
ToList
();
//轮播图
item
.
CoverImage
=
""
;
item
.
CarouselImageList
=
new
List
<
RB_ImageCommonModel
>();
if
(!
string
.
IsNullOrEmpty
(
item
.
CarouselImage
)
&&
item
.
CarouselImage
!=
"[]"
)
{
List
<
string
>
CarouselIdList
=
JsonConvert
.
DeserializeObject
<
List
<
string
>>(
item
.
CarouselImage
);
//封面图
item
.
CoverImage
=
CarouselIdList
[
0
];
//轮播图
foreach
(
var
qitem
in
CarouselIdList
)
{
item
.
CarouselImageList
.
Add
(
new
RB_ImageCommonModel
()
{
Id
=
0
,
Name
=
""
,
Path
=
qitem
});
}
}
item
.
GoodsBuyNum
=
olist
.
Where
(
x
=>
x
.
GoodsId
==
item
.
Id
).
FirstOrDefault
()?.
OrderNum
??
0
;
item
.
SiteName
=
sitelist
.
Where
(
x
=>
x
.
ID
==
item
.
SiteId
).
FirstOrDefault
()?.
SiteName
??
""
;
item
.
GuideName
=
guidelist
.
Where
(
x
=>
x
.
ID
==
item
.
GuideId
).
FirstOrDefault
()?.
Name
??
""
;
item
.
CarName
=
carlist
.
Where
(
x
=>
x
.
ID
==
item
.
CarId
).
FirstOrDefault
()?.
Name
??
""
;
item
.
CarColorName
=
carcolorlist
.
Where
(
x
=>
x
.
ID
==
item
.
CarColorId
).
FirstOrDefault
()?.
ColorName
??
""
;
}
}
return
list
;
}
/// <summary>
/// 获取商品详情
/// </summary>
...
...
Mall.Repository/GuideCar/RB_GuideCar_CarRepository.cs
View file @
7136a547
...
...
@@ -73,6 +73,10 @@ namespace Mall.Repository.GuideCar
{
builder
.
Append
(
$" AND
{
nameof
(
RB_GuideCar_Car_Extend
.
ID
)}
=
{
query
.
ID
}
"
);
}
if
(!
string
.
IsNullOrEmpty
(
query
.
GuideCarIds
))
{
builder
.
Append
(
$" AND
{
nameof
(
RB_GuideCar_Car_Extend
.
ID
)}
in(
{
query
.
GuideCarIds
}
)"
);
}
if
(
query
.
TenantId
>
0
)
{
builder
.
Append
(
$" AND
{
nameof
(
RB_GuideCar_Car_Extend
.
TenantId
)}
=
{
query
.
TenantId
}
"
);
...
...
Mall.Repository/GuideCar/RB_GuideCar_GuideRepository.cs
View file @
7136a547
...
...
@@ -119,6 +119,10 @@ namespace Mall.Repository.GuideCar
{
builder
.
Append
(
$" AND a.
{
nameof
(
RB_GuideCar_Guide_Extend
.
ID
)}
=
{
query
.
ID
}
"
);
}
if
(!
string
.
IsNullOrEmpty
(
query
.
GuideIds
))
{
builder
.
Append
(
$" AND a.
{
nameof
(
RB_GuideCar_Guide_Extend
.
ID
)}
in(
{
query
.
GuideIds
}
)"
);
}
if
(
query
.
IsEnable
>
-
1
)
{
builder
.
Append
(
$" AND a.
{
nameof
(
RB_GuideCar_Guide_Extend
.
IsEnable
)}
=
{
query
.
IsEnable
}
"
);
...
...
Mall.Repository/GuideCar/RB_GuideCar_SiteRepository.cs
View file @
7136a547
...
...
@@ -57,7 +57,7 @@ namespace Mall.Repository.GuideCar
/// <param name="rowCount">总条数</param>
/// <param name="query">查询条件</param>
/// <returns></returns>
public
List
<
RB_GuideCar_Site_Extend
>
GetL
ogisticsRulesL
ist
(
RB_GuideCar_Site_Extend
query
)
public
List
<
RB_GuideCar_Site_Extend
>
GetList
(
RB_GuideCar_Site_Extend
query
)
{
StringBuilder
builder
=
new
StringBuilder
();
builder
.
Append
(
$" SELECT * FROM
{
TableName
}
WHERE
{
nameof
(
RB_GuideCar_Site_Extend
.
Status
)}
=0 "
);
...
...
Mall.WebApi/Controllers/Product/GuideCarController.cs
View file @
7136a547
This diff is collapsed.
Click to expand it.
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