wgh/coreshoppro
1
0
Fork 0
mirror of http://git.coreshop.cn/jianweie/coreshoppro.git synced 2026-03-23 16:27:20 +08:00
Code Issues Packages Projects Releases Wiki Activity

# 2022-01-17

Browse Source 
### 1.3.0 开源社区版：
【新增】完善商品查看详情功能。#I4QTLR
【新增】订单详情页面需要增加下单客户信息。
【新增】完善服务订单管理功能，实现订单作废、导出功能；核销码实现列表，作废，导出功能。#I4OSBK
【修复】修复普通订单查看详情，因优惠信息问题导致的异常情况。#I4QXUQ
【修复】修复门店列表下的用户编辑页面名称大小写问题（linux下大小写敏感问题）。
【修复】修复微信支付成功相应的日志记录类型有误。#I4QSNZ
【修复】修复发货日志记录sku货号错误问题。#I4PX25
【修复】修复发货单列表查看详情，提示权限不足的问题。#I4QDQR

### 0.0.8 会员专业版：
【新增】新增接龙功能营销功能，实现单个活动，可以添加多个不同商品的不同sku混合选择下单。
【新增】增加接龙数据库脚本及演示文件。
【升级】升级uView组件到2.0.20版本。
【修复】修复编辑收货地址的路径中选取区域部分可以手动输入文字。
【修复】修复【微信直播带货】组件缺少获取sku分页数据的问题。#I4QKSU
【优化】调整【微信自定义交易组件】商品类目排序方式及展示内容。#I4QE0N
This commit is contained in:
JianWeie
2022-01-17 02:16:00 +08:00
parent 4164e59919
commit 5167b0e096
107 changed files with 7668 additions and 3218 deletions
Download Patch File Download Diff File Expand all files Collapse all files

112
CoreCms.Net.Model/Entities/Service/CoreCmsUserServicesOrder.cs
View File

@@ -3,11 +3,13 @@
* ProjectName: 核心内容管理系统
* Web: https://www.corecms.net
* Author: 大灰灰
* Email: jianweie@163.com
* CreateTime: 2021-06-08 22:14:59
* Email: jianweie@163.com
* CreateTime: 2022/1/15 1:30:57
* Description: 暂无
***********************************************************************/
***********************************************************************/
using SqlSugar;
using System.ComponentModel;
using System.ComponentModel.DataAnnotations;
namespace CoreCms.Net.Model.Entities
@@ -15,84 +17,136 @@ namespace CoreCms.Net.Model.Entities
/// <summary>
/// 服务购买表
/// </summary>
[SugarTable("CoreCmsUserServicesOrder",TableDescription = "服务购买表")]
public partial class CoreCmsUserServicesOrder
{
/// <summary>
/// 服务购买表
/// 构造函数
/// </summary>
public CoreCmsUserServicesOrder()
{
}
/// <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}")]
[StringLength(50, ErrorMessage = "【{0}】不能超过{1}字符长度")]
public System.String serviceOrderId { get; set; }
[StringLength(maximumLength:50,ErrorMessage = "{0}不能超过{1}字")]
public System.String serviceOrderId { get; set; }
/// <summary>
/// 关联用户
/// </summary>
[Display(Name = "关联用户")]
[SugarColumn(ColumnDescription = "关联用户")]
[Required(ErrorMessage = "请输入{0}")]
public System.Int32 userId { get; set; }
public System.Int32 userId { get; set; }
/// <summary>
/// 关联服务
/// </summary>
[Display(Name = "关联服务")]
[SugarColumn(ColumnDescription = "关联服务")]
[Required(ErrorMessage = "请输入{0}")]
public System.Int32 servicesId { get; set; }
public System.Int32 servicesId { get; set; }
/// <summary>
/// 是否支付
/// </summary>
[Display(Name = "是否支付")]
[SugarColumn(ColumnDescription = "是否支付")]
[Required(ErrorMessage = "请输入{0}")]
public System.Boolean isPay { get; set; }
public System.Boolean isPay { get; set; }
/// <summary>
/// 支付时间
/// </summary>
[Display(Name = "支付时间")]
[SugarColumn(ColumnDescription = "支付时间", IsNullable = true)]
public System.DateTime? payTime { get; set; }
public System.DateTime? payTime { get; set; }
/// <summary>
/// 支付单号
/// </summary>
[Display(Name = "支付单号")]
[SugarColumn(ColumnDescription = "支付单号", IsNullable = true)]
[StringLength(50, ErrorMessage = "【{0}】不能超过{1}字符长度")]
public System.String paymentId { get; set; }
[StringLength(maximumLength:50,ErrorMessage = "{0}不能超过{1}字")]
public System.String paymentId { get; set; }
/// <summary>
/// 状态
/// </summary>
[Display(Name = "状态")]
[SugarColumn(ColumnDescription = "状态")]
[Required(ErrorMessage = "请输入{0}")]
public System.Int32 status { get; set; }
public System.Int32 status { get; set; }
/// <summary>
/// 订单创建时间
/// </summary>
[Display(Name = "订单创建时间")]
[SugarColumn(ColumnDescription = "订单创建时间")]
[Required(ErrorMessage = "请输入{0}")]
public System.DateTime createTime { get; set; }
public System.DateTime createTime { get; set; }
/// <summary>
/// 截止服务时间
/// </summary>
[Display(Name = "截止服务时间")]
[SugarColumn(ColumnDescription = "截止服务时间", IsNullable = true)]
public System.DateTime? servicesEndTime { get; set; }
public System.DateTime? servicesEndTime { get; set; }
}
}
}

18
CoreCms.Net.Model/Entities/Service/CoreCmsUserServicesOrderPartial.cs
View File

@@ -32,5 +32,23 @@ namespace CoreCms.Net.Model.Entities
[Display(Name = "状态说明")]
[SugarColumn(IsIgnore = true)]
public string statusStr { get; set; }
/// <summary>
/// 服务标题
/// </summary>
[Display(Name = "服务标题")]
[SugarColumn(IsIgnore = true)]
public string serviceTitle { get; set; }
/// <summary>
/// 用户昵称
/// </summary>
[Display(Name = "用户昵称")]
[SugarColumn(IsIgnore = true)]
public string userName { get; set; }
}
}