Commit 43d8d00d authored by liudong1993's avatar liudong1993

1

parent 736497e7
......@@ -519,5 +519,21 @@ namespace Mall.Model.Entity.Product
/// 视频填充方式(0默认,1-填充)
/// </summary>
public int VideoType { get; set; }
/// <summary>
/// 评论积分赠送
/// </summary>
public int? IntegralComment
{
get;
set;
}
/// <summary>
/// 评论赠送类型 2固定值 1百分比
/// </summary>
public int? IntegralCommentType
{
get;
set;
}
}
}
......@@ -2383,7 +2383,7 @@ namespace Mall.Module.Product
date_enable = false;
}
var targetModel = targetList.FirstOrDefault();
if (targetModel.ReserveNum + (item.Number ?? 0) > (gmodel.RideNum ?? 0))
if (targetModel == null || targetModel.ReserveNum + (item.Number ?? 0) > (gmodel.RideNum ?? 0))
{
date_enable = false;
}
......@@ -2412,7 +2412,7 @@ namespace Mall.Module.Product
name = gmodel.Name,
categoryIdList = item.CategoryIdList,
num = item.Number,
surplus_num = (gmodel.RideNum ?? 0) - targetModel.ReserveNum,
surplus_num = (gmodel.RideNum ?? 0) - (targetModel?.ReserveNum ?? 0),
forehead_integral = gmodel.PointsDeduction,
forehead_integral_type = gmodel.PointsDeductionType,
accumulative = gmodel.IsMultipleDeduction,//累计多件抵扣
......
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