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
47b327de
Commit
47b327de
authored
May 27, 2020
by
吴春
Browse files
Options
Browse Files
Download
Plain Diff
解决冲突
parents
15785911
61e2df8d
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
29 changed files
with
2822 additions
and
507 deletions
+2822
-507
RequestParm.cs
Mall.Common/API/RequestParm.cs
+5
-0
Mall.Common.csproj
Mall.Common/Mall.Common.csproj
+3
-0
CSVHelper.cs
Mall.Common/Plugin/CSVHelper.cs
+76
-0
GoodsBetchDataHelper.cs
Mall.DataHelper/Import/GoodsBetchDataHelper.cs
+180
-0
GoodsOrderBetchDataHelper.cs
Mall.DataHelper/Import/GoodsOrderBetchDataHelper.cs
+159
-0
RB_Goods.cs
Mall.Model/Entity/Product/RB_Goods.cs
+1
-1
RB_Goods_OrderDetail.cs
Mall.Model/Entity/Product/RB_Goods_OrderDetail.cs
+1
-1
RB_Goods_SpecificationValue.cs
Mall.Model/Entity/Product/RB_Goods_SpecificationValue.cs
+1
-1
RB_Miniprogram_PageManage.cs
Mall.Model/Entity/User/RB_Miniprogram_PageManage.cs
+5
-0
RB_Destination_Extend.cs
Mall.Model/Extend/BaseSetUp/RB_Destination_Extend.cs
+5
-0
RB_Miniprogram_Template_Extend.cs
.../Extend/MarketingCenter/RB_Miniprogram_Template_Extend.cs
+5
-0
RB_Goods_Extend.cs
Mall.Model/Extend/Product/RB_Goods_Extend.cs
+16
-0
RB_Goods_Order_Extend.cs
Mall.Model/Extend/Product/RB_Goods_Order_Extend.cs
+51
-0
RB_Member_User_Extend.cs
Mall.Model/Extend/User/RB_Member_User_Extend.cs
+5
-0
GoodsImport.cs
Mall.Model/Query/GoodsImport.cs
+130
-0
OrderModule.cs
Mall.Module.Product/OrderModule.cs
+310
-49
ProductModule.cs
Mall.Module.Product/ProductModule.cs
+611
-100
MiniProgramModule.cs
Mall.Module.User/MiniProgramModule.cs
+12
-1
MiniProgramPageModule.cs
Mall.Module.User/MiniProgramPageModule.cs
+4
-0
UserModule.cs
Mall.Module.User/UserModule.cs
+4
-23
RB_DestinationRepository.cs
Mall.Repository/BaseSetUp/RB_DestinationRepository.cs
+3
-0
RB_GoodsRepository.cs
Mall.Repository/Product/RB_GoodsRepository.cs
+53
-0
RB_Member_UserRepository.cs
Mall.Repository/User/RB_Member_UserRepository.cs
+4
-0
RB_Miniprogram_PageManageRepository.cs
Mall.Repository/User/RB_Miniprogram_PageManageRepository.cs
+1
-1
FileController.cs
Mall.WebApi/Controllers/File/FileController.cs
+3
-2
MallController.cs
Mall.WebApi/Controllers/Mall/MallController.cs
+988
-322
OrderController.cs
Mall.WebApi/Controllers/Product/OrderController.cs
+31
-0
ProductController.cs
Mall.WebApi/Controllers/Product/ProductController.cs
+154
-6
TenantController.cs
Mall.WebApi/Controllers/User/TenantController.cs
+1
-0
No files found.
Mall.Common/API/RequestParm.cs
View file @
47b327de
...
...
@@ -67,5 +67,10 @@ namespace Mall.Common.API
/// 小程序Id
/// </summary>
public
string
MiniAppId
{
get
;
set
;
}
/// <summary>
/// 用户OpenId
/// </summary>
public
string
OpenId
{
get
;
set
;
}
}
}
Mall.Common/Mall.Common.csproj
View file @
47b327de
...
...
@@ -15,6 +15,7 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="LumenWorksX.Framework.IO" Version="1.0.1" />
<PackageReference Include="Microsoft.AspNetCore.Http" Version="2.2.2" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.Core" Version="2.2.5" />
<PackageReference Include="Microsoft.Extensions.Configuration" Version="3.0.1" />
...
...
@@ -23,6 +24,8 @@
<PackageReference Include="NPOI" Version="2.4.1" />
<PackageReference Include="StackExchange.Redis" Version="2.0.601" />
<PackageReference Include="System.Configuration.ConfigurationManager" Version="4.6.0" />
<PackageReference Include="System.Text.Encoding.CodePages" Version="4.7.1" />
<PackageReference Include="System.Text.Encoding.Extensions" Version="4.3.0" />
</ItemGroup>
</Project>
Mall.Common/Plugin/CSVHelper.cs
0 → 100644
View file @
47b327de
using
LumenWorks.Framework.IO.Csv
;
using
System
;
using
System.Collections.Generic
;
using
System.Data
;
using
System.IO
;
using
System.Linq
;
using
System.Reflection
;
using
System.Text
;
using
System.Text.RegularExpressions
;
using
System.Threading.Tasks
;
using
System.Text.Encodings
;
namespace
Mall.Common
{
public
class
CSVHelper
{
/// <summary>
/// 获取路径下的.csv文件
/// </summary>
/// <param name="FilePath"></param>
/// <returns></returns>
public
DataTable
GetStream
(
string
FilePath
)
{
FileStream
fileStream
=
new
FileStream
(
FilePath
,
FileMode
.
Open
,
FileAccess
.
Read
,
FileShare
.
Read
);
byte
[]
bytes
=
new
byte
[
fileStream
.
Length
];
fileStream
.
Read
(
bytes
,
0
,
bytes
.
Length
);
fileStream
.
Close
();
Stream
stream
=
new
MemoryStream
(
bytes
);
Encoding
.
RegisterProvider
(
CodePagesEncodingProvider
.
Instance
);
return
GetData
(
stream
,
Encoding
.
GetEncoding
(
"GB2312"
));
}
/// <summary>
/// 将.csv文件转换成DataTable
/// </summary>
/// <param name="stream"></param>
/// <returns></returns>
private
DataTable
GetData
(
Stream
stream
,
Encoding
enc
)
{
using
(
stream
)
{
using
(
StreamReader
input
=
new
StreamReader
(
stream
,
enc
))
{
using
(
CsvReader
csv
=
new
CsvReader
(
input
,
true
))
{
DataTable
dt
=
new
DataTable
();
//第一行字段数量
int
columnCount
=
csv
.
FieldCount
;
//标题数组
string
[]
headers
=
csv
.
GetFieldHeaders
();
//循环添加标题行
for
(
int
i
=
0
;
i
<
columnCount
;
i
++)
{
dt
.
Columns
.
Add
(
headers
[
i
]);
}
//循环添加列数据
while
(
csv
.
ReadNextRecord
())
{
DataRow
dr
=
dt
.
NewRow
();
for
(
int
i
=
0
;
i
<
columnCount
;
i
++)
{
if
(!
string
.
IsNullOrWhiteSpace
(
csv
[
i
]))
{
dr
[
i
]
=
csv
[
i
];
}
}
dt
.
Rows
.
Add
(
dr
);
}
return
dt
;
}
}
}
}
}
}
Mall.DataHelper/Import/GoodsBetchDataHelper.cs
0 → 100644
View file @
47b327de
using
Mall.Common
;
using
Mall.Model.Extend.Product
;
using
System
;
using
System.Collections.Generic
;
using
System.Data
;
using
System.Linq
;
namespace
Mall.DataHelper
{
/// <summary>
/// 商品导入
/// </summary>
public
class
GoodsBetchDataHelper
{
/// <summary>
/// 导入模板
/// </summary>
/// <param name="fileName"></param>
/// <returns></returns>
public
static
List
<
RB_Goods_Extend
>
ImportClaimData
(
string
fileName
)
{
List
<
RB_Goods_Extend
>
list
=
new
List
<
RB_Goods_Extend
>();
var
dt
=
new
DataTable
();
if
(
fileName
.
Contains
(
".csv"
))
{
dt
=
new
CSVHelper
().
GetStream
(
fileName
);
}
else
{
dt
=
Mall
.
Common
.
Plugin
.
NPOIHelper
.
ImportExceltoDt
(
fileName
,
0
,
0
,
true
);
}
if
(
dt
!=
null
&&
dt
.
Rows
.
Count
>
0
)
{
foreach
(
DataRow
dr
in
dt
.
Rows
)
{
list
.
Add
(
DataRowToModel
(
dr
));
}
}
return
list
;
}
/// <summary>
/// DataRow转实体
/// </summary>
/// <param name="dr"></param>
/// <returns></returns>
public
static
RB_Goods_Extend
DataRowToModel
(
DataRow
dr
)
{
RB_Goods_Extend
model
=
new
RB_Goods_Extend
();
if
(
dr
!=
null
)
{
if
(
dr
.
Table
.
Columns
.
Contains
(
"商品名称"
)
&&
!
string
.
IsNullOrEmpty
(
dr
[
"商品名称"
].
ToString
().
Trim
()))
{
model
.
Name
=
dr
[
"商品名称"
].
ToString
();
}
if
(
dr
.
Table
.
Columns
.
Contains
(
"原价"
)
&&
!
string
.
IsNullOrEmpty
(
dr
[
"原价"
].
ToString
().
Trim
()))
{
model
.
OriginalPrice
=
Convert
.
ToDecimal
(
dr
[
"原价"
].
ToString
());
}
if
(
dr
.
Table
.
Columns
.
Contains
(
"成本价"
)
&&
!
string
.
IsNullOrEmpty
(
dr
[
"成本价"
].
ToString
().
Trim
()))
{
model
.
CostPrice
=
Convert
.
ToDecimal
(
dr
[
"成本价"
].
ToString
());
}
if
(
dr
.
Table
.
Columns
.
Contains
(
"商品详情"
)
&&
!
string
.
IsNullOrEmpty
(
dr
[
"商品详情"
].
ToString
().
Trim
()))
{
model
.
GoodsDetails
=
dr
[
"商品详情"
].
ToString
();
}
if
(
dr
.
Table
.
Columns
.
Contains
(
"商品缩略图"
)
&&
!
string
.
IsNullOrEmpty
(
dr
[
"商品缩略图"
].
ToString
().
Trim
()))
{
model
.
CoverImage
=
dr
[
"商品缩略图"
].
ToString
();
}
if
(
dr
.
Table
.
Columns
.
Contains
(
"商品轮播图"
)
&&
!
string
.
IsNullOrEmpty
(
dr
[
"商品轮播图"
].
ToString
().
Trim
()))
{
model
.
CarouselImage
=
dr
[
"商品轮播图"
].
ToString
();
}
if
(
dr
.
Table
.
Columns
.
Contains
(
"商品视频"
)
&&
!
string
.
IsNullOrEmpty
(
dr
[
"商品视频"
].
ToString
().
Trim
()))
{
model
.
VideoAddress
=
dr
[
"商品视频"
].
ToString
();
}
if
(
dr
.
Table
.
Columns
.
Contains
(
"单位"
)
&&
!
string
.
IsNullOrEmpty
(
dr
[
"单位"
].
ToString
().
Trim
()))
{
model
.
Unit
=
dr
[
"单位"
].
ToString
();
}
if
(
dr
.
Table
.
Columns
.
Contains
(
"售价"
)
&&
!
string
.
IsNullOrEmpty
(
dr
[
"售价"
].
ToString
().
Trim
()))
{
model
.
SellingPrice
=
Convert
.
ToDecimal
(
dr
[
"售价"
].
ToString
());
}
if
(
dr
.
Table
.
Columns
.
Contains
(
"是否使用规格"
)
&&
!
string
.
IsNullOrEmpty
(
dr
[
"是否使用规格"
].
ToString
().
Trim
()))
{
model
.
IsCustomSpecification
=
Convert
.
ToInt32
(
dr
[
"是否使用规格"
].
ToString
());
}
if
(
dr
.
Table
.
Columns
.
Contains
(
"规格组"
)
&&
!
string
.
IsNullOrEmpty
(
dr
[
"规格组"
].
ToString
().
Trim
()))
{
model
.
SpecificationImport
=
dr
[
"规格组"
].
ToString
();
}
if
(
dr
.
Table
.
Columns
.
Contains
(
"商品库存"
)
&&
!
string
.
IsNullOrEmpty
(
dr
[
"商品库存"
].
ToString
().
Trim
()))
{
model
.
InventoryNum
=
Convert
.
ToInt32
(
dr
[
"商品库存"
].
ToString
());
}
if
(
dr
.
Table
.
Columns
.
Contains
(
"虚拟销量"
)
&&
!
string
.
IsNullOrEmpty
(
dr
[
"虚拟销量"
].
ToString
().
Trim
()))
{
model
.
SalesNum
=
Convert
.
ToInt32
(
dr
[
"虚拟销量"
].
ToString
());
}
if
(
dr
.
Table
.
Columns
.
Contains
(
"购物数量限制"
)
&&
!
string
.
IsNullOrEmpty
(
dr
[
"购物数量限制"
].
ToString
().
Trim
()))
{
model
.
LimitBuyGoodsNum
=
Convert
.
ToInt32
(
dr
[
"购物数量限制"
].
ToString
());
}
if
(
dr
.
Table
.
Columns
.
Contains
(
"单品满件包邮"
)
&&
!
string
.
IsNullOrEmpty
(
dr
[
"单品满件包邮"
].
ToString
().
Trim
()))
{
model
.
FullNumPinkage
=
Convert
.
ToInt32
(
dr
[
"单品满件包邮"
].
ToString
());
}
if
(
dr
.
Table
.
Columns
.
Contains
(
"单品满额包邮"
)
&&
!
string
.
IsNullOrEmpty
(
dr
[
"单品满额包邮"
].
ToString
().
Trim
()))
{
model
.
FullMoneyPinkage
=
Convert
.
ToDecimal
(
dr
[
"单品满额包邮"
].
ToString
());
}
if
(
dr
.
Table
.
Columns
.
Contains
(
"赠送积分"
)
&&
!
string
.
IsNullOrEmpty
(
dr
[
"赠送积分"
].
ToString
().
Trim
()))
{
model
.
IntegralPresent
=
Convert
.
ToInt32
(
dr
[
"赠送积分"
].
ToString
());
}
if
(
dr
.
Table
.
Columns
.
Contains
(
"赠送积分类型"
)
&&
!
string
.
IsNullOrEmpty
(
dr
[
"赠送积分类型"
].
ToString
().
Trim
()))
{
model
.
IntegralPresentType
=
Convert
.
ToInt32
(
dr
[
"赠送积分类型"
].
ToString
());
}
if
(
dr
.
Table
.
Columns
.
Contains
(
"可抵扣积分"
)
&&
!
string
.
IsNullOrEmpty
(
dr
[
"可抵扣积分"
].
ToString
().
Trim
()))
{
model
.
PointsDeduction
=
Convert
.
ToDecimal
(
dr
[
"可抵扣积分"
].
ToString
());
}
if
(
dr
.
Table
.
Columns
.
Contains
(
"可抵扣积分类型"
)
&&
!
string
.
IsNullOrEmpty
(
dr
[
"可抵扣积分类型"
].
ToString
().
Trim
()))
{
model
.
PointsDeductionType
=
Convert
.
ToInt32
(
dr
[
"可抵扣积分类型"
].
ToString
());
}
if
(
dr
.
Table
.
Columns
.
Contains
(
"允许多件累计折扣"
)
&&
!
string
.
IsNullOrEmpty
(
dr
[
"允许多件累计折扣"
].
ToString
().
Trim
()))
{
model
.
IsMultipleDeduction
=
Convert
.
ToInt32
(
dr
[
"允许多件累计折扣"
].
ToString
());
}
if
(
dr
.
Table
.
Columns
.
Contains
(
"自定义分享图片"
)
&&
!
string
.
IsNullOrEmpty
(
dr
[
"自定义分享图片"
].
ToString
().
Trim
()))
{
model
.
CustomShareImage
=
dr
[
"自定义分享图片"
].
ToString
();
}
if
(
dr
.
Table
.
Columns
.
Contains
(
"自定义分享标题"
)
&&
!
string
.
IsNullOrEmpty
(
dr
[
"自定义分享标题"
].
ToString
().
Trim
()))
{
model
.
CustomShareTitles
=
dr
[
"自定义分享标题"
].
ToString
();
}
if
(
dr
.
Table
.
Columns
.
Contains
(
"排序"
)
&&
!
string
.
IsNullOrEmpty
(
dr
[
"排序"
].
ToString
().
Trim
()))
{
model
.
Sort
=
Convert
.
ToInt32
(
dr
[
"排序"
].
ToString
());
}
if
(
dr
.
Table
.
Columns
.
Contains
(
"限购订单"
)
&&
!
string
.
IsNullOrEmpty
(
dr
[
"限购订单"
].
ToString
().
Trim
()))
{
model
.
LimitBuyOrderNum
=
Convert
.
ToInt32
(
dr
[
"限购订单"
].
ToString
());
}
if
(
dr
.
Table
.
Columns
.
Contains
(
"是否单独区域购买"
)
&&
!
string
.
IsNullOrEmpty
(
dr
[
"是否单独区域购买"
].
ToString
().
Trim
()))
{
model
.
IsAreaBuy
=
Convert
.
ToInt32
(
dr
[
"是否单独区域购买"
].
ToString
());
}
if
(
dr
.
Table
.
Columns
.
Contains
(
"区域限购详情"
)
&&
!
string
.
IsNullOrEmpty
(
dr
[
"区域限购详情"
].
ToString
().
Trim
()))
{
model
.
AreaImport
=
dr
[
"区域限购详情"
].
ToString
();
}
if
(
dr
.
Table
.
Columns
.
Contains
(
"规格详情"
)
&&
!
string
.
IsNullOrEmpty
(
dr
[
"规格详情"
].
ToString
().
Trim
()))
{
model
.
SpecificationPriceImport
=
dr
[
"规格详情"
].
ToString
();
}
if
(
dr
.
Table
.
Columns
.
Contains
(
"是否快速购买"
)
&&
!
string
.
IsNullOrEmpty
(
dr
[
"是否快速购买"
].
ToString
().
Trim
()))
{
model
.
IsQuickBuy
=
Convert
.
ToInt32
(
dr
[
"是否快速购买"
].
ToString
());
}
if
(
dr
.
Table
.
Columns
.
Contains
(
"是否热销"
)
&&
!
string
.
IsNullOrEmpty
(
dr
[
"是否热销"
].
ToString
().
Trim
()))
{
model
.
IsSellWell
=
Convert
.
ToInt32
(
dr
[
"是否热销"
].
ToString
());
}
if
(
dr
.
Table
.
Columns
.
Contains
(
"是否面议"
)
&&
!
string
.
IsNullOrEmpty
(
dr
[
"是否面议"
].
ToString
().
Trim
()))
{
model
.
IsGoodsNegotiable
=
Convert
.
ToInt32
(
dr
[
"是否面议"
].
ToString
());
}
}
return
model
;
}
}
}
\ No newline at end of file
Mall.DataHelper/Import/GoodsOrderBetchDataHelper.cs
0 → 100644
View file @
47b327de
using
Mall.Common
;
using
Mall.Model.Extend.Product
;
using
System
;
using
System.Collections.Generic
;
using
System.Data
;
using
System.Linq
;
namespace
Mall.DataHelper
{
/// <summary>
/// 订单导入
/// </summary>
public
class
GoodsOrderBetchDataHelper
{
/// <summary>
/// 导入模板
/// </summary>
/// <param name="fileName"></param>
/// <returns></returns>
public
static
List
<
RB_Goods_Order_Extend
>
ImportClaimData
(
string
fileName
)
{
List
<
RB_Goods_Order_Extend
>
list
=
new
List
<
RB_Goods_Order_Extend
>();
var
dt
=
new
DataTable
();
if
(
fileName
.
Contains
(
".csv"
))
{
dt
=
new
CSVHelper
().
GetStream
(
fileName
);
}
else
{
dt
=
Mall
.
Common
.
Plugin
.
NPOIHelper
.
ImportExceltoDt
(
fileName
,
0
,
0
,
true
);
}
if
(
dt
!=
null
&&
dt
.
Rows
.
Count
>
0
)
{
foreach
(
DataRow
dr
in
dt
.
Rows
)
{
list
.
Add
(
DataRowToModel
(
dr
));
}
}
return
list
;
}
/// <summary>
/// DataRow转实体
/// </summary>
/// <param name="dr"></param>
/// <returns></returns>
public
static
RB_Goods_Order_Extend
DataRowToModel
(
DataRow
dr
)
{
RB_Goods_Order_Extend
model
=
new
RB_Goods_Order_Extend
();
if
(
dr
!=
null
)
{
if
(
dr
.
Table
.
Columns
.
Contains
(
"所属平台"
)
&&
!
string
.
IsNullOrEmpty
(
dr
[
"所属平台"
].
ToString
().
Trim
()))
{
model
.
PlatformNameImport
=
dr
[
"所属平台"
].
ToString
();
}
if
(
dr
.
Table
.
Columns
.
Contains
(
"订单号"
)
&&
!
string
.
IsNullOrEmpty
(
dr
[
"订单号"
].
ToString
().
Trim
()))
{
model
.
OrderNo
=
dr
[
"订单号"
].
ToString
();
}
if
(
dr
.
Table
.
Columns
.
Contains
(
"商户单号"
)
&&
!
string
.
IsNullOrEmpty
(
dr
[
"商户单号"
].
ToString
().
Trim
()))
{
model
.
MerchantsNo
=
dr
[
"商户单号"
].
ToString
();
}
if
(
dr
.
Table
.
Columns
.
Contains
(
"下单用户"
)
&&
!
string
.
IsNullOrEmpty
(
dr
[
"下单用户"
].
ToString
().
Trim
()))
{
model
.
UserName
=
dr
[
"下单用户"
].
ToString
();
}
if
(
dr
.
Table
.
Columns
.
Contains
(
"商品名"
)
&&
!
string
.
IsNullOrEmpty
(
dr
[
"商品名"
].
ToString
().
Trim
()))
{
model
.
GoodsName
=
dr
[
"商品名"
].
ToString
();
}
if
(
dr
.
Table
.
Columns
.
Contains
(
"规格"
)
&&
!
string
.
IsNullOrEmpty
(
dr
[
"规格"
].
ToString
().
Trim
()))
{
model
.
SpecificationImport
=
dr
[
"规格"
].
ToString
();
}
if
(
dr
.
Table
.
Columns
.
Contains
(
"数量"
)
&&
!
string
.
IsNullOrEmpty
(
dr
[
"数量"
].
ToString
().
Trim
()))
{
model
.
OrderNum
=
Convert
.
ToInt32
(
dr
[
"数量"
].
ToString
());
}
if
(
dr
.
Table
.
Columns
.
Contains
(
"货号"
)
&&
!
string
.
IsNullOrEmpty
(
dr
[
"货号"
].
ToString
().
Trim
()))
{
model
.
ProductCode
=
dr
[
"货号"
].
ToString
();
}
if
(
dr
.
Table
.
Columns
.
Contains
(
"成本价"
)
&&
!
string
.
IsNullOrEmpty
(
dr
[
"成本价"
].
ToString
().
Trim
()))
{
model
.
CostMoneyImport
=
Convert
.
ToDecimal
(
dr
[
"成本价"
].
ToString
());
}
if
(
dr
.
Table
.
Columns
.
Contains
(
"收件人"
)
&&
!
string
.
IsNullOrEmpty
(
dr
[
"收件人"
].
ToString
().
Trim
()))
{
model
.
Consignee
=
dr
[
"收件人"
].
ToString
();
}
if
(
dr
.
Table
.
Columns
.
Contains
(
"收件人电话"
)
&&
!
string
.
IsNullOrEmpty
(
dr
[
"收件人电话"
].
ToString
().
Trim
()))
{
model
.
Mobile
=
dr
[
"收件人电话"
].
ToString
();
}
if
(
dr
.
Table
.
Columns
.
Contains
(
"收件人地址"
)
&&
!
string
.
IsNullOrEmpty
(
dr
[
"收件人地址"
].
ToString
().
Trim
()))
{
model
.
DistrictAddress
=
dr
[
"收件人地址"
].
ToString
();
}
if
(
dr
.
Table
.
Columns
.
Contains
(
"总金额"
)
&&
!
string
.
IsNullOrEmpty
(
dr
[
"总金额"
].
ToString
().
Trim
()))
{
model
.
PreferPrice
=
Convert
.
ToDecimal
(
dr
[
"总金额"
].
ToString
());
}
if
(
dr
.
Table
.
Columns
.
Contains
(
"实际付款"
)
&&
!
string
.
IsNullOrEmpty
(
dr
[
"实际付款"
].
ToString
().
Trim
()))
{
model
.
Income
=
Convert
.
ToDecimal
(
dr
[
"实际付款"
].
ToString
());
}
if
(
dr
.
Table
.
Columns
.
Contains
(
"运费"
)
&&
!
string
.
IsNullOrEmpty
(
dr
[
"运费"
].
ToString
().
Trim
()))
{
model
.
FreightMoney
=
Convert
.
ToDecimal
(
dr
[
"运费"
].
ToString
());
}
if
(
dr
.
Table
.
Columns
.
Contains
(
"下单时间"
)
&&
!
string
.
IsNullOrEmpty
(
dr
[
"下单时间"
].
ToString
().
Trim
()))
{
model
.
CreateDate
=
Convert
.
ToDateTime
(
dr
[
"下单时间"
].
ToString
());
}
if
(
dr
.
Table
.
Columns
.
Contains
(
"支付方式"
)
&&
!
string
.
IsNullOrEmpty
(
dr
[
"支付方式"
].
ToString
().
Trim
()))
{
model
.
PaymentWayImport
=
dr
[
"支付方式"
].
ToString
();
}
if
(
dr
.
Table
.
Columns
.
Contains
(
"订单状态"
)
&&
!
string
.
IsNullOrEmpty
(
dr
[
"订单状态"
].
ToString
().
Trim
()))
{
model
.
OrderStatusImport
=
dr
[
"订单状态"
].
ToString
();
}
if
(
dr
.
Table
.
Columns
.
Contains
(
"付款状态"
)
&&
!
string
.
IsNullOrEmpty
(
dr
[
"付款状态"
].
ToString
().
Trim
()))
{
model
.
PaymentStatusImport
=
dr
[
"付款状态"
].
ToString
();
}
if
(
dr
.
Table
.
Columns
.
Contains
(
"付款时间"
)
&&
!
string
.
IsNullOrEmpty
(
dr
[
"付款时间"
].
ToString
().
Trim
()))
{
model
.
PaymentTime
=
Convert
.
ToDateTime
(
dr
[
"付款时间"
].
ToString
());
}
if
(
dr
.
Table
.
Columns
.
Contains
(
"发货时间"
)
&&
!
string
.
IsNullOrEmpty
(
dr
[
"发货时间"
].
ToString
().
Trim
()))
{
model
.
DeliveryTime
=
Convert
.
ToDateTime
(
dr
[
"发货时间"
].
ToString
());
}
if
(
dr
.
Table
.
Columns
.
Contains
(
"收货时间"
)
&&
!
string
.
IsNullOrEmpty
(
dr
[
"收货时间"
].
ToString
().
Trim
()))
{
model
.
ReceivingTime
=
Convert
.
ToDateTime
(
dr
[
"收货时间"
].
ToString
());
}
if
(
dr
.
Table
.
Columns
.
Contains
(
"商家备注"
)
&&
!
string
.
IsNullOrEmpty
(
dr
[
"商家备注"
].
ToString
().
Trim
()))
{
model
.
Remark
=
dr
[
"商家备注"
].
ToString
();
}
if
(
dr
.
Table
.
Columns
.
Contains
(
"备注/表单"
)
&&
!
string
.
IsNullOrEmpty
(
dr
[
"备注/表单"
].
ToString
().
Trim
()))
{
model
.
BuyerMessage
=
dr
[
"备注/表单"
].
ToString
();
}
if
(
dr
.
Table
.
Columns
.
Contains
(
"售价"
)
&&
!
string
.
IsNullOrEmpty
(
dr
[
"售价"
].
ToString
().
Trim
()))
{
model
.
SellMoneyImport
=
Convert
.
ToDecimal
(
dr
[
"售价"
].
ToString
());
}
if
(
dr
.
Table
.
Columns
.
Contains
(
"原价"
)
&&
!
string
.
IsNullOrEmpty
(
dr
[
"原价"
].
ToString
().
Trim
()))
{
model
.
OriginalMoneyImport
=
Convert
.
ToDecimal
(
dr
[
"原价"
].
ToString
());
}
}
return
model
;
}
}
}
\ No newline at end of file
Mall.Model/Entity/Product/RB_Goods.cs
View file @
47b327de
...
...
@@ -58,7 +58,7 @@ namespace Mall.Model.Entity.Product
/// <summary>
/// 自定义分享图片
/// </summary>
public
int
?
CustomShareImage
public
string
CustomShareImage
{
get
;
set
;
...
...
Mall.Model/Entity/Product/RB_Goods_OrderDetail.cs
View file @
47b327de
...
...
@@ -58,7 +58,7 @@ namespace Mall.Model.Entity.Product
/// <summary>
/// 封面图
/// </summary>
public
int
?
CoverImage
public
string
CoverImage
{
get
;
set
;
...
...
Mall.Model/Entity/Product/RB_Goods_SpecificationValue.cs
View file @
47b327de
...
...
@@ -49,7 +49,7 @@ namespace Mall.Model.Entity.Product
/// <summary>
/// 规格图片
/// </summary>
public
int
?
Image
public
string
Image
{
get
;
set
;
...
...
Mall.Model/Entity/User/RB_Miniprogram_PageManage.cs
View file @
47b327de
...
...
@@ -84,5 +84,10 @@ namespace Mall.Model.Entity.User
get
;
set
;
}
/// <summary>
/// 参数PlaceHolder
/// </summary>
public
string
TipText
{
get
;
set
;
}
}
}
Mall.Model/Extend/BaseSetUp/RB_Destination_Extend.cs
View file @
47b327de
...
...
@@ -75,5 +75,10 @@ namespace Mall.Model.Extend.BaseSetUp
/// ID查询字符串
/// </summary>
public
string
QIds
{
get
;
set
;
}
/// <summary>
/// 批量name查询
/// </summary>
public
string
NameStr
{
get
;
set
;
}
}
}
Mall.Model/Extend/MarketingCenter/RB_Miniprogram_Template_Extend.cs
View file @
47b327de
...
...
@@ -654,6 +654,11 @@ namespace Mall.Model.Extend.MarketingCenter
/// 页面名称
/// </summary>
public
string
PageName
{
get
;
set
;
}
/// <summary>
/// App前端使用
/// </summary>
public
string
new_link_url
{
get
;
set
;
}
}
/// <summary>
...
...
Mall.Model/Extend/Product/RB_Goods_Extend.cs
View file @
47b327de
...
...
@@ -62,6 +62,10 @@ namespace Mall.Model.Extend.Product
/// </summary>
public
string
GoodsIds
{
get
;
set
;
}
/// <summary>
/// 商品str
/// </summary>
public
string
GoodsNameStr
{
get
;
set
;
}
/// <summary>
/// 封面图
/// </summary>
public
string
CoverImage
{
get
;
set
;
}
...
...
@@ -96,10 +100,18 @@ namespace Mall.Model.Extend.Product
/// </summary>
public
List
<
RB_Goods_Area_Extend
>
AreaList
{
get
;
set
;
}
/// <summary>
/// 区域购买导入
/// </summary>
public
string
AreaImport
{
get
;
set
;
}
/// <summary>
/// 规格名列表
/// </summary>
public
List
<
RB_Goods_Specification_Extend
>
SpecificationList
{
get
;
set
;
}
/// <summary>
/// 规格组导入
/// </summary>
public
string
SpecificationImport
{
get
;
set
;
}
/// <summary>
/// 规格值名称列表
/// </summary>
public
List
<
string
>
SpecificationNameList
{
get
;
set
;
}
...
...
@@ -108,6 +120,10 @@ namespace Mall.Model.Extend.Product
/// </summary>
public
List
<
RB_Goods_SpecificationPrice_Extend
>
SpecificationPriceList
{
get
;
set
;
}
/// <summary>
/// 规格价格详情导入
/// </summary>
public
string
SpecificationPriceImport
{
get
;
set
;
}
/// <summary>
/// 分销佣金列表
/// </summary>
public
List
<
RB_Goods_DistributionCommission_Extend
>
DistributionCommissionList
{
get
;
set
;
}
...
...
Mall.Model/Extend/Product/RB_Goods_Order_Extend.cs
View file @
47b327de
...
...
@@ -109,6 +109,7 @@ namespace Mall.Model.Extend.Product
/// </summary>
public
int
?
User_Coupon_Id
{
get
;
set
;
}
/// <summary>
/// 支付方式
/// </summary>
...
...
@@ -122,6 +123,56 @@ namespace Mall.Model.Extend.Product
get
;
set
;
}
#
region
订单导入
/// <summary>
/// 平台名称
/// </summary>
public
string
PlatformNameImport
{
get
;
set
;
}
/// <summary>
/// 规格导入
/// </summary>
public
string
SpecificationImport
{
get
;
set
;
}
/// <summary>
/// 成本价
/// </summary>
public
decimal
CostMoneyImport
{
get
;
set
;
}
/// <summary>
/// 支付方式
/// </summary>
public
string
PaymentWayImport
{
get
;
set
;
}
/// <summary>
/// 订单状态
/// </summary>
public
string
OrderStatusImport
{
get
;
set
;
}
/// <summary>
/// 付款状态
/// </summary>
public
string
PaymentStatusImport
{
get
;
set
;
}
/// <summary>
/// 售价
/// </summary>
public
decimal
SellMoneyImport
{
get
;
set
;
}
/// <summary>
/// 原价
/// </summary>
public
decimal
OriginalMoneyImport
{
get
;
set
;
}
/// <summary>
/// 省
/// </summary>
public
string
PName
{
get
;
set
;
}
/// <summary>
/// 市
/// </summary>
public
string
CName
{
get
;
set
;
}
/// <summary>
/// 区
/// </summary>
public
string
DName
{
get
;
set
;
}
#
endregion
>>>>>>>
61
e2df8d6e7f6e7b0ef4482885c6e6b79d1870e7
}
/// <summary>
...
...
Mall.Model/Extend/User/RB_Member_User_Extend.cs
View file @
47b327de
...
...
@@ -28,6 +28,11 @@ namespace Mall.Model.Extend.User
/// </summary>
public
string
UserIds
{
get
;
set
;
}
/// <summary>
/// 用户名str
/// </summary>
public
string
UserNameStr
{
get
;
set
;
}
/// <summary>
/// 下线数量
/// </summary>
...
...
Mall.Model/Query/GoodsImport.cs
0 → 100644
View file @
47b327de
using
Mall.Common.AOP
;
using
System
;
using
System.Collections.Generic
;
using
System.Text
;
namespace
Mall.Model.Query
{
/// <summary>
/// 赞羊商品轮播
/// </summary>
[
Serializable
]
public
class
GoodsCarouselImport
{
/// <summary>
/// id
/// </summary>
public
int
id
{
get
;
set
;
}
/// <summary>
/// 图片地址
/// </summary>
public
string
pic_url
{
get
;
set
;
}
}
/// <summary>
/// 赞羊规格
/// </summary>
[
Serializable
]
public
class
GoodsSpecificationImport
{
/// <summary>
/// attr_group_id
/// </summary>
public
int
attr_group_id
{
get
;
set
;
}
/// <summary>
/// 规格名称
/// </summary>
public
string
attr_group_name
{
get
;
set
;
}
/// <summary>
/// 子集
/// </summary>
public
List
<
GoodsSpecificationValueImport
>
attr_list
{
get
;
set
;
}
}
/// <summary>
/// 赞羊规格值
/// </summary>
[
Serializable
]
public
class
GoodsSpecificationValueImport
{
/// <summary>
/// attr_id
/// </summary>
public
int
attr_id
{
get
;
set
;
}
/// <summary>
/// 图片地址
/// </summary>
public
string
attr_name
{
get
;
set
;
}
/// <summary>
/// 图片地址
/// </summary>
public
string
pic_url
{
get
;
set
;
}
}
/// <summary>
/// 赞羊规格价格
/// </summary>
[
Serializable
]
public
class
GoodsSpecificationPriceImport
{
/// <summary>
/// id
/// </summary>
public
int
id
{
get
;
set
;
}
/// <summary>
/// 商品id
/// </summary>
public
int
goods_id
{
get
;
set
;
}
/// <summary>
/// key
/// </summary>
public
string
sign_id
{
get
;
set
;
}
/// <summary>
/// 库存
/// </summary>
public
int
stock
{
get
;
set
;
}
/// <summary>
/// 价格
/// </summary>
public
decimal
price
{
get
;
set
;
}
/// <summary>
/// 货号
/// </summary>
public
string
no
{
get
;
set
;
}
/// <summary>
/// 重量
/// </summary>
public
int
weight
{
get
;
set
;
}
/// <summary>
/// 图片地址
/// </summary>
public
string
pic_url
{
get
;
set
;
}
}
/// <summary>
/// 赞羊区域导入
/// </summary>
[
Serializable
]
public
class
GoodsAreaListImport
{
/// <summary>
/// 列表
/// </summary>
public
List
<
GoodsAreaImport
>
list
{
get
;
set
;
}
}
/// <summary>
/// 赞羊区域详情
/// </summary>
[
Serializable
]
public
class
GoodsAreaImport
{
/// <summary>
/// id
/// </summary>
public
int
id
{
get
;
set
;
}
/// <summary>
/// 名称
/// </summary>
public
string
name
{
get
;
set
;
}
}
}
Mall.Module.Product/OrderModule.cs
View file @
47b327de
This diff is collapsed.
Click to expand it.
Mall.Module.Product/ProductModule.cs
View file @
47b327de
This diff is collapsed.
Click to expand it.
Mall.Module.User/MiniProgramModule.cs
View file @
47b327de
...
...
@@ -162,7 +162,18 @@ namespace Mall.Module.User
/// <returns></returns>
public
List
<
RB_Mall_Magic_Extend
>
GetMallMagicListModule
(
RB_Mall_Magic_Extend
query
)
{
return
magicRepository
.
GetMallMagicListRepository
(
query
);
var
list
=
magicRepository
.
GetMallMagicListRepository
(
query
);
if
(
list
!=
null
&&
list
.
Count
>
0
)
{
foreach
(
var
item
in
list
)
{
if
(
item
.
MagicData
!=
null
&&
!
string
.
IsNullOrEmpty
(
item
.
MagicData
))
{
item
.
MagicDataList
=
Common
.
Plugin
.
JsonHelper
.
DeserializeObject
<
List
<
MagicItem
>>(
item
.
MagicData
);
}
}
}
return
list
;
}
/// <summary>
...
...
Mall.Module.User/MiniProgramPageModule.cs
View file @
47b327de
...
...
@@ -208,6 +208,7 @@ namespace Mall.Module.User
PageUrl
=
"/pages/index/index?page_id="
+
item
.
Id
,
PageType
=
Common
.
Enum
.
MallBase
.
PageTypeEnum
.
DiyPage
,
IsParameter
=
0
,
TipText
=
""
,
SelfPageName
=
item
.
PageName
,
ParameterValue
=
""
,
});
...
...
@@ -250,6 +251,7 @@ namespace Mall.Module.User
if
(
extModel
.
IsParameter
==
0
)
{
extModel
.
ParameterValue
=
""
;
extModel
.
TipText
=
""
;
}
if
(
extModel
.
PageId
>
0
)
{
...
...
@@ -261,6 +263,8 @@ namespace Mall.Module.User
{
nameof
(
RB_Miniprogram_PageManage_Extend
.
PageSort
),
extModel
.
PageSort
},
{
nameof
(
RB_Miniprogram_PageManage_Extend
.
IsParameter
),
extModel
.
IsParameter
},
{
nameof
(
RB_Miniprogram_PageManage_Extend
.
ParameterValue
),
extModel
.
ParameterValue
},
{
nameof
(
RB_Miniprogram_PageManage_Extend
.
TipText
),
extModel
.
TipText
},
};
flag
=
miniprogram_PageManageRepository
.
Update
(
fileds
,
new
WhereHelper
(
nameof
(
RB_Miniprogram_PageManage_Extend
.
PageId
),
extModel
.
PageId
));
}
...
...
Mall.Module.User/UserModule.cs
View file @
47b327de
...
...
@@ -1924,9 +1924,9 @@ namespace Mall.Module.User
item
.
CoverImage
=
""
;
if
(!
string
.
IsNullOrEmpty
(
item
.
CarouselImage
)
&&
item
.
CarouselImage
!=
"[]"
)
{
List
<
int
>
CarouselIdList
=
JsonConvert
.
DeserializeObject
<
List
<
int
>>(
item
.
CarouselImage
);
List
<
string
>
CarouselIdList
=
JsonConvert
.
DeserializeObject
<
List
<
string
>>(
item
.
CarouselImage
);
//封面图
item
.
CoverImage
=
material_InfoRepository
.
GetEntity
(
CarouselIdList
[
0
])?.
Path
??
""
;
item
.
CoverImage
=
CarouselIdList
[
0
]
;
}
}
}
...
...
@@ -2527,25 +2527,6 @@ namespace Mall.Module.User
//查询商品信息
string
goodsIds
=
string
.
Join
(
","
,
list
.
Select
(
x
=>
x
.
GoodsId
).
Distinct
());
var
goodsList
=
goodsRepository
.
GetList
(
new
RB_Goods_Extend
()
{
GoodsIds
=
goodsIds
,
TenantId
=
demodel
.
TenantId
,
MallBaseId
=
demodel
.
MallBaseId
});
//查询图片
List
<
RB_Material_Info_Extend
>
Mlist
=
new
List
<
RB_Material_Info_Extend
>();
if
(
goodsList
.
Any
())
{
List
<
int
>
imgIds
=
new
List
<
int
>();
foreach
(
var
item
in
goodsList
)
{
if
(!
string
.
IsNullOrEmpty
(
item
.
CarouselImage
)
&&
item
.
CarouselImage
!=
"[]"
)
{
List
<
int
>
CarouselIdList
=
JsonConvert
.
DeserializeObject
<
List
<
int
>>(
item
.
CarouselImage
);
//封面图
imgIds
.
Add
(
CarouselIdList
[
0
]);
}
}
if
(
imgIds
.
Any
())
{
Mlist
=
material_InfoRepository
.
GetList
(
new
RB_Material_Info_Extend
()
{
TenantId
=
demodel
.
TenantId
,
MallBaseId
=
demodel
.
MallBaseId
,
MaterialIds
=
string
.
Join
(
","
,
imgIds
.
Distinct
())
});
}
}
foreach
(
var
item
in
list
)
{
...
...
@@ -2557,9 +2538,9 @@ namespace Mall.Module.User
{
if
(!
string
.
IsNullOrEmpty
(
goodsModel
.
CarouselImage
)
&&
goodsModel
.
CarouselImage
!=
"[]"
)
{
List
<
int
>
CarouselIdList
=
JsonConvert
.
DeserializeObject
<
List
<
int
>>(
goodsModel
.
CarouselImage
);
List
<
string
>
CarouselIdList
=
JsonConvert
.
DeserializeObject
<
List
<
string
>>(
goodsModel
.
CarouselImage
);
//封面图
item
.
GoodsImgPath
=
Mlist
.
Where
(
x
=>
x
.
Id
==
CarouselIdList
[
0
]).
FirstOrDefault
()?.
Path
??
""
;
item
.
GoodsImgPath
=
CarouselIdList
[
0
]
;
}
}
}
...
...
Mall.Repository/BaseSetUp/RB_DestinationRepository.cs
View file @
47b327de
...
...
@@ -100,6 +100,9 @@ namespace Mall.Repository.BaseSetUp
{
sb
.
AppendFormat
(
" AND {0} LIKE '%{1}%' "
,
nameof
(
RB_Destination_Extend
.
Name
),
where
.
Name
.
Trim
());
}
if
(!
string
.
IsNullOrEmpty
(
where
.
NameStr
))
{
sb
.
AppendFormat
(
" AND {0} in({1})"
,
nameof
(
RB_Destination_Extend
.
Name
),
where
.
NameStr
);
}
}
return
Get
<
RB_Destination_Extend
>(
sb
.
ToString
()).
ToList
();
...
...
Mall.Repository/Product/RB_GoodsRepository.cs
View file @
47b327de
...
...
@@ -116,6 +116,59 @@ where {where} group by g.Id order by g.CreateDate desc";
return
Get
<
RB_Goods_Extend
>(
sql
).
ToList
();
}
/// <summary>
/// 获取列表
/// </summary>
/// <param name="dmodel"></param>
/// <returns></returns>
public
List
<
RB_Goods_Extend
>
GetSingleList
(
RB_Goods_Extend
dmodel
)
{
string
where
=
$" 1=1 and g.
{
nameof
(
RB_Goods_Extend
.
Status
)}
=0"
;
if
(
dmodel
.
TenantId
>
0
)
{
where
+=
$@" and g.
{
nameof
(
RB_Goods_Extend
.
TenantId
)}
=
{
dmodel
.
TenantId
}
"
;
}
if
(
dmodel
.
MallBaseId
>
0
)
{
where
+=
$@" and g.
{
nameof
(
RB_Goods_Extend
.
MallBaseId
)}
=
{
dmodel
.
MallBaseId
}
"
;
}
if
(
dmodel
.
Id
>
0
)
{
where
+=
$@" and g.
{
nameof
(
RB_Goods_Extend
.
Id
)}
=
{
dmodel
.
Id
}
"
;
}
if
(!
string
.
IsNullOrEmpty
(
dmodel
.
GoodsIds
))
{
where
+=
$@" and g.
{
nameof
(
RB_Goods_Extend
.
Id
)}
in(
{
dmodel
.
GoodsIds
}
)"
;
}
if
(!
string
.
IsNullOrEmpty
(
dmodel
.
Name
))
{
where
+=
$@" and g.
{
nameof
(
RB_Goods_Extend
.
Name
)}
like '%
{
dmodel
.
Name
}
%'"
;
}
if
(!
string
.
IsNullOrEmpty
(
dmodel
.
GoodsNameStr
))
{
where
+=
$@" and g.
{
nameof
(
RB_Goods_Extend
.
Name
)}
in (
{
dmodel
.
GoodsNameStr
}
)"
;
}
if
(
dmodel
.
GoodsStatus
>
0
)
{
where
+=
$@" and g.
{
nameof
(
RB_Goods_Extend
.
GoodsStatus
)}
=
{
dmodel
.
GoodsStatus
}
"
;
}
if
(
dmodel
.
IsSelectSellOut
==
1
)
{
where
+=
$@" and g.
{
nameof
(
RB_Goods_Extend
.
InventoryNum
)}
<=0"
;
}
if
(!
string
.
IsNullOrEmpty
(
dmodel
.
StartTime
))
{
where
+=
$@" and g.
{
nameof
(
RB_Goods_Extend
.
CreateDate
)}
>='
{
dmodel
.
StartTime
}
'"
;
}
if
(!
string
.
IsNullOrEmpty
(
dmodel
.
EndTime
))
{
where
+=
$@" and g.
{
nameof
(
RB_Goods_Extend
.
CreateDate
)}
<='
{
dmodel
.
EndTime
+
" 23:59:59"
}
'"
;
}
string
sql
=
$@"select g.* from RB_Goods g where
{
where
}
"
;
return
Get
<
RB_Goods_Extend
>(
sql
).
ToList
();
}
/// <summary>
/// 小程序获取商品列表
/// </summary>
...
...
Mall.Repository/User/RB_Member_UserRepository.cs
View file @
47b327de
...
...
@@ -78,6 +78,10 @@ select * from RB_Member_User where {where} order by CreateDate desc
{
where
+=
$@" and
{
nameof
(
RB_Member_User
.
Name
)}
like '%
{
dmodel
.
Name
}
%'"
;
}
if
(!
string
.
IsNullOrEmpty
(
dmodel
.
UserNameStr
))
{
where
+=
$@" and
{
nameof
(
RB_Member_User
.
Name
)}
in(
{
dmodel
.
UserNameStr
}
)"
;
}
if
(!
string
.
IsNullOrEmpty
(
dmodel
.
AliasName
))
{
where
+=
$@" and
{
nameof
(
RB_Member_User
.
AliasName
)}
like '%
{
dmodel
.
AliasName
}
%'"
;
...
...
Mall.Repository/User/RB_Miniprogram_PageManageRepository.cs
View file @
47b327de
...
...
@@ -80,7 +80,7 @@ namespace Mall.Repository.User
{
StringBuilder
builder
=
new
StringBuilder
();
builder
.
Append
(
@"
SELECT B.PageId, B.PageName,B.PageType,B.PageUrl,B.PageSort,B.IsParameter,B.ParameterValue,IFNULL(A.SelfPageName,'') AS SelfPageName,A.Id
SELECT B.PageId, B.PageName,B.PageType,B.PageUrl,B.PageSort,B.IsParameter,B.ParameterValue,IFNULL(A.SelfPageName,'') AS SelfPageName,A.Id
,B.TipText
FROM rb_miniprogram_page AS A INNER JOIN rb_miniprogram_pagemanage AS B ON A.PageId = B.PageId
WHERE B.`Status`= 0 "
);
if
(
query
!=
null
)
...
...
Mall.WebApi/Controllers/File/FileController.cs
View file @
47b327de
...
...
@@ -37,7 +37,8 @@ namespace Mall.WebApi.Controllers.File
//验证文件格式
List
<
string
>
ExtList
=
new
List
<
string
>()
{
".xls"
,
".xlsx"
".xlsx"
,
".csv"
};
if
(!
ExtList
.
Contains
(
fileExtention
))
{
return
new
ApiResult
{
resultCode
=
(
int
)
ResultCode
.
Fail
,
message
=
"文件格式有误"
,
data
=
""
};
...
...
@@ -54,7 +55,7 @@ namespace Mall.WebApi.Controllers.File
files
[
0
].
CopyTo
(
fstream
);
}
return
ApiResult
.
Success
(
""
,
path_server
);
return
ApiResult
.
Success
(
""
,
new
{
Name
=
filename
,
Path
=
path_server
}
);
}
catch
(
Exception
ex
)
{
...
...
Mall.WebApi/Controllers/Mall/MallController.cs
View file @
47b327de
This diff is collapsed.
Click to expand it.
Mall.WebApi/Controllers/Product/OrderController.cs
View file @
47b327de
...
...
@@ -1619,5 +1619,36 @@ namespace Mall.WebApi.Controllers.MallBase
}
#
endregion
#
region
赞羊订单导入
/// <summary>
/// 赞羊订单导入
/// </summary>
/// <returns></returns>
[
HttpPost
]
public
ApiResult
SetGoodsOrderBatchImport
()
{
var
req
=
RequestParm
;
JObject
parms
=
JObject
.
Parse
(
req
.
msg
.
ToString
());
string
FilePath
=
parms
.
GetStringValue
(
"FilePath"
);
if
(
string
.
IsNullOrEmpty
(
FilePath
))
{
return
ApiResult
.
ParamIsNull
(
"文件路径不存在"
);
}
string
msg
=
orderModule
.
SetGoodsOrderBatchImport
(
FilePath
,
req
.
TenantId
,
req
.
MallBaseId
);
if
(
msg
==
""
)
{
return
ApiResult
.
Success
();
}
else
{
return
ApiResult
.
Failed
(
msg
);
}
}
#
endregion
}
}
\ No newline at end of file
Mall.WebApi/Controllers/Product/ProductController.cs
View file @
47b327de
This diff is collapsed.
Click to expand it.
Mall.WebApi/Controllers/User/TenantController.cs
View file @
47b327de
...
...
@@ -1042,6 +1042,7 @@ namespace Mall.WebApi.Controllers.User
qitem
.
PageUrl
,
qitem
.
IsParameter
,
qitem
.
ParameterValue
,
qitem
.
TipText
,
qitem
.
Id
,
qitem
.
SelfPageName
})
...
...
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