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
7cc2f77e
Commit
7cc2f77e
authored
Oct 13, 2022
by
黄奎
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
页面修改
parent
8084c578
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
16 additions
and
9 deletions
+16
-9
OrderModule.cs
Mall.Module.Product/OrderModule.cs
+5
-1
AppletOrderController.cs
Mall.WebApi/Controllers/Product/AppletOrderController.cs
+11
-8
No files found.
Mall.Module.Product/OrderModule.cs
View file @
7cc2f77e
...
@@ -698,10 +698,14 @@ namespace Mall.Module.Product
...
@@ -698,10 +698,14 @@ namespace Mall.Module.Product
var
scModel
=
scList
.
FirstOrDefault
();
var
scModel
=
scList
.
FirstOrDefault
();
Dictionary
<
string
,
object
>
keyValues
=
new
Dictionary
<
string
,
object
>()
Dictionary
<
string
,
object
>
keyValues
=
new
Dictionary
<
string
,
object
>()
{
{
{
nameof
(
RB_Goods_ShoppingCart
.
Number
),
scModel
.
Number
+
demodel
.
Number
},
{
nameof
(
RB_Goods_ShoppingCart
.
UpdateDate
),
DateTime
.
Now
},
{
nameof
(
RB_Goods_ShoppingCart
.
UpdateDate
),
DateTime
.
Now
},
{
nameof
(
RB_Goods_ShoppingCart
.
RelationId
),
demodel
.
RelationId
},
{
nameof
(
RB_Goods_ShoppingCart
.
RelationId
),
demodel
.
RelationId
},
};
};
if
(
demodel
.
TenantId
!=
27
)
{
keyValues
.
Add
(
nameof
(
RB_Goods_ShoppingCart
.
Number
),
scModel
.
Number
+
demodel
.
Number
);
}
List
<
WhereHelper
>
wheres
=
new
List
<
WhereHelper
>()
List
<
WhereHelper
>
wheres
=
new
List
<
WhereHelper
>()
{
{
new
WhereHelper
()
new
WhereHelper
()
...
...
Mall.WebApi/Controllers/Product/AppletOrderController.cs
View file @
7cc2f77e
...
@@ -503,18 +503,21 @@ namespace Mall.WebApi.Controllers.MallBase
...
@@ -503,18 +503,21 @@ namespace Mall.WebApi.Controllers.MallBase
{
{
return
ApiResult
.
ParamIsNull
(
"请选择学员!"
);
return
ApiResult
.
ParamIsNull
(
"请选择学员!"
);
}
}
if
(
demodel
.
DeliveryMethod
!=
Common
.
Enum
.
Goods
.
OrderDeliveryMethodEnum
.
VerificationShop
)
if
(
userInfo
.
TenantId
!=
27
)
{
{
if
((
demodel
.
District
??
0
)
<=
0
)
if
(
demodel
.
DeliveryMethod
!=
Common
.
Enum
.
Goods
.
OrderDeliveryMethodEnum
.
VerificationShop
)
{
return
ApiResult
.
ParamIsNull
(
"收货地址有误"
);
}
if
(
string
.
IsNullOrEmpty
(
demodel
.
ShoppingAddress
))
{
{
return
ApiResult
.
ParamIsNull
(
"收货详细地址不能为空"
);
if
((
demodel
.
District
??
0
)
<=
0
)
{
return
ApiResult
.
ParamIsNull
(
"收货地址有误"
);
}
if
(
string
.
IsNullOrEmpty
(
demodel
.
ShoppingAddress
))
{
return
ApiResult
.
ParamIsNull
(
"收货详细地址不能为空"
);
}
}
}
}
}
if
(
demodel
.
DetailList
==
null
||
!
demodel
.
DetailList
.
Any
())
if
(
demodel
.
DetailList
==
null
||
!
demodel
.
DetailList
.
Any
())
{
{
return
ApiResult
.
ParamIsNull
(
"请传递商品信息"
);
return
ApiResult
.
ParamIsNull
(
"请传递商品信息"
);
...
...
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