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
a69a004f
Commit
a69a004f
authored
Feb 25, 2021
by
黄奎
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
新增字段
parent
b7da5b1b
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
29 additions
and
6 deletions
+29
-6
RB_MallBase.cs
Mall.Model/Entity/BaseSetUp/RB_MallBase.cs
+0
-5
RB_MiniProgram.cs
Mall.Model/Entity/User/RB_MiniProgram.cs
+5
-0
MallHelper.cs
Mall.WebApi/Controllers/Mall/MallHelper.cs
+1
-1
AppletTradeController.cs
...WebApi/Controllers/TradePavilion/AppletTradeController.cs
+23
-0
No files found.
Mall.Model/Entity/BaseSetUp/RB_MallBase.cs
View file @
a69a004f
...
...
@@ -359,10 +359,5 @@ namespace Mall.Model.Entity.BaseSetUp
/// 是否开启全局分类包邮规则
/// </summary>
public
int
IsFreeShipping
{
get
;
set
;
}
/// <summary>
/// 是否显示价格(0-不显示,1-显示)
/// </summary>
public
int
IsShowPrice
{
get
;
set
;
}
}
}
Mall.Model/Entity/User/RB_MiniProgram.cs
View file @
a69a004f
...
...
@@ -458,6 +458,11 @@ namespace Mall.Model.Entity.User
public
string
CourseOrderTpl
{
get
;
set
;
}
/// <summary>
/// 是否是韩国馆(1-是)
/// </summary>
public
int
IsKorea
{
get
;
set
;
}
}
...
...
Mall.WebApi/Controllers/Mall/MallHelper.cs
View file @
a69a004f
...
...
@@ -2546,7 +2546,7 @@ namespace Mall.WebApi.Controllers
is_show_cart
=
mallBaseModel
?.
ListShopCar
,
is_show_sales_num
=
mallBaseModel
?.
ListBuyCount
,
is_show_goods_name
=
mallBaseModel
?.
ListName
,
is_show_
goods_price
=
mallBaseModel
?.
IsShowPrice
??
0
,
//是否显示商品价格【hk2020-02-21新增】
is_show_
korea
=
miniProgram
?.
IsKorea
??
0
,
//是否是韩国馆(1-是)
is_underline_price
=
mallBaseModel
?.
DetailsLineationPrice
,
is_express
=
mallBaseModel
?.
DeatilsExpress
,
is_not_share_show
=
mallBaseModel
?.
OtherNoShare
,
...
...
Mall.WebApi/Controllers/TradePavilion/AppletTradeController.cs
View file @
a69a004f
...
...
@@ -304,6 +304,18 @@ namespace Mall.WebApi.Controllers.TradePavilion
return
ApiResult
.
Success
(
data
:
pageModel
);
}
/// <summary>
/// 获取咨询详情
/// </summary>
/// <returns></returns>
public
ApiResult
GetCommerceAsk
()
{
JObject
parms
=
JObject
.
Parse
(
RequestParm
.
msg
.
ToString
());
var
Id
=
parms
.
GetInt
(
"Id"
,
0
);
var
extModel
=
askModule
.
GetCommerceAskModule
(
Id
);
return
ApiResult
.
Success
(
data
:
extModel
);
}
#
endregion
#
region
活动管理
...
...
@@ -459,6 +471,17 @@ namespace Mall.WebApi.Controllers.TradePavilion
return
flag
?
ApiResult
.
Success
()
:
ApiResult
.
Failed
();
}
/// <summary>
/// 删除评论
/// </summary>
/// <returns></returns>
public
ApiResult
RemoveCommerceComment
()
{
JObject
jObj
=
JObject
.
Parse
(
RequestParm
.
msg
.
ToString
());
var
Id
=
jObj
.
GetInt
(
"Id"
);
var
flag
=
commerceCommentModule
.
RemoveCommerceCommentModule
(
Id
);
return
flag
?
ApiResult
.
Success
()
:
ApiResult
.
Failed
();
}
#
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