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
d0eecf82
Commit
d0eecf82
authored
Oct 30, 2020
by
黄奎
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
页面修改
parent
90b0cf25
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
11 deletions
+3
-11
ProductModule.cs
Mall.Module.Product/ProductModule.cs
+1
-10
AppletStoresController.cs
Mall.WebApi/Controllers/Reserve/AppletStoresController.cs
+2
-1
No files found.
Mall.Module.Product/ProductModule.cs
View file @
d0eecf82
...
@@ -3460,7 +3460,7 @@ namespace Mall.Module.Product
...
@@ -3460,7 +3460,7 @@ namespace Mall.Module.Product
var
servicePersionList
=
reserve_ServicePersonalRepository
.
GetServicePersonalList
(
new
Model
.
Extend
.
Reserve
.
RB_Reserve_ServicePersonal_Extend
()
var
servicePersionList
=
reserve_ServicePersonalRepository
.
GetServicePersonalList
(
new
Model
.
Extend
.
Reserve
.
RB_Reserve_ServicePersonal_Extend
()
{
{
StoreId
=
storeId
,
StoreId
=
storeId
,
})
.
ToList
();
})
?.
ToList
()??
new
List
<
Model
.
Extend
.
Reserve
.
RB_Reserve_ServicePersonal_Extend
>
();
return
new
return
new
{
{
goods
=
new
goods
=
new
...
@@ -3514,11 +3514,6 @@ namespace Mall.Module.Product
...
@@ -3514,11 +3514,6 @@ namespace Mall.Module.Product
payment_order
,
//订单数量
payment_order
,
//订单数量
confine_order_count
=
model
.
LimitBuyOrderNum
,
confine_order_count
=
model
.
LimitBuyOrderNum
,
is_area_limit
=
model
.
IsAreaBuy
,
is_area_limit
=
model
.
IsAreaBuy
,
area_limit
=
new
List
<
object
>()
{
new
{
list
=
model
.
AreaList
.
Select
(
x
=>
new
{
area_id
=
x
.
AreaId
,
area_name
=
x
.
AreaName
,
area_type
=
x
.
AreaType
})
}
},
form_id
=
model
.
FormsId
,
form_id
=
model
.
FormsId
,
sales
=
(
model
.
SalesNum
??
0
)
+
payment_num
,
//已售出数量 + 订单商品数量//
sales
=
(
model
.
SalesNum
??
0
)
+
payment_num
,
//已售出数量 + 订单商品数量//
name
=
model
.
Name
,
name
=
model
.
Name
,
...
@@ -3583,10 +3578,6 @@ namespace Mall.Module.Product
...
@@ -3583,10 +3578,6 @@ namespace Mall.Module.Product
is_quick_shop
=
model
.
IsQuickBuy
,
is_quick_shop
=
model
.
IsQuickBuy
,
is_sell_well
=
model
.
IsSellWell
,
is_sell_well
=
model
.
IsSellWell
,
is_negotiable
=
model
.
IsGoodsNegotiable
,
is_negotiable
=
model
.
IsGoodsNegotiable
,
freeShippingName
=
model
.
FreeShippingModel
.
Name
,
fullMoneyPinkage
=
model
.
FreeShippingModel
.
FullMoneyPinkage
??
0
,
fullNumPinkage
=
model
.
FreeShippingModel
.
FullNumPinkage
??
0
,
freeShippingUrl
=
model
.
FreeShippingModel
.
FreeShippingUrl
,
marketingLogo
=
model
.
MarketingLogo
,
marketingLogo
=
model
.
MarketingLogo
,
//分类
//分类
cats
=
model
.
CategoryList
.
Select
(
x
=>
new
cats
=
model
.
CategoryList
.
Select
(
x
=>
new
...
...
Mall.WebApi/Controllers/Reserve/AppletStoresController.cs
View file @
d0eecf82
...
@@ -135,7 +135,8 @@ namespace Mall.WebApi.Controllers.Reserve
...
@@ -135,7 +135,8 @@ namespace Mall.WebApi.Controllers.Reserve
var
storeModel
=
contentModule
.
GetStoresListModule
(
new
RB_Stores_Extend
()
var
storeModel
=
contentModule
.
GetStoresListModule
(
new
RB_Stores_Extend
()
{
{
Id
=
storeId
,
Id
=
storeId
,
MallBaseId
=
parms
.
MallBaseId
MallBaseId
=
parms
.
MallBaseId
,
CurrentPosition
=
position
},
isFirst
:
true
)?.
FirstOrDefault
();
},
isFirst
:
true
)?.
FirstOrDefault
();
string
serviceTime
=
""
;
string
serviceTime
=
""
;
if
(
storeModel
!=
null
)
if
(
storeModel
!=
null
)
...
...
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