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
6922109e
Commit
6922109e
authored
Feb 25, 2021
by
黄奎
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
新增字段
parent
a69a004f
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
31 additions
and
3 deletions
+31
-3
UserInfo.cs
Mall.Common/API/UserInfo.cs
+5
-0
RB_Goods.cs
Mall.Model/Entity/Product/RB_Goods.cs
+15
-0
ProductModule.cs
Mall.Module.Product/ProductModule.cs
+3
-0
AppletGoodsController.cs
Mall.WebApi/Controllers/Product/AppletGoodsController.cs
+1
-0
ProductController.cs
Mall.WebApi/Controllers/Product/ProductController.cs
+6
-3
TenantController.cs
Mall.WebApi/Controllers/User/TenantController.cs
+1
-0
No files found.
Mall.Common/API/UserInfo.cs
View file @
6922109e
...
...
@@ -34,6 +34,11 @@ namespace Mall.Common
/// </summary>
public
int
IsOpenSchool
{
get
;
set
;
}
/// <summary>
/// 是否是韩国馆版本(1-是)
/// </summary>
public
int
IsKorea
{
get
;
set
;
}
/// <summary>
/// 账号
/// </summary>
...
...
Mall.Model/Entity/Product/RB_Goods.cs
View file @
6922109e
...
...
@@ -584,5 +584,20 @@ namespace Mall.Model.Entity.Product
/// 最低利润率
/// </summary>
public
decimal
MinProfitRate
{
get
;
set
;
}
/// <summary>
/// 商品所属国家
/// </summary>
public
string
GoodsCountry
{
get
;
set
;
}
/// <summary>
/// 海关代码/关税率
/// </summary>
public
string
FatCode
{
get
;
set
;
}
/// <summary>
/// 官网
/// </summary>
public
string
GoodsUrl
{
get
;
set
;
}
}
}
Mall.Module.Product/ProductModule.cs
View file @
6922109e
...
...
@@ -7045,6 +7045,9 @@ namespace Mall.Module.Product
{
nameof
(
RB_Goods
.
GoodsPageType
),
demodel
.
GoodsPageType
},
{
nameof
(
RB_Goods
.
IsNoTax
),
demodel
.
IsNoTax
},
{
nameof
(
RB_Goods
.
MinProfitRate
),
demodel
.
MinProfitRate
},
{
nameof
(
RB_Goods
.
GoodsCountry
),
demodel
.
GoodsCountry
},
{
nameof
(
RB_Goods
.
FatCode
),
demodel
.
FatCode
},
{
nameof
(
RB_Goods
.
GoodsUrl
),
demodel
.
GoodsUrl
},
};
if
(
goodsModel
.
IsProcurement
==
1
)
{
...
...
Mall.WebApi/Controllers/Product/AppletGoodsController.cs
View file @
6922109e
...
...
@@ -361,6 +361,7 @@ namespace Mall.WebApi.Controllers.MallBase
id
=
model
.
Id
,
sign
=
""
,
name
=
model
.
Name
,
subName
=
model
.
SubName
,
cover_pic
=
model
.
CoverImage
,
video_url
=
model
.
VideoAddress
,
original_price
=
model
.
OriginalPrice
,
...
...
Mall.WebApi/Controllers/Product/ProductController.cs
View file @
6922109e
...
...
@@ -1792,6 +1792,9 @@ namespace Mall.WebApi.Controllers.MallBase
public
ApiResult
SetProductGoodsInfo
()
{
var
parms
=
RequestParm
;
JObject
prams
=
JObject
.
Parse
(
parms
.
msg
.
ToString
());
int
IsKorea
=
prams
.
GetInt
(
"IsKorea"
,
0
);
//是否为韩国馆项目(1-是)
RB_Goods_Extend
demodel
=
JsonConvert
.
DeserializeObject
<
RB_Goods_Extend
>(
parms
.
msg
.
ToString
());
demodel
.
TenantId
=
parms
.
TenantId
;
demodel
.
MallBaseId
=
parms
.
MallBaseId
;
...
...
@@ -1805,15 +1808,15 @@ namespace Mall.WebApi.Controllers.MallBase
return
ApiResult
.
ParamIsNull
(
"请添加商品轮播图"
);
}
demodel
.
CarouselImage
=
JsonConvert
.
SerializeObject
(
demodel
.
CarouselImageList
.
Select
(
x
=>
x
.
Path
));
if
((
demodel
.
SellingPrice
??
0
)
<
0
)
if
(
IsKorea
==
0
&&
(
demodel
.
SellingPrice
??
0
)
<
0
)
{
return
ApiResult
.
ParamIsNull
(
"请输入售价"
);
}
if
((
demodel
.
OriginalPrice
??
0
)
<=
0
)
if
(
IsKorea
==
0
&&
(
demodel
.
OriginalPrice
??
0
)
<=
0
)
{
return
ApiResult
.
ParamIsNull
(
"请输入原价"
);
}
if
(
string
.
IsNullOrEmpty
(
demodel
.
Unit
))
if
(
IsKorea
==
0
&&
string
.
IsNullOrEmpty
(
demodel
.
Unit
))
{
return
ApiResult
.
ParamIsNull
(
"请输入单位"
);
}
...
...
Mall.WebApi/Controllers/User/TenantController.cs
View file @
6922109e
...
...
@@ -203,6 +203,7 @@ namespace Mall.WebApi.Controllers.User
ERPBranchId
=
(
erpUserInfo
?.
RB_Branch_id
??
-
1
),
ERPGroupId
=
(
erpUserInfo
?.
RB_Group_id
??
0
),
IsOpenSchool
=
0
,
IsKorea
=
0
,
};
UserReidsCache
.
UserInfoSet
(
UserModuleCacheKeyConfig
.
Mall_Login_Info
+
model
.
TenantId
,
obj
,
Config
.
JwtExpirTime
);
return
ApiResult
.
Success
(
""
,
obj
);
...
...
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