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
163224f5
Commit
163224f5
authored
Jul 13, 2021
by
黄奎
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
页面修改
parent
34496740
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
142 additions
and
35 deletions
+142
-35
RB_Goods.cs
Mall.Model/Entity/Product/RB_Goods.cs
+7
-0
RB_Goods_Extend.cs
Mall.Model/Extend/Product/RB_Goods_Extend.cs
+31
-0
GuideCarModule.cs
Mall.Module.Product/GuideCarModule.cs
+14
-9
OrderModule.cs
Mall.Module.Product/OrderModule.cs
+0
-19
ProductController.cs
Mall.WebApi/Controllers/Product/ProductController.cs
+90
-7
No files found.
Mall.Model/Entity/Product/RB_Goods.cs
View file @
163224f5
...
...
@@ -444,6 +444,7 @@ namespace Mall.Model.Entity.Product
/// 营销标识(文字+文字颜色+文字背景/ 图标)
/// </summary>
public
string
MarketingLogo
{
get
;
set
;
}
/// <summary>
/// 是否是直播商品 1是 2否
/// </summary>
...
...
@@ -503,14 +504,17 @@ namespace Mall.Model.Entity.Product
/// 线路名称
/// </summary>
public
string
LineName
{
get
;
set
;
}
/// <summary>
/// 关联城市或景点
/// </summary>
public
string
LineDescription
{
get
;
set
;
}
/// <summary>
/// 是否拼座 1是 2否
/// </summary>
public
int
?
IsSpell
{
get
;
set
;
}
/// <summary>
/// 乘坐人数
/// </summary>
...
...
@@ -524,6 +528,7 @@ namespace Mall.Model.Entity.Product
/// 视频填充方式(0默认,1-填充)
/// </summary>
public
int
VideoType
{
get
;
set
;
}
/// <summary>
/// 评论积分赠送
/// </summary>
...
...
@@ -545,10 +550,12 @@ namespace Mall.Model.Entity.Product
/// 商品备注
/// </summary>
public
string
Remark
{
get
;
set
;
}
/// <summary>
/// 课程分数
/// </summary>
public
decimal
?
CourseScore
{
get
;
set
;
}
/// <summary>
/// 课程标签
/// </summary>
...
...
Mall.Model/Extend/Product/RB_Goods_Extend.cs
View file @
163224f5
...
...
@@ -360,4 +360,35 @@ namespace Mall.Model.Extend.Product
/// </summary>
public
List
<
string
>
StoreNameList
{
get
;
set
;
}
}
/// <summary>
/// 标签项目
/// </summary>
public
class
MarketingLogoItem
{
/// <summary>
/// 标签类型(1-文字模式,2-图片模式,0-无模式)
/// </summary>
public
int
iswords
{
get
;
set
;
}
/// <summary>
/// 标签文字
/// </summary>
public
string
words
{
get
;
set
;
}
/// <summary>
/// 标签字体颜色
/// </summary>
public
string
wordsColor
{
get
;
set
;
}
/// <summary>
/// 标签背景颜色
/// </summary>
public
string
wordsBack
{
get
;
set
;
}
/// <summary>
/// 标签图片
/// </summary>
public
string
ico
{
get
;
set
;
}
}
}
Mall.Module.Product/GuideCarModule.cs
View file @
163224f5
...
...
@@ -1755,7 +1755,18 @@ namespace Mall.Module.Product
{
IsAllowShare
=
2
;
}
var
tempLogo
=
new
MarketingLogoItem
();
if
(!
string
.
IsNullOrEmpty
(
model
?.
MarketingLogo
))
{
try
{
tempLogo
=
Common
.
Plugin
.
JsonHelper
.
DeserializeObject
<
MarketingLogoItem
>(
model
?.
MarketingLogo
);
}
catch
{
tempLogo
=
new
MarketingLogoItem
();
}
}
return
new
{
goods
=
new
...
...
@@ -1790,13 +1801,7 @@ namespace Mall.Module.Product
line_name
=
model
.
LineName
,
line_descriptionlist
=
model
.
LineDescriptionList
,
is_spell
=
model
.
IsSpell
,
ride_num
=
model
.
RideNum
,
//target_list = targetList.Select(x=>new {
// x.Id,
// Date = x.Date.Value.ToString("yyyy-MM-dd"),
// x.IsReserve,
// x.ReserveNum
//}),
ride_num
=
model
.
RideNum
,
advance_day
=
model
.
AdvanceDay
,
give_integral
=
model
.
IntegralPresent
,
give_integral_type
=
model
.
IntegralPresentType
,
...
...
@@ -1862,7 +1867,7 @@ namespace Mall.Module.Product
mall_name
=
model
.
MallName
,
format_time
=
model
.
UpdateDate
.
HasValue
?
model
.
UpdateDate
.
Value
.
ToString
(
"yyyy-MM-dd"
)
:
""
},
marketingLogo
=
model
.
Marketing
Logo
,
marketingLogo
=
temp
Logo
,
cats
=
model
.
CategoryList
.
Select
(
x
=>
new
{
x
.
CategoryId
,
...
...
Mall.Module.Product/OrderModule.cs
View file @
163224f5
...
...
@@ -2663,25 +2663,6 @@ namespace Mall.Module.Product
confine_order_count
=
gmodel
.
LimitBuyOrderNum
,
//限制订单数量
form_id
=
gmodel
.
FormsId
,
//表单id
marketingLogo
=
gmodel
.
MarketingLogo
//goodsWarehouse = new
//{
// id = 19813,
// mall_id = 1285,
// name = "测试商品【勿拍】",
// original_price = "100000.00",
// cost_price = "0.00",
// detail = "<p>测试</p>",
// cover_pic = "https://cdnimg.iotweixin.com/uploads/mall1285/20200303/0729b37fd19a002733018a1ece30ca55.jpg",
// pic_url = "[{\"id=\"77531\",\"pic_url=\"https:\\/\\/cdnimg.iotweixin.com\\/uploads\\/mall1285\\/20200303\\/0729b37fd19a002733018a1ece30ca55.jpg\"},{\"id=\"77530\",\"pic_url=\"https:\\/\\/cdnimg.iotweixin.com\\/uploads\\/mall1285\\/20200303\\/8eebc4fc427d7d2bbd2625f5f3448c5b.jpg\"}]",
// video_url = "https://cdnimg.iotweixin.com/uploads/mall1285/20200303/5f26c823c9118e7646681152ef441fd7.mp4",
// unit = "件",
// created_at = "2020-05-25 16:05:02",
// updated_at = "2020-05-25 16:05:02",
// deleted_at = "0000-00-00 00:00:00",
// is_delete = 0
//},
//form_data= null,
//form= null
});
}
}
...
...
Mall.WebApi/Controllers/Product/ProductController.cs
View file @
163224f5
...
...
@@ -18,6 +18,7 @@ using Mall.Module.Product;
using
Mall.AOP
;
using
Microsoft.Extensions.Configuration
;
using
Microsoft.Extensions.Configuration.Json
;
using
Mall.Common.Enum.Goods
;
namespace
Mall.WebApi.Controllers.MallBase
{
...
...
@@ -1630,6 +1631,18 @@ namespace Mall.WebApi.Controllers.MallBase
object
obj
=
new
object
();
if
(
model
!=
null
)
{
var
MarketingLogo
=
new
MarketingLogoItem
();
if
(!
string
.
IsNullOrEmpty
(
model
?.
MarketingLogo
))
{
try
{
MarketingLogo
=
JsonHelper
.
DeserializeObject
<
MarketingLogoItem
>(
model
?.
MarketingLogo
);
}
catch
{
MarketingLogo
=
new
MarketingLogoItem
();
}
}
obj
=
new
{
model
?.
Id
,
...
...
@@ -1773,7 +1786,7 @@ namespace Mall.WebApi.Controllers.MallBase
model
?.
PresentFXMonth
,
model
?.
Advertising
,
model
?.
SubName
,
model
?.
MarketingLogo
,
MarketingLogo
,
model
?.
ShelvesDate
,
model
?.
DownDate
,
model
?.
VideoType
,
...
...
@@ -1795,12 +1808,82 @@ namespace Mall.WebApi.Controllers.MallBase
[
HttpPost
]
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
;
JObject
parms
=
JObject
.
Parse
(
RequestParm
.
msg
.
ToString
());
RB_Goods_Extend
demodel
=
new
RB_Goods_Extend
()
{
Id
=
parms
.
GetInt
(
"Id"
),
Name
=
parms
.
GetStringValue
(
"Name"
),
VideoAddress
=
parms
.
GetStringValue
(
"VideoAddress"
),
CustomShareTitles
=
parms
.
GetStringValue
(
"CustomShareTitles"
),
CustomShareImage
=
parms
.
GetStringValue
(
"CustomShareImage"
),
CustomShareImagePath
=
parms
.
GetStringValue
(
"CustomShareImagePath"
),
IsLiveGoods
=
parms
.
GetInt
(
"IsLiveGoods"
),
GoodsStatus
=
parms
.
GetInt
(
"GoodsStatus"
),
InventoryNum
=
parms
.
GetInt
(
"InventoryNum"
),
DefaultSpecificationName
=
parms
.
GetStringValue
(
"DefaultSpecificationName"
),
SellingPrice
=
parms
.
GetDecimal
(
"SellingPrice"
),
OriginalPrice
=
parms
.
GetDecimal
(
"OriginalPrice"
),
Unit
=
parms
.
GetStringValue
(
"Unit"
),
CostPrice
=
parms
.
GetDecimal
(
"CostPrice"
),
IsGoodsNegotiable
=
parms
.
GetInt
(
"IsGoodsNegotiable"
),
SalesNum
=
parms
.
GetInt
(
"SalesNum"
),
GoodsNumbers
=
parms
.
GetStringValue
(
"GoodsNumbers"
),
IsCustomSpecification
=
parms
.
GetInt
(
"IsCustomSpecification"
),
GoodsWeight
=
parms
.
GetInt
(
"GoodsWeight"
),
IsDefaultService
=
parms
.
GetInt
(
"IsDefaultService"
),
FreightId
=
parms
.
GetInt
(
"FreightId"
),
FreightName
=
parms
.
GetStringValue
(
"FreightName"
),
FormsId
=
parms
.
GetInt
(
"FormsId"
,-
1
),
FormsName
=
parms
.
GetStringValue
(
"FormsName"
),
LimitBuyGoodsNum
=
parms
.
GetInt
(
"LimitBuyGoodsNum"
,-
1
),
LimitBuyOrderNum
=
parms
.
GetInt
(
"LimitBuyOrderNum"
,-
1
),
IsAreaBuy
=
parms
.
GetInt
(
"IsAreaBuy"
),
IntegralPresent
=
parms
.
GetInt
(
"IntegralPresent"
),
IntegralPresentType
=
parms
.
GetInt
(
"IntegralPresentType"
),
PointsDeduction
=
parms
.
GetInt
(
"PointsDeduction"
),
PointsDeductionType
=
parms
.
GetInt
(
"PointsDeductionType"
),
IsMultipleDeduction
=
parms
.
GetInt
(
"IsMultipleDeduction"
),
GoodsDetails
=
parms
.
GetStringValue
(
"GoodsDetails"
),
SeparateDistribution
=
parms
.
GetInt
(
"SeparateDistribution"
),
SeparateDistributionType
=
parms
.
GetInt
(
"SeparateDistributionType"
),
SeparateDistributionMoneyType
=
parms
.
GetInt
(
"SeparateDistributionMoneyType"
),
EnjoyMember
=
parms
.
GetInt
(
"EnjoyMember"
),
SeparateSetMember
=
parms
.
GetInt
(
"SeparateSetMember"
),
IsQuickBuy
=
parms
.
GetInt
(
"IsQuickBuy"
),
FullNumPinkage
=
parms
.
GetInt
(
"FullNumPinkage"
),
FullMoneyPinkage
=
parms
.
GetDecimal
(
"FullMoneyPinkage"
),
SupplierId
=
parms
.
GetInt
(
"SupplierId"
),
Sort
=
parms
.
GetInt
(
"Sort"
),
Commission
=
parms
.
GetDecimal
(
"Commission"
),
PresentFXGrade
=
parms
.
GetInt
(
"PresentFXGrade"
),
PresentFXMonth
=
parms
.
GetInt
(
"PresentFXMonth"
),
Advertising
=
parms
.
GetStringValue
(
"Advertising"
),
SubName
=
parms
.
GetStringValue
(
"SubName"
),
ShelvesDate
=
parms
.
GetDateTime
(
"ShelvesDate"
),
DownDate
=
parms
.
GetDateTime
(
"DownDate"
),
SendArea
=
parms
.
GetStringValue
(
"SendArea"
),
VideoType
=
parms
.
GetInt
(
"VideoType"
),
GoodsPageType
=(
GoodsPageTypeEnum
)
parms
.
GetInt
(
"GoodsPageType"
),
Remark
=
parms
.
GetStringValue
(
"Remark"
),
IsNoTax
=
parms
.
GetInt
(
"IsNoTax"
),
GoodsCountry
=
parms
.
GetStringValue
(
"GoodsCountry"
),
FatCode
=
parms
.
GetStringValue
(
"FatCode"
),
GoodsUrl
=
parms
.
GetStringValue
(
"GoodsUrl"
),
goodsLogo
=
parms
.
GetStringValue
(
"goodsLogo"
),
};
int
IsKorea
=
parms
.
GetInt
(
"IsKorea"
,
0
);
//是否为韩国馆项目(1-是)
demodel
.
CategoryList
=
JsonHelper
.
DeserializeObject
<
List
<
RB_Goods_Category_Extend
>>(
parms
.
GetStringValue
(
"CategoryList"
));
demodel
.
CarouselImageList
=
JsonHelper
.
DeserializeObject
<
List
<
RB_ImageCommonModel
>>(
parms
.
GetStringValue
(
"CarouselImageList"
));
demodel
.
SpecificationList
=
JsonHelper
.
DeserializeObject
<
List
<
RB_Goods_Specification_Extend
>>(
parms
.
GetStringValue
(
"SpecificationList"
));
demodel
.
SpecificationPriceList
=
JsonHelper
.
DeserializeObject
<
List
<
RB_Goods_SpecificationPrice_Extend
>>(
parms
.
GetStringValue
(
"SpecificationPriceList"
));
demodel
.
ServiceList
=
JsonHelper
.
DeserializeObject
<
List
<
RB_ImageCommonModel
>>(
parms
.
GetStringValue
(
"ServiceList"
));
demodel
.
AreaList
=
JsonHelper
.
DeserializeObject
<
List
<
RB_Goods_Area_Extend
>>(
parms
.
GetStringValue
(
"AreaList"
));
demodel
.
DistributionCommissionList
=
JsonHelper
.
DeserializeObject
<
List
<
RB_Goods_DistributionCommission_Extend
>>(
parms
.
GetStringValue
(
"DistributionCommissionList"
));
var
marketingLogo
=
JsonHelper
.
DeserializeObject
<
MarketingLogoItem
>(
parms
.
GetStringValue
(
"MarketingLogo"
));
demodel
.
MarketingLogo
=
JsonHelper
.
Serialize
(
marketingLogo
);
//待完善
demodel
.
TenantId
=
RequestParm
.
TenantId
;
demodel
.
MallBaseId
=
RequestParm
.
MallBaseId
;
if
(
string
.
IsNullOrEmpty
(
demodel
.
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