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
de613f47
Commit
de613f47
authored
Jul 28, 2020
by
liudong1993
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
//商品广告词
parent
65c58a2c
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
13 additions
and
2 deletions
+13
-2
RB_Goods.cs
Mall.Model/Entity/Product/RB_Goods.cs
+4
-0
RB_Goods_Order.cs
Mall.Model/Entity/Product/RB_Goods_Order.cs
+4
-2
ProductModule.cs
Mall.Module.Product/ProductModule.cs
+2
-0
AppletOrderController.cs
Mall.WebApi/Controllers/Product/AppletOrderController.cs
+1
-0
ProductController.cs
Mall.WebApi/Controllers/Product/ProductController.cs
+2
-0
No files found.
Mall.Model/Entity/Product/RB_Goods.cs
View file @
de613f47
...
@@ -426,5 +426,9 @@ namespace Mall.Model.Entity.Product
...
@@ -426,5 +426,9 @@ namespace Mall.Model.Entity.Product
/// 赠送的月份 几个月
/// 赠送的月份 几个月
/// </summary>
/// </summary>
public
int
?
PresentFXMonth
{
get
;
set
;
}
public
int
?
PresentFXMonth
{
get
;
set
;
}
/// <summary>
/// 广告词
/// </summary>
public
string
Advertising
{
get
;
set
;
}
}
}
}
}
Mall.Model/Entity/Product/RB_Goods_Order.cs
View file @
de613f47
...
@@ -299,7 +299,9 @@ namespace Mall.Model.Entity.Product
...
@@ -299,7 +299,9 @@ namespace Mall.Model.Entity.Product
/// 退款单号
/// 退款单号
/// </summary>
/// </summary>
public
string
RefundOrderNo
{
get
;
set
;
}
public
string
RefundOrderNo
{
get
;
set
;
}
/// <summary>
/// 主播名称(多个以逗号分隔)
/// </summary>
public
string
AnchorName
{
get
;
set
;
}
}
}
}
}
Mall.Module.Product/ProductModule.cs
View file @
de613f47
...
@@ -1800,6 +1800,7 @@ namespace Mall.Module.Product
...
@@ -1800,6 +1800,7 @@ namespace Mall.Module.Product
//goods_warehouse_id = 0,//
//goods_warehouse_id = 0,//
status
=
model
.
GoodsStatus
,
status
=
model
.
GoodsStatus
,
isAllowShare
=
IsAllowShare
,
//是否可以分享
isAllowShare
=
IsAllowShare
,
//是否可以分享
advertising
=
model
.
Advertising
,
//广告词
price
=
model
.
SellingPrice
,
price
=
model
.
SellingPrice
,
use_attr
=
model
.
IsCustomSpecification
,
use_attr
=
model
.
IsCustomSpecification
,
attr_groups
=
model
.
SpecificationList
.
Select
(
x
=>
new
attr_groups
=
model
.
SpecificationList
.
Select
(
x
=>
new
...
@@ -3629,6 +3630,7 @@ namespace Mall.Module.Product
...
@@ -3629,6 +3630,7 @@ namespace Mall.Module.Product
{
nameof
(
RB_Goods
.
Commission
),
demodel
.
Commission
},
{
nameof
(
RB_Goods
.
Commission
),
demodel
.
Commission
},
{
nameof
(
RB_Goods
.
PresentFXGrade
),
demodel
.
PresentFXGrade
},
{
nameof
(
RB_Goods
.
PresentFXGrade
),
demodel
.
PresentFXGrade
},
{
nameof
(
RB_Goods
.
PresentFXMonth
),
demodel
.
PresentFXMonth
},
{
nameof
(
RB_Goods
.
PresentFXMonth
),
demodel
.
PresentFXMonth
},
{
nameof
(
RB_Goods
.
Advertising
),
demodel
.
Advertising
}
};
};
if
(
goodsModel
.
IsProcurement
==
1
)
if
(
goodsModel
.
IsProcurement
==
1
)
{
{
...
...
Mall.WebApi/Controllers/Product/AppletOrderController.cs
View file @
de613f47
...
@@ -473,6 +473,7 @@ namespace Mall.WebApi.Controllers.MallBase
...
@@ -473,6 +473,7 @@ namespace Mall.WebApi.Controllers.MallBase
demodel
.
Recycled
??=
2
;
demodel
.
Recycled
??=
2
;
demodel
.
Refund
??=
0
;
demodel
.
Refund
??=
0
;
demodel
.
Status
=
0
;
demodel
.
Status
=
0
;
demodel
.
AnchorName
??=
""
;
demodel
.
UpdateDate
=
DateTime
.
Now
;
demodel
.
UpdateDate
=
DateTime
.
Now
;
demodel
.
UserId
=
userInfo
.
UserId
;
demodel
.
UserId
=
userInfo
.
UserId
;
#
endregion
#
endregion
...
...
Mall.WebApi/Controllers/Product/ProductController.cs
View file @
de613f47
...
@@ -1986,6 +1986,8 @@ namespace Mall.WebApi.Controllers.MallBase
...
@@ -1986,6 +1986,8 @@ namespace Mall.WebApi.Controllers.MallBase
demodel
.
PresentFXGrade
??=
0
;
//赠送粉象等级
demodel
.
PresentFXGrade
??=
0
;
//赠送粉象等级
demodel
.
PresentFXMonth
??=
0
;
demodel
.
PresentFXMonth
??=
0
;
demodel
.
Advertising
??=
""
;
//广告词
if
(
demodel
.
IsProxy
==
1
&&
demodel
.
CostPrice
>
0
)
if
(
demodel
.
IsProxy
==
1
&&
demodel
.
CostPrice
>
0
)
{
{
decimal
ProxyMoney
=
0
;
decimal
ProxyMoney
=
0
;
...
...
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