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
30ad235b
Commit
30ad235b
authored
Jun 05, 2020
by
黄奎
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master' of
http://gitlab.oytour.com/Kui2/mall.oytour.com
parents
829b68cc
4bec7a05
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
169 additions
and
20 deletions
+169
-20
Config.cs
Mall.Common/Config.cs
+10
-1
OrderModule.cs
Mall.Module.Product/OrderModule.cs
+134
-3
RB_Goods_OrderAfterSaleRepository.cs
Mall.Repository/Product/RB_Goods_OrderAfterSaleRepository.cs
+4
-0
AppletCouponController.cs
...Api/Controllers/MarketingCenter/AppletCouponController.cs
+1
-15
SupplierController.cs
Mall.WebApi/Controllers/User/SupplierController.cs
+16
-0
appsettings.json
Mall.WebApi/appsettings.json
+4
-1
No files found.
Mall.Common/Config.cs
View file @
30ad235b
...
...
@@ -342,7 +342,16 @@ namespace Mall.Common
}
}
/// <summary>
/// 网络主管的id,用于新建供应商账户的时候的创建人
/// </summary>
public
static
string
NetworkDirector
{
get
{
return
new
ConfigurationBuilder
().
Add
(
new
JsonConfigurationSource
{
Path
=
"appsettings.json"
}).
Build
().
GetSection
(
"NetworkDirector"
).
Value
;
}
}
}
}
\ No newline at end of file
Mall.Module.Product/OrderModule.cs
View file @
30ad235b
This diff is collapsed.
Click to expand it.
Mall.Repository/Product/RB_Goods_OrderAfterSaleRepository.cs
View file @
30ad235b
...
...
@@ -162,6 +162,10 @@ INNER JOIN rb_member_user mu on mu.Id=oas.UserId
{
where
+=
$" and oas.
{
nameof
(
RB_Goods_OrderAfterSale
.
OrderDetialId
)}
=
{
dmodel
.
OrderDetialId
}
"
;
}
if
(
dmodel
.
Type
>
0
)
{
where
+=
$" and oas.
{
nameof
(
RB_Goods_OrderAfterSale
.
Type
)}
=
{
dmodel
.
Type
}
"
;
}
if
(!
string
.
IsNullOrEmpty
(
dmodel
.
ReOrderNo
))
{
where
+=
$" and oas.
{
nameof
(
RB_Goods_OrderAfterSale
.
ReOrderNo
)}
like '%
{
dmodel
.
ReOrderNo
}
%'"
;
...
...
Mall.WebApi/Controllers/MarketingCenter/AppletCouponController.cs
View file @
30ad235b
...
...
@@ -189,21 +189,7 @@ namespace Mall.WebApi.Controllers.MarketingCenter
x
.
MaxDiscountsPrice
,
x
.
UseType
});
//var result = list.Select(x => new
//{
// x.ID,
// StartDate = x.StartDate.HasValue ? x.StartDate.Value.ToString("yyyy-MM-dd HH:mm:ss") : "",
// EndDate = x.EndDate.HasValue ? x.EndDate.Value.ToString("yyyy-MM-dd HH:mm:ss") : "",
// x.Name,
// x.Describe,
// x.MinConsumePrice,
// x.CouponType,
// x.MaxDiscountsPrice,
// x.UseType
//});
return
ApiResult
.
Success
(
""
,
data
:
JsonHelper
.
GetCamelCaseResultJson
(
result
));
return
ApiResult
.
Success
(
""
,
result
);
}
}
...
...
Mall.WebApi/Controllers/User/SupplierController.cs
0 → 100644
View file @
30ad235b
using
System
;
using
System.Collections.Generic
;
using
System.Linq
;
using
System.Threading.Tasks
;
using
Microsoft.AspNetCore.Mvc
;
namespace
Mall.WebApi.Controllers.User
{
public
class
SupplierController
:
Controller
{
public
IActionResult
Index
()
{
return
View
();
}
}
}
\ No newline at end of file
Mall.WebApi/appsettings.json
View file @
30ad235b
{
"ConnectionStrings"
:
{
"DefaultConnection"
:
"server=192.168.2.214;user id=reborn;password=Reborn@2018;database=reborn_mall;CharSet=utf8; Convert Zero Datetime=true; "
,
"DefaultConnectionPName"
:
"MySql.Data.MySqlClient"
"DefaultConnectionPName"
:
"MySql.Data.MySqlClient"
,
"FinanceConnection"
:
"server=192.168.2.214;user id=reborn;password=Reborn@2018;database=reborn_finance;CharSet=utf8; Convert Zero Datetime=true; "
,
"FinanceConnectionPName"
:
"MySql.Data.MySqlClient"
},
"Logging"
:
{
"LogLevel"
:
{
...
...
@@ -26,6 +28,7 @@
"FirstPage"
:
"pages/index/index.html"
,
"ByteDanceSendTemplate"
:
"https://developer.toutiao.com/api/apps/game/template/send"
,
"sTenpayNotify"
:
"http://mallapi.oytour.com/api/WeChatNotify/Notify"
,
//微信回调地址
"NetworkDirector"
:
1756
,
//网络主管的id,用于新建供应商账户的时候的创建人
"RedisSetting"
:
{
"RedisServer"
:
"192.168.2.214"
,
"RedisPort"
:
"6379"
,
...
...
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