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
4a19043f
Commit
4a19043f
authored
Apr 01, 2021
by
吴春
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
提交代码
parent
4bb16eca
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
10 additions
and
4 deletions
+10
-4
RB_MallBase.cs
Mall.Model/Entity/BaseSetUp/RB_MallBase.cs
+5
-0
MallHelper.cs
Mall.WebApi/Controllers/Mall/MallHelper.cs
+5
-4
No files found.
Mall.Model/Entity/BaseSetUp/RB_MallBase.cs
View file @
4a19043f
...
...
@@ -77,6 +77,11 @@ namespace Mall.Model.Entity.BaseSetUp
/// </summary>
public
int
BalanceFun
{
get
;
set
;
}
/// <summary>
/// 储值卡功能
/// </summary>
public
int
DepositFun
{
get
;
set
;
}
/// <summary>
/// 商品面议联系方式
/// </summary>
...
...
Mall.WebApi/Controllers/Mall/MallHelper.cs
View file @
4a19043f
...
...
@@ -106,7 +106,7 @@ namespace Mall.WebApi.Controllers
/// </summary>
/// <param name="item"></param>
/// <returns></returns>
public
static
object
PlusDataToObject
(
ComponentItem
subItem
,
int
TenantId
,
int
MallBaseId
,
int
SmallShopsId
,
int
IsOpenSchool
,
int
StoreId
,
int
UserId
=
0
)
public
static
object
PlusDataToObject
(
ComponentItem
subItem
,
int
TenantId
,
int
MallBaseId
,
int
SmallShopsId
,
int
IsOpenSchool
,
int
StoreId
,
int
UserId
=
0
)
{
var
obj
=
new
object
();
switch
(
subItem
.
Id
)
...
...
@@ -1395,7 +1395,7 @@ namespace Mall.WebApi.Controllers
foreach
(
var
tempGood
in
tempGoodsList
)
{
var
lastItem
=
new
miaiUserDetail
();
// var tempGood = tempGoodsList?.Where(qitem => qitem.UserId == goodItem.id)?.FirstOrDefault();
// var tempGood = tempGoodsList?.Where(qitem => qitem.UserId == goodItem.id)?.FirstOrDefault();
if
(
tempGood
!=
null
&&
tempGood
.
Id
>
0
)
{
lastItem
.
id
=
tempGood
.
UserId
;
...
...
@@ -1458,7 +1458,7 @@ namespace Mall.WebApi.Controllers
foreach
(
var
tempGood
in
tempGoodsList
)
{
var
lastItem
=
new
miaiUserDetail
();
// var tempGood = tempGoodsList?.Where(qitem => qitem.UserId == goodItem.id)?.FirstOrDefault();
// var tempGood = tempGoodsList?.Where(qitem => qitem.UserId == goodItem.id)?.FirstOrDefault();
if
(
tempGood
!=
null
&&
tempGood
.
Id
>
0
)
{
lastItem
.
id
=
tempGood
.
UserId
;
...
...
@@ -1521,7 +1521,7 @@ namespace Mall.WebApi.Controllers
foreach
(
var
tempGood
in
tempGoodsList
)
{
var
lastItem
=
new
miaiUserDetail
();
// var tempGood = tempGoodsList?.Where(qitem => qitem.UserId == goodItem.id)?.FirstOrDefault();
// var tempGood = tempGoodsList?.Where(qitem => qitem.UserId == goodItem.id)?.FirstOrDefault();
if
(
tempGood
!=
null
&&
tempGood
.
Id
>
0
)
{
lastItem
.
id
=
tempGood
.
UserId
;
...
...
@@ -2917,6 +2917,7 @@ namespace Mall.WebApi.Controllers
theme_color
=
""
,
latitude_longitude
=
mallBaseModel
?.
LongAndLat
,
IsShowRecharge
=
rechargeModel
.
IsOpenBtn
,
IsDeposit
=
mallBaseModel
?.
DepositFun
??
0
,
IsOpenReserve
=
(
miniProgram
?.
IsOpenReserve
??
0
),
};
#
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