Skip to content

M
mall.oytour.com
Commit 82d667c6 authored by 黄奎's avatar 黄奎
Browse files
Options

页面修改

parent 2043c69d
Hide whitespace changes
Inline Side-by-side
Showing with 132 additions and 7 deletions
Mall.WebApi/Controllers/Education/EducationController.cs
View file @ 82d667c6
......@@ -209,6 +209,18 @@ namespace Mall.WebApi.Controllers.Education
}
var model = educationModule.GetProductGoodsInfo(GoodsId, req.TenantId, req.MallBaseId);
var MarketingLogo = new MarketingLogoItem();
if (!string.IsNullOrEmpty(model?.MarketingLogo))
{
try
{
MarketingLogo = JsonHelper.DeserializeObject<MarketingLogoItem>(model?.MarketingLogo);
}
catch
{
MarketingLogo = new MarketingLogoItem();
}
}
return ApiResult.Success("", new
{
model?.Id,
......@@ -293,7 +305,7 @@ namespace Mall.WebApi.Controllers.Education
}),
model?.Advertising,
model?.SubName,
model?.MarketingLogo,
MarketingLogo,
model?.IntegralComment,
model?.IntegralCommentType,
model?.GoodsPageType,
......@@ -349,7 +361,54 @@ namespace Mall.WebApi.Controllers.Education
public ApiResult SetGoodsInfo()
{
var parms = RequestParm;
RB_Goods_Extend demodel = JsonConvert.DeserializeObject<RB_Goods_Extend>(parms.msg.ToString());
JObject jObj = JObject.Parse(RequestParm.msg.ToString());
RB_Goods_Extend demodel = new RB_Goods_Extend()
{
Advertising=jObj.GetStringValue("Advertising"),
Commission = jObj.GetDecimal("Commission"),
CostPrice = jObj.GetDecimal("CostPrice"),
CustomShareImage=jObj.GetStringValue("CustomShareImage"),
CustomShareTitles=jObj.GetStringValue("CustomShareTitles"),
EnjoyMember=jObj.GetInt("EnjoyMember"),
GoodsDetails=jObj.GetStringValue("GoodsDetails"),
GoodsPageType = (GoodsPageTypeEnum)jObj.GetInt("GoodsPageType"),
GoodsStatus = jObj.GetInt("GoodsStatus"),
Id = jObj.GetInt("Id"),
IntegralComment = jObj.GetInt("IntegralComment"),
IntegralCommentType = jObj.GetInt("IntegralCommentType"),
IntegralPresent = jObj.GetInt("IntegralPresent"),
IntegralPresentType = jObj.GetInt("IntegralPresentType"),
IsAreaBuy = jObj.GetInt("IsAreaBuy"),
IsLiveGoods = jObj.GetInt("IsLiveGoods"),
Name = jObj.GetStringValue("Name"),
OriginalPrice = jObj.GetDecimal("OriginalPrice"),
PointsDeduction = jObj.GetDecimal("PointsDeduction"),
PointsDeductionType = jObj.GetInt("PointsDeductionType"),
SalesNum=jObj.GetInt("SalesNum"),
SellingPrice = jObj.GetDecimal("SellingPrice"),
SeparateDistribution = jObj.GetInt("SeparateDistribution"),
SeparateDistributionMoneyType = jObj.GetInt("SeparateDistributionMoneyType"),
SeparateDistributionType = jObj.GetInt("SeparateDistributionType"),
SeparateSetMember = jObj.GetInt("SeparateSetMember"),
Sort = jObj.GetInt("Sort"),
SubName = jObj.GetStringValue("SubName"),
SupplierId = jObj.GetInt("SupplierId"),
UseDay = jObj.GetInt("UseDay"),
VideoAddress = jObj.GetStringValue("VideoAddress"),
};
demodel.TeacherList= JsonHelper.DeserializeObject<List<RB_Goods_WK_Teacher_Extend>>(jObj.GetStringValue("TeacherList"));
demodel.MemberPriceTreeList = JsonHelper.DeserializeObject<List<RB_Goods_MemberPrice_Extend>>(jObj.GetStringValue("MemberPriceTreeList"));
demodel.MemberPriceList = JsonHelper.DeserializeObject<List<RB_Goods_MemberPrice_Extend>>(jObj.GetStringValue("MemberPriceList"));
demodel.DistributionCommissionTreeList = JsonHelper.DeserializeObject<List<RB_Goods_DistributionCommission_Extend>>(jObj.GetStringValue("DistributionCommissionTreeList"));
demodel.DistributionCommissionList = JsonHelper.DeserializeObject<List<RB_Goods_DistributionCommission_Extend>>(jObj.GetStringValue("DistributionCommissionList"));
demodel.CourseList= JsonHelper.DeserializeObject<List<RB_Goods_WK_Course_Extend>>(jObj.GetStringValue("CourseList"));
demodel.CourseLableList= JsonHelper.DeserializeObject<List<string>>(jObj.GetStringValue("CourseLableList"));
demodel.CategoryList = JsonHelper.DeserializeObject<List<RB_Goods_Category_Extend>>(jObj.GetStringValue("CategoryList"));
demodel.CarouselImageList = JsonHelper.DeserializeObject<List<RB_ImageCommonModel>>(jObj.GetStringValue("CarouselImageList"));
demodel.AreaList = JsonHelper.DeserializeObject<List<RB_Goods_Area_Extend>>(jObj.GetStringValue("AreaList"));
var marketingLogo = JsonHelper.DeserializeObject<MarketingLogoItem>(jObj.GetStringValue("MarketingLogo"));
demodel.MarketingLogo = JsonHelper.Serialize(marketingLogo);
demodel.TenantId = parms.TenantId;
demodel.MallBaseId = parms.MallBaseId;
......
Mall.WebApi/Controllers/Product/GuideCarController.cs
View file @ 82d667c6
......@@ -277,6 +277,18 @@ namespace Mall.WebApi.Controllers.MallBase
}
var model = guideCarModule.GetProductGoodsInfo(GoodsId, req.TenantId, req.MallBaseId);
var MarketingLogo = new MarketingLogoItem();
if (!string.IsNullOrEmpty(model?.MarketingLogo))
{
try
{
MarketingLogo = JsonHelper.DeserializeObject<MarketingLogoItem>(model?.MarketingLogo);
}
catch
{
MarketingLogo = new MarketingLogoItem();
}
}
return ApiResult.Success("", new
{
model?.Id,
......@@ -360,7 +372,7 @@ namespace Mall.WebApi.Controllers.MallBase
}),
model?.Advertising,
model?.SubName,
model?.MarketingLogo,
MarketingLogo,
model?.SiteId,
model?.GuideId,
model?.CarId,
......@@ -510,7 +522,64 @@ namespace Mall.WebApi.Controllers.MallBase
public ApiResult SetGoodsInfo()
{
var parms = RequestParm;
RB_Goods_Extend demodel = JsonConvert.DeserializeObject<RB_Goods_Extend>(parms.msg.ToString());
JObject jObj = JObject.Parse(RequestParm.msg.ToString());
RB_Goods_Extend demodel = new RB_Goods_Extend()
{
AdvanceDay = jObj.GetInt("AdvanceDay"),
Advertising = jObj.GetStringValue("Advertising"),
CarBuyYear = jObj.GetStringValue("CarBuyYear"),
CarColorId=jObj.GetInt("CarColorId"),
CarId=jObj.GetInt("CarId"),
CarNumber=jObj.GetStringValue("CarNumber"),
CarType=(GuideCarGoodsTypeEnum)jObj.GetInt("CarType"),
Commission=jObj.GetDecimal("Commission"),
CostPrice=jObj.GetDecimal("CostPrice"),
CustomShareImage=jObj.GetStringValue("CustomShareImage"),
CustomShareTitles=jObj.GetStringValue("CustomShareTitles"),
EnjoyMember=jObj.GetInt("EnjoyMember"),
GoodsDetails=jObj.GetStringValue("GoodsDetails"),
GoodsPageType=(GoodsPageTypeEnum)jObj.GetInt("GoodsPageType"),
GoodsStatus=jObj.GetInt("GoodsStatus"),
GuideId=jObj.GetInt("GuideId"),
Id=jObj.GetInt("Id"),
IntegralComment=jObj.GetInt("IntegralComment"),
IntegralCommentType=jObj.GetInt("IntegralCommentType"),
IntegralPresent=jObj.GetInt("IntegralPresent"),
IntegralPresentType=jObj.GetInt("IntegralPresentType"),
IsAreaBuy=jObj.GetInt("IsAreaBuy"),
IsLiveGoods=jObj.GetInt("IsLiveGoods"),
IsMultipleDeduction=jObj.GetInt("IsMultipleDeduction"),
IsSpell=jObj.GetInt("IsSpell"),
LineName=jObj.GetStringValue("LineName"),
Name=jObj.GetStringValue("Name"),
OriginalPrice=jObj.GetDecimal("OriginalPrice"),
PointsDeduction=jObj.GetDecimal("PointsDeduction"),
PointsDeductionType=jObj.GetInt("PointsDeductionType"),
RideNum=jObj.GetInt("RideNum"),
SellingPrice=jObj.GetDecimal("SellingPrice"),
SeparateDistribution=jObj.GetInt("SeparateDistribution"),
SeparateDistributionMoneyType=jObj.GetInt("SeparateDistributionMoneyType"),
SeparateDistributionType=jObj.GetInt("SeparateDistributionType"),
SeparateSetMember=jObj.GetInt("SeparateSetMember"),
SiteId=jObj.GetInt("SiteId"),
Sort=jObj.GetInt("Sort"),
SubName=jObj.GetStringValue("SubName"),
SupplierId=jObj.GetInt("SupplierId"),
UseDay=jObj.GetInt("UseDay"),
VideoAddress=jObj.GetStringValue("VideoAddress"),
};
demodel.TargetDateStrList= JsonHelper.DeserializeObject<List<string>>(jObj.GetStringValue("TargetDateStrList"));
demodel.TargetDateList= JsonHelper.DeserializeObject<List<RB_Goods_TargetDate_Extend>>(jObj.GetStringValue("TargetDateList"));
demodel.MemberPriceTreeList = JsonHelper.DeserializeObject<List<RB_Goods_MemberPrice_Extend>>(jObj.GetStringValue("MemberPriceTreeList"));
demodel.MemberPriceList = JsonHelper.DeserializeObject<List<RB_Goods_MemberPrice_Extend>>(jObj.GetStringValue("MemberPriceList"));
demodel.LineDescriptionList= JsonHelper.DeserializeObject<List<string>>(jObj.GetStringValue("LineDescriptionList"));
demodel.DistributionCommissionTreeList= JsonHelper.DeserializeObject<List<RB_Goods_DistributionCommission_Extend>>(jObj.GetStringValue("DistributionCommissionTreeList"));
demodel.DistributionCommissionList = JsonHelper.DeserializeObject<List<RB_Goods_DistributionCommission_Extend>>(jObj.GetStringValue("DistributionCommissionList"));
demodel.CategoryList = JsonHelper.DeserializeObject<List<RB_Goods_Category_Extend>>(jObj.GetStringValue("CategoryList"));
demodel.CarouselImageList = JsonHelper.DeserializeObject<List<RB_ImageCommonModel>>(jObj.GetStringValue("CarouselImageList"));
demodel.AreaList = JsonHelper.DeserializeObject<List<RB_Goods_Area_Extend>>(jObj.GetStringValue("AreaList"));
var marketingLogo = JsonHelper.DeserializeObject<MarketingLogoItem>(jObj.GetStringValue("MarketingLogo"));
demodel.MarketingLogo = JsonHelper.Serialize(marketingLogo);
demodel.TenantId = parms.TenantId;
demodel.MallBaseId = parms.MallBaseId;
......
Mall.WebApi/Controllers/Product/ProductController.cs
View file @ 82d667c6
......@@ -1859,8 +1859,6 @@ namespace Mall.WebApi.Controllers.MallBase
PresentFXMonth = parms.GetInt("PresentFXMonth"),
Advertising = parms.GetStringValue("Advertising"),
SubName = parms.GetStringValue("SubName"),
SendArea = parms.GetStringValue("SendArea"),
VideoType = parms.GetInt("VideoType"),
GoodsPageType = (GoodsPageTypeEnum)parms.GetInt("GoodsPageType"),
......@@ -1870,7 +1868,6 @@ namespace Mall.WebApi.Controllers.MallBase
FatCode = parms.GetStringValue("FatCode"),
GoodsUrl = parms.GetStringValue("GoodsUrl"),
goodsLogo = parms.GetStringValue("goodsLogo"),
};
if (!string.IsNullOrEmpty(parms.GetStringValue("ShelvesDate")))
{
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment