Skip to content

M
mall.oytour.com
Commit db241bc8 authored by 吴春's avatar 吴春
Browse files
Options

Merge branch 'master' of http://gitlab.oytour.com/Kui2/mall.oytour.com

parents e8e6b2f1 f6320b7e
Hide whitespace changes
Inline Side-by-side
Showing with 315 additions and 71 deletions
Mall.Model/Entity/MarketingCenter/RB_Share_Friend.cs
View file @ db241bc8
...@@ -97,5 +97,10 @@ namespace Mall.Model.Entity.MarketingCenter ...@@ -97,5 +97,10 @@ namespace Mall.Model.Entity.MarketingCenter
/// 更新时间 /// 更新时间
/// </summary> /// </summary>
public DateTime UpdateDate { get; set; } public DateTime UpdateDate { get; set; }
/// <summary>
/// 分享数量
/// </summary>
public int ShareCount { get; set; }
} }
} }
Mall.Module.MarketingCenter/ShareModule.cs
View file @ db241bc8
...@@ -348,5 +348,15 @@ namespace Mall.Module.MarketingCenter ...@@ -348,5 +348,15 @@ namespace Mall.Module.MarketingCenter
flag = share_FriendRepository.Update(fileds, new WhereHelper(nameof(RB_Share_Friend_Extend.Id), Id)); flag = share_FriendRepository.Update(fileds, new WhereHelper(nameof(RB_Share_Friend_Extend.Id), Id));
return flag; return flag;
} }
/// <summary>
/// 更新分享数量
/// </summary>
/// <param name="Id"></param>
/// <returns></returns>
public bool SetShareFrendShareCountModule(object Id)
{
return share_FriendRepository.SetShareFrendShareCountRepository(Id);
}
} }
} }
Mall.Module.Product/OrderModule.cs
View file @ db241bc8
...@@ -2689,6 +2689,11 @@ namespace Mall.Module.Product ...@@ -2689,6 +2689,11 @@ namespace Mall.Module.Product
} }
} }
} }
if (dcList.Where(x => x.SmallShopId > 0).Any())
{
IsCommissionCoupons = false;
}
} }
} }
} }
......
Mall.Module.Product/ProductModule.cs
View file @ db241bc8
...@@ -1489,6 +1489,11 @@ namespace Mall.Module.Product ...@@ -1489,6 +1489,11 @@ namespace Mall.Module.Product
} }
MaxSellMoney = model.SpecificationPriceList.Max(x => x.SellingPrice ?? 0); MaxSellMoney = model.SpecificationPriceList.Max(x => x.SellingPrice ?? 0);
model.SellingPrice = model.SpecificationPriceList.Min(x => x.SellingPrice ?? 0); model.SellingPrice = model.SpecificationPriceList.Min(x => x.SellingPrice ?? 0);
decimal MaxPrice = MaxSellMoney + Math.Ceiling(MaxSellMoney / 10);
if (MaxPrice > model.OriginalPrice)
{
model.OriginalPrice = MaxPrice;
}
} }
//区域 //区域
model.AreaList = new List<RB_Goods_Area_Extend>(); model.AreaList = new List<RB_Goods_Area_Extend>();
......
Mall.Repository/MarketingCenter/RB_Share_FriendRepository.cs
View file @ db241bc8
...@@ -22,7 +22,7 @@ namespace Mall.Repository.MarketingCenter ...@@ -22,7 +22,7 @@ namespace Mall.Repository.MarketingCenter
/// <param name="query">查询条件</param> /// <param name="query">查询条件</param>
/// <param name="IsUse">true-只查询启用的</param> /// <param name="IsUse">true-只查询启用的</param>
/// <returns></returns> /// <returns></returns>
public List<RB_Share_Friend_Extend> GetShareFriendPageListRepository(int pageIndex, int pageSize, out long rowsCount, RB_Share_Friend_Extend query,bool IsUse=false) public List<RB_Share_Friend_Extend> GetShareFriendPageListRepository(int pageIndex, int pageSize, out long rowsCount, RB_Share_Friend_Extend query, bool IsUse = false)
{ {
StringBuilder builder = new StringBuilder(); StringBuilder builder = new StringBuilder();
builder.AppendFormat(@" builder.AppendFormat(@"
...@@ -46,7 +46,7 @@ WHERE 1=1 AND A.Status=0 ...@@ -46,7 +46,7 @@ WHERE 1=1 AND A.Status=0
} }
if (query.CateId > 0) if (query.CateId > 0)
{ {
builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Share_Friend_Extend.CateId),query.CateId); builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Share_Friend_Extend.CateId), query.CateId);
} }
if (!string.IsNullOrWhiteSpace(query.CateIds)) if (!string.IsNullOrWhiteSpace(query.CateIds))
{ {
...@@ -192,7 +192,7 @@ WHERE 1=1 AND A.Status=0 ...@@ -192,7 +192,7 @@ WHERE 1=1 AND A.Status=0
dynamicParameters.Add("UpdateBy", extModel.UpdateBy); dynamicParameters.Add("UpdateBy", extModel.UpdateBy);
dynamicParameters.Add("UpdateDate", extModel.UpdateDate); dynamicParameters.Add("UpdateDate", extModel.UpdateDate);
dynamicParameters.Add("Id", extModel.Id); dynamicParameters.Add("Id", extModel.Id);
flag = base.Execute(builder.ToString(),dynamicParameters) > 0; flag = base.Execute(builder.ToString(), dynamicParameters) > 0;
} }
else else
{ {
...@@ -218,5 +218,21 @@ WHERE 1=1 AND A.Status=0 ...@@ -218,5 +218,21 @@ WHERE 1=1 AND A.Status=0
} }
return flag; return flag;
} }
/// <summary>
/// 更新分享数量
/// </summary>
/// <param name="Id"></param>
/// <returns></returns>
public bool SetShareFrendShareCountRepository(object Id)
{
bool flag = false;
DynamicParameters dynamicParameters = new DynamicParameters();
StringBuilder builder = new StringBuilder();
builder.Append(@" UPDATE rb_share_friend SET shareCount=shareCount+1 WHERE Id=@Id ");
dynamicParameters.Add("Id", Id);
flag = base.Execute(builder.ToString(), dynamicParameters) > 0;
return flag;
}
} }
} }
\ No newline at end of file
Mall.WebApi/Controllers/Mall/MallHelper.cs
View file @ db241bc8
...@@ -3,11 +3,13 @@ using Mall.Model.Entity.BaseSetUp; ...@@ -3,11 +3,13 @@ using Mall.Model.Entity.BaseSetUp;
using Mall.Model.Entity.MarketingCenter; using Mall.Model.Entity.MarketingCenter;
using Mall.Model.Extend.BaseSetUp; using Mall.Model.Extend.BaseSetUp;
using Mall.Model.Extend.MarketingCenter; using Mall.Model.Extend.MarketingCenter;
using Mall.Model.Extend.Product;
using Mall.Model.Extend.User; using Mall.Model.Extend.User;
using Mall.Module.BaseSetUp; using Mall.Module.BaseSetUp;
using Mall.Module.MarketingCenter; using Mall.Module.MarketingCenter;
using Mall.Module.Product; using Mall.Module.Product;
using Mall.Module.User; using Mall.Module.User;
using Mall.Repository.Product;
using Mall.Repository.User; using Mall.Repository.User;
using Newtonsoft.Json; using Newtonsoft.Json;
using System; using System;
...@@ -70,6 +72,10 @@ namespace Mall.WebApi.Controllers ...@@ -70,6 +72,10 @@ namespace Mall.WebApi.Controllers
/// 微店商品价格 /// 微店商品价格
/// </summary> /// </summary>
private static RB_SmallShops_PriceRepository smallShops_PriceRepository = new RB_SmallShops_PriceRepository(); private static RB_SmallShops_PriceRepository smallShops_PriceRepository = new RB_SmallShops_PriceRepository();
/// <summary>
/// 商品规格价格
/// </summary>
private static RB_Goods_SpecificationPriceRepository goods_SpecificationPriceRepository = new RB_Goods_SpecificationPriceRepository();
/// <summary> /// <summary>
...@@ -195,41 +201,87 @@ namespace Mall.WebApi.Controllers ...@@ -195,41 +201,87 @@ namespace Mall.WebApi.Controllers
#region 微店价格 #region 微店价格
RB_SmallShops_Info_Extend smallModel = new RB_SmallShops_Info_Extend(); RB_SmallShops_Info_Extend smallModel = new RB_SmallShops_Info_Extend();
List<RB_SmallShops_Price_Extend> smallPList = new List<RB_SmallShops_Price_Extend>(); List<RB_SmallShops_Price_Extend> smallPList = new List<RB_SmallShops_Price_Extend>();
if (SmallShopsId > 0 && tempGoodsList.Any()) { if (SmallShopsId > 0 && tempGoodsList.Any())
{
string goodsId = string.Join(",", tempGoodsList.Select(x => x.Id)); string goodsId = string.Join(",", tempGoodsList.Select(x => x.Id));
smallModel = smallShops_InfoRepository.GetEntity<RB_SmallShops_Info_Extend>(SmallShopsId); smallModel = smallShops_InfoRepository.GetEntity<RB_SmallShops_Info_Extend>(SmallShopsId);
smallPList = smallShops_PriceRepository.GetList(new RB_SmallShops_Price_Extend() { SmallShopsId = SmallShopsId, GoodsIds = goodsId }); smallPList = smallShops_PriceRepository.GetList(new RB_SmallShops_Price_Extend() { SmallShopsId = SmallShopsId, GoodsIds = goodsId });
foreach (var item in tempGoodsList) { var spriceList = goods_SpecificationPriceRepository.GetList(new RB_Goods_SpecificationPrice_Extend() { GoodsIds = goodsId });
foreach (var item in tempGoodsList)
{
if ((smallModel.UpPrice ?? 0) > 0 || smallPList.Where(x => x.GoodsId == item.Id && x.UpPrice > 0).Any()) if ((smallModel.UpPrice ?? 0) > 0 || smallPList.Where(x => x.GoodsId == item.Id && x.UpPrice > 0).Any())
{ {
var sspModel = smallPList.Where(x => x.GoodsId == item.Id && x.SpecificationKey == "").FirstOrDefault(); var spList = spriceList.Where(x => x.GoodsId == item.Id).ToList();
if (sspModel != null) if (spList.Any())
{ {
//单商品设置的 foreach (var qitem in spriceList)
if (sspModel.PriceType == 1)
{ {
item.SellingPrice = (item.SellingPrice ?? 0) + Math.Ceiling((item.SellingPrice ?? 0) * (sspModel.UpPrice ?? 0) / 100); var sspModel = smallPList.Where(x => x.SpecificationKey == qitem.SpecificationSort).FirstOrDefault();
item.OriginalPrice = (item.OriginalPrice ?? 0) + Math.Ceiling((item.OriginalPrice ?? 0) * (sspModel.UpPrice ?? 0) / 100); if (sspModel != null)
{
//单商品设置的
if (sspModel.PriceType == 1)
{
qitem.SellingPrice = (qitem.SellingPrice ?? 0) + Math.Ceiling((qitem.SellingPrice ?? 0) * (sspModel.UpPrice ?? 0) / 100);
}
else if (sspModel.PriceType == 2)
{
qitem.SellingPrice = (qitem.SellingPrice ?? 0) + (sspModel.UpPrice ?? 0);
}
}
else
{
if ((smallModel.UpPrice ?? 0) > 0)
{
if (smallModel.PriceType == 1)
{
qitem.SellingPrice = (qitem.SellingPrice ?? 0) + Math.Ceiling((qitem.SellingPrice ?? 0) * (smallModel.UpPrice ?? 0) / 100);
}
else if (smallModel.PriceType == 2)
{
qitem.SellingPrice = (qitem.SellingPrice ?? 0) + (smallModel.UpPrice ?? 0);
}
}
}
} }
else if (sspModel.PriceType == 2) item.SellingPrice = spriceList.Min(x => x.SellingPrice ?? 0);
{ decimal MaxPrice = spriceList.Max(x => x.SellingPrice ?? 0);
item.SellingPrice = (item.SellingPrice ?? 0) + (sspModel.UpPrice ?? 0); MaxPrice += Math.Ceiling(MaxPrice / 10);
item.OriginalPrice = (item.OriginalPrice ?? 0) + (sspModel.UpPrice ?? 0); if (MaxPrice > item.OriginalPrice) {
item.OriginalPrice = MaxPrice;
} }
} }
else else
{ {
if ((smallModel.UpPrice ?? 0) > 0) var sspModel = smallPList.Where(x => x.GoodsId == item.Id && x.SpecificationKey == "").FirstOrDefault();
if (sspModel != null)
{ {
if (smallModel.PriceType == 1) //单商品设置的
if (sspModel.PriceType == 1)
{ {
item.SellingPrice = (item.SellingPrice ?? 0) + Math.Ceiling((item.SellingPrice ?? 0) * (smallModel.UpPrice ?? 0) / 100); item.SellingPrice = (item.SellingPrice ?? 0) + Math.Ceiling((item.SellingPrice ?? 0) * (sspModel.UpPrice ?? 0) / 100);
item.OriginalPrice = (item.OriginalPrice ?? 0) + Math.Ceiling((item.OriginalPrice ?? 0) * (smallModel.UpPrice ?? 0) / 100); item.OriginalPrice = (item.OriginalPrice ?? 0) + Math.Ceiling((item.OriginalPrice ?? 0) * (sspModel.UpPrice ?? 0) / 100);
} }
else if (smallModel.PriceType == 2) else if (sspModel.PriceType == 2)
{ {
item.SellingPrice = (item.SellingPrice ?? 0) + (smallModel.UpPrice ?? 0); item.SellingPrice = (item.SellingPrice ?? 0) + (sspModel.UpPrice ?? 0);
item.OriginalPrice = (item.OriginalPrice ?? 0) + (smallModel.UpPrice ?? 0); item.OriginalPrice = (item.OriginalPrice ?? 0) + (sspModel.UpPrice ?? 0);
}
}
else
{
if ((smallModel.UpPrice ?? 0) > 0)
{
if (smallModel.PriceType == 1)
{
item.SellingPrice = (item.SellingPrice ?? 0) + Math.Ceiling((item.SellingPrice ?? 0) * (smallModel.UpPrice ?? 0) / 100);
item.OriginalPrice = (item.OriginalPrice ?? 0) + Math.Ceiling((item.OriginalPrice ?? 0) * (smallModel.UpPrice ?? 0) / 100);
}
else if (smallModel.PriceType == 2)
{
item.SellingPrice = (item.SellingPrice ?? 0) + (smallModel.UpPrice ?? 0);
item.OriginalPrice = (item.OriginalPrice ?? 0) + (smallModel.UpPrice ?? 0);
}
} }
} }
} }
...@@ -274,38 +326,83 @@ namespace Mall.WebApi.Controllers ...@@ -274,38 +326,83 @@ namespace Mall.WebApi.Controllers
string goodsId = string.Join(",", catGoodsList.Select(x => x.Id)); string goodsId = string.Join(",", catGoodsList.Select(x => x.Id));
smallModel = smallShops_InfoRepository.GetEntity<RB_SmallShops_Info_Extend>(SmallShopsId); smallModel = smallShops_InfoRepository.GetEntity<RB_SmallShops_Info_Extend>(SmallShopsId);
smallPList = smallShops_PriceRepository.GetList(new RB_SmallShops_Price_Extend() { SmallShopsId = SmallShopsId, GoodsIds = goodsId }); smallPList = smallShops_PriceRepository.GetList(new RB_SmallShops_Price_Extend() { SmallShopsId = SmallShopsId, GoodsIds = goodsId });
var spriceList = goods_SpecificationPriceRepository.GetList(new RB_Goods_SpecificationPrice_Extend() { GoodsIds = goodsId });
foreach (var item in catGoodsList) foreach (var item in catGoodsList)
{ {
if ((smallModel.UpPrice ?? 0) > 0 || smallPList.Where(x => x.GoodsId == item.Id && x.UpPrice > 0).Any()) if ((smallModel.UpPrice ?? 0) > 0 || smallPList.Where(x => x.GoodsId == item.Id && x.UpPrice > 0).Any())
{ {
var sspModel = smallPList.Where(x => x.GoodsId == item.Id && x.SpecificationKey == "").FirstOrDefault(); var spList = spriceList.Where(x => x.GoodsId == item.Id).ToList();
if (sspModel != null) if (spList.Any())
{ {
//单商品设置的 foreach (var qitem in spriceList)
if (sspModel.PriceType == 1)
{ {
item.SellingPrice = (item.SellingPrice ?? 0) + Math.Ceiling((item.SellingPrice ?? 0) * (sspModel.UpPrice ?? 0) / 100); var sspModel = smallPList.Where(x => x.SpecificationKey == qitem.SpecificationSort).FirstOrDefault();
item.OriginalPrice = (item.OriginalPrice ?? 0) + Math.Ceiling((item.OriginalPrice ?? 0) * (sspModel.UpPrice ?? 0) / 100); if (sspModel != null)
{
//单商品设置的
if (sspModel.PriceType == 1)
{
qitem.SellingPrice = (qitem.SellingPrice ?? 0) + Math.Ceiling((qitem.SellingPrice ?? 0) * (sspModel.UpPrice ?? 0) / 100);
}
else if (sspModel.PriceType == 2)
{
qitem.SellingPrice = (qitem.SellingPrice ?? 0) + (sspModel.UpPrice ?? 0);
}
}
else
{
if ((smallModel.UpPrice ?? 0) > 0)
{
if (smallModel.PriceType == 1)
{
qitem.SellingPrice = (qitem.SellingPrice ?? 0) + Math.Ceiling((qitem.SellingPrice ?? 0) * (smallModel.UpPrice ?? 0) / 100);
}
else if (smallModel.PriceType == 2)
{
qitem.SellingPrice = (qitem.SellingPrice ?? 0) + (smallModel.UpPrice ?? 0);
}
}
}
} }
else if (sspModel.PriceType == 2) item.SellingPrice = spriceList.Min(x => x.SellingPrice ?? 0);
decimal MaxPrice = spriceList.Max(x => x.SellingPrice ?? 0);
MaxPrice += Math.Ceiling(MaxPrice / 10);
if (MaxPrice > item.OriginalPrice)
{ {
item.SellingPrice = (item.SellingPrice ?? 0) + (sspModel.UpPrice ?? 0); item.OriginalPrice = MaxPrice;
item.OriginalPrice = (item.OriginalPrice ?? 0) + (sspModel.UpPrice ?? 0);
} }
} }
else else
{ {
if ((smallModel.UpPrice ?? 0) > 0) var sspModel = smallPList.Where(x => x.GoodsId == item.Id && x.SpecificationKey == "").FirstOrDefault();
if (sspModel != null)
{ {
if (smallModel.PriceType == 1) //单商品设置的
if (sspModel.PriceType == 1)
{ {
item.SellingPrice = (item.SellingPrice ?? 0) + Math.Ceiling((item.SellingPrice ?? 0) * (smallModel.UpPrice ?? 0) / 100); item.SellingPrice = (item.SellingPrice ?? 0) + Math.Ceiling((item.SellingPrice ?? 0) * (sspModel.UpPrice ?? 0) / 100);
item.OriginalPrice = (item.OriginalPrice ?? 0) + Math.Ceiling((item.OriginalPrice ?? 0) * (smallModel.UpPrice ?? 0) / 100); item.OriginalPrice = (item.OriginalPrice ?? 0) + Math.Ceiling((item.OriginalPrice ?? 0) * (sspModel.UpPrice ?? 0) / 100);
} }
else if (smallModel.PriceType == 2) else if (sspModel.PriceType == 2)
{ {
item.SellingPrice = (item.SellingPrice ?? 0) + (smallModel.UpPrice ?? 0); item.SellingPrice = (item.SellingPrice ?? 0) + (sspModel.UpPrice ?? 0);
item.OriginalPrice = (item.OriginalPrice ?? 0) + (smallModel.UpPrice ?? 0); item.OriginalPrice = (item.OriginalPrice ?? 0) + (sspModel.UpPrice ?? 0);
}
}
else
{
if ((smallModel.UpPrice ?? 0) > 0)
{
if (smallModel.PriceType == 1)
{
item.SellingPrice = (item.SellingPrice ?? 0) + Math.Ceiling((item.SellingPrice ?? 0) * (smallModel.UpPrice ?? 0) / 100);
item.OriginalPrice = (item.OriginalPrice ?? 0) + Math.Ceiling((item.OriginalPrice ?? 0) * (smallModel.UpPrice ?? 0) / 100);
}
else if (smallModel.PriceType == 2)
{
item.SellingPrice = (item.SellingPrice ?? 0) + (smallModel.UpPrice ?? 0);
item.OriginalPrice = (item.OriginalPrice ?? 0) + (smallModel.UpPrice ?? 0);
}
} }
} }
} }
...@@ -352,38 +449,83 @@ namespace Mall.WebApi.Controllers ...@@ -352,38 +449,83 @@ namespace Mall.WebApi.Controllers
string goodsId = string.Join(",", goodsList.Select(x => x.Id)); string goodsId = string.Join(",", goodsList.Select(x => x.Id));
smallModel = smallShops_InfoRepository.GetEntity<RB_SmallShops_Info_Extend>(SmallShopsId); smallModel = smallShops_InfoRepository.GetEntity<RB_SmallShops_Info_Extend>(SmallShopsId);
smallPList = smallShops_PriceRepository.GetList(new RB_SmallShops_Price_Extend() { SmallShopsId = SmallShopsId, GoodsIds = goodsId }); smallPList = smallShops_PriceRepository.GetList(new RB_SmallShops_Price_Extend() { SmallShopsId = SmallShopsId, GoodsIds = goodsId });
var spriceList = goods_SpecificationPriceRepository.GetList(new RB_Goods_SpecificationPrice_Extend() { GoodsIds = goodsId });
foreach (var item in goodsList) foreach (var item in goodsList)
{ {
if ((smallModel.UpPrice ?? 0) > 0 || smallPList.Where(x => x.GoodsId == item.Id && x.UpPrice > 0).Any()) if ((smallModel.UpPrice ?? 0) > 0 || smallPList.Where(x => x.GoodsId == item.Id && x.UpPrice > 0).Any())
{ {
var sspModel = smallPList.Where(x => x.GoodsId == item.Id && x.SpecificationKey == "").FirstOrDefault(); var spList = spriceList.Where(x => x.GoodsId == item.Id).ToList();
if (sspModel != null) if (spList.Any())
{ {
//单商品设置的 foreach (var qitem in spriceList)
if (sspModel.PriceType == 1)
{ {
item.SellingPrice = (item.SellingPrice ?? 0) + Math.Ceiling((item.SellingPrice ?? 0) * (sspModel.UpPrice ?? 0) / 100); var sspModel = smallPList.Where(x => x.SpecificationKey == qitem.SpecificationSort).FirstOrDefault();
item.OriginalPrice = (item.OriginalPrice ?? 0) + Math.Ceiling((item.OriginalPrice ?? 0) * (sspModel.UpPrice ?? 0) / 100); if (sspModel != null)
{
//单商品设置的
if (sspModel.PriceType == 1)
{
qitem.SellingPrice = (qitem.SellingPrice ?? 0) + Math.Ceiling((qitem.SellingPrice ?? 0) * (sspModel.UpPrice ?? 0) / 100);
}
else if (sspModel.PriceType == 2)
{
qitem.SellingPrice = (qitem.SellingPrice ?? 0) + (sspModel.UpPrice ?? 0);
}
}
else
{
if ((smallModel.UpPrice ?? 0) > 0)
{
if (smallModel.PriceType == 1)
{
qitem.SellingPrice = (qitem.SellingPrice ?? 0) + Math.Ceiling((qitem.SellingPrice ?? 0) * (smallModel.UpPrice ?? 0) / 100);
}
else if (smallModel.PriceType == 2)
{
qitem.SellingPrice = (qitem.SellingPrice ?? 0) + (smallModel.UpPrice ?? 0);
}
}
}
} }
else if (sspModel.PriceType == 2) item.SellingPrice = spriceList.Min(x => x.SellingPrice ?? 0);
decimal MaxPrice = spriceList.Max(x => x.SellingPrice ?? 0);
MaxPrice += Math.Ceiling(MaxPrice / 10);
if (MaxPrice > item.OriginalPrice)
{ {
item.SellingPrice = (item.SellingPrice ?? 0) + (sspModel.UpPrice ?? 0); item.OriginalPrice = MaxPrice;
item.OriginalPrice = (item.OriginalPrice ?? 0) + (sspModel.UpPrice ?? 0);
} }
} }
else else
{ {
if ((smallModel.UpPrice ?? 0) > 0) var sspModel = smallPList.Where(x => x.GoodsId == item.Id && x.SpecificationKey == "").FirstOrDefault();
if (sspModel != null)
{ {
if (smallModel.PriceType == 1) //单商品设置的
if (sspModel.PriceType == 1)
{
item.SellingPrice = (item.SellingPrice ?? 0) + Math.Ceiling((item.SellingPrice ?? 0) * (sspModel.UpPrice ?? 0) / 100);
item.OriginalPrice = (item.OriginalPrice ?? 0) + Math.Ceiling((item.OriginalPrice ?? 0) * (sspModel.UpPrice ?? 0) / 100);
}
else if (sspModel.PriceType == 2)
{ {
item.SellingPrice = (item.SellingPrice ?? 0) + Math.Ceiling((item.SellingPrice ?? 0) * (smallModel.UpPrice ?? 0) / 100); item.SellingPrice = (item.SellingPrice ?? 0) + (sspModel.UpPrice ?? 0);
item.OriginalPrice = (item.OriginalPrice ?? 0) + Math.Ceiling((item.OriginalPrice ?? 0) * (smallModel.UpPrice ?? 0) / 100); item.OriginalPrice = (item.OriginalPrice ?? 0) + (sspModel.UpPrice ?? 0);
} }
else if (smallModel.PriceType == 2) }
else
{
if ((smallModel.UpPrice ?? 0) > 0)
{ {
item.SellingPrice = (item.SellingPrice ?? 0) + (smallModel.UpPrice ?? 0); if (smallModel.PriceType == 1)
item.OriginalPrice = (item.OriginalPrice ?? 0) + (smallModel.UpPrice ?? 0); {
item.SellingPrice = (item.SellingPrice ?? 0) + Math.Ceiling((item.SellingPrice ?? 0) * (smallModel.UpPrice ?? 0) / 100);
item.OriginalPrice = (item.OriginalPrice ?? 0) + Math.Ceiling((item.OriginalPrice ?? 0) * (smallModel.UpPrice ?? 0) / 100);
}
else if (smallModel.PriceType == 2)
{
item.SellingPrice = (item.SellingPrice ?? 0) + (smallModel.UpPrice ?? 0);
item.OriginalPrice = (item.OriginalPrice ?? 0) + (smallModel.UpPrice ?? 0);
}
} }
} }
} }
...@@ -427,38 +569,83 @@ namespace Mall.WebApi.Controllers ...@@ -427,38 +569,83 @@ namespace Mall.WebApi.Controllers
string goodsId = string.Join(",", tempGoodsList.Select(x => x.Id)); string goodsId = string.Join(",", tempGoodsList.Select(x => x.Id));
smallModel = smallShops_InfoRepository.GetEntity<RB_SmallShops_Info_Extend>(SmallShopsId); smallModel = smallShops_InfoRepository.GetEntity<RB_SmallShops_Info_Extend>(SmallShopsId);
smallPList = smallShops_PriceRepository.GetList(new RB_SmallShops_Price_Extend() { SmallShopsId = SmallShopsId, GoodsIds = goodsId }); smallPList = smallShops_PriceRepository.GetList(new RB_SmallShops_Price_Extend() { SmallShopsId = SmallShopsId, GoodsIds = goodsId });
var spriceList = goods_SpecificationPriceRepository.GetList(new RB_Goods_SpecificationPrice_Extend() { GoodsIds = goodsId });
foreach (var item in tempGoodsList) foreach (var item in tempGoodsList)
{ {
if ((smallModel.UpPrice ?? 0) > 0 || smallPList.Where(x => x.GoodsId == item.Id && x.UpPrice > 0).Any()) if ((smallModel.UpPrice ?? 0) > 0 || smallPList.Where(x => x.GoodsId == item.Id && x.UpPrice > 0).Any())
{ {
var sspModel = smallPList.Where(x => x.GoodsId == item.Id && x.SpecificationKey == "").FirstOrDefault(); var spList = spriceList.Where(x => x.GoodsId == item.Id).ToList();
if (sspModel != null) if (spList.Any())
{ {
//单商品设置的 foreach (var qitem in spriceList)
if (sspModel.PriceType == 1)
{ {
item.SellingPrice = (item.SellingPrice ?? 0) + Math.Ceiling((item.SellingPrice ?? 0) * (sspModel.UpPrice ?? 0) / 100); var sspModel = smallPList.Where(x => x.SpecificationKey == qitem.SpecificationSort).FirstOrDefault();
item.OriginalPrice = (item.OriginalPrice ?? 0) + Math.Ceiling((item.OriginalPrice ?? 0) * (sspModel.UpPrice ?? 0) / 100); if (sspModel != null)
{
//单商品设置的
if (sspModel.PriceType == 1)
{
qitem.SellingPrice = (qitem.SellingPrice ?? 0) + Math.Ceiling((qitem.SellingPrice ?? 0) * (sspModel.UpPrice ?? 0) / 100);
}
else if (sspModel.PriceType == 2)
{
qitem.SellingPrice = (qitem.SellingPrice ?? 0) + (sspModel.UpPrice ?? 0);
}
}
else
{
if ((smallModel.UpPrice ?? 0) > 0)
{
if (smallModel.PriceType == 1)
{
qitem.SellingPrice = (qitem.SellingPrice ?? 0) + Math.Ceiling((qitem.SellingPrice ?? 0) * (smallModel.UpPrice ?? 0) / 100);
}
else if (smallModel.PriceType == 2)
{
qitem.SellingPrice = (qitem.SellingPrice ?? 0) + (smallModel.UpPrice ?? 0);
}
}
}
} }
else if (sspModel.PriceType == 2) item.SellingPrice = spriceList.Min(x => x.SellingPrice ?? 0);
decimal MaxPrice = spriceList.Max(x => x.SellingPrice ?? 0);
MaxPrice += Math.Ceiling(MaxPrice / 10);
if (MaxPrice > item.OriginalPrice)
{ {
item.SellingPrice = (item.SellingPrice ?? 0) + (sspModel.UpPrice ?? 0); item.OriginalPrice = MaxPrice;
item.OriginalPrice = (item.OriginalPrice ?? 0) + (sspModel.UpPrice ?? 0);
} }
} }
else else
{ {
if ((smallModel.UpPrice ?? 0) > 0) var sspModel = smallPList.Where(x => x.GoodsId == item.Id && x.SpecificationKey == "").FirstOrDefault();
if (sspModel != null)
{ {
if (smallModel.PriceType == 1) //单商品设置的
if (sspModel.PriceType == 1)
{ {
item.SellingPrice = (item.SellingPrice ?? 0) + Math.Ceiling((item.SellingPrice ?? 0) * (smallModel.UpPrice ?? 0) / 100); item.SellingPrice = (item.SellingPrice ?? 0) + Math.Ceiling((item.SellingPrice ?? 0) * (sspModel.UpPrice ?? 0) / 100);
item.OriginalPrice = (item.OriginalPrice ?? 0) + Math.Ceiling((item.OriginalPrice ?? 0) * (smallModel.UpPrice ?? 0) / 100); item.OriginalPrice = (item.OriginalPrice ?? 0) + Math.Ceiling((item.OriginalPrice ?? 0) * (sspModel.UpPrice ?? 0) / 100);
} }
else if (smallModel.PriceType == 2) else if (sspModel.PriceType == 2)
{ {
item.SellingPrice = (item.SellingPrice ?? 0) + (smallModel.UpPrice ?? 0); item.SellingPrice = (item.SellingPrice ?? 0) + (sspModel.UpPrice ?? 0);
item.OriginalPrice = (item.OriginalPrice ?? 0) + (smallModel.UpPrice ?? 0); item.OriginalPrice = (item.OriginalPrice ?? 0) + (sspModel.UpPrice ?? 0);
}
}
else
{
if ((smallModel.UpPrice ?? 0) > 0)
{
if (smallModel.PriceType == 1)
{
item.SellingPrice = (item.SellingPrice ?? 0) + Math.Ceiling((item.SellingPrice ?? 0) * (smallModel.UpPrice ?? 0) / 100);
item.OriginalPrice = (item.OriginalPrice ?? 0) + Math.Ceiling((item.OriginalPrice ?? 0) * (smallModel.UpPrice ?? 0) / 100);
}
else if (smallModel.PriceType == 2)
{
item.SellingPrice = (item.SellingPrice ?? 0) + (smallModel.UpPrice ?? 0);
item.OriginalPrice = (item.OriginalPrice ?? 0) + (smallModel.UpPrice ?? 0);
}
} }
} }
} }
......
Mall.WebApi/Controllers/MarketingCenter/ShareController.cs
View file @ db241bc8
...@@ -157,11 +157,14 @@ namespace Mall.WebApi.Controllers.MarketingCenter ...@@ -157,11 +157,14 @@ namespace Mall.WebApi.Controllers.MarketingCenter
qitem.ImgList, qitem.ImgList,
qitem.CoverImg, qitem.CoverImg,
qitem.LinkUrl, qitem.LinkUrl,
qitem.CreateDateStr qitem.CreateDateStr,
qitem.ShareCount,
}); });
return ApiResult.Success("", pagelist); return ApiResult.Success("", pagelist);
} }
/// <summary> /// <summary>
/// 获取分享详情列表 /// 获取分享详情列表
/// </summary> /// </summary>
...@@ -273,5 +276,18 @@ namespace Mall.WebApi.Controllers.MarketingCenter ...@@ -273,5 +276,18 @@ namespace Mall.WebApi.Controllers.MarketingCenter
bool flag = shareModule.SetShareFriendMaterialInfoModule(Id, MaterialInfo); bool flag = shareModule.SetShareFriendMaterialInfoModule(Id, MaterialInfo);
return flag ? ApiResult.Success() : ApiResult.Failed(); return flag ? ApiResult.Success() : ApiResult.Failed();
} }
/// <summary>
/// 更新分享数量
/// </summary>
/// <returns></returns>
[AllowAnonymous]
public ApiResult SetShareCount()
{
JObject parm = JObject.Parse(RequestParm.msg.ToString());
int Id = parm.GetInt("Id", 0);
bool flag = shareModule.SetShareFrendShareCountModule(Id);
return flag ? ApiResult.Success() : ApiResult.Failed();
}
} }
} }
\ No newline at end of file
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