diff --git a/CoreCms.Net.Configuration/GlobalEnumVars.cs b/CoreCms.Net.Configuration/GlobalEnumVars.cs index 63aa5a37..0fd42c28 100644 --- a/CoreCms.Net.Configuration/GlobalEnumVars.cs +++ b/CoreCms.Net.Configuration/GlobalEnumVars.cs @@ -2870,6 +2870,88 @@ namespace CoreCms.Net.Configuration } + /// + /// 品牌审核-认证审核类型 + /// + public enum RegisterType + { + 国内品牌申请R标 = 1, + 国内品牌申请TM标 = 2, + 海外品牌申请R标 = 3, + 海外品牌申请TM标 = 4 + } + + /// + /// 品牌审核-商标分类 + /// + public enum TrademarkType + { + 第1类 = 1, + 第2类 = 2, + 第3类 = 3, + 第4类 = 4, + 第5类 = 5, + 第6类 = 6, + 第7类 = 7, + 第8类 = 8, + 第9类 = 9, + 第10类 = 10, + 第11类 = 11, + 第12类 = 12, + 第13类 = 13, + 第14类 = 14, + 第15类 = 15, + 第16类 = 16, + 第17类 = 17, + 第18类 = 18, + 第19类 = 19, + 第20类 = 20, + 第21类 = 21, + 第22类 = 22, + 第23类 = 23, + 第24类 = 24, + 第25类 = 25, + 第26类 = 26, + 第27类 = 27, + 第28类 = 28, + 第29类 = 29, + 第30类 = 30, + 第31类 = 31, + 第32类 = 32, + 第33类 = 33, + 第34类 = 34, + 第35类 = 35, + 第36类 = 36, + 第37类 = 37, + 第38类 = 38, + 第39类 = 39, + 第40类 = 40, + 第41类 = 41, + 第42类 = 42, + 第43类 = 43, + 第44类 = 44, + 第45类 = 45, + } + + /// + /// 品牌审核-品牌经营类型 + /// + public enum BrandManagementType + { + 自有品牌 = 1, + 代理品牌 = 2, + 无品牌 = 3 + } + + /// + /// 品牌审核-商品产地是否进口 + /// + public enum CommodityOriginType + { + 是 = 1, + 否 = 2 + } + #endregion #region 佣金相关 diff --git a/CoreCms.Net.IRepository/WeChat/ICoreCmsUserWeChatInfoRepository.cs b/CoreCms.Net.IRepository/WeChat/ICoreCmsUserWeChatInfoRepository.cs index 2a4eba0a..eb8227c0 100644 --- a/CoreCms.Net.IRepository/WeChat/ICoreCmsUserWeChatInfoRepository.cs +++ b/CoreCms.Net.IRepository/WeChat/ICoreCmsUserWeChatInfoRepository.cs @@ -8,7 +8,12 @@ * Description: 暂无 ***********************************************************************/ +using System; +using System.Linq.Expressions; +using System.Threading.Tasks; using CoreCms.Net.Model.Entities; +using CoreCms.Net.Model.ViewModels.Basics; +using SqlSugar; namespace CoreCms.Net.IRepository { @@ -17,5 +22,23 @@ namespace CoreCms.Net.IRepository /// public interface ICoreCmsUserWeChatInfoRepository : IBaseRepository { + + + /// + /// 重写根据条件查询分页数据 + /// + /// 判断集合 + /// 排序方式 + /// 当前页面索引 + /// 分布大小 + /// + /// 是否使用WITH(NOLOCK) + /// + new Task> QueryPageAsync( + Expression> predicate, + Expression> orderByExpression, OrderByType orderByType, int pageIndex = 1, + int pageSize = 20, bool blUseNoLock = false); + + } } \ No newline at end of file diff --git a/CoreCms.Net.IRepository/WeChat/IWeChatTransactionComponentBrandAuditLogRepository.cs b/CoreCms.Net.IRepository/WeChat/IWeChatTransactionComponentBrandAuditLogRepository.cs new file mode 100644 index 00000000..7c5bd2db --- /dev/null +++ b/CoreCms.Net.IRepository/WeChat/IWeChatTransactionComponentBrandAuditLogRepository.cs @@ -0,0 +1,29 @@ +/*********************************************************************** + * Project: CoreCms + * ProjectName: 核心内容管理系统 + * Web: https://www.corecms.net + * Author: 大灰灰 + * Email: jianweie@163.com + * CreateTime: 2022/3/21 3:30:18 + * Description: 暂无 + ***********************************************************************/ + +using System; +using System.Collections.Generic; +using System.Linq.Expressions; +using System.Threading.Tasks; +using CoreCms.Net.Model.Entities; +using CoreCms.Net.Model.ViewModels.Basics; +using CoreCms.Net.Model.ViewModels.UI; +using SqlSugar; + + +namespace CoreCms.Net.IRepository +{ + /// + /// 自定义交易组件上传品牌信息审核结果日志 工厂接口 + /// + public interface IWeChatTransactionComponentBrandAuditLogRepository : IBaseRepository + { + } +} diff --git a/CoreCms.Net.IRepository/WeChat/IWeChatTransactionComponentBrandAuditRepository.cs b/CoreCms.Net.IRepository/WeChat/IWeChatTransactionComponentBrandAuditRepository.cs new file mode 100644 index 00000000..0784306c --- /dev/null +++ b/CoreCms.Net.IRepository/WeChat/IWeChatTransactionComponentBrandAuditRepository.cs @@ -0,0 +1,88 @@ +/*********************************************************************** + * Project: CoreCms + * ProjectName: 核心内容管理系统 + * Web: https://www.corecms.net + * Author: 大灰灰 + * Email: jianweie@163.com + * CreateTime: 2022/3/20 1:01:47 + * Description: 暂无 + ***********************************************************************/ + +using System; +using System.Collections.Generic; +using System.Linq.Expressions; +using System.Threading.Tasks; +using CoreCms.Net.Model.Entities; +using CoreCms.Net.Model.ViewModels.Basics; +using CoreCms.Net.Model.ViewModels.UI; +using SqlSugar; + + +namespace CoreCms.Net.IRepository +{ + /// + /// 自定义交易组件上传品牌信息 工厂接口 + /// + public interface IWeChatTransactionComponentBrandAuditRepository : IBaseRepository + { + #region 重写增删改查操作=========================================================== + + /// + /// 重写异步插入方法 + /// + /// + /// + new Task InsertAsync(WeChatTransactionComponentBrandAudit entity); + + + /// + /// 重写异步更新方法 + /// + /// + /// + new Task UpdateAsync(WeChatTransactionComponentBrandAudit entity); + + + /// + /// 重写异步更新方法 + /// + /// + /// + new Task UpdateAsync(List entity); + + + /// + /// 重写删除指定ID的数据 + /// + /// + /// + new Task DeleteByIdAsync(object id); + + + /// + /// 重写删除指定ID集合的数据(批量删除) + /// + /// + /// + new Task DeleteByIdsAsync(int[] ids); + + #endregion + + + /// + /// 重写根据条件查询分页数据 + /// + /// 判断集合 + /// 排序方式 + /// 当前页面索引 + /// 分布大小 + /// + /// 是否使用WITH(NOLOCK) + /// + new Task> QueryPageAsync( + Expression> predicate, + Expression> orderByExpression, OrderByType orderByType, int pageIndex = 1, + int pageSize = 20, bool blUseNoLock = false); + + } +} diff --git a/CoreCms.Net.IServices/WeChat/ICoreCmsUserWeChatInfoServices.cs b/CoreCms.Net.IServices/WeChat/ICoreCmsUserWeChatInfoServices.cs index 148da634..8817d639 100644 --- a/CoreCms.Net.IServices/WeChat/ICoreCmsUserWeChatInfoServices.cs +++ b/CoreCms.Net.IServices/WeChat/ICoreCmsUserWeChatInfoServices.cs @@ -8,7 +8,12 @@ * Description: 暂无 ***********************************************************************/ +using System; +using System.Linq.Expressions; +using System.Threading.Tasks; using CoreCms.Net.Model.Entities; +using CoreCms.Net.Model.ViewModels.Basics; +using SqlSugar; namespace CoreCms.Net.IServices { @@ -17,5 +22,25 @@ namespace CoreCms.Net.IServices /// public interface ICoreCmsUserWeChatInfoServices : IBaseServices { + + + + #region 重写根据条件查询分页数据 + /// + /// 重写根据条件查询分页数据 + /// + /// 判断集合 + /// 排序方式 + /// 当前页面索引 + /// 分布大小 + /// + /// 是否使用WITH(NOLOCK) + /// + new Task> QueryPageAsync( + Expression> predicate, + Expression> orderByExpression, OrderByType orderByType, int pageIndex = 1, + int pageSize = 20, bool blUseNoLock = false); + #endregion + } } \ No newline at end of file diff --git a/CoreCms.Net.IServices/WeChat/IWeChatAccessTokenServices.cs b/CoreCms.Net.IServices/WeChat/IWeChatAccessTokenServices.cs index 631c4d43..d53f00d6 100644 --- a/CoreCms.Net.IServices/WeChat/IWeChatAccessTokenServices.cs +++ b/CoreCms.Net.IServices/WeChat/IWeChatAccessTokenServices.cs @@ -8,14 +8,21 @@ * Description: 暂无 ***********************************************************************/ +using System; +using System.Collections.Generic; +using System.Linq.Expressions; +using System.Threading.Tasks; using CoreCms.Net.Model.Entities; +using CoreCms.Net.Model.ViewModels.Basics; +using CoreCms.Net.Model.ViewModels.UI; +using SqlSugar; namespace CoreCms.Net.IServices { /// - /// 微信授权交互 服务工厂接口 + /// 微信授权交互 服务工厂接口 /// public interface IWeChatAccessTokenServices : IBaseServices { } -} \ No newline at end of file +} diff --git a/CoreCms.Net.IServices/WeChat/IWeChatTransactionComponentBrandAuditLogServices.cs b/CoreCms.Net.IServices/WeChat/IWeChatTransactionComponentBrandAuditLogServices.cs new file mode 100644 index 00000000..593758df --- /dev/null +++ b/CoreCms.Net.IServices/WeChat/IWeChatTransactionComponentBrandAuditLogServices.cs @@ -0,0 +1,29 @@ +/*********************************************************************** + * Project: CoreCms + * ProjectName: 核心内容管理系统 + * Web: https://www.corecms.net + * Author: 大灰灰 + * Email: jianweie@163.com + * CreateTime: 2022/3/21 3:30:18 + * Description: 暂无 + ***********************************************************************/ + +using System; +using System.Collections.Generic; +using System.Linq.Expressions; +using System.Threading.Tasks; +using CoreCms.Net.Model.Entities; +using CoreCms.Net.Model.ViewModels.Basics; +using CoreCms.Net.Model.ViewModels.UI; +using SqlSugar; + +namespace CoreCms.Net.IServices +{ + /// + /// 自定义交易组件上传品牌信息审核结果日志 服务工厂接口 + /// + public interface IWeChatTransactionComponentBrandAuditLogServices : IBaseServices + { + + } +} diff --git a/CoreCms.Net.IServices/WeChat/IWeChatTransactionComponentBrandAuditServices.cs b/CoreCms.Net.IServices/WeChat/IWeChatTransactionComponentBrandAuditServices.cs new file mode 100644 index 00000000..14d45804 --- /dev/null +++ b/CoreCms.Net.IServices/WeChat/IWeChatTransactionComponentBrandAuditServices.cs @@ -0,0 +1,83 @@ +/*********************************************************************** + * Project: CoreCms + * ProjectName: 核心内容管理系统 + * Web: https://www.corecms.net + * Author: 大灰灰 + * Email: jianweie@163.com + * CreateTime: 2022/3/20 1:01:47 + * Description: 暂无 + ***********************************************************************/ + +using System; +using System.Collections.Generic; +using System.Linq.Expressions; +using System.Threading.Tasks; +using CoreCms.Net.Model.Entities; +using CoreCms.Net.Model.ViewModels.Basics; +using CoreCms.Net.Model.ViewModels.UI; +using SqlSugar; + +namespace CoreCms.Net.IServices +{ + /// + /// 自定义交易组件上传品牌信息 服务工厂接口 + /// + public interface IWeChatTransactionComponentBrandAuditServices : IBaseServices + { + #region 重写增删改查操作=========================================================== + + /// + /// 重写异步插入方法 + /// + /// + /// + new Task InsertAsync(WeChatTransactionComponentBrandAudit entity); + + /// + /// 重写异步更新方法 + /// + /// + /// + new Task UpdateAsync(WeChatTransactionComponentBrandAudit entity); + + /// + /// 重写异步更新方法 + /// + /// + /// + new Task UpdateAsync(List entity); + + /// + /// 重写删除指定ID的数据 + /// + /// + /// + new Task DeleteByIdAsync(object id); + + /// + /// 重写删除指定ID集合的数据(批量删除) + /// + /// + /// + new Task DeleteByIdsAsync(int[] ids); + + #endregion + + #region 重写根据条件查询分页数据 + /// + /// 重写根据条件查询分页数据 + /// + /// 判断集合 + /// 排序方式 + /// 当前页面索引 + /// 分布大小 + /// + /// 是否使用WITH(NOLOCK) + /// + new Task> QueryPageAsync( + Expression> predicate, + Expression> orderByExpression, OrderByType orderByType, int pageIndex = 1, + int pageSize = 20, bool blUseNoLock = false); + #endregion + } +} diff --git a/CoreCms.Net.Model/Entities/WeChat/WeChatTransactionComponentBrandAudit.cs b/CoreCms.Net.Model/Entities/WeChat/WeChatTransactionComponentBrandAudit.cs new file mode 100644 index 00000000..066d3676 --- /dev/null +++ b/CoreCms.Net.Model/Entities/WeChat/WeChatTransactionComponentBrandAudit.cs @@ -0,0 +1,308 @@ +/*********************************************************************** + * Project: CoreCms + * ProjectName: 核心内容管理系统 + * Web: https://www.corecms.net + * Author: 大灰灰 + * Email: jianweie@163.com + * CreateTime: 2022/3/21 3:39:55 + * Description: 暂无 + ***********************************************************************/ + +using SqlSugar; +using System.ComponentModel; +using System.ComponentModel.DataAnnotations; + +namespace CoreCms.Net.Model.Entities +{ + /// + /// 自定义交易组件上传品牌信息 + /// + public partial class WeChatTransactionComponentBrandAudit + { + /// + /// 构造函数 + /// + public WeChatTransactionComponentBrandAudit() + { + } + + /// + /// 序列 + /// + [Display(Name = "序列")] + + [SugarColumn(IsPrimaryKey = true, IsIdentity = true)] + + [Required(ErrorMessage = "请输入{0}")] + + + + public System.Int32 id { get; set; } + + + /// + /// 营业执照或组织机构代码证 + /// + [Display(Name = "营业执照或组织机构代码证")] + + [Required(ErrorMessage = "请输入{0}")] + [StringLength(maximumLength:500,ErrorMessage = "{0}不能超过{1}字")] + + + public System.String license { get; set; } + + + /// + /// 认证审核类型 + /// + [Display(Name = "认证审核类型")] + + [Required(ErrorMessage = "请输入{0}")] + + + + public System.Int32 brand_audit_type { get; set; } + + + /// + /// 商标分类 + /// + [Display(Name = "商标分类")] + + [Required(ErrorMessage = "请输入{0}")] + [StringLength(maximumLength:10,ErrorMessage = "{0}不能超过{1}字")] + + + public System.String trademark_type { get; set; } + + + /// + /// 经营类型 + /// + [Display(Name = "经营类型")] + + [Required(ErrorMessage = "请输入{0}")] + + + + public System.Int32 brand_management_type { get; set; } + + + /// + /// 商品产地是否进口 + /// + [Display(Name = "商品产地是否进口")] + + [Required(ErrorMessage = "请输入{0}")] + + + + public System.Int32 commodity_origin_type { get; set; } + + + /// + /// 商标/品牌词 + /// + [Display(Name = "商标/品牌词")] + + [Required(ErrorMessage = "请输入{0}")] + [StringLength(maximumLength:50,ErrorMessage = "{0}不能超过{1}字")] + + + public System.String brand_wording { get; set; } + + + /// + /// 销售授权书 + /// + [Display(Name = "销售授权书")] + + + [StringLength(maximumLength:500,ErrorMessage = "{0}不能超过{1}字")] + + + public System.String sale_authorization { get; set; } + + + /// + /// 商标注册证书 + /// + [Display(Name = "商标注册证书")] + + [Required(ErrorMessage = "请输入{0}")] + [StringLength(maximumLength:500,ErrorMessage = "{0}不能超过{1}字")] + + + public System.String trademark_registration_certificate { get; set; } + + + /// + /// 商标变更证明 + /// + [Display(Name = "商标变更证明")] + + + [StringLength(maximumLength:500,ErrorMessage = "{0}不能超过{1}字")] + + + public System.String trademark_change_certificate { get; set; } + + + /// + /// 商标注册人姓名 + /// + [Display(Name = "商标注册人姓名")] + + [Required(ErrorMessage = "请输入{0}")] + [StringLength(maximumLength:100,ErrorMessage = "{0}不能超过{1}字")] + + + public System.String trademark_registrant { get; set; } + + + /// + /// 商标注册号/申请号 + /// + [Display(Name = "商标注册号/申请号")] + + [Required(ErrorMessage = "请输入{0}")] + [StringLength(maximumLength:10,ErrorMessage = "{0}不能超过{1}字")] + + + public System.String trademark_registrant_nu { get; set; } + + + /// + /// 商标有效期 + /// + [Display(Name = "商标有效期")] + + [Required(ErrorMessage = "请输入{0}")] + + + + public System.DateTime trademark_authorization_period { get; set; } + + + /// + /// 商标注册申请受理通知书 + /// + [Display(Name = "商标注册申请受理通知书")] + + + [StringLength(maximumLength:100,ErrorMessage = "{0}不能超过{1}字")] + + + public System.String trademark_registration_application { get; set; } + + + /// + /// 商标申请人姓名 + /// + [Display(Name = "商标申请人姓名")] + + + [StringLength(maximumLength:100,ErrorMessage = "{0}不能超过{1}字")] + + + public System.String trademark_applicant { get; set; } + + + /// + /// 商标申请时间 + /// + [Display(Name = "商标申请时间")] + + [Required(ErrorMessage = "请输入{0}")] + + + + public System.DateTime trademark_application_time { get; set; } + + + /// + /// 中华人民共和国海关进口货物报关单 + /// + [Display(Name = "中华人民共和国海关进口货物报关单")] + + + [StringLength(maximumLength:500,ErrorMessage = "{0}不能超过{1}字")] + + + public System.String imported_goods_form { get; set; } + + + /// + /// 商品使用场景 + /// + [Display(Name = "商品使用场景")] + + [Required(ErrorMessage = "请输入{0}")] + + + + public System.Int32 scene_group_list { get; set; } + + + /// + /// 审核单id + /// + [Display(Name = "审核单id")] + + + [StringLength(maximumLength:50,ErrorMessage = "{0}不能超过{1}字")] + + + public System.String audit_id { get; set; } + + + /// + /// 审核状态 + /// + [Display(Name = "审核状态")] + + + + + + public System.Int32? status { get; set; } + + + /// + /// 品牌id + /// + [Display(Name = "品牌id")] + + + + + + public System.Int32? brandId { get; set; } + + + /// + /// 拒绝原因 + /// + [Display(Name = "拒绝原因")] + + + [StringLength(maximumLength:255,ErrorMessage = "{0}不能超过{1}字")] + + + public System.String rejectReason { get; set; } + + + /// + /// 创建时间 + /// + [Display(Name = "创建时间")] + + [Required(ErrorMessage = "请输入{0}")] + + + + public System.DateTime createTime { get; set; } + + + } +} diff --git a/CoreCms.Net.Model/Entities/WeChat/WeChatTransactionComponentBrandAuditLog.cs b/CoreCms.Net.Model/Entities/WeChat/WeChatTransactionComponentBrandAuditLog.cs new file mode 100644 index 00000000..c62d2fda --- /dev/null +++ b/CoreCms.Net.Model/Entities/WeChat/WeChatTransactionComponentBrandAuditLog.cs @@ -0,0 +1,116 @@ +/*********************************************************************** + * Project: CoreCms + * ProjectName: 核心内容管理系统 + * Web: https://www.corecms.net + * Author: 大灰灰 + * Email: jianweie@163.com + * CreateTime: 2022/3/21 3:30:18 + * Description: 暂无 + ***********************************************************************/ + +using SqlSugar; +using System.ComponentModel; +using System.ComponentModel.DataAnnotations; + +namespace CoreCms.Net.Model.Entities +{ + /// + /// 自定义交易组件上传品牌信息审核结果日志 + /// + public partial class WeChatTransactionComponentBrandAuditLog + { + /// + /// 构造函数 + /// + public WeChatTransactionComponentBrandAuditLog() + { + } + + /// + /// 序列 + /// + [Display(Name = "序列")] + + [SugarColumn(IsPrimaryKey = true, IsIdentity = true)] + + [Required(ErrorMessage = "请输入{0}")] + + + + public System.Int32 id { get; set; } + + + /// + /// 审核Id + /// + [Display(Name = "审核Id")] + + [Required(ErrorMessage = "请输入{0}")] + [StringLength(maximumLength:50,ErrorMessage = "{0}不能超过{1}字")] + + + public System.String audit_id { get; set; } + + + /// + /// 审核状态,1:已通过,9:拒绝 + /// + [Display(Name = "审核状态,1:已通过,9:拒绝")] + + [Required(ErrorMessage = "请输入{0}")] + + + + public System.Int32 status { get; set; } + + + /// + /// 审核类型，本接口固定为1 + /// + [Display(Name = "审核类型，本接口固定为1")] + + [Required(ErrorMessage = "请输入{0}")] + + + + public System.Int32 audit_type { get; set; } + + + /// + /// 相关信息 + /// + [Display(Name = "相关信息")] + + [Required(ErrorMessage = "请输入{0}")] + [StringLength(maximumLength:500,ErrorMessage = "{0}不能超过{1}字")] + + + public System.String reject_reason { get; set; } + + + /// + /// 品牌id + /// + [Display(Name = "品牌id")] + + [Required(ErrorMessage = "请输入{0}")] + + + + public System.Int32 brand_id { get; set; } + + + /// + /// 回调时间 + /// + [Display(Name = "回调时间")] + + [Required(ErrorMessage = "请输入{0}")] + + + + public System.DateTime createTime { get; set; } + + + } +} diff --git a/CoreCms.Net.Model/Entities/WeChat/WeChatTransactionComponentGoodSKU.cs b/CoreCms.Net.Model/Entities/WeChat/WeChatTransactionComponentGoodSKU.cs index abef5150..b5aa2f26 100644 --- a/CoreCms.Net.Model/Entities/WeChat/WeChatTransactionComponentGoodSKU.cs +++ b/CoreCms.Net.Model/Entities/WeChat/WeChatTransactionComponentGoodSKU.cs @@ -25,152 +25,152 @@ namespace CoreCms.Net.Model.Entities public WeChatTransactionComponentGoodSKU() { } - + /// /// 序列 /// [Display(Name = "序列")] - + [SugarColumn(IsPrimaryKey = true, IsIdentity = true)] - + [Required(ErrorMessage = "请输入{0}")] - - - - public System.Int32 id { get; set; } - - + + + + public System.Int32 id { get; set; } + + /// /// 交易组件平台自定义skuID /// [Display(Name = "交易组件平台自定义skuID")] - + [Required(ErrorMessage = "请输入{0}")] - - - - public System.Int64 skuId { get; set; } - - + + + + public System.Int64 skuId { get; set; } + + /// /// 商家自定义商品ID /// [Display(Name = "商家自定义商品ID")] - + [Required(ErrorMessage = "请输入{0}")] - [StringLength(maximumLength: 50, ErrorMessage = "{0}不能超过{1}字")] - - - public System.String outProductId { get; set; } - - + [StringLength(maximumLength:50,ErrorMessage = "{0}不能超过{1}字")] + + + public System.String outProductId { get; set; } + + /// /// 商家自定义skuID /// [Display(Name = "商家自定义skuID")] - + [Required(ErrorMessage = "请输入{0}")] - [StringLength(maximumLength: 50, ErrorMessage = "{0}不能超过{1}字")] - - - public System.String outSkuId { get; set; } - - + [StringLength(maximumLength:50,ErrorMessage = "{0}不能超过{1}字")] + + + public System.String outSkuId { get; set; } + + /// /// sku小图 /// [Display(Name = "sku小图")] - + [Required(ErrorMessage = "请输入{0}")] - [StringLength(maximumLength: 255, ErrorMessage = "{0}不能超过{1}字")] - - - public System.String thumbImg { get; set; } - - + [StringLength(maximumLength:255,ErrorMessage = "{0}不能超过{1}字")] + + + public System.String thumbImg { get; set; } + + /// /// 成本价格 /// [Display(Name = "成本价格")] - + [Required(ErrorMessage = "请输入{0}")] - - - - public System.Decimal costprice { get; set; } - - + + + + public System.Decimal costprice { get; set; } + + /// /// 售卖价格 /// [Display(Name = "售卖价格")] - + [Required(ErrorMessage = "请输入{0}")] - - - - public System.Decimal salePrice { get; set; } - - + + + + public System.Decimal salePrice { get; set; } + + /// /// 市场价格 /// [Display(Name = "市场价格")] - + [Required(ErrorMessage = "请输入{0}")] - - - - public System.Decimal marketPrice { get; set; } - - + + + + public System.Decimal marketPrice { get; set; } + + /// /// 库存 /// [Display(Name = "库存")] - + [Required(ErrorMessage = "请输入{0}")] - - - - public System.Int32 stockNum { get; set; } - - + + + + public System.Int32 stockNum { get; set; } + + /// /// 条形码 /// [Display(Name = "条形码")] - - - [StringLength(maximumLength: 50, ErrorMessage = "{0}不能超过{1}字")] - - - public System.String barCode { get; set; } - - + + + [StringLength(maximumLength:50,ErrorMessage = "{0}不能超过{1}字")] + + + public System.String barCode { get; set; } + + /// /// 商品编码 /// [Display(Name = "商品编码")] - - - [StringLength(maximumLength: 50, ErrorMessage = "{0}不能超过{1}字")] - - - public System.String skuCode { get; set; } - - + + + [StringLength(maximumLength:50,ErrorMessage = "{0}不能超过{1}字")] + + + public System.String skuCode { get; set; } + + /// /// 是否选择 /// [Display(Name = "是否选择")] - + [Required(ErrorMessage = "请输入{0}")] - - - - public System.Boolean isSelect { get; set; } - - + + + + public System.Boolean isSelect { get; set; } + + } } diff --git a/CoreCms.Net.Repository/WeChat/CoreCmsUserWeChatInfoRepository.cs b/CoreCms.Net.Repository/WeChat/CoreCmsUserWeChatInfoRepository.cs index 3b558ad6..d6cdca08 100644 --- a/CoreCms.Net.Repository/WeChat/CoreCmsUserWeChatInfoRepository.cs +++ b/CoreCms.Net.Repository/WeChat/CoreCmsUserWeChatInfoRepository.cs @@ -8,9 +8,15 @@ * Description: 暂无 ***********************************************************************/ +using System; +using System.Collections.Generic; +using System.Linq.Expressions; +using System.Threading.Tasks; using CoreCms.Net.IRepository; using CoreCms.Net.IRepository.UnitOfWork; using CoreCms.Net.Model.Entities; +using CoreCms.Net.Model.ViewModels.Basics; +using SqlSugar; namespace CoreCms.Net.Repository { @@ -23,5 +29,83 @@ namespace CoreCms.Net.Repository public CoreCmsUserWeChatInfoRepository(IUnitOfWork unitOfWork) : base(unitOfWork) { } + + + + #region 重写根据条件查询分页数据 + /// + /// 重写根据条件查询分页数据 + /// + /// 判断集合 + /// 排序方式 + /// 当前页面索引 + /// 分布大小 + /// + /// 是否使用WITH(NOLOCK) + /// + public new async Task> QueryPageAsync(Expression> predicate, + Expression> orderByExpression, OrderByType orderByType, int pageIndex = 1, + int pageSize = 20, bool blUseNoLock = false) + { + RefAsync totalCount = 0; + List page; + if (blUseNoLock) + { + page = await DbClient.Queryable() + .OrderByIF(orderByExpression != null, orderByExpression, orderByType) + .WhereIF(predicate != null, predicate).Select(p => new CoreCmsUserWeChatInfo + { + id = p.id, + type = p.type, + userId = p.userId, + openid = p.openid, + sessionKey = p.sessionKey, + unionId = p.unionId, + avatar = p.avatar, + nickName = p.nickName, + gender = p.gender, + language = p.language, + city = p.city, + province = p.province, + country = p.country, + countryCode = p.countryCode, + mobile = p.mobile, + createTime = p.createTime, + updateTime = p.updateTime, + + }).With(SqlWith.NoLock).ToPageListAsync(pageIndex, pageSize, totalCount); + } + else + { + page = await DbClient.Queryable() + .OrderByIF(orderByExpression != null, orderByExpression, orderByType) + .WhereIF(predicate != null, predicate).Select(p => new CoreCmsUserWeChatInfo + { + id = p.id, + type = p.type, + userId = p.userId, + openid = p.openid, + sessionKey = p.sessionKey, + unionId = p.unionId, + avatar = p.avatar, + nickName = p.nickName, + gender = p.gender, + language = p.language, + city = p.city, + province = p.province, + country = p.country, + countryCode = p.countryCode, + mobile = p.mobile, + createTime = p.createTime, + updateTime = p.updateTime, + + }).ToPageListAsync(pageIndex, pageSize, totalCount); + } + var list = new PageList(page, pageIndex, pageSize, totalCount); + return list; + } + + #endregion + } } \ No newline at end of file diff --git a/CoreCms.Net.Repository/WeChat/WeChatAccessTokenRepository.cs b/CoreCms.Net.Repository/WeChat/WeChatAccessTokenRepository.cs index 1f3dfa92..3a59364c 100644 --- a/CoreCms.Net.Repository/WeChat/WeChatAccessTokenRepository.cs +++ b/CoreCms.Net.Repository/WeChat/WeChatAccessTokenRepository.cs @@ -8,22 +8,31 @@ * Description: 暂无 ***********************************************************************/ +using System; +using System.Collections.Generic; +using System.Linq.Expressions; +using System.Threading.Tasks; +using CoreCms.Net.Caching.Manual; +using CoreCms.Net.Configuration; +using CoreCms.Net.Model.Entities; +using CoreCms.Net.Model.ViewModels.Basics; using CoreCms.Net.IRepository; using CoreCms.Net.IRepository.UnitOfWork; -using CoreCms.Net.Model.Entities; +using CoreCms.Net.Model.ViewModels.UI; +using SqlSugar; namespace CoreCms.Net.Repository { /// - /// 微信授权交互 接口实现 + /// 微信授权交互 接口实现 /// public class WeChatAccessTokenRepository : BaseRepository, IWeChatAccessTokenRepository { private readonly IUnitOfWork _unitOfWork; - public WeChatAccessTokenRepository(IUnitOfWork unitOfWork) : base(unitOfWork) { _unitOfWork = unitOfWork; } + } -} \ No newline at end of file +} diff --git a/CoreCms.Net.Repository/WeChat/WeChatTransactionComponentBrandAuditLogRepository.cs b/CoreCms.Net.Repository/WeChat/WeChatTransactionComponentBrandAuditLogRepository.cs new file mode 100644 index 00000000..474fdc9c --- /dev/null +++ b/CoreCms.Net.Repository/WeChat/WeChatTransactionComponentBrandAuditLogRepository.cs @@ -0,0 +1,37 @@ +/*********************************************************************** + * Project: CoreCms + * ProjectName: 核心内容管理系统 + * Web: https://www.corecms.net + * Author: 大灰灰 + * Email: jianweie@163.com + * CreateTime: 2022/3/21 3:30:18 + * Description: 暂无 + ***********************************************************************/ + +using System; +using System.Collections.Generic; +using System.Linq.Expressions; +using System.Threading.Tasks; +using CoreCms.Net.Caching.Manual; +using CoreCms.Net.Configuration; +using CoreCms.Net.Model.Entities; +using CoreCms.Net.Model.ViewModels.Basics; +using CoreCms.Net.IRepository; +using CoreCms.Net.IRepository.UnitOfWork; +using CoreCms.Net.Model.ViewModels.UI; +using SqlSugar; + +namespace CoreCms.Net.Repository +{ + /// + /// 自定义交易组件上传品牌信息审核结果日志 接口实现 + /// + public class WeChatTransactionComponentBrandAuditLogRepository : BaseRepository, IWeChatTransactionComponentBrandAuditLogRepository + { + private readonly IUnitOfWork _unitOfWork; + public WeChatTransactionComponentBrandAuditLogRepository(IUnitOfWork unitOfWork) : base(unitOfWork) + { + _unitOfWork = unitOfWork; + } + } +} diff --git a/CoreCms.Net.Repository/WeChat/WeChatTransactionComponentBrandAuditRepository.cs b/CoreCms.Net.Repository/WeChat/WeChatTransactionComponentBrandAuditRepository.cs new file mode 100644 index 00000000..3cb3992e --- /dev/null +++ b/CoreCms.Net.Repository/WeChat/WeChatTransactionComponentBrandAuditRepository.cs @@ -0,0 +1,236 @@ +/*********************************************************************** + * Project: CoreCms + * ProjectName: 核心内容管理系统 + * Web: https://www.corecms.net + * Author: 大灰灰 + * Email: jianweie@163.com + * CreateTime: 2022/3/20 1:19:25 + * Description: 暂无 + ***********************************************************************/ + +using System; +using System.Collections.Generic; +using System.Linq.Expressions; +using System.Threading.Tasks; +using CoreCms.Net.Caching.Manual; +using CoreCms.Net.Configuration; +using CoreCms.Net.Model.Entities; +using CoreCms.Net.Model.ViewModels.Basics; +using CoreCms.Net.IRepository; +using CoreCms.Net.IRepository.UnitOfWork; +using CoreCms.Net.Model.ViewModels.UI; +using SqlSugar; + +namespace CoreCms.Net.Repository +{ + /// + /// 自定义交易组件上传品牌信息 接口实现 + /// + public class WeChatTransactionComponentBrandAuditRepository : BaseRepository, IWeChatTransactionComponentBrandAuditRepository + { + private readonly IUnitOfWork _unitOfWork; + public WeChatTransactionComponentBrandAuditRepository(IUnitOfWork unitOfWork) : base(unitOfWork) + { + _unitOfWork = unitOfWork; + } + + #region 实现重写增删改查操作========================================================== + + /// + /// 重写异步插入方法 + /// + /// 实体数据 + /// + public new async Task InsertAsync(WeChatTransactionComponentBrandAudit entity) + { + var jm = new AdminUiCallBack(); + entity.createTime = DateTime.Now; + entity.status = (int)CoreCms.Net.WeChat.Service.TransactionComponent.Enum.AuditEnum.AuditCategoryStatus.审核中; + + var bl = await DbClient.Insertable(entity).ExecuteReturnIdentityAsync() > 0; + jm.code = bl ? 0 : 1; + jm.msg = bl ? GlobalConstVars.CreateSuccess : GlobalConstVars.CreateFailure; + + return jm; + } + + /// + /// 重写异步更新方法 + /// + /// + /// + public new async Task UpdateAsync(WeChatTransactionComponentBrandAudit entity) + { + var jm = new AdminUiCallBack(); + + var oldModel = await DbClient.Queryable().In(entity.id).SingleAsync(); + if (oldModel == null) + { + jm.msg = "不存在此信息"; + return jm; + } + //事物处理过程开始 + //oldModel.id = entity.id; + oldModel.license = entity.license; + oldModel.brand_audit_type = entity.brand_audit_type; + oldModel.trademark_type = entity.trademark_type; + oldModel.brand_management_type = entity.brand_management_type; + oldModel.commodity_origin_type = entity.commodity_origin_type; + oldModel.brand_wording = entity.brand_wording; + oldModel.sale_authorization = entity.sale_authorization; + oldModel.trademark_registration_certificate = entity.trademark_registration_certificate; + oldModel.trademark_change_certificate = entity.trademark_change_certificate; + oldModel.trademark_registrant = entity.trademark_registrant; + oldModel.trademark_registrant_nu = entity.trademark_registrant_nu; + oldModel.trademark_authorization_period = entity.trademark_authorization_period; + oldModel.trademark_registration_application = entity.trademark_registration_application; + oldModel.trademark_applicant = entity.trademark_applicant; + oldModel.trademark_application_time = entity.trademark_application_time; + oldModel.imported_goods_form = entity.imported_goods_form; + oldModel.scene_group_list = entity.scene_group_list; + + //事物处理过程结束 + var bl = await DbClient.Updateable(oldModel).ExecuteCommandHasChangeAsync(); + jm.code = bl ? 0 : 1; + jm.msg = bl ? GlobalConstVars.EditSuccess : GlobalConstVars.EditFailure; + + return jm; + } + + /// + /// 重写异步更新方法 + /// + /// + /// + public new async Task UpdateAsync(List entity) + { + var jm = new AdminUiCallBack(); + + var bl = await DbClient.Updateable(entity).ExecuteCommandHasChangeAsync(); + jm.code = bl ? 0 : 1; + jm.msg = bl ? GlobalConstVars.EditSuccess : GlobalConstVars.EditFailure; + + return jm; + } + + /// + /// 重写删除指定ID的数据 + /// + /// + /// + public new async Task DeleteByIdAsync(object id) + { + var jm = new AdminUiCallBack(); + + var bl = await DbClient.Deleteable(id).ExecuteCommandHasChangeAsync(); + jm.code = bl ? 0 : 1; + jm.msg = bl ? GlobalConstVars.DeleteSuccess : GlobalConstVars.DeleteFailure; + + return jm; + } + + /// + /// 重写删除指定ID集合的数据(批量删除) + /// + /// + /// + public new async Task DeleteByIdsAsync(int[] ids) + { + var jm = new AdminUiCallBack(); + + var bl = await DbClient.Deleteable().In(ids).ExecuteCommandHasChangeAsync(); + jm.code = bl ? 0 : 1; + jm.msg = bl ? GlobalConstVars.DeleteSuccess : GlobalConstVars.DeleteFailure; + + return jm; + } + + #endregion + + #region 重写根据条件查询分页数据 + /// + /// 重写根据条件查询分页数据 + /// + /// 判断集合 + /// 排序方式 + /// 当前页面索引 + /// 分布大小 + /// + /// 是否使用WITH(NOLOCK) + /// + public new async Task> QueryPageAsync(Expression> predicate, + Expression> orderByExpression, OrderByType orderByType, int pageIndex = 1, + int pageSize = 20, bool blUseNoLock = false) + { + RefAsync totalCount = 0; + List page; + if (blUseNoLock) + { + page = await DbClient.Queryable() + .OrderByIF(orderByExpression != null, orderByExpression, orderByType) + .WhereIF(predicate != null, predicate).Select(p => new WeChatTransactionComponentBrandAudit + { + id = p.id, + license = p.license, + brand_audit_type = p.brand_audit_type, + trademark_type = p.trademark_type, + brand_management_type = p.brand_management_type, + commodity_origin_type = p.commodity_origin_type, + brand_wording = p.brand_wording, + sale_authorization = p.sale_authorization, + trademark_registration_certificate = p.trademark_registration_certificate, + trademark_change_certificate = p.trademark_change_certificate, + trademark_registrant = p.trademark_registrant, + trademark_registrant_nu = p.trademark_registrant_nu, + trademark_authorization_period = p.trademark_authorization_period, + trademark_registration_application = p.trademark_registration_application, + trademark_applicant = p.trademark_applicant, + trademark_application_time = p.trademark_application_time, + imported_goods_form = p.imported_goods_form, + scene_group_list = p.scene_group_list, + audit_id = p.audit_id, + status = p.status, + brandId = p.brandId, + rejectReason = p.rejectReason, + createTime = p.createTime, + }).With(SqlWith.NoLock).ToPageListAsync(pageIndex, pageSize, totalCount); + } + else + { + page = await DbClient.Queryable() + .OrderByIF(orderByExpression != null, orderByExpression, orderByType) + .WhereIF(predicate != null, predicate).Select(p => new WeChatTransactionComponentBrandAudit + { + id = p.id, + license = p.license, + brand_audit_type = p.brand_audit_type, + trademark_type = p.trademark_type, + brand_management_type = p.brand_management_type, + commodity_origin_type = p.commodity_origin_type, + brand_wording = p.brand_wording, + sale_authorization = p.sale_authorization, + trademark_registration_certificate = p.trademark_registration_certificate, + trademark_change_certificate = p.trademark_change_certificate, + trademark_registrant = p.trademark_registrant, + trademark_registrant_nu = p.trademark_registrant_nu, + trademark_authorization_period = p.trademark_authorization_period, + trademark_registration_application = p.trademark_registration_application, + trademark_applicant = p.trademark_applicant, + trademark_application_time = p.trademark_application_time, + imported_goods_form = p.imported_goods_form, + scene_group_list = p.scene_group_list, + audit_id = p.audit_id, + status = p.status, + brandId = p.brandId, + rejectReason = p.rejectReason, + createTime = p.createTime, + }).ToPageListAsync(pageIndex, pageSize, totalCount); + } + var list = new PageList(page, pageIndex, pageSize, totalCount); + return list; + } + + #endregion + + } +} diff --git a/CoreCms.Net.Services/WeChat/CoreCmsUserWeChatInfoServices.cs b/CoreCms.Net.Services/WeChat/CoreCmsUserWeChatInfoServices.cs index ecf447a1..f972eb3c 100644 --- a/CoreCms.Net.Services/WeChat/CoreCmsUserWeChatInfoServices.cs +++ b/CoreCms.Net.Services/WeChat/CoreCmsUserWeChatInfoServices.cs @@ -9,13 +9,15 @@ ***********************************************************************/ using System; +using System.Linq.Expressions; using System.Threading.Tasks; using CoreCms.Net.Configuration; using CoreCms.Net.IRepository; using CoreCms.Net.IRepository.UnitOfWork; using CoreCms.Net.IServices; using CoreCms.Net.Model.Entities; -using CoreCms.Net.Model.ViewModels.UI; +using CoreCms.Net.Model.ViewModels.Basics; +using SqlSugar; namespace CoreCms.Net.Services @@ -34,5 +36,27 @@ namespace CoreCms.Net.Services _unitOfWork = unitOfWork; } + + + #region 重写根据条件查询分页数据 + /// + /// 重写根据条件查询分页数据 + /// + /// 判断集合 + /// 排序方式 + /// 当前页面索引 + /// 分布大小 + /// + /// 是否使用WITH(NOLOCK) + /// + public new async Task> QueryPageAsync(Expression> predicate, + Expression> orderByExpression, OrderByType orderByType, int pageIndex = 1, + int pageSize = 20, bool blUseNoLock = false) + { + return await _dal.QueryPageAsync(predicate, orderByExpression, orderByType, pageIndex, pageSize, blUseNoLock); + } + #endregion + + } } diff --git a/CoreCms.Net.Services/WeChat/CoreCmsUserWeChatMsgTemplateServices.cs b/CoreCms.Net.Services/WeChat/CoreCmsUserWeChatMsgTemplateServices.cs index d60e0bd9..d36d3a4b 100644 --- a/CoreCms.Net.Services/WeChat/CoreCmsUserWeChatMsgTemplateServices.cs +++ b/CoreCms.Net.Services/WeChat/CoreCmsUserWeChatMsgTemplateServices.cs @@ -15,7 +15,6 @@ using CoreCms.Net.IRepository; using CoreCms.Net.IRepository.UnitOfWork; using CoreCms.Net.IServices; using CoreCms.Net.Model.Entities; -using CoreCms.Net.Model.ViewModels.UI; namespace CoreCms.Net.Services diff --git a/CoreCms.Net.Services/WeChat/WeChatAccessTokenServices.cs b/CoreCms.Net.Services/WeChat/WeChatAccessTokenServices.cs index ae65f894..a7a9b19c 100644 --- a/CoreCms.Net.Services/WeChat/WeChatAccessTokenServices.cs +++ b/CoreCms.Net.Services/WeChat/WeChatAccessTokenServices.cs @@ -8,15 +8,24 @@ * Description: 暂无 ***********************************************************************/ +using System; +using System.Collections.Generic; +using System.Linq.Expressions; +using System.Threading.Tasks; +using CoreCms.Net.Configuration; using CoreCms.Net.IRepository; using CoreCms.Net.IRepository.UnitOfWork; using CoreCms.Net.IServices; using CoreCms.Net.Model.Entities; +using CoreCms.Net.Model.ViewModels.Basics; +using CoreCms.Net.Model.ViewModels.UI; +using SqlSugar; + namespace CoreCms.Net.Services { /// - /// 微信授权交互 接口实现 + /// 微信授权交互 接口实现 /// public class WeChatAccessTokenServices : BaseServices, IWeChatAccessTokenServices { @@ -25,9 +34,10 @@ namespace CoreCms.Net.Services public WeChatAccessTokenServices(IUnitOfWork unitOfWork, IWeChatAccessTokenRepository dal) { - _dal = dal; - BaseDal = dal; + this._dal = dal; + base.BaseDal = dal; _unitOfWork = unitOfWork; } + } -} \ No newline at end of file +} diff --git a/CoreCms.Net.Services/WeChat/WeChatTransactionComponentBrandAuditLogServices.cs b/CoreCms.Net.Services/WeChat/WeChatTransactionComponentBrandAuditLogServices.cs new file mode 100644 index 00000000..c6dc0d6b --- /dev/null +++ b/CoreCms.Net.Services/WeChat/WeChatTransactionComponentBrandAuditLogServices.cs @@ -0,0 +1,43 @@ +/*********************************************************************** + * Project: CoreCms + * ProjectName: 核心内容管理系统 + * Web: https://www.corecms.net + * Author: 大灰灰 + * Email: jianweie@163.com + * CreateTime: 2022/3/21 3:30:18 + * Description: 暂无 + ***********************************************************************/ + +using System; +using System.Collections.Generic; +using System.Linq.Expressions; +using System.Threading.Tasks; +using CoreCms.Net.Configuration; +using CoreCms.Net.IRepository; +using CoreCms.Net.IRepository.UnitOfWork; +using CoreCms.Net.IServices; +using CoreCms.Net.Model.Entities; +using CoreCms.Net.Model.ViewModels.Basics; +using CoreCms.Net.Model.ViewModels.UI; +using SqlSugar; + + +namespace CoreCms.Net.Services +{ + /// + /// 自定义交易组件上传品牌信息审核结果日志 接口实现 + /// + public class WeChatTransactionComponentBrandAuditLogServices : BaseServices, IWeChatTransactionComponentBrandAuditLogServices + { + private readonly IWeChatTransactionComponentBrandAuditLogRepository _dal; + private readonly IUnitOfWork _unitOfWork; + + public WeChatTransactionComponentBrandAuditLogServices(IUnitOfWork unitOfWork, IWeChatTransactionComponentBrandAuditLogRepository dal) + { + this._dal = dal; + base.BaseDal = dal; + _unitOfWork = unitOfWork; + } + + } +} diff --git a/CoreCms.Net.Services/WeChat/WeChatTransactionComponentBrandAuditServices.cs b/CoreCms.Net.Services/WeChat/WeChatTransactionComponentBrandAuditServices.cs new file mode 100644 index 00000000..f1d1fc8d --- /dev/null +++ b/CoreCms.Net.Services/WeChat/WeChatTransactionComponentBrandAuditServices.cs @@ -0,0 +1,117 @@ +/*********************************************************************** + * Project: CoreCms + * ProjectName: 核心内容管理系统 + * Web: https://www.corecms.net + * Author: 大灰灰 + * Email: jianweie@163.com + * CreateTime: 2022/3/20 1:01:47 + * Description: 暂无 + ***********************************************************************/ + +using System; +using System.Collections.Generic; +using System.Linq.Expressions; +using System.Threading.Tasks; +using CoreCms.Net.Configuration; +using CoreCms.Net.IRepository; +using CoreCms.Net.IRepository.UnitOfWork; +using CoreCms.Net.IServices; +using CoreCms.Net.Model.Entities; +using CoreCms.Net.Model.ViewModels.Basics; +using CoreCms.Net.Model.ViewModels.UI; +using SqlSugar; + + +namespace CoreCms.Net.Services +{ + /// + /// 自定义交易组件上传品牌信息 接口实现 + /// + public class WeChatTransactionComponentBrandAuditServices : BaseServices, IWeChatTransactionComponentBrandAuditServices + { + private readonly IWeChatTransactionComponentBrandAuditRepository _dal; + private readonly IUnitOfWork _unitOfWork; + + public WeChatTransactionComponentBrandAuditServices(IUnitOfWork unitOfWork, IWeChatTransactionComponentBrandAuditRepository dal) + { + this._dal = dal; + base.BaseDal = dal; + _unitOfWork = unitOfWork; + } + + #region 实现重写增删改查操作========================================================== + + /// + /// 重写异步插入方法 + /// + /// 实体数据 + /// + public new async Task InsertAsync(WeChatTransactionComponentBrandAudit entity) + { + return await _dal.InsertAsync(entity); + } + + /// + /// 重写异步更新方法方法 + /// + /// + /// + public new async Task UpdateAsync(WeChatTransactionComponentBrandAudit entity) + { + return await _dal.UpdateAsync(entity); + } + + /// + /// 重写异步更新方法方法 + /// + /// + /// + public new async Task UpdateAsync(List entity) + { + return await _dal.UpdateAsync(entity); + } + + /// + /// 重写删除指定ID的数据 + /// + /// + /// + public new async Task DeleteByIdAsync(object id) + { + return await _dal.DeleteByIdAsync(id); + } + + /// + /// 重写删除指定ID集合的数据(批量删除) + /// + /// + /// + public new async Task DeleteByIdsAsync(int[] ids) + { + return await _dal.DeleteByIdsAsync(ids); + } + + #endregion + + + #region 重写根据条件查询分页数据 + /// + /// 重写根据条件查询分页数据 + /// + /// 判断集合 + /// 排序方式 + /// 当前页面索引 + /// 分布大小 + /// + /// 是否使用WITH(NOLOCK) + /// + public new async Task> QueryPageAsync(Expression> predicate, + Expression> orderByExpression, OrderByType orderByType, int pageIndex = 1, + int pageSize = 20, bool blUseNoLock = false) + { + return await _dal.QueryPageAsync(predicate, orderByExpression, orderByType, pageIndex, pageSize, blUseNoLock); + } + #endregion + + } +} diff --git a/CoreCms.Net.WeChat.Service/Configuration/EventType.cs b/CoreCms.Net.WeChat.Service/Configuration/EventType.cs index 629d982c..8c2aafbe 100644 --- a/CoreCms.Net.WeChat.Service/Configuration/EventType.cs +++ b/CoreCms.Net.WeChat.Service/Configuration/EventType.cs @@ -63,7 +63,10 @@ namespace CoreCms.Net.WeChat.Service.Configuration /// 类目审核结果回调 /// public const string OpenProductCategoryAudit = "open_product_category_audit"; - + /// + /// 品牌审核结果 + /// + public const string OpenProductBrandAudit = "open_product_brand_audit"; #endregion diff --git a/CoreCms.Net.WeChat.Service/Mediator/TransactionComponent/OpenProductBrandAuditEventCommandHandler.cs b/CoreCms.Net.WeChat.Service/Mediator/TransactionComponent/OpenProductBrandAuditEventCommandHandler.cs new file mode 100644 index 00000000..75e79eed --- /dev/null +++ b/CoreCms.Net.WeChat.Service/Mediator/TransactionComponent/OpenProductBrandAuditEventCommandHandler.cs @@ -0,0 +1,112 @@ +/*********************************************************************** + * Project: CoreCms.Net * + * Web: https://CoreCms.Net * + * ProjectName: 核心内容管理系统 * + * Author: 大灰灰 * + * Email: JianWeie@163.com * + * CreateTime: 2020-08-13 23:57:23 + * Description: 暂无 + ***********************************************************************/ + + +using System; +using System.Threading; +using System.Threading.Tasks; +using CoreCms.Net.Configuration; +using CoreCms.Net.IServices; +using CoreCms.Net.Model.Entities; +using CoreCms.Net.Utility.Helper; +using CoreCms.Net.WeChat.Service.HttpClients; +using CoreCms.Net.WeChat.Service.Models; +using MediatR; +using SKIT.FlurlHttpClient.Wechat.Api; +using SKIT.FlurlHttpClient.Wechat.Api.Events; + +namespace CoreCms.Net.WeChat.Service.Mediator +{ + /// + /// 表示 TEXT 事件的数据 + /// + public class OpenProductBrandAuditEventCommand : IRequest + { + public OpenProductBrandAuditEvent EventObj { get; set; } + } + + /// + /// 品牌审核结果 + /// + public class OpenProductBrandAuditEventCommandHandler : IRequestHandler + { + private readonly IWeChatTransactionComponentBrandAuditServices _auditServices; + private readonly IWeChatTransactionComponentBrandAuditLogServices _logServices; + + private readonly ICoreCmsSettingServices _settingServices; + private readonly ICoreCmsSmsServices _smsServices; + + + public OpenProductBrandAuditEventCommandHandler(IWeChatTransactionComponentBrandAuditServices auditServices, IWeChatTransactionComponentBrandAuditLogServices logServices, ICoreCmsSettingServices settingServices, ICoreCmsSmsServices smsServices) + { + _auditServices = auditServices; + _logServices = logServices; + _settingServices = settingServices; + _smsServices = smsServices; + } + + public async Task Handle(OpenProductBrandAuditEventCommand request, CancellationToken cancellationToken) + { + + var jm = new WeChatApiCallBack() { Status = true }; + + if (request.EventObj != null) + { + var brand = await _auditServices.QueryByClauseAsync(p => p.audit_id == request.EventObj.EventData.AuditId); + if (brand != null) + { + await _auditServices.UpdateAsync(p => new WeChatTransactionComponentBrandAudit() + { + status = request.EventObj.EventData.Status, + rejectReason = request.EventObj.EventData.RejectReason, + brandId = request.EventObj.EventData.BrandId, + }, p => p.audit_id == request.EventObj.EventData.AuditId); + + var log = new WeChatTransactionComponentBrandAuditLog(); + log.audit_id = request.EventObj.EventData.AuditId; + log.status = request.EventObj.EventData.Status; + log.audit_type = request.EventObj.EventData.AuditType; + log.reject_reason = request.EventObj.EventData.RejectReason; + log.brand_id = request.EventObj.EventData.BrandId; + log.createTime = DateTime.Now; + + var id = await _logServices.InsertAsync(log); + if (id > 0) + { + var smsOptions = await _settingServices.GetSmsOptions(); + if (smsOptions.Enabled == true) + { + var smsBody = string.Empty; + if (log.status == 1) + { + smsBody = "你提交的品牌已经通过，请登录平台查看。"; + } + else if (log.status == 9) + { + smsBody = "你提交的品牌审核已被拒绝，失败原因为：" + log.reject_reason + "，请修改资料后重新提交。"; + + } + if (!string.IsNullOrEmpty(smsBody)) + { + var allConfigs = await _settingServices.GetConfigDictionaries(); + var shopMobile = CommonHelper.GetConfigDictionary(allConfigs, SystemSettingConstVars.ShopMobile); + + await _smsServices.SendSms(shopMobile, smsBody, smsOptions); + } + } + } + } + } + + return await Task.FromResult(jm); + } + } + +} diff --git a/CoreCms.Net.Web.Admin/Controllers/WeChat/WeChatTransactionComponentBrandAuditController.cs b/CoreCms.Net.Web.Admin/Controllers/WeChat/WeChatTransactionComponentBrandAuditController.cs new file mode 100644 index 00000000..0ae87ae3 --- /dev/null +++ b/CoreCms.Net.Web.Admin/Controllers/WeChat/WeChatTransactionComponentBrandAuditController.cs @@ -0,0 +1,585 @@ +/*********************************************************************** + * Project: CoreCms + * ProjectName: 核心内容管理系统 + * Web: https://www.corecms.net + * Author: 大灰灰 + * Email: jianweie@163.com + * CreateTime: 2022/3/20 1:19:25 + * Description: 暂无 + ***********************************************************************/ + + +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.IO; +using System.Linq; +using System.Linq.Expressions; +using System.Threading.Tasks; +using CoreCms.Net.Caching.AccressToken; +using CoreCms.Net.Configuration; +using CoreCms.Net.Model.Entities; +using CoreCms.Net.Model.Entities.Expression; +using CoreCms.Net.Model.FromBody; +using CoreCms.Net.Model.ViewModels.UI; +using CoreCms.Net.Filter; +using CoreCms.Net.Loging; +using CoreCms.Net.IServices; +using CoreCms.Net.Utility.Helper; +using CoreCms.Net.Utility.Extensions; +using CoreCms.Net.WeChat.Service.HttpClients; +using CoreCms.Net.WeChat.Service.TransactionComponent.Enum; +using Microsoft.AspNetCore.Authorization; +using Microsoft.AspNetCore.Hosting; +using Microsoft.AspNetCore.Mvc; +using NPOI.HSSF.UserModel; +using SKIT.FlurlHttpClient.Wechat.Api; +using SKIT.FlurlHttpClient.Wechat.Api.Models; +using SqlSugar; + +namespace CoreCms.Net.Web.Admin.Controllers +{ + /// + /// 自定义交易组件上传品牌信息 + /// + [Description("自定义交易组件上传品牌信息")] + [Route("api/[controller]/[action]")] + [ApiController] + [RequiredErrorForAdmin] + [Authorize] + public class WeChatTransactionComponentBrandAuditController : ControllerBase + { + private readonly IWebHostEnvironment _webHostEnvironment; + private readonly IWeChatTransactionComponentBrandAuditServices _weChatTransactionComponentBrandAuditServices; + private readonly WeChat.Service.HttpClients.IWeChatApiHttpClientFactory _weChatApiHttpClientFactory; + + /// + /// 构造函数 + /// + public WeChatTransactionComponentBrandAuditController(IWebHostEnvironment webHostEnvironment + , IWeChatTransactionComponentBrandAuditServices weChatTransactionComponentBrandAuditServices, IWeChatApiHttpClientFactory weChatApiHttpClientFactory) + { + _webHostEnvironment = webHostEnvironment; + _weChatTransactionComponentBrandAuditServices = weChatTransactionComponentBrandAuditServices; + _weChatApiHttpClientFactory = weChatApiHttpClientFactory; + } + + #region 获取列表============================================================ + // POST: Api/WeChatTransactionComponentBrandAudit/GetPageList + /// + /// 获取列表 + /// + /// + [HttpPost] + [Description("获取列表")] + public async Task GetPageList() + { + var jm = new AdminUiCallBack(); + var pageCurrent = Request.Form["page"].FirstOrDefault().ObjectToInt(1); + var pageSize = Request.Form["limit"].FirstOrDefault().ObjectToInt(30); + var where = PredicateBuilder.True(); + //获取排序字段 + var orderField = Request.Form["orderField"].FirstOrDefault(); + + Expression> orderEx = orderField switch + { + "id" => p => p.id, + "license" => p => p.license, + "brand_audit_type" => p => p.brand_audit_type, + "trademark_type" => p => p.trademark_type, + "brand_management_type" => p => p.brand_management_type, + "commodity_origin_type" => p => p.commodity_origin_type, + "brand_wording" => p => p.brand_wording, + "sale_authorization" => p => p.sale_authorization, + "trademark_registration_certificate" => p => p.trademark_registration_certificate, + "trademark_change_certificate" => p => p.trademark_change_certificate, + "trademark_registrant" => p => p.trademark_registrant, + "trademark_registrant_nu" => p => p.trademark_registrant_nu, + "trademark_authorization_period" => p => p.trademark_authorization_period, + "trademark_registration_application" => p => p.trademark_registration_application, + "trademark_applicant" => p => p.trademark_applicant, + "trademark_application_time" => p => p.trademark_application_time, + "imported_goods_form" => p => p.imported_goods_form, + "scene_group_list" => p => p.scene_group_list, + "audit_id" => p => p.audit_id, + "status" => p => p.status, + "brandId" => p => p.brandId, + "rejectReason" => p => p.rejectReason, + "createTime" => p => p.createTime, + _ => p => p.id + }; + + //设置排序方式 + var orderDirection = Request.Form["orderDirection"].FirstOrDefault(); + var orderBy = orderDirection switch + { + "asc" => OrderByType.Asc, + "desc" => OrderByType.Desc, + _ => OrderByType.Desc + }; + //查询筛选 + + //序列 int + var id = Request.Form["id"].FirstOrDefault().ObjectToInt(0); + if (id > 0) + { + where = where.And(p => p.id == id); + } + //营业执照或组织机构代码证 nvarchar + var license = Request.Form["license"].FirstOrDefault(); + if (!string.IsNullOrEmpty(license)) + { + where = where.And(p => p.license.Contains(license)); + } + //认证审核类型 int + var brand_audit_type = Request.Form["brand_audit_type"].FirstOrDefault().ObjectToInt(0); + if (brand_audit_type > 0) + { + where = where.And(p => p.brand_audit_type == brand_audit_type); + } + //商标分类 nvarchar + var trademark_type = Request.Form["trademark_type"].FirstOrDefault(); + if (!string.IsNullOrEmpty(trademark_type)) + { + where = where.And(p => p.trademark_type.Contains(trademark_type)); + } + //经营类型 int + var brand_management_type = Request.Form["brand_management_type"].FirstOrDefault().ObjectToInt(0); + if (brand_management_type > 0) + { + where = where.And(p => p.brand_management_type == brand_management_type); + } + //商品产地是否进口 int + var commodity_origin_type = Request.Form["commodity_origin_type"].FirstOrDefault().ObjectToInt(0); + if (commodity_origin_type > 0) + { + where = where.And(p => p.commodity_origin_type == commodity_origin_type); + } + //商标/品牌词 nvarchar + var brand_wording = Request.Form["brand_wording"].FirstOrDefault(); + if (!string.IsNullOrEmpty(brand_wording)) + { + where = where.And(p => p.brand_wording.Contains(brand_wording)); + } + //销售授权书 nvarchar + var sale_authorization = Request.Form["sale_authorization"].FirstOrDefault(); + if (!string.IsNullOrEmpty(sale_authorization)) + { + where = where.And(p => p.sale_authorization.Contains(sale_authorization)); + } + //商标注册证书 nvarchar + var trademark_registration_certificate = Request.Form["trademark_registration_certificate"].FirstOrDefault(); + if (!string.IsNullOrEmpty(trademark_registration_certificate)) + { + where = where.And(p => p.trademark_registration_certificate.Contains(trademark_registration_certificate)); + } + //商标变更证明 nvarchar + var trademark_change_certificate = Request.Form["trademark_change_certificate"].FirstOrDefault(); + if (!string.IsNullOrEmpty(trademark_change_certificate)) + { + where = where.And(p => p.trademark_change_certificate.Contains(trademark_change_certificate)); + } + //商标注册人姓名 nvarchar + var trademark_registrant = Request.Form["trademark_registrant"].FirstOrDefault(); + if (!string.IsNullOrEmpty(trademark_registrant)) + { + where = where.And(p => p.trademark_registrant.Contains(trademark_registrant)); + } + //商标注册号/申请号 nvarchar + var trademark_registrant_nu = Request.Form["trademark_registrant_nu"].FirstOrDefault(); + if (!string.IsNullOrEmpty(trademark_registrant_nu)) + { + where = where.And(p => p.trademark_registrant_nu.Contains(trademark_registrant_nu)); + } + //商标有效期 datetime + var trademark_authorization_period = Request.Form["trademark_authorization_period"].FirstOrDefault(); + if (!string.IsNullOrEmpty(trademark_authorization_period)) + { + if (trademark_authorization_period.Contains("到")) + { + var dts = trademark_authorization_period.Split("到"); + var dtStart = dts[0].Trim().ObjectToDate(); + where = where.And(p => p.trademark_authorization_period > dtStart); + var dtEnd = dts[1].Trim().ObjectToDate(); + where = where.And(p => p.trademark_authorization_period < dtEnd); + } + else + { + var dt = trademark_authorization_period.ObjectToDate(); + where = where.And(p => p.trademark_authorization_period > dt); + } + } + //商标注册申请受理通知书 nvarchar + var trademark_registration_application = Request.Form["trademark_registration_application"].FirstOrDefault(); + if (!string.IsNullOrEmpty(trademark_registration_application)) + { + where = where.And(p => p.trademark_registration_application.Contains(trademark_registration_application)); + } + //商标申请人姓名 nvarchar + var trademark_applicant = Request.Form["trademark_applicant"].FirstOrDefault(); + if (!string.IsNullOrEmpty(trademark_applicant)) + { + where = where.And(p => p.trademark_applicant.Contains(trademark_applicant)); + } + //商标申请时间 datetime + var trademark_application_time = Request.Form["trademark_application_time"].FirstOrDefault(); + if (!string.IsNullOrEmpty(trademark_application_time)) + { + if (trademark_application_time.Contains("到")) + { + var dts = trademark_application_time.Split("到"); + var dtStart = dts[0].Trim().ObjectToDate(); + where = where.And(p => p.trademark_application_time > dtStart); + var dtEnd = dts[1].Trim().ObjectToDate(); + where = where.And(p => p.trademark_application_time < dtEnd); + } + else + { + var dt = trademark_application_time.ObjectToDate(); + where = where.And(p => p.trademark_application_time > dt); + } + } + //中华人民共和国海关进口货物报关单 nvarchar + var imported_goods_form = Request.Form["imported_goods_form"].FirstOrDefault(); + if (!string.IsNullOrEmpty(imported_goods_form)) + { + where = where.And(p => p.imported_goods_form.Contains(imported_goods_form)); + } + //商品使用场景 int + var scene_group_list = Request.Form["scene_group_list"].FirstOrDefault().ObjectToInt(0); + if (scene_group_list > 0) + { + where = where.And(p => p.scene_group_list == scene_group_list); + } + //审核单id nvarchar + var audit_id = Request.Form["audit_id"].FirstOrDefault(); + if (!string.IsNullOrEmpty(audit_id)) + { + where = where.And(p => p.audit_id.Contains(audit_id)); + } + //审核状态 int + var status = Request.Form["status"].FirstOrDefault().ObjectToInt(0); + if (status > 0) + { + where = where.And(p => p.status == status); + } + //品牌id int + var brandId = Request.Form["brandId"].FirstOrDefault().ObjectToInt(0); + if (brandId > 0) + { + where = where.And(p => p.brandId == brandId); + } + //拒绝原因 nvarchar + var rejectReason = Request.Form["rejectReason"].FirstOrDefault(); + if (!string.IsNullOrEmpty(rejectReason)) + { + where = where.And(p => p.rejectReason.Contains(rejectReason)); + } + //创建时间 datetime + var createTime = Request.Form["createTime"].FirstOrDefault(); + if (!string.IsNullOrEmpty(createTime)) + { + if (createTime.Contains("到")) + { + var dts = createTime.Split("到"); + var dtStart = dts[0].Trim().ObjectToDate(); + where = where.And(p => p.createTime > dtStart); + var dtEnd = dts[1].Trim().ObjectToDate(); + where = where.And(p => p.createTime < dtEnd); + } + else + { + var dt = createTime.ObjectToDate(); + where = where.And(p => p.createTime > dt); + } + } + //获取数据 + var list = await _weChatTransactionComponentBrandAuditServices.QueryPageAsync(where, orderEx, orderBy, pageCurrent, pageSize, true); + //返回数据 + jm.data = list; + jm.code = 0; + jm.count = list.TotalCount; + jm.msg = "数据调用成功!"; + return jm; + } + #endregion + + #region 首页数据============================================================ + // POST: Api/WeChatTransactionComponentBrandAudit/GetIndex + /// + /// 首页数据 + /// + /// + [HttpPost] + [Description("首页数据")] + public AdminUiCallBack GetIndex() + { + //返回数据 + var jm = new AdminUiCallBack { code = 0 }; + + //认证审核类型 + var registerType = EnumHelper.EnumToList(); + //商标分类 + var trademarkType = EnumHelper.EnumToList(); + //品牌经营类型 + var brandManagementType = EnumHelper.EnumToList(); + //商品产地是否进口 + var commodityOriginType = EnumHelper.EnumToList(); + + var auditCategoryStatus = EnumHelper.EnumToList(); + + + jm.data = new + { + registerType, + trademarkType, + brandManagementType, + commodityOriginType, + auditCategoryStatus + }; + + return jm; + } + #endregion + + #region 创建数据============================================================ + // POST: Api/WeChatTransactionComponentBrandAudit/GetCreate + /// + /// 创建数据 + /// + /// + [HttpPost] + [Description("创建数据")] + public AdminUiCallBack GetCreate() + { + //返回数据 + var jm = new AdminUiCallBack { code = 0 }; + + //认证审核类型 + var registerType = EnumHelper.EnumToList(); + //商标分类 + var trademarkType = EnumHelper.EnumToList(); + //品牌经营类型 + var brandManagementType = EnumHelper.EnumToList(); + //商品产地是否进口 + var commodityOriginType = EnumHelper.EnumToList(); + + jm.data = new + { + registerType, + trademarkType, + brandManagementType, + commodityOriginType, + }; + + return jm; + } + #endregion + + #region 创建提交============================================================ + // POST: Api/WeChatTransactionComponentBrandAudit/DoCreate + /// + /// 创建提交 + /// + /// + /// + [HttpPost] + [Description("创建提交")] + public async Task DoCreate([FromBody] WeChatTransactionComponentBrandAudit entity) + { + var jm = await _weChatTransactionComponentBrandAuditServices.InsertAsync(entity); + return jm; + } + #endregion + + #region 编辑数据============================================================ + // POST: Api/WeChatTransactionComponentBrandAudit/GetEdit + /// + /// 编辑数据 + /// + /// + /// + [HttpPost] + [Description("编辑数据")] + public async Task GetEdit([FromBody] FMIntId entity) + { + var jm = new AdminUiCallBack(); + + var model = await _weChatTransactionComponentBrandAuditServices.QueryByIdAsync(entity.id, false); + if (model == null) + { + jm.msg = "不存在此信息"; + return jm; + } + jm.code = 0; + + //认证审核类型 + var registerType = EnumHelper.EnumToList(); + //商标分类 + var trademarkType = EnumHelper.EnumToList(); + //品牌经营类型 + var brandManagementType = EnumHelper.EnumToList(); + //商品产地是否进口 + var commodityOriginType = EnumHelper.EnumToList(); + + jm.data = new + { + model, + registerType, + trademarkType, + brandManagementType, + commodityOriginType, + }; + + return jm; + } + #endregion + + #region 编辑提交============================================================ + // POST: Api/WeChatTransactionComponentBrandAudit/Edit + /// + /// 编辑提交 + /// + /// + /// + [HttpPost] + [Description("编辑提交")] + public async Task DoEdit([FromBody] WeChatTransactionComponentBrandAudit entity) + { + var jm = await _weChatTransactionComponentBrandAuditServices.UpdateAsync(entity); + return jm; + } + #endregion + + #region 删除数据============================================================ + // POST: Api/WeChatTransactionComponentBrandAudit/DoDelete/10 + /// + /// 单选删除 + /// + /// + /// + [HttpPost] + [Description("单选删除")] + public async Task DoDelete([FromBody] FMIntId entity) + { + var jm = new AdminUiCallBack(); + + var model = await _weChatTransactionComponentBrandAuditServices.ExistsAsync(p => p.id == entity.id, true); + if (!model) + { + jm.msg = GlobalConstVars.DataisNo; + return jm; + } + jm = await _weChatTransactionComponentBrandAuditServices.DeleteByIdAsync(entity.id); + + return jm; + } + #endregion + + #region 预览数据============================================================ + // POST: Api/WeChatTransactionComponentBrandAudit/GetDetails/10 + /// + /// 预览数据 + /// + /// + /// + [HttpPost] + [Description("预览数据")] + public async Task GetDetails([FromBody] FMIntId entity) + { + var jm = new AdminUiCallBack(); + + var model = await _weChatTransactionComponentBrandAuditServices.QueryByIdAsync(entity.id, false); + if (model == null) + { + jm.msg = "不存在此信息"; + return jm; + } + jm.code = 0; + jm.data = model; + + return jm; + } + #endregion + + #region 提交审核============================================================ + // POST: Api/WeChatTransactionComponentBrandAudit/DoAudit/10 + /// + /// 提交审核 + /// + /// + /// + [HttpPost] + [Description("提交审核")] + public async Task DoAudit([FromBody] FMIntId entity) + { + var jm = new AdminUiCallBack(); + + var model = await _weChatTransactionComponentBrandAuditServices.QueryByIdAsync(entity.id, false); + if (model == null) + { + jm.msg = GlobalConstVars.DataisNo; + return jm; + } + + //获取小程序认证 + var accessToken = WeChatCacheAccessTokenHelper.GetWxOpenAccessToken(); + var client = _weChatApiHttpClientFactory.CreateWxOpenClient(); + var request = new ShopAuditAuditBrandRequest(); + + request.AccessToken = accessToken; + + request.Audit.LicenseUrl = model.license; + request.Audit.Brand.BrandAuditType = model.brand_audit_type; + request.Audit.Brand.TrademarkType = model.trademark_type; + request.Audit.Brand.BrandManagementType = model.brand_management_type; + request.Audit.Brand.CommodityOriginType = model.commodity_origin_type; + request.Audit.Brand.BrandWording = model.brand_wording; + + request.Audit.Brand.SaleAuthorizationUrlList = !string.IsNullOrEmpty(model.sale_authorization) + ? new List(model.sale_authorization.Split(",")) : new List(); + + request.Audit.Brand.TrademarkRegistrationCertificateUrlList = !string.IsNullOrEmpty(model.trademark_registration_certificate) + ? new List(model.trademark_registration_certificate.Split(",")) : new List(); + + request.Audit.Brand.TrademarkChangeCertificateUrlList = !string.IsNullOrEmpty(model.trademark_change_certificate) + ? new List(model.trademark_change_certificate.Split(",")) : new List(); + + request.Audit.Brand.TrademarkRegistrant = model.trademark_registrant; + request.Audit.Brand.TrademarkRegistrantNumber = model.trademark_registrant_nu; + + request.Audit.Brand.TrademarkAuthorizationTime = model.trademark_authorization_period; + + request.Audit.Brand.TrademarkRegistrationApplicationUrlList = !string.IsNullOrEmpty(model.trademark_registration_application) + ? new List(model.trademark_registration_application.Split(",")) : new List(); + + + request.Audit.Brand.TrademarkApplicant = model.trademark_applicant; + request.Audit.Brand.TrademarkAuthorizationTime = model.trademark_application_time; + + request.Audit.Brand.ImportedGoodsFormUrlList = !string.IsNullOrEmpty(model.imported_goods_form) + ? new List(model.imported_goods_form.Split(",")) : new List(); + + var response = await client.ExecuteShopAuditAuditBrandAsync(request); + + if (response.IsSuccessful()) + { + var bl = await _weChatTransactionComponentBrandAuditServices.UpdateAsync( + p => new WeChatTransactionComponentBrandAudit() { audit_id = response.AuditId }, + p => p.id == model.id); + + jm.code = 0; + jm.msg = "提交审核成功"; + } + else + { + jm.code = 1; + jm.data = response.ErrorCode; + jm.msg = response.ErrorMessage; + jm.otherData = accessToken; + } + return jm; + } + #endregion + } +} diff --git a/CoreCms.Net.Web.Admin/Controllers/WeChat/WeChatTransactionComponentGoodController.cs b/CoreCms.Net.Web.Admin/Controllers/WeChat/WeChatTransactionComponentGoodController.cs index 0392242a..d6749bc6 100644 --- a/CoreCms.Net.Web.Admin/Controllers/WeChat/WeChatTransactionComponentGoodController.cs +++ b/CoreCms.Net.Web.Admin/Controllers/WeChat/WeChatTransactionComponentGoodController.cs @@ -843,6 +843,74 @@ namespace CoreCms.Net.Web.Admin.Controllers } #endregion + #region 免审更新============================================================ + // POST: Api/WeChatTransactionComponentGood/WithoutAuditUpdateSKU/10 + /// + /// 提交更新 + /// + /// + /// + [HttpPost] + [Description("免审更新")] + public async Task WithoutAuditUpdateSKU([FromBody] FMIntId entity) + { + var jm = new AdminUiCallBack(); + var model = await _weChatTransactionComponentGoodsServices.QueryByClauseAsync(p => p.id == entity.id, true); + if (model == null) + { + jm.msg = GlobalConstVars.DataisNo; + return jm; + } + + var sku = await _weChatTransactionComponentGoodSkuServices.QueryListByClauseAsync(p => + p.isSelect == true && p.outProductId == model.outProductId); + + //获取小程序认证 + var accessToken = WeChatCacheAccessTokenHelper.GetWxOpenAccessToken(); + var client = _weChatApiHttpClientFactory.CreateWxOpenClient(); + var request = new ShopSPUUpdateWithoutAuditRequest(); + + request.AccessToken = accessToken; + + request.OutProductId = model.outProductId; + request.ProductId = model.productId; + + request.PagePath = model.path; + + request.SKUList = new List(); + + sku.ForEach(p => + { + var item = new ShopSPUUpdateWithoutAuditRequest.Types.SKU(); + + item.OutSKUId = p.outSkuId; + + item.SalePrice = Convert.ToInt32(p.salePrice * 100); + item.MarketPrice = Convert.ToInt32(p.marketPrice * 100); + item.Stock = p.stockNum; + item.BarCode = p.barCode; + item.SKUCode = p.skuCode; + + request.SKUList.Add(item); + }); + + var response = await client.ExecuteShopSPUUpdateWithoutAuditAsync(request); + + if (response.IsSuccessful()) + { + + jm.code = 0; + jm.msg = "更新成功"; + } + else + { + jm.code = 1; + jm.data = response.ErrorCode; + jm.msg = response.ErrorMessage; + } + return jm; + } + #endregion } } diff --git a/CoreCms.Net.Web.Admin/CoreCms.Net.Web.Admin.csproj b/CoreCms.Net.Web.Admin/CoreCms.Net.Web.Admin.csproj index cdf059f9..180891f9 100644 --- a/CoreCms.Net.Web.Admin/CoreCms.Net.Web.Admin.csproj +++ b/CoreCms.Net.Web.Admin/CoreCms.Net.Web.Admin.csproj @@ -46,6 +46,7 @@ + diff --git a/CoreCms.Net.Web.Admin/wwwroot/static/css/overWrite.css b/CoreCms.Net.Web.Admin/wwwroot/static/css/overWrite.css index ee2036bc..9fa7209b 100644 --- a/CoreCms.Net.Web.Admin/wwwroot/static/css/overWrite.css +++ b/CoreCms.Net.Web.Admin/wwwroot/static/css/overWrite.css @@ -109,6 +109,7 @@ a { } .coreshop-form .layui-form-label { font-size: 12px; + padding: 8px 5px; } /*用于给*打红色标记一般用于*/ .required-color { @@ -1064,4 +1065,42 @@ xm-select .xm-body .xm-option.hide-icon.selected { line-height: 16px; display: inline; vertical-align: middle; +} +.continuousCheckInBox { + overflow: hidden; + width: 450px; + margin-left: 50px; + border: 1px solid rgba(0, 0, 0, 0.1); + padding: 10px; + margin-bottom: 10px; + border-radius: 10px; + position: relative; + float: left; +} +.continuousCheckInBox .layui-form-item label { + width: 100px; +} +.continuousCheckInBox .btn-continuous-delete { + position: absolute; + right: 30px; + top: 30px; +} +.cumulativeCheckInBox { + overflow: hidden; + width: 450px; + margin-left: 50px; + border: 1px solid rgba(0, 0, 0, 0.1); + padding: 10px; + margin-bottom: 10px; + border-radius: 10px; + position: relative; + float: left; +} +.cumulativeCheckInBox .layui-form-item label { + width: 100px; +} +.cumulativeCheckInBox .btn-delete { + position: absolute; + right: 30px; + top: 30px; } \ No newline at end of file diff --git a/CoreCms.Net.Web.Admin/wwwroot/static/css/overWrite.less b/CoreCms.Net.Web.Admin/wwwroot/static/css/overWrite.less index 757bb27a..cf0e6e0a 100644 --- a/CoreCms.Net.Web.Admin/wwwroot/static/css/overWrite.less +++ b/CoreCms.Net.Web.Admin/wwwroot/static/css/overWrite.less @@ -43,7 +43,7 @@ a { cursor: pointer } .layui-form-mid { padding: 8px 10px !important; border-bottom: 1px dashed #eee; min-height: 21px; color: #999 !important; .layui-form-switch { margin-top: -3px; } } - /*表单左侧label文字大小重写*/ .layui-form-label { font-size: 12px; } + /*表单左侧label文字大小重写*/ .layui-form-label { font-size: 12px; padding: 8px 5px; } } /*用于给*打红色标记一般用于*/ .required-color { color: red; } @@ -361,4 +361,18 @@ xm-select .xm-label .xm-label-block, xm-select .xm-body .xm-option.hide-icon.sel .layadmin-side-shrink .layui-layout-admin .layui-logo { width: 60px; background-image: url(../images/common/logoMin.png); } .ew-tree-table .ew-tree-pack { cursor: pointer; line-height: 16px; display: inline; vertical-align: middle; } - .ew-tree-table .ew-tree-pack > span { height: 16px; line-height: 16px; display: inline; vertical-align: middle; } \ No newline at end of file + .ew-tree-table .ew-tree-pack > span { height: 16px; line-height: 16px; display: inline; vertical-align: middle; } + + +//连续签到 +.continuousCheckInBox { overflow: hidden; width: 450px; margin-left: 50px; border: 1px solid rgba(0, 0, 0, 0.1); padding: 10px; margin-bottom: 10px; border-radius: 10px; position: relative; float: left; + .layui-form-item label { width: 100px; } + .btn-continuous-delete { position: absolute; right: 30px; top: 30px; } +} + + +//累计签到 +.cumulativeCheckInBox { overflow: hidden; width: 450px; margin-left: 50px; border: 1px solid rgba(0, 0, 0, 0.1); padding: 10px; margin-bottom: 10px; border-radius: 10px; position: relative; float: left; + .layui-form-item label { width: 100px; } + .btn-delete { position: absolute; right: 30px; top: 30px; } +} diff --git a/CoreCms.Net.Web.Admin/wwwroot/static/css/overWrite.min.css b/CoreCms.Net.Web.Admin/wwwroot/static/css/overWrite.min.css index 93d16e0e..774f29ca 100644 --- a/CoreCms.Net.Web.Admin/wwwroot/static/css/overWrite.min.css +++ b/CoreCms.Net.Web.Admin/wwwroot/static/css/overWrite.min.css @@ -1 +1 @@ -::-webkit-scrollbar{width:6px;height:6px;background-color:#f5f5f5;}::-webkit-scrollbar-track{-webkit-box-shadow:inset 0 0 6px rgba(0,0,0,.3);border-radius:6px;background-color:#f5f5f5;}::-webkit-scrollbar-thumb{border-radius:6px;-webkit-box-shadow:inset 0 0 6px rgba(0,0,0,.3);background-color:#009688;}a{cursor:pointer;}.cursor:hover{cursor:pointer;}.layui-nav *{font-size:13.5px;}.layui-breadcrumb>*{font-size:12px;}.layui-input,.layui-textarea{display:block;width:100%;padding-left:5px;}.coreshop-search-form,.layui-table-box,.layui-table-view,.coreshop-form{background-color:#fff;}.layui-side-menu .layui-nav .layui-nav-item .layui-icon{font-size:14px;}.layui-nav-tree .layui-nav-more{right:15px;padding:0;}.table-body{background-color:#fff;margin:10px;padding:0 10px;border:1px solid #e6e6e6;}.layadmin-shortcut li cite{font-size:13px;}.layui-tab-title li{font-size:13px;}.layui-elem-field legend{font-size:13px;}.coreshop-form .layui-form-item{margin-bottom:10px;font-size:12px;}.coreshop-form .order-ship-btn{margin:0 auto;margin-top:25px;display:block;}.coreshop-form .layui-btn-fluid{width:50%;}.coreshop-form .layui-tab-content{padding:10px;}.coreshop-form .add-save-btn{width:100%;}.coreshop-form .layui-form-pane .layui-form-label{padding:8px 5px;}.coreshop-form .layui-form-mid{padding:8px 10px !important;border-bottom:1px dashed #eee;min-height:21px;color:#999 !important;}.coreshop-form .layui-form-mid .layui-form-switch{margin-top:-3px;}.coreshop-form .layui-form-label{font-size:12px;}.required-color{color:#f00;}.select-address{display:inline-block !important;width:30%;margin-right:2%;padding:10px 0;border:1px solid #e6e6e6;margin-bottom:0;}.sellect_seller_brands_list li,.sellect_seller_goods_list li{background-color:#f9f9f9;padding:4px;margin:4px;}.sellect_seller_brands_list li span,.sellect_seller_goods_list li span{color:#f00;margin-right:7px;cursor:pointer;}.list-tag{float:right;margin-right:0;}.link-hot{color:#009688;cursor:pointer;}.layui-btn+.layui-btn{margin-left:5px;}.have-add .layui-form-switch,.have-add-td .layui-form-switch{margin-top:0;}.help-tip{float:right;}.icon-wenhao{color:#9e9e9e;font-size:16px !important;position:relative;top:11px;}.layui-iconpicker{margin-bottom:10px;}.layui-field-title{margin:10px 0 10px;}.noDefaultToolbar .layui-table-tool .layui-table-tool-temp{padding-right:0;}.coreshop-toolbar-search-form,.coreshop-search-form{border:1px solid #e6e6e6;padding:10px;margin:10px 10px 0 10px;}.coreshop-toolbar-search-form .layui-input-wrap,.coreshop-search-form .layui-input-wrap{line-height:30px;}.coreshop-toolbar-search-form .layui-input,.coreshop-search-form .layui-input,.coreshop-toolbar-search-form .layui-select,.coreshop-search-form .layui-select,.coreshop-toolbar-search-form .layui-textarea,.coreshop-search-form .layui-textarea{height:30px;line-height:1.3;line-height:30px\9;border-width:1px;border-style:solid;background-color:#fff;border-radius:2px;}.coreshop-toolbar-search-form .layui-form-label,.coreshop-search-form .layui-form-label{float:left;display:block;padding:5px 5px 5px 2px;width:auto;min-width:60px;max-width:120px;font-weight:400;line-height:20px;text-align:center;font-size:12px;}.coreshop-toolbar-search-form .layui-input-block,.coreshop-search-form .layui-input-block{margin-left:74px;min-height:26px;}.coreshop-toolbar-search-form .layui-form-select dl,.coreshop-search-form .layui-form-select dl{top:29px;}.coreshop-toolbar-search-form .layui-form-end-item,.coreshop-search-form .layui-form-end-item{margin-bottom:0;}.coreshop-toolbar-search-form .layui-form-item,.coreshop-search-form .layui-form-item{margin-bottom:0;}.coreshop-toolbar-search-form .layui-form-item .layui-inline,.coreshop-search-form .layui-form-item .layui-inline{margin-bottom:0;margin-right:0;}.coreshop-toolbar-search-form .layui-form-item .layui-inline .layui-input-inline,.coreshop-search-form .layui-form-item .layui-inline .layui-input-inline{margin-right:5px;width:150px;font-size:12px;}.coreshop-toolbar-search-form .layui-form-item .layui-inline .layui-input-inline input::-webkit-input-placeholder,.coreshop-search-form .layui-form-item .layui-inline .layui-input-inline input::-webkit-input-placeholder{font-size:12px;}.coreshop-toolbar-search-form .layui-form-item .layui-inline .layui-input-inline input::-moz-placeholder,.coreshop-search-form .layui-form-item .layui-inline .layui-input-inline input::-moz-placeholder{font-size:12px;}.coreshop-toolbar-search-form .layui-form-item .layui-inline .layui-input-inline input:-ms-input-placeholder,.coreshop-search-form .layui-form-item .layui-inline .layui-input-inline input:-ms-input-placeholder{font-size:12px;}.coreshop-toolbar-search-form .layui-form-item .layui-inline .layui-input-inline input:-moz-placeholder,.coreshop-search-form .layui-form-item .layui-inline .layui-input-inline input:-moz-placeholder{font-size:12px;}.coreshop-toolbar-search-form .layui-form-item .layui-inline .core-time-input,.coreshop-search-form .layui-form-item .layui-inline .core-time-input{width:308px;}.coreshop-toolbar-search-form xm-select,.coreshop-search-form xm-select{min-height:28px;line-height:28px;}.coreshop-toolbar-search-form xm-select *,.coreshop-search-form xm-select *{font-size:12px;}.coreshop-toolbar-search-form .xm-body .xm-tree .xm-option-content,.coreshop-search-form .xm-body .xm-tree .xm-option-content{padding-left:6px;font-size:12px;}.coreshop-toolbar-search-form xm-select .xm-label .scroll .label-content,.coreshop-search-form xm-select .xm-label .scroll .label-content{line-height:28px;}.coreshop-toolbar-search-form xm-select>.xm-label .scroll .label-content,.coreshop-search-form xm-select>.xm-label .scroll .label-content{display:flex;padding:0 20px 0 10px;font-size:12px;}.coreshop-toolbar-search-form .layui-form-mid,.coreshop-search-form .layui-form-mid{padding:4px 0 !important;}.coreshop-toolbar-search-form .layui-input-inline.core-time-input,.coreshop-search-form .layui-input-inline.core-time-input{width:300px;}.coreshop-toolbar-search-form{border:0;padding:0;margin:0;}.order-form .layui-form-item .layui-inline{margin-bottom:5px;margin-right:0;}.order-table .layui-table-tool-temp{padding-right:0;}.order-table table th{padding:0;}.order-table .layui-table-cell{height:auto;line-height:28px;padding:0 5px;position:relative;box-sizing:border-box;}.order-table .layui-table-cell,.order-table .layui-table-tool-panel li{overflow:inherit;text-overflow:ellipsis;white-space:inherit;}.order-table .orderShip{padding:0 5px;}.order-min-table{background:#fafafa;}.order-min-table .layui-table{border-width:1px;border-style:solid;border-color:#eee;}.order-min-table .layui-table th{text-align:center;font-weight:400;}.order-min-table .layui-table tr td{text-align:center;}.order-min-table .layui-table tr td .title{padding:0 5px;}.order-tab-card .layui-tab-title{padding-left:25px;padding-top:5px;}.order-tab-card .layui-tab-title .layui-this:after{border-top:1px solid #eee;}.layui-elem-quote{border-radius:0 2px 2px 0;background-color:#f2f2f2;font-size:12px;padding:10px;}.layui-layout-admin .layui-side{overflow-x:hidden;}.layui-layout-admin .layui-side::-webkit-scrollbar{display:none;}.layui-layout-admin .layui-layer-title{height:40px;line-height:40px;border:0;background-color:#20222a;color:#fff;}.layui-layout-admin i[close]{top:5px;}.layui-layer-admin .layui-layer-title{font-size:13px;}.layui-layer-admin .layui-layer-title{height:40px;line-height:40px;border:0;background-color:#20222a;color:#fff;}.layui-layer-admin i[close]{top:8px;}.layui-layer-iframe .layui-layer-btn,.layui-layer-page .layui-layer-btn,.layui-layer-dialog .layui-layer-btn{padding-top:10px;}.layui-layer-iframe .layui-layer-btn,.layui-layer-page .layui-layer-btn{border-top:1px dashed #eee;}.layui-layer-btn .layui-layer-btn0{border-color:#009688;background-color:#009688;color:#fff;}.layui-layer-btn a{height:32px;line-height:32px;padding:0 25px;margin:5px 0 0 10px;border-radius:100px;}.layui-upload-img{height:90px;max-height:90px;width:auto;}.layui-layer-tips .layui-layer-content{position:relative;line-height:22px;min-width:12px;padding:4px 5px;font-size:12px;_float:left;border-radius:2px;box-shadow:1px 1px 3px rgba(0,0,0,.2);background-color:#000;color:#fff;}.layui-badge-green{color:#52c41a;background:#f6ffed;border:1px solid #b7eb8f;}.layui-badge-blue{color:#1890ff;background:#e6f7ff;border:1px solid #91d5ff;}.layui-badge-red{color:#f5222d;background:#fff1f0;border:1px solid #ffa39e;}.layui-badge-yellow{color:#faad14;background:#fffbe6;border:1px solid #ffe58f;}.layui-badge-gray{color:#8c8c8c;background:#fafafa;border:1px solid #ccc;}xm-select>.xm-body{margin-left:-2px;}xm-select>.xm-body .xm-option{background-color:transparent !important;}xm-select>.xm-body .xm-option.hide-icon.selected{background-color:#5fb878 !important;}xm-select>.xm-body .xm-option:hover{background-color:#f2f2f2 !important;}.xm-body .xm-tree{min-width:200px;}.xm-body .xm-tree .xm-option-content{padding-left:6px;}xm-select{border-color:#e6e6e6 !important;}xm-select:hover{border-color:#d2d2d2 !important;}xm-select[style="border-color: rgb(229, 77, 66);"]{border-color:#e54d42 !important;}body .ew-xmselect-tree xm-select .xm-body .xm-option .xm-option-icon{position:absolute;left:30px;top:0;right:0;bottom:0;width:auto;height:auto;border:none !important;z-index:1;}body .ew-xmselect-tree xm-select .xm-body .xm-option .xm-option-icon:before{display:none;}body .ew-xmselect-tree xm-select .xm-body .xm-option.selected{background-color:#f2f2f2 !important;}body .ew-xmselect-tree xm-select .xm-body .xm-option.selected .xm-option-content{color:#5fb878 !important;}xm-select .xm-body .xm-option .xm-option-icon{border-color:#2d8cf0 !important;}xm-select .xm-label .xm-label-block,xm-select .xm-body .xm-option.hide-icon.selected{background-color:#2d8cf0 !important;}.layui-form-required:before{content:"*";display:inline-block;font-family:SimSun;margin-right:4px;font-size:14px;line-height:1;color:#ed4014;}.layui-form-radio *{font-size:12px;}.layui-table td,.layui-table th{position:relative;padding:9px 15px;min-height:20px;line-height:20px;font-size:12px;}.layui-table-cell{height:28px;line-height:28px;padding:0 8px;position:relative;box-sizing:border-box;}.layui-table{word-break:break-all;word-wrap:break-word;}.layui-layer-admin .layui-layer-content{padding:10px;line-height:22px;}.layui-layer-admin .layui-layer-setwin{position:absolute;right:15px;*right:0;top:8px;font-size:0;line-height:initial;}.layui-layer-admin .layui-layer-setwin a{position:relative;width:31px;height:31px;margin-left:10px;font-size:12px;_overflow:hidden;color:#fff;}.layui-layer-admin .layui-layer-setwin .layui-layer-close1{background-position:-149px -31px;cursor:pointer;}.layadmin-header{display:none;height:35px;line-height:35px;margin-bottom:0;border-radius:0;}.layui-btn{font-size:12px;}.ew-crop-img-preview{float:left;margin-bottom:10px;margin-right:15px;overflow:hidden;background:#e6e6e6;}.preview-lg{width:256px;height:144px;}.preview-md{width:128px;height:72px;}.preview-sm{width:64px;height:36px;}.preview-xs{width:32px;height:18px;margin-right:0;}.docs-data{width:100%;float:left;text-align:left;}.myCropperBox .layui-form-label{width:70px;padding:2px 5px;height:25px;line-height:20px;border-width:1px;border-style:solid;border-radius:2px 0 0 2px;text-align:center;background-color:#fbfbfb;overflow:hidden;box-sizing:border-box;}.myCropperBox .layui-form-item{margin-bottom:5px;clear:both;*zoom:1;}.myCropperBox .layui-input{height:25px;line-height:1.3;border-width:1px;border-style:solid;background-color:#fff;}.myCropperBox .layui-input-inline{margin-left:-1px;margin-right:10px;}.myCropperBox .layui-form-mid{float:left;display:block;padding:2px 0 !important;height:25px;line-height:20px;text-align:left;overflow:hidden;box-sizing:border-box;}.addGoods .layui-form-pane xm-select,.editGoodsTypes .layui-form-pane xm-select,.editGoodsParameters .layui-form-pane xm-select{margin:0 -1px -1px 0;}.addGoods .grade_price,.editGoodsTypes .grade_price,.editGoodsParameters .grade_price{width:80% !important;float:left;display:inline;}.addGoods .grade_price input,.editGoodsTypes .grade_price input,.editGoodsParameters .grade_price input{display:inline;width:100px;}.addGoods .spec-item,.editGoodsTypes .spec-item,.editGoodsParameters .spec-item{float:left;margin:5px;}.addGoods .spec-item .layui-form-checkbox,.editGoodsTypes .spec-item .layui-form-checkbox,.editGoodsParameters .spec-item .layui-form-checkbox{margin-top:0 !important;}.addGoods .spec-item .checkboxBox,.editGoodsTypes .spec-item .checkboxBox,.editGoodsParameters .spec-item .checkboxBox{float:left;display:block;line-height:20px;width:75px;}.addGoods .layui-form-pane .layui-form-item[pane] .layui-input-inline,.editGoodsTypes .layui-form-pane .layui-form-item[pane] .layui-input-inline,.editGoodsParameters .layui-form-pane .layui-form-item[pane] .layui-input-inline{margin-left:0;width:auto;}.addGoods .del-img,.editGoodsTypes .del-img,.editGoodsParameters .del-img{position:absolute;background-color:rgba(0,0,0,.5);color:#fff;width:13px;height:13px;line-height:12px;font-size:10px;display:inline-block;text-align:center;border-radius:50%;right:-6px;top:-6px;}.addGoods .w-e-text-container,.editGoodsTypes .w-e-text-container,.editGoodsParameters .w-e-text-container{height:600px !important;}.addGoods .layui-form-text .layui-input-block,.editGoodsTypes .layui-form-text .layui-input-block,.editGoodsParameters .layui-form-text .layui-input-block{margin-left:0;left:0;}.addGoods .imgdiv,.editGoodsTypes .imgdiv,.editGoodsParameters .imgdiv,.transactioncomponent .imgdiv{float:left;text-align:center;border:1px solid #ccc;padding:5px;padding-bottom:0;margin-right:10px;background-color:#fff;}.addGoods .layui-upload-img,.editGoodsTypes .layui-upload-img,.editGoodsParameters .layui-upload-img,.transactioncomponent .layui-upload-img{margin:0;}.addGoods .layui-upload-list,.editGoodsTypes .layui-upload-list,.editGoodsParameters .layui-upload-list,.transactioncomponent .layui-upload-list{margin:10px 0;overflow:hidden;}.addGoods .spec_image,.editGoodsTypes .spec_image,.editGoodsParameters .spec_image,.transactioncomponent .spec_image{display:inline-block;}.addGoods .spec_image_item,.editGoodsTypes .spec_image_item,.editGoodsParameters .spec_image_item,.transactioncomponent .spec_image_item{position:relative;display:inline-block;}#parametersBox .layui-form-item{background:#fff;}.text-right{text-align:right;}.text-center{text-align:center;}.text-left{text-align:left;}.core-hidden{display:none;}.core-show{display:block;}.float-left{float:left !important;}.float-right{float:right !important;}.float-none{float:none !important;}.text-red,.line-red,.lines-red{color:#e54d42;}.text-orange,.line-orange,.lines-orange{color:#f37b1d;}.text-yellow,.line-yellow,.lines-yellow{color:#fbbd08;}.text-olive,.line-olive,.lines-olive{color:#8dc63f;}.text-green,.line-green,.lines-green{color:#39b54a;}.text-cyan,.line-cyan,.lines-cyan{color:#1cbbb4;}.text-blue,.line-blue,.lines-blue{color:#0081ff;}.text-purple,.line-purple,.lines-purple{color:#6739b6;}.text-mauve,.line-mauve,.lines-mauve{color:#9c26b0;}.text-pink,.line-pink,.lines-pink{color:#e03997;}.text-brown,.line-brown,.lines-brown{color:#a5673f;}.text-grey,.line-grey,.lines-grey{color:#8799a3;}.text-gray,.line-gray,.lines-gray{color:#aaa;}.text-black,.line-black,.lines-black{color:#333;}.text-white,.line-white,.lines-white{color:#fff;}.layui-form-item .layui-inline-1{width:50px;}.layui-form-item .layui-inline-2{width:100px;}.layui-form-item .layui-inline-3{width:150px;}.layui-form-item .layui-inline-4{width:200px;}.layui-form-item .layui-inline-5{width:250px;}.layui-form-item .layui-inline-6{width:300px;}.layui-form-item .layui-inline-7{width:350px;}.layui-form-item .layui-inline-8{width:400px;}.layui-form-item .layui-inline-9{width:450px;}.layui-form-item .layui-inline-10{width:500px;}.layui-form-item .layui-inline-11{width:550px;}.layui-form-item .layui-inline-12{width:600px;}.layui-form-item .layui-inline-13{width:650px;}.layui-form-item .layui-inline-14{width:700px;}.layui-form-item .layui-inline-100{width:calc(100% - 110px - 20px - 10px);padding:0 10px;}.layui-form-item .layui-form-mid.layui-inline-1{width:20px;padding:0 10px;}.layui-form-item .layui-form-mid.layui-inline-2{width:80px;padding:0 10px;}.layui-form-item .layui-form-mid.layui-inline-3{width:130px;padding:0 10px;}.layui-form-item .layui-form-mid.layui-inline-4{width:180px;padding:0 10px;}.layui-form-item .layui-form-mid.layui-inline-5{width:230px;padding:0 10px;}.layui-form-item .layui-form-mid.layui-inline-6{width:280px;padding:0 10px;}.layui-form-item .layui-form-mid.layui-inline-7{width:330px;padding:0 10px;}.layui-form-item .layui-form-mid.layui-inline-8{width:380px;padding:0 10px;}.layui-form-item .layui-form-mid.layui-inline-9{width:430px;padding:0 10px;}.layui-form-item .layui-form-mid.layui-inline-10{width:480px;padding:0 10px;}.layui-form-item .layui-form-mid.layui-inline-11{width:530px;padding:0 10px;}.layui-form-item .layui-form-mid.layui-inline-12{width:580px;padding:0 10px;}.layui-form-item .layui-form-mid.layui-inline-13{width:630px;padding:0 10px;}.layui-form-item .layui-form-mid.layui-inline-14{width:680px;padding:0 10px;}.layui-form-item .layui-form-mid.layui-inline-100{width:calc(100% - 110px - 20px - 10px);padding:0 10px;}.coreshop-nav-tree .layui-nav-more{right:15px;padding:0;}.coreshop-nav-tree .layui-nav-item>a{height:45px;line-height:45px;}.coreshop-nav-tree .layui-nav-item a cite{letter-spacing:2px;font-size:13.5px;}.coreshop-nav-tree .layui-icon{font-size:13px;}.coreshop-nav-tree .layui-nav-item .layui-icon:first-child{position:absolute;top:50%;left:20px;margin-top:-24px;}.coreshop-admin .layui-logo{padding:0;}.coreshop-admin .layui-logo span{font-size:21px;font-weight:550;letter-spacing:5px;}.coreshop-upload-img{height:37px;max-height:37px;width:auto;margin:0 8px 0 0;}.productBox .layui-table td,.productBox .layui-table th{padding:9px 5px;text-align:center;}.productBox .layui-input,.productBox .layui-select,.productBox .layui-textarea{height:28px;}.pagebarbox .layui-table-page{text-align:right;}.pagebarbox .layui-table-pagebar{float:left;}.longLogo{height:50px;width:220px;display:block;}.layadmin-side-shrink .longLogo{height:50px;width:220px;display:none;}.layadmin-side-shrink .layui-layout-admin .layui-logo{width:60px;background-image:url(../images/common/logoMin.png);}.ew-tree-table .ew-tree-pack{cursor:pointer;line-height:16px;display:inline;vertical-align:middle;}.ew-tree-table .ew-tree-pack>span{height:16px;line-height:16px;display:inline;vertical-align:middle;} \ No newline at end of file +::-webkit-scrollbar{width:6px;height:6px;background-color:#f5f5f5;}::-webkit-scrollbar-track{-webkit-box-shadow:inset 0 0 6px rgba(0,0,0,.3);border-radius:6px;background-color:#f5f5f5;}::-webkit-scrollbar-thumb{border-radius:6px;-webkit-box-shadow:inset 0 0 6px rgba(0,0,0,.3);background-color:#009688;}a{cursor:pointer;}.cursor:hover{cursor:pointer;}.layui-nav *{font-size:13.5px;}.layui-breadcrumb>*{font-size:12px;}.layui-input,.layui-textarea{display:block;width:100%;padding-left:5px;}.coreshop-search-form,.layui-table-box,.layui-table-view,.coreshop-form{background-color:#fff;}.layui-side-menu .layui-nav .layui-nav-item .layui-icon{font-size:14px;}.layui-nav-tree .layui-nav-more{right:15px;padding:0;}.table-body{background-color:#fff;margin:10px;padding:0 10px;border:1px solid #e6e6e6;}.layadmin-shortcut li cite{font-size:13px;}.layui-tab-title li{font-size:13px;}.layui-elem-field legend{font-size:13px;}.coreshop-form .layui-form-item{margin-bottom:10px;font-size:12px;}.coreshop-form .order-ship-btn{margin:0 auto;margin-top:25px;display:block;}.coreshop-form .layui-btn-fluid{width:50%;}.coreshop-form .layui-tab-content{padding:10px;}.coreshop-form .add-save-btn{width:100%;}.coreshop-form .layui-form-pane .layui-form-label{padding:8px 5px;}.coreshop-form .layui-form-mid{padding:8px 10px !important;border-bottom:1px dashed #eee;min-height:21px;color:#999 !important;}.coreshop-form .layui-form-mid .layui-form-switch{margin-top:-3px;}.coreshop-form .layui-form-label{font-size:12px;padding:8px 5px;}.required-color{color:#f00;}.select-address{display:inline-block !important;width:30%;margin-right:2%;padding:10px 0;border:1px solid #e6e6e6;margin-bottom:0;}.sellect_seller_brands_list li,.sellect_seller_goods_list li{background-color:#f9f9f9;padding:4px;margin:4px;}.sellect_seller_brands_list li span,.sellect_seller_goods_list li span{color:#f00;margin-right:7px;cursor:pointer;}.list-tag{float:right;margin-right:0;}.link-hot{color:#009688;cursor:pointer;}.layui-btn+.layui-btn{margin-left:5px;}.have-add .layui-form-switch,.have-add-td .layui-form-switch{margin-top:0;}.help-tip{float:right;}.icon-wenhao{color:#9e9e9e;font-size:16px !important;position:relative;top:11px;}.layui-iconpicker{margin-bottom:10px;}.layui-field-title{margin:10px 0 10px;}.noDefaultToolbar .layui-table-tool .layui-table-tool-temp{padding-right:0;}.coreshop-toolbar-search-form,.coreshop-search-form{border:1px solid #e6e6e6;padding:10px;margin:10px 10px 0 10px;}.coreshop-toolbar-search-form .layui-input-wrap,.coreshop-search-form .layui-input-wrap{line-height:30px;}.coreshop-toolbar-search-form .layui-input,.coreshop-search-form .layui-input,.coreshop-toolbar-search-form .layui-select,.coreshop-search-form .layui-select,.coreshop-toolbar-search-form .layui-textarea,.coreshop-search-form .layui-textarea{height:30px;line-height:1.3;line-height:30px\9;border-width:1px;border-style:solid;background-color:#fff;border-radius:2px;}.coreshop-toolbar-search-form .layui-form-label,.coreshop-search-form .layui-form-label{float:left;display:block;padding:5px 5px 5px 2px;width:auto;min-width:60px;max-width:120px;font-weight:400;line-height:20px;text-align:center;font-size:12px;}.coreshop-toolbar-search-form .layui-input-block,.coreshop-search-form .layui-input-block{margin-left:74px;min-height:26px;}.coreshop-toolbar-search-form .layui-form-select dl,.coreshop-search-form .layui-form-select dl{top:29px;}.coreshop-toolbar-search-form .layui-form-end-item,.coreshop-search-form .layui-form-end-item{margin-bottom:0;}.coreshop-toolbar-search-form .layui-form-item,.coreshop-search-form .layui-form-item{margin-bottom:0;}.coreshop-toolbar-search-form .layui-form-item .layui-inline,.coreshop-search-form .layui-form-item .layui-inline{margin-bottom:0;margin-right:0;}.coreshop-toolbar-search-form .layui-form-item .layui-inline .layui-input-inline,.coreshop-search-form .layui-form-item .layui-inline .layui-input-inline{margin-right:5px;width:150px;font-size:12px;}.coreshop-toolbar-search-form .layui-form-item .layui-inline .layui-input-inline input::-webkit-input-placeholder,.coreshop-search-form .layui-form-item .layui-inline .layui-input-inline input::-webkit-input-placeholder{font-size:12px;}.coreshop-toolbar-search-form .layui-form-item .layui-inline .layui-input-inline input::-moz-placeholder,.coreshop-search-form .layui-form-item .layui-inline .layui-input-inline input::-moz-placeholder{font-size:12px;}.coreshop-toolbar-search-form .layui-form-item .layui-inline .layui-input-inline input:-ms-input-placeholder,.coreshop-search-form .layui-form-item .layui-inline .layui-input-inline input:-ms-input-placeholder{font-size:12px;}.coreshop-toolbar-search-form .layui-form-item .layui-inline .layui-input-inline input:-moz-placeholder,.coreshop-search-form .layui-form-item .layui-inline .layui-input-inline input:-moz-placeholder{font-size:12px;}.coreshop-toolbar-search-form .layui-form-item .layui-inline .core-time-input,.coreshop-search-form .layui-form-item .layui-inline .core-time-input{width:308px;}.coreshop-toolbar-search-form xm-select,.coreshop-search-form xm-select{min-height:28px;line-height:28px;}.coreshop-toolbar-search-form xm-select *,.coreshop-search-form xm-select *{font-size:12px;}.coreshop-toolbar-search-form .xm-body .xm-tree .xm-option-content,.coreshop-search-form .xm-body .xm-tree .xm-option-content{padding-left:6px;font-size:12px;}.coreshop-toolbar-search-form xm-select .xm-label .scroll .label-content,.coreshop-search-form xm-select .xm-label .scroll .label-content{line-height:28px;}.coreshop-toolbar-search-form xm-select>.xm-label .scroll .label-content,.coreshop-search-form xm-select>.xm-label .scroll .label-content{display:flex;padding:0 20px 0 10px;font-size:12px;}.coreshop-toolbar-search-form .layui-form-mid,.coreshop-search-form .layui-form-mid{padding:4px 0 !important;}.coreshop-toolbar-search-form .layui-input-inline.core-time-input,.coreshop-search-form .layui-input-inline.core-time-input{width:300px;}.coreshop-toolbar-search-form{border:0;padding:0;margin:0;}.order-form .layui-form-item .layui-inline{margin-bottom:5px;margin-right:0;}.order-table .layui-table-tool-temp{padding-right:0;}.order-table table th{padding:0;}.order-table .layui-table-cell{height:auto;line-height:28px;padding:0 5px;position:relative;box-sizing:border-box;}.order-table .layui-table-cell,.order-table .layui-table-tool-panel li{overflow:inherit;text-overflow:ellipsis;white-space:inherit;}.order-table .orderShip{padding:0 5px;}.order-min-table{background:#fafafa;}.order-min-table .layui-table{border-width:1px;border-style:solid;border-color:#eee;}.order-min-table .layui-table th{text-align:center;font-weight:400;}.order-min-table .layui-table tr td{text-align:center;}.order-min-table .layui-table tr td .title{padding:0 5px;}.order-tab-card .layui-tab-title{padding-left:25px;padding-top:5px;}.order-tab-card .layui-tab-title .layui-this:after{border-top:1px solid #eee;}.layui-elem-quote{border-radius:0 2px 2px 0;background-color:#f2f2f2;font-size:12px;padding:10px;}.layui-layout-admin .layui-side{overflow-x:hidden;}.layui-layout-admin .layui-side::-webkit-scrollbar{display:none;}.layui-layout-admin .layui-layer-title{height:40px;line-height:40px;border:0;background-color:#20222a;color:#fff;}.layui-layout-admin i[close]{top:5px;}.layui-layer-admin .layui-layer-title{font-size:13px;}.layui-layer-admin .layui-layer-title{height:40px;line-height:40px;border:0;background-color:#20222a;color:#fff;}.layui-layer-admin i[close]{top:8px;}.layui-layer-iframe .layui-layer-btn,.layui-layer-page .layui-layer-btn,.layui-layer-dialog .layui-layer-btn{padding-top:10px;}.layui-layer-iframe .layui-layer-btn,.layui-layer-page .layui-layer-btn{border-top:1px dashed #eee;}.layui-layer-btn .layui-layer-btn0{border-color:#009688;background-color:#009688;color:#fff;}.layui-layer-btn a{height:32px;line-height:32px;padding:0 25px;margin:5px 0 0 10px;border-radius:100px;}.layui-upload-img{height:90px;max-height:90px;width:auto;}.layui-layer-tips .layui-layer-content{position:relative;line-height:22px;min-width:12px;padding:4px 5px;font-size:12px;_float:left;border-radius:2px;box-shadow:1px 1px 3px rgba(0,0,0,.2);background-color:#000;color:#fff;}.layui-badge-green{color:#52c41a;background:#f6ffed;border:1px solid #b7eb8f;}.layui-badge-blue{color:#1890ff;background:#e6f7ff;border:1px solid #91d5ff;}.layui-badge-red{color:#f5222d;background:#fff1f0;border:1px solid #ffa39e;}.layui-badge-yellow{color:#faad14;background:#fffbe6;border:1px solid #ffe58f;}.layui-badge-gray{color:#8c8c8c;background:#fafafa;border:1px solid #ccc;}xm-select>.xm-body{margin-left:-2px;}xm-select>.xm-body .xm-option{background-color:transparent !important;}xm-select>.xm-body .xm-option.hide-icon.selected{background-color:#5fb878 !important;}xm-select>.xm-body .xm-option:hover{background-color:#f2f2f2 !important;}.xm-body .xm-tree{min-width:200px;}.xm-body .xm-tree .xm-option-content{padding-left:6px;}xm-select{border-color:#e6e6e6 !important;}xm-select:hover{border-color:#d2d2d2 !important;}xm-select[style="border-color: rgb(229, 77, 66);"]{border-color:#e54d42 !important;}body .ew-xmselect-tree xm-select .xm-body .xm-option .xm-option-icon{position:absolute;left:30px;top:0;right:0;bottom:0;width:auto;height:auto;border:none !important;z-index:1;}body .ew-xmselect-tree xm-select .xm-body .xm-option .xm-option-icon:before{display:none;}body .ew-xmselect-tree xm-select .xm-body .xm-option.selected{background-color:#f2f2f2 !important;}body .ew-xmselect-tree xm-select .xm-body .xm-option.selected .xm-option-content{color:#5fb878 !important;}xm-select .xm-body .xm-option .xm-option-icon{border-color:#2d8cf0 !important;}xm-select .xm-label .xm-label-block,xm-select .xm-body .xm-option.hide-icon.selected{background-color:#2d8cf0 !important;}.layui-form-required:before{content:"*";display:inline-block;font-family:SimSun;margin-right:4px;font-size:14px;line-height:1;color:#ed4014;}.layui-form-radio *{font-size:12px;}.layui-table td,.layui-table th{position:relative;padding:9px 15px;min-height:20px;line-height:20px;font-size:12px;}.layui-table-cell{height:28px;line-height:28px;padding:0 8px;position:relative;box-sizing:border-box;}.layui-table{word-break:break-all;word-wrap:break-word;}.layui-layer-admin .layui-layer-content{padding:10px;line-height:22px;}.layui-layer-admin .layui-layer-setwin{position:absolute;right:15px;*right:0;top:8px;font-size:0;line-height:initial;}.layui-layer-admin .layui-layer-setwin a{position:relative;width:31px;height:31px;margin-left:10px;font-size:12px;_overflow:hidden;color:#fff;}.layui-layer-admin .layui-layer-setwin .layui-layer-close1{background-position:-149px -31px;cursor:pointer;}.layadmin-header{display:none;height:35px;line-height:35px;margin-bottom:0;border-radius:0;}.layui-btn{font-size:12px;}.ew-crop-img-preview{float:left;margin-bottom:10px;margin-right:15px;overflow:hidden;background:#e6e6e6;}.preview-lg{width:256px;height:144px;}.preview-md{width:128px;height:72px;}.preview-sm{width:64px;height:36px;}.preview-xs{width:32px;height:18px;margin-right:0;}.docs-data{width:100%;float:left;text-align:left;}.myCropperBox .layui-form-label{width:70px;padding:2px 5px;height:25px;line-height:20px;border-width:1px;border-style:solid;border-radius:2px 0 0 2px;text-align:center;background-color:#fbfbfb;overflow:hidden;box-sizing:border-box;}.myCropperBox .layui-form-item{margin-bottom:5px;clear:both;*zoom:1;}.myCropperBox .layui-input{height:25px;line-height:1.3;border-width:1px;border-style:solid;background-color:#fff;}.myCropperBox .layui-input-inline{margin-left:-1px;margin-right:10px;}.myCropperBox .layui-form-mid{float:left;display:block;padding:2px 0 !important;height:25px;line-height:20px;text-align:left;overflow:hidden;box-sizing:border-box;}.addGoods .layui-form-pane xm-select,.editGoodsTypes .layui-form-pane xm-select,.editGoodsParameters .layui-form-pane xm-select{margin:0 -1px -1px 0;}.addGoods .grade_price,.editGoodsTypes .grade_price,.editGoodsParameters .grade_price{width:80% !important;float:left;display:inline;}.addGoods .grade_price input,.editGoodsTypes .grade_price input,.editGoodsParameters .grade_price input{display:inline;width:100px;}.addGoods .spec-item,.editGoodsTypes .spec-item,.editGoodsParameters .spec-item{float:left;margin:5px;}.addGoods .spec-item .layui-form-checkbox,.editGoodsTypes .spec-item .layui-form-checkbox,.editGoodsParameters .spec-item .layui-form-checkbox{margin-top:0 !important;}.addGoods .spec-item .checkboxBox,.editGoodsTypes .spec-item .checkboxBox,.editGoodsParameters .spec-item .checkboxBox{float:left;display:block;line-height:20px;width:75px;}.addGoods .layui-form-pane .layui-form-item[pane] .layui-input-inline,.editGoodsTypes .layui-form-pane .layui-form-item[pane] .layui-input-inline,.editGoodsParameters .layui-form-pane .layui-form-item[pane] .layui-input-inline{margin-left:0;width:auto;}.addGoods .del-img,.editGoodsTypes .del-img,.editGoodsParameters .del-img{position:absolute;background-color:rgba(0,0,0,.5);color:#fff;width:13px;height:13px;line-height:12px;font-size:10px;display:inline-block;text-align:center;border-radius:50%;right:-6px;top:-6px;}.addGoods .w-e-text-container,.editGoodsTypes .w-e-text-container,.editGoodsParameters .w-e-text-container{height:600px !important;}.addGoods .layui-form-text .layui-input-block,.editGoodsTypes .layui-form-text .layui-input-block,.editGoodsParameters .layui-form-text .layui-input-block{margin-left:0;left:0;}.addGoods .imgdiv,.editGoodsTypes .imgdiv,.editGoodsParameters .imgdiv,.transactioncomponent .imgdiv{float:left;text-align:center;border:1px solid #ccc;padding:5px;padding-bottom:0;margin-right:10px;background-color:#fff;}.addGoods .layui-upload-img,.editGoodsTypes .layui-upload-img,.editGoodsParameters .layui-upload-img,.transactioncomponent .layui-upload-img{margin:0;}.addGoods .layui-upload-list,.editGoodsTypes .layui-upload-list,.editGoodsParameters .layui-upload-list,.transactioncomponent .layui-upload-list{margin:10px 0;overflow:hidden;}.addGoods .spec_image,.editGoodsTypes .spec_image,.editGoodsParameters .spec_image,.transactioncomponent .spec_image{display:inline-block;}.addGoods .spec_image_item,.editGoodsTypes .spec_image_item,.editGoodsParameters .spec_image_item,.transactioncomponent .spec_image_item{position:relative;display:inline-block;}#parametersBox .layui-form-item{background:#fff;}.text-right{text-align:right;}.text-center{text-align:center;}.text-left{text-align:left;}.core-hidden{display:none;}.core-show{display:block;}.float-left{float:left !important;}.float-right{float:right !important;}.float-none{float:none !important;}.text-red,.line-red,.lines-red{color:#e54d42;}.text-orange,.line-orange,.lines-orange{color:#f37b1d;}.text-yellow,.line-yellow,.lines-yellow{color:#fbbd08;}.text-olive,.line-olive,.lines-olive{color:#8dc63f;}.text-green,.line-green,.lines-green{color:#39b54a;}.text-cyan,.line-cyan,.lines-cyan{color:#1cbbb4;}.text-blue,.line-blue,.lines-blue{color:#0081ff;}.text-purple,.line-purple,.lines-purple{color:#6739b6;}.text-mauve,.line-mauve,.lines-mauve{color:#9c26b0;}.text-pink,.line-pink,.lines-pink{color:#e03997;}.text-brown,.line-brown,.lines-brown{color:#a5673f;}.text-grey,.line-grey,.lines-grey{color:#8799a3;}.text-gray,.line-gray,.lines-gray{color:#aaa;}.text-black,.line-black,.lines-black{color:#333;}.text-white,.line-white,.lines-white{color:#fff;}.layui-form-item .layui-inline-1{width:50px;}.layui-form-item .layui-inline-2{width:100px;}.layui-form-item .layui-inline-3{width:150px;}.layui-form-item .layui-inline-4{width:200px;}.layui-form-item .layui-inline-5{width:250px;}.layui-form-item .layui-inline-6{width:300px;}.layui-form-item .layui-inline-7{width:350px;}.layui-form-item .layui-inline-8{width:400px;}.layui-form-item .layui-inline-9{width:450px;}.layui-form-item .layui-inline-10{width:500px;}.layui-form-item .layui-inline-11{width:550px;}.layui-form-item .layui-inline-12{width:600px;}.layui-form-item .layui-inline-13{width:650px;}.layui-form-item .layui-inline-14{width:700px;}.layui-form-item .layui-inline-100{width:calc(100% - 110px - 20px - 10px);padding:0 10px;}.layui-form-item .layui-form-mid.layui-inline-1{width:20px;padding:0 10px;}.layui-form-item .layui-form-mid.layui-inline-2{width:80px;padding:0 10px;}.layui-form-item .layui-form-mid.layui-inline-3{width:130px;padding:0 10px;}.layui-form-item .layui-form-mid.layui-inline-4{width:180px;padding:0 10px;}.layui-form-item .layui-form-mid.layui-inline-5{width:230px;padding:0 10px;}.layui-form-item .layui-form-mid.layui-inline-6{width:280px;padding:0 10px;}.layui-form-item .layui-form-mid.layui-inline-7{width:330px;padding:0 10px;}.layui-form-item .layui-form-mid.layui-inline-8{width:380px;padding:0 10px;}.layui-form-item .layui-form-mid.layui-inline-9{width:430px;padding:0 10px;}.layui-form-item .layui-form-mid.layui-inline-10{width:480px;padding:0 10px;}.layui-form-item .layui-form-mid.layui-inline-11{width:530px;padding:0 10px;}.layui-form-item .layui-form-mid.layui-inline-12{width:580px;padding:0 10px;}.layui-form-item .layui-form-mid.layui-inline-13{width:630px;padding:0 10px;}.layui-form-item .layui-form-mid.layui-inline-14{width:680px;padding:0 10px;}.layui-form-item .layui-form-mid.layui-inline-100{width:calc(100% - 110px - 20px - 10px);padding:0 10px;}.coreshop-nav-tree .layui-nav-more{right:15px;padding:0;}.coreshop-nav-tree .layui-nav-item>a{height:45px;line-height:45px;}.coreshop-nav-tree .layui-nav-item a cite{letter-spacing:2px;font-size:13.5px;}.coreshop-nav-tree .layui-icon{font-size:13px;}.coreshop-nav-tree .layui-nav-item .layui-icon:first-child{position:absolute;top:50%;left:20px;margin-top:-24px;}.coreshop-admin .layui-logo{padding:0;}.coreshop-admin .layui-logo span{font-size:21px;font-weight:550;letter-spacing:5px;}.coreshop-upload-img{height:37px;max-height:37px;width:auto;margin:0 8px 0 0;}.productBox .layui-table td,.productBox .layui-table th{padding:9px 5px;text-align:center;}.productBox .layui-input,.productBox .layui-select,.productBox .layui-textarea{height:28px;}.pagebarbox .layui-table-page{text-align:right;}.pagebarbox .layui-table-pagebar{float:left;}.longLogo{height:50px;width:220px;display:block;}.layadmin-side-shrink .longLogo{height:50px;width:220px;display:none;}.layadmin-side-shrink .layui-layout-admin .layui-logo{width:60px;background-image:url(../images/common/logoMin.png);}.ew-tree-table .ew-tree-pack{cursor:pointer;line-height:16px;display:inline;vertical-align:middle;}.ew-tree-table .ew-tree-pack>span{height:16px;line-height:16px;display:inline;vertical-align:middle;}.continuousCheckInBox{overflow:hidden;width:450px;margin-left:50px;border:1px solid rgba(0,0,0,.1);padding:10px;margin-bottom:10px;border-radius:10px;position:relative;float:left;}.continuousCheckInBox .layui-form-item label{width:100px;}.continuousCheckInBox .btn-continuous-delete{position:absolute;right:30px;top:30px;}.cumulativeCheckInBox{overflow:hidden;width:450px;margin-left:50px;border:1px solid rgba(0,0,0,.1);padding:10px;margin-bottom:10px;border-radius:10px;position:relative;float:left;}.cumulativeCheckInBox .layui-form-item label{width:100px;}.cumulativeCheckInBox .btn-delete{position:absolute;right:30px;top:30px;} \ No newline at end of file diff --git a/CoreCms.Net.Web.Admin/wwwroot/views/wechat/transactioncomponent/brandaudit/create.html b/CoreCms.Net.Web.Admin/wwwroot/views/wechat/transactioncomponent/brandaudit/create.html new file mode 100644 index 00000000..9a0452f5 --- /dev/null +++ b/CoreCms.Net.Web.Admin/wwwroot/views/wechat/transactioncomponent/brandaudit/create.html @@ -0,0 +1,478 @@ + + + + + + + + + + diff --git a/CoreCms.Net.Web.Admin/wwwroot/views/wechat/transactioncomponent/brandaudit/details.html b/CoreCms.Net.Web.Admin/wwwroot/views/wechat/transactioncomponent/brandaudit/details.html new file mode 100644 index 00000000..5ea3b78e --- /dev/null +++ b/CoreCms.Net.Web.Admin/wwwroot/views/wechat/transactioncomponent/brandaudit/details.html @@ -0,0 +1,189 @@ + + \ No newline at end of file diff --git a/CoreCms.Net.Web.Admin/wwwroot/views/wechat/transactioncomponent/brandaudit/edit.html b/CoreCms.Net.Web.Admin/wwwroot/views/wechat/transactioncomponent/brandaudit/edit.html new file mode 100644 index 00000000..66415239 --- /dev/null +++ b/CoreCms.Net.Web.Admin/wwwroot/views/wechat/transactioncomponent/brandaudit/edit.html @@ -0,0 +1,515 @@ + + + + + + + + + + diff --git a/CoreCms.Net.Web.Admin/wwwroot/views/wechat/transactioncomponent/brandaudit/index.html b/CoreCms.Net.Web.Admin/wwwroot/views/wechat/transactioncomponent/brandaudit/index.html new file mode 100644 index 00000000..871d4dc7 --- /dev/null +++ b/CoreCms.Net.Web.Admin/wwwroot/views/wechat/transactioncomponent/brandaudit/index.html @@ -0,0 +1,430 @@ +自定义交易组件上传品牌信息 + +
+
+ +
+
+ + + +
+
+
+ + + + + + + + + diff --git a/CoreCms.Net.Web.Admin/wwwroot/views/wechat/transactioncomponent/goods/index.html b/CoreCms.Net.Web.Admin/wwwroot/views/wechat/transactioncomponent/goods/index.html index 511f72c5..63a32505 100644 --- a/CoreCms.Net.Web.Admin/wwwroot/views/wechat/transactioncomponent/goods/index.html +++ b/CoreCms.Net.Web.Admin/wwwroot/views/wechat/transactioncomponent/goods/index.html @@ -46,6 +46,7 @@ 获取草稿状态 获取线上状态 上架商品 + 免审更新 下架商品 清空数据 @@ -207,7 +208,9 @@ case 'delistingSKU': doDelistingSpu(checkStatus) break; - + case 'withoutAuditUpdateSKU': + doWithoutAuditUpdateSKU(checkStatus) + break; }; }); @@ -591,7 +594,19 @@ }); }); } - //监听 表格复选框操作 + + //执行免审更新操作 + function doWithoutAuditUpdateSKU(checkStatus) { + var checkData = checkStatus.data; + if (checkData.length === 0) { + return layer.msg('请选择您要处理的数据'); + } + coreHelper.Post("Api/WeChatTransactionComponentGood/WithoutAuditUpdateSKU", { id: checkData[0].id }, function (e) { + if (debug) { console.log(e); } //开启调试返回数据 + table.reloadData('LAY-app-WeChatTransactionComponentGood-tableBox'); + layer.msg(e.msg); + }); + } }); }; diff --git a/数据库/SqlServer/20220321/20220321完整数据库带演示商品.rar b/数据库/SqlServer/20220321/20220321完整数据库带演示商品.rar new file mode 100644 index 00000000..266dc46e Binary files /dev/null and b/数据库/SqlServer/20220321/20220321完整数据库带演示商品.rar differ diff --git a/数据库/SqlServer/20220321/升级脚本-创建上传品牌信息及日志.sql b/数据库/SqlServer/20220321/升级脚本-创建上传品牌信息及日志.sql new file mode 100644 index 00000000..6c56e3d7 Binary files /dev/null and b/数据库/SqlServer/20220321/升级脚本-创建上传品牌信息及日志.sql differ diff --git a/数据库/SqlServer/数据库更新日志.txt b/数据库/SqlServer/数据库更新日志.txt index 0c3d6344..09b03d32 100644 --- a/数据库/SqlServer/数据库更新日志.txt +++ b/数据库/SqlServer/数据库更新日志.txt @@ -1,3 +1,6 @@ +2022-03-21 +【新增】表【WeChatTransactionComponentBrandAudit】【WeChatTransactionComponentBrandAuditLog】实现自定义交易组件上传品牌信息，及品牌审核回调 + 2022-03-14 【新增】表【CoreCmsContinuousCheckInRuleDetails】【CoreCmsContinuousCheckInRules】【CoreCmsCumulativeCheckInRules】【CoreCmsUserCheckIn】【CoreCmsUserCheckInDetails】实现日历签到功能。