mirror of
http://git.coreshop.cn/jianweie/coreshoppro.git
synced 2025-12-06 21:03:26 +08:00
# 2022-02-11
### 1.3.5 开源社区版(会员专业版同步修改): 无 ### 0.1.6 会员专业版: 【新增】后台【平台设置-订单管理】增加【佣金计算通道】功能,分为【仅代理】【仅分销】【先代理后分销】【先分销后代理】四种自选模式。 【新增】增加【CoreCmsAgentOrderDetails】表,实现代理佣金订单详情列表功能,精确到具体商品明细。 【新增】增加【CoreCmsDistributionOrderDetails】表,实现三级佣金订单详情列表功能,精确到具体商品明细。 【修复】修复代理商商铺开启按钮错用三级分销商店铺开关功能,增加代理商商铺开启开关。 【修复】修复代理商佣金明细日期选择范围错乱问题。 【优化】uniapp自带progress进度条更换为uview2.x进度条。 【优化】敏感词过滤组件启用废弃的【WordsMatch】方法,启用【StringSearch】方法替代。
This commit is contained in:
@@ -2828,5 +2828,19 @@ namespace CoreCms.Net.Configuration
|
||||
|
||||
#endregion
|
||||
|
||||
#region 佣金相关
|
||||
/// <summary>
|
||||
/// 代理分销通道判定
|
||||
/// </summary>
|
||||
public enum CommissionChannel
|
||||
{
|
||||
仅代理 = 1,
|
||||
仅分销 = 2,
|
||||
先代理后分销 = 3,
|
||||
先分销后代理 = 4,
|
||||
}
|
||||
#endregion
|
||||
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
@@ -101,6 +101,17 @@ namespace CoreCms.Net.Configuration
|
||||
/// </summary>
|
||||
public const string StoreOrderAutomaticDelivery = "storeOrderAutomaticDelivery";
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// 门店订单自动发货
|
||||
/// </summary>
|
||||
public const string CommissionChannel = "commissionChannel";
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
//分销功能(老分销)=============================================================
|
||||
/// <summary>
|
||||
/// 是否开启分销
|
||||
@@ -594,6 +605,7 @@ namespace CoreCms.Net.Configuration
|
||||
/// </summary>
|
||||
public const string SmsTplForCommon = "smsTplForCommon";
|
||||
|
||||
|
||||
//网络打印机============================================================================
|
||||
/// <summary>
|
||||
/// 是否开启
|
||||
@@ -645,6 +657,10 @@ namespace CoreCms.Net.Configuration
|
||||
/// </summary>
|
||||
public const string AgentAgreement = "agentAgreement";
|
||||
/// <summary>
|
||||
/// 是否开启店铺:
|
||||
/// </summary>
|
||||
public const string AgentStore = "agentStore";
|
||||
/// <summary>
|
||||
/// 是否允许代理代购服务
|
||||
/// </summary>
|
||||
public const string IsAllowProcurementService = "isAllowProcurementService";
|
||||
|
||||
@@ -77,7 +77,6 @@ namespace CoreCms.Net.Configuration
|
||||
di.Add(SystemSettingConstVars.StoreOrderAutomaticDelivery, new DictionaryKeyValues() { sKey = "门店自提自动发货", sValue = "2" });
|
||||
|
||||
|
||||
|
||||
//分销功能
|
||||
|
||||
di.Add(SystemSettingConstVars.OpenDistribution, new DictionaryKeyValues() { sKey = "是否开启三级分销", sValue = "1" });
|
||||
@@ -183,12 +182,13 @@ namespace CoreCms.Net.Configuration
|
||||
di.Add(SystemSettingConstVars.FilesStoragePath, new DictionaryKeyValues() { sKey = "存储路径", sValue = "/upload/" });
|
||||
di.Add(SystemSettingConstVars.FilesStorageFileSuffix, new DictionaryKeyValues() { sKey = "文件后缀类型", sValue = "gif,jpg,jpeg,png,bmp,xls,xlsx,doc,pdf,mp4,WebM,Ogv" });
|
||||
di.Add(SystemSettingConstVars.FilesStorageFileMaxSize, new DictionaryKeyValues() { sKey = "文件最大大小", sValue = "10" });
|
||||
di.Add(SystemSettingConstVars.FilesStorageBucketBindUrl, new DictionaryKeyValues() { sKey = "云存储绑定域名", sValue = "http://www.coreshop.cn/" });
|
||||
di.Add(SystemSettingConstVars.FilesStorageBucketBindUrl, new DictionaryKeyValues() { sKey = "云存储绑定域名", sValue = "https://www.corecms.net/" });
|
||||
di.Add(SystemSettingConstVars.FilesStorageAccessKeyId, new DictionaryKeyValues() { sKey = "云存储授权账户", sValue = "" });
|
||||
di.Add(SystemSettingConstVars.FilesStorageAccessKeySecret, new DictionaryKeyValues() { sKey = "云存储授权密钥", sValue = "" });
|
||||
di.Add(SystemSettingConstVars.FilesStorageTencentAccountId, new DictionaryKeyValues() { sKey = "腾讯云账户标识", sValue = "" });
|
||||
di.Add(SystemSettingConstVars.FilesStorageTencentCosRegion, new DictionaryKeyValues() { sKey = "腾讯云桶地域", sValue = "" });
|
||||
di.Add(SystemSettingConstVars.FilesStorageTencentBucketName, new DictionaryKeyValues() { sKey = "腾讯云桶名称", sValue = "" });
|
||||
|
||||
di.Add(SystemSettingConstVars.FilesStorageAliYunEndpoint, new DictionaryKeyValues() { sKey = "阿里云节点", sValue = "https://oss-cn-shenzhen.aliyuncs.com" });
|
||||
di.Add(SystemSettingConstVars.FilesStorageAliYunBucketName, new DictionaryKeyValues() { sKey = "阿里云桶名称", sValue = "CoreShop" });
|
||||
|
||||
@@ -264,7 +264,5 @@ namespace CoreCms.Net.Configuration
|
||||
return list;
|
||||
}
|
||||
|
||||
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user