### 0.6.0 专业版(大版本升级,破坏性升级,请酌情处理):

【新增】弃用现在sku前端,启用全新sku组件,更加灵活,体验更好。
【新增】新增通过商品序列获取sku全新列表功能。
【新增】仓储层底层增加二级缓存功能,后面将逐步完善底层缓存中心模块。
【新增】0元购,积分兑换模式下,也去计算用户是否科技升级。
【新增】数据及业务仓储增加二级缓存功能。curd可自主控制是否缓存和清除。
【新增】订单导出excel数据增加商品名称+货品sku组合展示的方式。
【新增】自定义交易组件增加【获取商家信息】【更新商家信息】两个接口处理。
【新增】增加公告列表及公告详情页面,首页组件公告点击跳转列表展示。
【新增】个人中心增加【公告中心】入口。
【新增】后台余额变动增加说明录入。

【调整】将前端能进行分包的文件夹都进行分包,减少主包占用,方便进行二开。
【调整】因ckeditor5存在图片不可设置宽度,上传不支持mp4,排版不畅等情况,降级使用ckeditor4版本。
【修复】修复0.5.5版本售后积分返还机制积分模式判断异常的问题。
【修复】修复使用积分全额抵扣,或其他优惠政策导致的0元购,未进行短信提醒及小票打印机未打印的问题。
【修复】修复更换ckeditor4编辑器后接龙添加编辑调用失败的问题。
【修复】修复积分全额抵扣,金额0元购的情况下,进行售后执行完毕,订单未完结的情况。
【优化】去除分销申请面板按钮无用并失效报错的customStyle属性。
【优化】优化部分方法中使用手写字符串的遗留问题,统一采用enum方式。
【优化】优化前端及接口部分命名错误的问题。错将skill误写成seckill。
【优化】去除uniapp端多个客服代码。
【优化】商品详情底部完善购物车数量显示的问题。
【优化】优化团购列表,拼团列表,秒杀页面页面样式布局差异问题。
【优化】调整支付结果界面样式效果,仿微信支付结果界面。更加清晰明朗。
【优化】优化售后提交页面json计算,开放当用户下单后但未发货情况下,可以申请直接售后的操作需求。
【优化】后台商家手机号码支持设置多个,使用小写逗号分隔,方便多个商家管理员接收下单提醒。
【优化】后台售后单审核,调整售后商品为必选项。
This commit is contained in:
大灰灰
2022-09-14 00:53:04 +08:00
parent 6ce893cb38
commit 7b68f352d7
3118 changed files with 161226 additions and 10176 deletions

View File

@@ -8,163 +8,217 @@
* Description: 暂无
***********************************************************************/
using System;
using System.ComponentModel.DataAnnotations;
using SqlSugar;
using System.ComponentModel;
using System.ComponentModel.DataAnnotations;
namespace CoreCms.Net.Model.Entities
{
/// <summary>
/// 发货单表
/// 发货单表
/// </summary>
public partial class CoreCmsBillDelivery
{
/// <summary>
/// 发货单序列
/// 构造函数
/// </summary>
public CoreCmsBillDelivery()
{
}
/// <summary>
/// 发货单序列
/// </summary>
[Display(Name = "发货单序列")]
[SugarColumn(IsPrimaryKey = true)]
[Required(ErrorMessage = "请输入{0}")]
[StringLength(20, ErrorMessage = "{0}不能超过{1}字")]
public string deliveryId { get; set; }
[StringLength(maximumLength:20,ErrorMessage = "{0}不能超过{1}字")]
public System.String deliveryId { get; set; }
/// <summary>
/// 订单号
/// 订单号
/// </summary>
[Display(Name = "订单号")]
[StringLength(500, ErrorMessage = "{0}不能超过{1}字")]
public string orderId { get; set; }
[StringLength(maximumLength:500,ErrorMessage = "{0}不能超过{1}字")]
public System.String orderId { get; set; }
/// <summary>
/// 物流公司编码
/// 物流公司编码
/// </summary>
[Display(Name = "物流公司编码")]
[StringLength(50, ErrorMessage = "{0}不能超过{1}字")]
public string logiCode { get; set; }
[StringLength(maximumLength:50,ErrorMessage = "{0}不能超过{1}字")]
public System.String logiCode { get; set; }
/// <summary>
/// 物流单号
/// 物流单号
/// </summary>
[Display(Name = "物流单号")]
[StringLength(50, ErrorMessage = "{0}不能超过{1}字")]
public string logiNo { get; set; }
[StringLength(maximumLength:50,ErrorMessage = "{0}不能超过{1}字")]
public System.String logiNo { get; set; }
/// <summary>
/// 第三方对接物流编码
/// </summary>
[Display(Name = "第三方对接物流编码")]
[StringLength(maximumLength: 50, ErrorMessage = "{0}不能超过{1}字")]
public System.String thirdPartylogiCode { get; set; }
[StringLength(maximumLength:50,ErrorMessage = "{0}不能超过{1}字")]
public System.String thirdPartylogiCode { get; set; }
/// <summary>
/// 快递物流信息
/// 快递物流信息
/// </summary>
[Display(Name = "快递物流信息")]
public string logiInformation { get; set; }
public System.String logiInformation { get; set; }
/// <summary>
/// 快递是否不更新
/// 快递是否不更新
/// </summary>
[Display(Name = "快递是否不更新")]
[Required(ErrorMessage = "请输入{0}")]
public bool logiStatus { get; set; }
public System.Boolean logiStatus { get; set; }
/// <summary>
/// 收货地区ID
/// 收货地区ID
/// </summary>
[Display(Name = "收货地区ID")]
[Required(ErrorMessage = "请输入{0}")]
public int shipAreaId { get; set; }
public System.Int32 shipAreaId { get; set; }
/// <summary>
/// 收货详细地址
/// 收货详细地址
/// </summary>
[Display(Name = "收货详细地址")]
[StringLength(200, ErrorMessage = "{0}不能超过{1}字")]
public string shipAddress { get; set; }
[StringLength(maximumLength:200,ErrorMessage = "{0}不能超过{1}字")]
public System.String shipAddress { get; set; }
/// <summary>
/// 收货人姓名
/// 收货人姓名
/// </summary>
[Display(Name = "收货人姓名")]
[StringLength(50, ErrorMessage = "{0}不能超过{1}字")]
public string shipName { get; set; }
[StringLength(maximumLength:50,ErrorMessage = "{0}不能超过{1}字")]
public System.String shipName { get; set; }
/// <summary>
/// 收货电话
/// 收货电话
/// </summary>
[Display(Name = "收货电话")]
[StringLength(50, ErrorMessage = "{0}不能超过{1}字")]
public string shipMobile { get; set; }
[StringLength(maximumLength:50,ErrorMessage = "{0}不能超过{1}字")]
public System.String shipMobile { get; set; }
/// <summary>
/// 状态
/// 状态
/// </summary>
[Display(Name = "状态")]
[Required(ErrorMessage = "请输入{0}")]
public int status { get; set; }
public System.Int32 status { get; set; }
/// <summary>
/// 备注
/// 备注
/// </summary>
[Display(Name = "备注")]
[StringLength(255, ErrorMessage = "{0}不能超过{1}字")]
public string memo { get; set; }
[StringLength(maximumLength:255,ErrorMessage = "{0}不能超过{1}字")]
public System.String memo { get; set; }
/// <summary>
/// 确认收货时间
/// 确认收货时间
/// </summary>
[Display(Name = "确认收货时间")]
public DateTime? confirmTime { get; set; }
public System.DateTime? confirmTime { get; set; }
/// <summary>
/// 创建时间
/// 创建时间
/// </summary>
[Display(Name = "创建时间")]
[Required(ErrorMessage = "请输入{0}")]
public DateTime createTime { get; set; }
public System.DateTime createTime { get; set; }
/// <summary>
/// 更新时间
/// 更新时间
/// </summary>
[Display(Name = "更新时间")]
public DateTime? updateTime { get; set; }
public System.DateTime? updateTime { get; set; }
}
}
}

View File

@@ -3,72 +3,79 @@
* ProjectName: 核心内容管理系统
* Web: https://www.corecms.net
* Author: 大灰灰
* Email: jianweie@163.com
* CreateTime: 2021-06-08 22:14:58
* Email: jianweie@163.com
* CreateTime: 2021/10/18 9:26:42
* Description: 暂无
***********************************************************************/
using SqlSugar;
***********************************************************************/
using System.ComponentModel.DataAnnotations;
using SqlSugar;
namespace CoreCms.Net.Model.Entities
{
/// <summary>
/// 购物车表
/// 购物车表
/// </summary>
[SugarTable("CoreCmsCart",TableDescription = "购物车表")]
public partial class CoreCmsCart
public class CoreCmsCart
{
/// <summary>
/// 购物车表
/// </summary>
public CoreCmsCart()
{
}
/// <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 int id { get; set; }
/// <summary>
/// 用户序列
/// 用户序列
/// </summary>
[Display(Name = "用户序列")]
[SugarColumn(ColumnDescription = "用户序列")]
[Required(ErrorMessage = "请输入{0}")]
public System.Int32 userId { get; set; }
public int userId { get; set; }
/// <summary>
/// 货品序列
/// 货品序列
/// </summary>
[Display(Name = "货品序列")]
[SugarColumn(ColumnDescription = "货品序列")]
[Required(ErrorMessage = "请输入{0}")]
public System.Int32 productId { get; set; }
public int productId { get; set; }
/// <summary>
/// 货品数量
/// 货品数量
/// </summary>
[Display(Name = "货品数量")]
[SugarColumn(ColumnDescription = "货品数量")]
[Required(ErrorMessage = "请输入{0}")]
public System.Int32 nums { get; set; }
public int nums { get; set; }
/// <summary>
/// 购物车类型
/// 购物车类型
/// </summary>
[Display(Name = "购物车类型")]
[SugarColumn(ColumnDescription = "购物车类型")]
[Required(ErrorMessage = "请输入{0}")]
public System.Int32 type { get; set; }
public int type { get; set; }
/// <summary>
/// 关联对象序列
/// </summary>
[Display(Name = "关联对象序列")]
[Required(ErrorMessage = "请输入{0}")]
public int objectId { get; set; }
public int objectId { get; set; }
}
}

View File

@@ -48,6 +48,15 @@ namespace CoreCms.Net.Model.Entities
[Display(Name = "单选内容")]
[SugarColumn(IsIgnore = true)]
public List<string> radioValue { get; set; }
/// <summary>
/// 表单提交值
/// </summary>
[Display(Name = "表单提交值")]
[SugarColumn(IsIgnore = true)]
public string postValue { get; set; } = "";
}
/// <summary>

View File

@@ -12,6 +12,7 @@ using System;
using System.Collections.Generic;
using System.ComponentModel.DataAnnotations;
using CoreCms.Net.Model.FromBody;
using CoreCms.Net.Model.ViewModels.DTO;
using SqlSugar;
namespace CoreCms.Net.Model.Entities
@@ -115,6 +116,11 @@ namespace CoreCms.Net.Model.Entities
[SugarColumn(IsIgnore = true)]
public Dictionary<string, Dictionary<string, DefaultSpesDesc>> specification { get; set; } = new();
/// <summary>
/// 关联SKU
[SugarColumn(IsIgnore = true)]
public CoreCmsProductsView skuList { get; set; } = new();
/// <summary>
/// 是否收藏
/// </summary>

View File

@@ -1,25 +1,25 @@
/***********************************************************************
* Project: CoreCms
* ProjectName: 核心内容管理系统
* Web: https://www.corecms.net
* Author: 大灰灰
* ProjectName: 核心内容管理系统
* Web: https://www.corecms.net
* Author: 大灰灰
* Email: jianweie@163.com
* CreateTime: 2021-06-08 22:14:58
* CreateTime: 2021/7/16 2:53:31
* Description: 暂无
***********************************************************************/
***********************************************************************/
using SqlSugar;
using System.ComponentModel.DataAnnotations;
namespace CoreCms.Net.Model.Entities
{
/// <summary>
/// 商品类型属性
/// 商品SKU模型
/// </summary>
[SugarTable("CoreCmsGoodsTypeSpec",TableDescription = "商品类型属性表")]
public partial class CoreCmsGoodsTypeSpec
{
/// <summary>
/// 商品类型属性表
/// 构造函数
/// </summary>
public CoreCmsGoodsTypeSpec()
{
@@ -29,23 +29,25 @@ namespace CoreCms.Net.Model.Entities
/// 序列
/// </summary>
[Display(Name = "序列")]
[SugarColumn(ColumnDescription = "序列", IsPrimaryKey = true, IsIdentity = true)]
[SugarColumn(IsPrimaryKey = true, IsIdentity = true)]
[Required(ErrorMessage = "请输入{0}")]
public System.Int32 id { get; set; }
/// <summary>
/// 属性名称
/// Sku模型名称
/// </summary>
[Display(Name = "属性名称")]
[SugarColumn(ColumnDescription = "属性名称")]
[Display(Name = "Sku模型名称")]
[Required(ErrorMessage = "请输入{0}")]
[StringLength(255, ErrorMessage = "{0}不能超过{1}字符长度")]
[StringLength(maximumLength: 255, ErrorMessage = "{0}不能超过{1}字")]
public System.String name { get; set; }
/// <summary>
/// 属性排序
/// Sku模型排序
/// </summary>
[Display(Name = "属性排序")]
[SugarColumn(ColumnDescription = "属性排序")]
[Display(Name = "Sku模型排序")]
[Required(ErrorMessage = "请输入{0}")]
public System.Int32 sort { get; set; }
}
}

View File

@@ -3,56 +3,78 @@
* ProjectName: 核心内容管理系统
* Web: https://www.corecms.net
* Author: 大灰灰
* Email: jianweie@163.com
* CreateTime: 2021-06-08 22:14:58
* Email: jianweie@163.com
* CreateTime: 2021/7/16 2:53:44
* Description: 暂无
***********************************************************************/
***********************************************************************/
using SqlSugar;
using System.ComponentModel;
using System.ComponentModel.DataAnnotations;
namespace CoreCms.Net.Model.Entities
{
/// <summary>
/// 商品类型属性值
/// 商品SKU明细
/// </summary>
[SugarTable("CoreCmsGoodsTypeSpecValue",TableDescription = "商品类型属性值表")]
public partial class CoreCmsGoodsTypeSpecValue
{
/// <summary>
/// 商品类型属性值表
/// 构造函数
/// </summary>
public CoreCmsGoodsTypeSpecValue()
{
}
/// <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>
/// 属性ID 关联goods_type_spec.id
/// Sku模型序列
/// </summary>
[Display(Name = "属性ID 关联goods_type_spec.id")]
[SugarColumn(ColumnDescription = "属性ID 关联goods_type_spec.id")]
[Display(Name = "Sku模型序列")]
[Required(ErrorMessage = "请输入{0}")]
public System.Int32 specId { get; set; }
public System.Int32 specId { get; set; }
/// <summary>
/// 属性
/// Sku模型
/// </summary>
[Display(Name = "属性值")]
[SugarColumn(ColumnDescription = "属性值")]
[Display(Name = "Sku模型值")]
[Required(ErrorMessage = "请输入{0}")]
[StringLength(255, ErrorMessage = "{0}不能超过{1}字符长度")]
public System.String value { get; set; }
[StringLength(maximumLength:255,ErrorMessage = "{0}不能超过{1}字")]
public System.String value { get; set; }
/// <summary>
/// 排序
/// </summary>
[Display(Name = "排序")]
[SugarColumn(ColumnDescription = "排序")]
[Required(ErrorMessage = "请输入{0}")]
public System.Int32 sort { get; set; }
public System.Int32 sort { get; set; }
}
}
}

View File

@@ -410,12 +410,17 @@ namespace CoreCms.Net.Model.Entities
public System.Decimal couponDiscountAmount { get; set; }
/// <summary>
/// 优惠券信息
/// </summary>
[Display(Name = "优惠券信息")]
public System.String coupon { get; set; }
@@ -473,22 +478,24 @@ namespace CoreCms.Net.Model.Entities
[Display(Name = "订单来源")]
[Required(ErrorMessage = "请输入{0}")]
public System.Int32 source { get; set; }
/// <summary>
/// 场景值
/// </summary>
[Display(Name = "场景值")]
[Required(ErrorMessage = "请输入{0}")]
public System.Int32 scene { get; set; }
public System.Int32 scene { get; set; }
/// <summary>
/// 是否评论
/// </summary>
@@ -505,10 +512,14 @@ namespace CoreCms.Net.Model.Entities
/// 删除标志
/// </summary>
[Display(Name = "删除标志")]
[Required(ErrorMessage = "请输入{0}")]
public System.Boolean isdel { get; set; }
/// <summary>
/// 关联营销类型对象序列
/// </summary>
@@ -516,6 +527,8 @@ namespace CoreCms.Net.Model.Entities
[Required(ErrorMessage = "请输入{0}")]
public System.Int32 objectId { get; set; }
@@ -523,13 +536,23 @@ namespace CoreCms.Net.Model.Entities
/// 创建时间
/// </summary>
[Display(Name = "创建时间")]
[Required(ErrorMessage = "请输入{0}")]
public System.DateTime createTime { get; set; }
/// <summary>
/// <summary>
/// 更新时间
/// </summary>
[Display(Name = "更新时间")]
public System.DateTime? updateTime { get; set; }