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
c4fa3379
Commit
c4fa3379
authored
Jan 21, 2022
by
黄奎
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
页面修改
parent
d76eb05b
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
14 additions
and
7 deletions
+14
-7
AppletGoodsController.cs
Mall.WebApi/Controllers/Product/AppletGoodsController.cs
+9
-6
SupplierController.cs
Mall.WebApi/Controllers/User/SupplierController.cs
+5
-1
No files found.
Mall.WebApi/Controllers/Product/AppletGoodsController.cs
View file @
c4fa3379
...
...
@@ -1194,6 +1194,8 @@ namespace Mall.WebApi.Controllers.MallBase
{
var
smodel
=
model
.
SpecificationList
[
i
];
var
svmodel
=
smodel
.
SpecificationValueList
.
Where
(
x
=>
x
.
Sort
==
Convert
.
ToInt32
(
ssarr
[
i
])).
FirstOrDefault
();
if
(
svmodel
!=
null
)
{
attr_list
.
Add
(
new
{
attr_group_name
=
smodel
.
Name
,
...
...
@@ -1203,6 +1205,7 @@ namespace Mall.WebApi.Controllers.MallBase
});
}
}
}
decimal
price_member
=
item
.
SellingPrice
??
0
;
//未设会员价格的话 就为销售价格
if
(
model
.
EnjoyMember
==
1
&&
model
.
SeparateSetMember
==
1
)
{
...
...
Mall.WebApi/Controllers/User/SupplierController.cs
View file @
c4fa3379
...
...
@@ -240,7 +240,11 @@ namespace Mall.WebApi.Controllers.User
{
var
parms
=
RequestParm
;
var
query
=
JsonConvert
.
DeserializeObject
<
RB_Distributor_Info_Extend
>(
RequestParm
.
msg
.
ToString
());
if
(
UserInfo
!=
null
&&
UserInfo
.
TenantId
>
0
)
{
query
.
TenantId
=
UserInfo
.
TenantId
;
}
query
.
MallBaseId
=
parms
.
MallBaseId
;
query
.
AuditStatus
=
Common
.
Enum
.
User
.
DistributorAuditStatusEnum
.
Audited
;
if
(
string
.
IsNullOrWhiteSpace
(
query
.
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