# 2022-02-24

### 1.3.7 开源社区版:
无
### 0.2.4 会员专业版:
【新增】数据库sku表【CoreCmsProducts】增加"积分可抵扣金额"【pointsDeduction】字段
【新增】商品sku新增最高抵扣金额功能,可通过积分进行价格抵扣,实现单品使用【积分+价格】的购买模式。与订单积分折扣并存。
【新增】积分新增积分模式功能,分为全局计算和单品计算,【全局计算】是指直接对订单按照使用比例进行计算,【单品计算】是指根据单个商品下sku独立设置的最高可抵扣金额进行计算。
【新增】积分新增显示积分组合兑换价功能,勾选显示,将在商品详情,购物车等界面显示积分加价格的效果。
【新增】积分新增显示名称功能,前端可改名积分显示名称为自定义,如:金豆,衡豆等。
【新增】商品列表页面、购物车界面、下单界面、商品详情界面新增积分新增是否显示组合价功能,如果勾选,将显示【1000积分+25元换购】的内容。
【优化】当添加视频后,默认采用商品封面图作为视频底图,防止视频大小差异出现黑边或预加载中黑屏的问题。
【优化】商品列表展示列表去除padding留白效果。
【优化】优化form表单redio和checkBox选项分行显示的问题。
【修复】修复拼团分享页面倒计时识别失败的问题,修复拼团分享页面分享按钮点击失败的问题。#I4QWDH #I4QWFC
This commit is contained in:
JianWeie
2022-02-24 02:16:41 +08:00
parent 289c3fc5a1
commit 53b16cfeab
31 changed files with 605 additions and 207 deletions

View File

@@ -70,6 +70,12 @@ namespace CoreCms.Net.Model.Entities
[SugarColumn(IsIgnore = true)]
public decimal weight { get; set; } = 0;
/// <summary>
/// 积分抵扣金额
/// </summary>
[Display(Name = "积分抵扣金额")]
[SugarColumn(IsIgnore = true)]
public decimal pointsDeduction { get; set; } = 0;
/// <summary>
/// 图集
@@ -95,6 +101,7 @@ namespace CoreCms.Net.Model.Entities
[SugarColumn(IsIgnore = true)]
public List<CoreCmsProducts> sku { get; set; } = new();
/// <summary>
/// 是否收藏
/// </summary>

View File

@@ -3,11 +3,13 @@
* ProjectName: 核心内容管理系统
* Web: https://www.corecms.net
* Author: 大灰灰
* Email: jianweie@163.com
* CreateTime: 2021-06-08 22:14:58
* Email: jianweie@163.com
* CreateTime: 2022/2/22 0:43:08
* Description: 暂无
***********************************************************************/
***********************************************************************/
using SqlSugar;
using System.ComponentModel;
using System.ComponentModel.DataAnnotations;
namespace CoreCms.Net.Model.Entities
@@ -15,118 +17,208 @@ namespace CoreCms.Net.Model.Entities
/// <summary>
/// 货品表
/// </summary>
[SugarTable("CoreCmsProducts",TableDescription = "货品表")]
public partial class CoreCmsProducts
{
/// <summary>
/// 货品表
/// 构造函数
/// </summary>
public CoreCmsProducts()
{
}
/// <summary>
/// 货品序列
/// </summary>
[Display(Name = "货品序列")]
[SugarColumn(ColumnDescription = "货品序列", IsPrimaryKey = true, IsIdentity = true)]
[SugarColumn(IsPrimaryKey = true, IsIdentity = true)]
[Required(ErrorMessage = "请输入{0}")]
public System.Int32 id { get; set; }
public System.Int32 id { get; set; }
/// <summary>
/// 商品序列
/// </summary>
[Display(Name = "商品序列")]
[SugarColumn(ColumnDescription = "商品序列")]
[Required(ErrorMessage = "请输入{0}")]
public System.Int32 goodsId { get; set; }
public System.Int32 goodsId { get; set; }
/// <summary>
/// 商品条码
/// </summary>
[Display(Name = "商品条码")]
[SugarColumn(ColumnDescription = "商品条码", IsNullable = true)]
[StringLength(128, ErrorMessage = "【{0}】不能超过{1}字符长度")]
public System.String barcode { get; set; }
[StringLength(maximumLength:128,ErrorMessage = "{0}不能超过{1}字")]
public System.String barcode { get; set; }
/// <summary>
/// 货品编码
/// </summary>
[Display(Name = "货品编码")]
[SugarColumn(ColumnDescription = "货品编码", IsNullable = true)]
[StringLength(30, ErrorMessage = "【{0}】不能超过{1}字符长度")]
public System.String sn { get; set; }
[StringLength(maximumLength:30,ErrorMessage = "{0}不能超过{1}字")]
public System.String sn { get; set; }
/// <summary>
/// 货品价格
/// </summary>
[Display(Name = "货品价格")]
[SugarColumn(ColumnDescription = "货品价格")]
[Required(ErrorMessage = "请输入{0}")]
public System.Decimal price { get; set; }
public System.Decimal price { get; set; }
/// <summary>
/// 货品成本价
/// </summary>
[Display(Name = "货品成本价")]
[SugarColumn(ColumnDescription = "货品成本价")]
[Required(ErrorMessage = "请输入{0}")]
public System.Decimal costprice { get; set; }
public System.Decimal costprice { get; set; }
/// <summary>
/// 货品市场价
/// </summary>
[Display(Name = "货品市场价")]
[SugarColumn(ColumnDescription = "货品市场价")]
[Required(ErrorMessage = "请输入{0}")]
public System.Decimal mktprice { get; set; }
public System.Decimal mktprice { get; set; }
/// <summary>
/// 是否上架
/// </summary>
[Display(Name = "是否上架")]
[SugarColumn(ColumnDescription = "是否上架")]
[Required(ErrorMessage = "请输入{0}")]
public System.Boolean marketable { get; set; }
public System.Boolean marketable { get; set; }
/// <summary>
/// 积分可抵扣金额
/// </summary>
[Display(Name = "积分可抵扣金额")]
[Required(ErrorMessage = "请输入{0}")]
public System.Decimal pointsDeduction { get; set; }
/// <summary>
/// 重量(千克)
/// </summary>
[Display(Name = "重量(千克)")]
[SugarColumn(ColumnDescription = "重量(千克)")]
[Required(ErrorMessage = "请输入{0}")]
public System.Decimal weight { get; set; }
public System.Decimal weight { get; set; }
/// <summary>
/// 库存
/// </summary>
[Display(Name = "库存")]
[SugarColumn(ColumnDescription = "库存")]
[Required(ErrorMessage = "请输入{0}")]
public System.Int32 stock { get; set; }
public System.Int32 stock { get; set; }
/// <summary>
/// 冻结库存
/// </summary>
[Display(Name = "冻结库存")]
[SugarColumn(ColumnDescription = "冻结库存")]
[Required(ErrorMessage = "请输入{0}")]
public System.Int32 freezeStock { get; set; }
public System.Int32 freezeStock { get; set; }
/// <summary>
/// 规格值
/// </summary>
[Display(Name = "规格值")]
[SugarColumn(ColumnDescription = "规格值", IsNullable = true)]
public System.String spesDesc { get; set; }
public System.String spesDesc { get; set; }
/// <summary>
/// 是否默认货品
/// </summary>
[Display(Name = "是否默认货品")]
[SugarColumn(ColumnDescription = "是否默认货品")]
[Required(ErrorMessage = "请输入{0}")]
public System.Boolean isDefalut { get; set; }
public System.Boolean isDefalut { get; set; }
/// <summary>
/// 规格图片
/// </summary>
[Display(Name = "规格图片")]
[SugarColumn(ColumnDescription = "规格图片", IsNullable = true)]
public System.String images { get; set; }
public System.String images { get; set; }
/// <summary>
/// 是否删除
/// </summary>
[Display(Name = "是否删除")]
[SugarColumn(ColumnDescription = "是否删除")]
[Required(ErrorMessage = "请输入{0}")]
public System.Boolean isDel { get; set; }
public System.Boolean isDel { get; set; }
}
}
}

View File

@@ -36,6 +36,16 @@ namespace CoreCms.Net.Model.ViewModels.DTO
/// 订单金额
/// </summary>
public decimal orderMoney { get; set; }
/// <summary>
/// 购物车货品序列号
/// </summary>
public string ids { get; set; }
/// <summary>
/// 购物车类型
/// </summary>
public int cartType { get; set; }
}
/// <summary>