Skip to content

M
mall.oytour.com
Commit 55468ea3 authored by liudong1993's avatar liudong1993
Browse files
Options

首页评分 + 取消课程订单

parent 3e70ccea
Hide whitespace changes
Inline Side-by-side
Showing with 69 additions and 39 deletions
Mall.Model/Extend/MarketingCenter/RB_Miniprogram_Template_Extend.cs
View file @ 55468ea3
......@@ -830,7 +830,7 @@ namespace Mall.Model.Extend.MarketingCenter
public int goodsLength { get; set; }
/// <summary>
/// 列表样式[-1-列表模式,0-左右滑动,1-一行一个,2-一行两个3-一行三个]
/// 列表样式[-1-列表模式,0-左右滑动,1-一行一个,2-一行两个3-一行三个 4-教育模式]
/// </summary>
public int listStyle { get; set; }
......@@ -889,6 +889,16 @@ namespace Mall.Model.Extend.MarketingCenter
/// </summary>
public string buttonColor { get; set; }
/// <summary>
/// 显示评分 ld 2020-10-13
/// </summary>
public bool showScore { get; set; }
/// <summary>
/// 评分颜色
/// </summary>
public string scoreColor { get; set; }
/// <summary>
/// 显示商品角标
/// </summary>
......@@ -981,6 +991,11 @@ namespace Mall.Model.Extend.MarketingCenter
/// 【原价】前端使用
/// </summary>
public decimal OriginalPrice { get; set; }
/// <summary>
/// 课程评分 2020-10-13 ld
/// </summary>
public decimal courseScore { get; set; }
}
/// <summary>
......
Mall.Module.Product/OrderModule.cs
View file @ 55468ea3
......@@ -6010,7 +6010,7 @@ namespace Mall.Module.Product
}, trans);
}
}
if (IsSDGoods == false)
if (IsSDGoods == false && demodel.OrderClassify != 2)
{
//更新商品数量
Dictionary<string, object> keyValues = new Dictionary<string, object>() {
......@@ -6379,18 +6379,21 @@ namespace Mall.Module.Product
}
else
{
//更新商品表库存
Dictionary<string, object> keyValues1 = new Dictionary<string, object>() {
{ nameof(RB_Goods.InventoryNum), (gmodel.InventoryNum??0)+(item.Number??0)}
};
List<WhereHelper> wheres1 = new List<WhereHelper>() {
new WhereHelper(){
FiledName=nameof(RB_Goods.Id),
FiledValue=gmodel.Id,
OperatorEnum=OperatorEnum.Equal
if (omodel.OrderClassify != 2)
{
//更新商品表库存
Dictionary<string, object> keyValues1 = new Dictionary<string, object>() {
{ nameof(RB_Goods.InventoryNum), (gmodel.InventoryNum??0)+(item.Number??0)}
};
List<WhereHelper> wheres1 = new List<WhereHelper>() {
new WhereHelper(){
FiledName=nameof(RB_Goods.Id),
FiledValue=gmodel.Id,
OperatorEnum=OperatorEnum.Equal
}
};
goodsRepository.Update(keyValues1, wheres1, trans);
}
};
goodsRepository.Update(keyValues1, wheres1, trans);
}
goods_LogRepository.Insert(new RB_Goods_Log()
{
......@@ -9716,18 +9719,21 @@ namespace Mall.Module.Product
}
else
{
//更新商品表库存
Dictionary<string, object> keyValues1 = new Dictionary<string, object>() {
{ nameof(RB_Goods.InventoryNum), (gmodel.InventoryNum??0)+(item.Number??0)}
};
List<WhereHelper> wheres1 = new List<WhereHelper>() {
new WhereHelper(){
FiledName=nameof(RB_Goods.Id),
FiledValue=gmodel.Id,
OperatorEnum=OperatorEnum.Equal
}
};
goodsRepository.Update(keyValues1, wheres1, trans);
if (omodel.OrderClassify != 2)
{
//更新商品表库存
Dictionary<string, object> keyValues1 = new Dictionary<string, object>() {
{ nameof(RB_Goods.InventoryNum), (gmodel.InventoryNum??0)+(item.Number??0)}
};
List<WhereHelper> wheres1 = new List<WhereHelper>() {
new WhereHelper(){
FiledName=nameof(RB_Goods.Id),
FiledValue=gmodel.Id,
OperatorEnum=OperatorEnum.Equal
}
};
goodsRepository.Update(keyValues1, wheres1, trans);
}
}
goods_LogRepository.Insert(new RB_Goods_Log()
{
......
Mall.WebApi/Controllers/Mall/MallHelper.cs
View file @ 55468ea3
......@@ -217,6 +217,7 @@ namespace Mall.WebApi.Controllers
lastItem.price = Math.Round((tempGood?.SellingPrice ?? 0), 2);
lastItem.picUrl = tempGood?.CoverImage != null ? Common.Config.GetFileUrl(tempGood.CoverImage) : "";
lastItem.OriginalPrice = Math.Round((tempGood?.OriginalPrice ?? 0), 2);
lastItem.courseScore = (tempGood.CourseScore ?? 0);
newGoodsList.Add(lastItem);
}
}
......@@ -245,7 +246,8 @@ namespace Mall.WebApi.Controllers
price = Math.Round((gItem?.SellingPrice ?? 0), 2),
name = gItem.Name,
picUrl = Common.Config.GetFileUrl(gItem.CoverImage),
OriginalPrice = Math.Round((gItem?.OriginalPrice ?? 0), 2)
OriginalPrice = Math.Round((gItem?.OriginalPrice ?? 0), 2),
courseScore = gItem.CourseScore ?? 0
});
}
}
......@@ -369,7 +371,8 @@ namespace Mall.WebApi.Controllers
price = Math.Round((gItem?.SellingPrice ?? 0), 2),
name = gItem.Name,
picUrl = Common.Config.GetFileUrl(gItem.CoverImage),
OriginalPrice = Math.Round((gItem?.OriginalPrice ?? 0), 2)
OriginalPrice = Math.Round((gItem?.OriginalPrice ?? 0), 2),
courseScore = gItem.CourseScore ?? 0
});
}
}
......@@ -492,6 +495,7 @@ namespace Mall.WebApi.Controllers
childItem.price = Math.Round((tempGood?.SellingPrice ?? 0), 2);
childItem.picUrl = tempGood?.CoverImage != null ? Common.Config.GetFileUrl(tempGood.CoverImage) : "";
childItem.OriginalPrice = Math.Round((tempGood?.OriginalPrice ?? 0), 2);
childItem.courseScore = (tempGood.CourseScore ?? 0);
newGoodsList.Add(childItem);
}
}
......@@ -1138,6 +1142,8 @@ namespace Mall.WebApi.Controllers
buyBtnStyle = 1,
buyBtnText = "购买",
buttonColor = "#ff4544",
showScore = false,
scoreColor = "#FFC86E",
showGoodsTag = false,
customizeGoodsTag = false,
goodsTagPicUrl = "",
......
Mall.WindowsService/Module/FinanceModule.cs
View file @ 55468ea3
......@@ -602,18 +602,21 @@ and DATE_FORMAT(b.PaymentTime,'%y-%m-%d')<DATE_FORMAT('{endDate}','%y-%m-%d') A
}
else
{
//更新商品表库存
Dictionary<string, object> keyValues1 = new Dictionary<string, object>() {
{ nameof(RB_Goods_Extend.InventoryNum), (gmodel.InventoryNum??0)+(ditem.Number??0)}
};
List<WhereHelper> wheres1 = new List<WhereHelper>() {
new WhereHelper(){
FiledName=nameof(RB_Goods_Extend.Id),
FiledValue=gmodel.Id,
OperatorEnum=OperatorEnum.Equal
}
};
goodsRepository.Update(keyValues1, wheres1);
if (qitem.OrderClassify != 2)
{
//更新商品表库存
Dictionary<string, object> keyValues1 = new Dictionary<string, object>() {
{ nameof(RB_Goods_Extend.InventoryNum), (gmodel.InventoryNum??0)+(ditem.Number??0)}
};
List<WhereHelper> wheres1 = new List<WhereHelper>() {
new WhereHelper(){
FiledName=nameof(RB_Goods_Extend.Id),
FiledValue=gmodel.Id,
OperatorEnum=OperatorEnum.Equal
}
};
goodsRepository.Update(keyValues1, wheres1);
}
}
goods_LogRepository.Insert(new Mall.Model.Entity.Product.RB_Goods_Log()
{
......
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