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
2b858bc0
Commit
2b858bc0
authored
Oct 30, 2020
by
黄奎
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
页面修改
parent
814e647d
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
1119 additions
and
5 deletions
+1119
-5
ProductModule.cs
Mall.Module.Product/ProductModule.cs
+1092
-0
AppletGoodsController.cs
Mall.WebApi/Controllers/Product/AppletGoodsController.cs
+26
-0
AppletOrderController.cs
Mall.WebApi/Controllers/Product/AppletOrderController.cs
+0
-4
OSGoodsController.cs
Mall.WebApi/Controllers/Reserve/OSGoodsController.cs
+1
-1
No files found.
Mall.Module.Product/ProductModule.cs
View file @
2b858bc0
This diff is collapsed.
Click to expand it.
Mall.WebApi/Controllers/Product/AppletGoodsController.cs
View file @
2b858bc0
...
@@ -405,6 +405,32 @@ namespace Mall.WebApi.Controllers.MallBase
...
@@ -405,6 +405,32 @@ namespace Mall.WebApi.Controllers.MallBase
return
ApiResult
.
Success
(
""
,
Robj
);
return
ApiResult
.
Success
(
""
,
Robj
);
}
}
/// <summary>
/// 预定页面详情
/// </summary>
/// <returns></returns>
[
HttpPost
]
public
ApiResult
GetAppletOfflineGoodsInfo
(
object
requestMsg
)
{
var
req
=
JsonConvert
.
DeserializeObject
<
RequestParm
>(
requestMsg
.
ToString
());
if
(
req
.
MallBaseId
<=
0
)
{
return
ApiResult
.
ParamIsNull
();
}
JObject
prams
=
JObject
.
Parse
(
req
.
msg
.
ToString
());
int
GoodsId
=
prams
.
GetInt
(
"GoodsId"
,
0
);
int
StoreId
=
prams
.
GetInt
(
"StoreId"
,
0
);
if
(
GoodsId
<=
0
||
StoreId
<=
0
)
{
return
ApiResult
.
ParamIsNull
();
}
int
UserId
=
req
.
UserId
;
var
Robj
=
productModule
.
GetAppletOfflineGoodsInfoModule
(
GoodsId
,
UserId
,
req
.
SmallShopsId
,
req
.
TenantId
,
req
.
MallBaseId
,
storeId
:
StoreId
);
return
ApiResult
.
Success
(
""
,
Robj
);
}
/// <summary>
/// <summary>
/// 获取小程序商品详情备份
/// 获取小程序商品详情备份
/// </summary>
/// </summary>
...
...
Mall.WebApi/Controllers/Product/AppletOrderController.cs
View file @
2b858bc0
...
@@ -704,10 +704,6 @@ namespace Mall.WebApi.Controllers.MallBase
...
@@ -704,10 +704,6 @@ namespace Mall.WebApi.Controllers.MallBase
var
req
=
RequestParm
;
var
req
=
RequestParm
;
var
userInfo
=
AppletUserInfo
;
var
userInfo
=
AppletUserInfo
;
RB_Goods_Order_Extend
demodel
=
JsonConvert
.
DeserializeObject
<
RB_Goods_Order_Extend
>(
req
.
msg
.
ToString
());
RB_Goods_Order_Extend
demodel
=
JsonConvert
.
DeserializeObject
<
RB_Goods_Order_Extend
>(
req
.
msg
.
ToString
());
if
(
string
.
IsNullOrEmpty
(
demodel
.
Consignee
))
{
return
ApiResult
.
ParamIsNull
(
"请传递联系人"
);
}
if
(
string
.
IsNullOrEmpty
(
demodel
.
Mobile
))
if
(
string
.
IsNullOrEmpty
(
demodel
.
Mobile
))
{
{
return
ApiResult
.
ParamIsNull
(
"请传递联系人手机号码"
);
return
ApiResult
.
ParamIsNull
(
"请传递联系人手机号码"
);
...
...
Mall.WebApi/Controllers/Reserve/OSGoodsController.cs
View file @
2b858bc0
...
@@ -532,7 +532,7 @@ namespace Mall.WebApi.Controllers.Reserve
...
@@ -532,7 +532,7 @@ namespace Mall.WebApi.Controllers.Reserve
}
}
foreach
(
var
item
in
MGradeList
)
foreach
(
var
item
in
MGradeList
)
{
{
var
defaultModel
=
demodel
.
MemberPriceList
.
Where
(
x
=>
x
.
MemberGrade
==
item
.
Id
).
FirstOrDefault
();
var
defaultModel
=
demodel
.
MemberPriceList
.
Where
(
x
=>
x
.
MemberGrade
==
item
.
Grade
).
FirstOrDefault
();
if
(
defaultModel
==
null
)
if
(
defaultModel
==
null
)
{
{
return
ApiResult
.
ParamIsNull
(
"会员价格"
+
item
.
Name
+
"不存在"
);
return
ApiResult
.
ParamIsNull
(
"会员价格"
+
item
.
Name
+
"不存在"
);
...
...
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