mirror of
http://git.coreshop.cn/jianweie/coreshoppro.git
synced 2026-02-05 16:09:49 +08:00
# 2022-02-11
### 1.3.5 开源社区版(会员专业版同步修改): 无 ### 0.1.6 会员专业版: 【新增】后台【平台设置-订单管理】增加【佣金计算通道】功能,分为【仅代理】【仅分销】【先代理后分销】【先分销后代理】四种自选模式。 【新增】增加【CoreCmsAgentOrderDetails】表,实现代理佣金订单详情列表功能,精确到具体商品明细。 【新增】增加【CoreCmsDistributionOrderDetails】表,实现三级佣金订单详情列表功能,精确到具体商品明细。 【修复】修复代理商商铺开启按钮错用三级分销商店铺开关功能,增加代理商商铺开启开关。 【修复】修复代理商佣金明细日期选择范围错乱问题。 【优化】uniapp自带progress进度条更换为uview2.x进度条。 【优化】敏感词过滤组件启用废弃的【WordsMatch】方法,启用【StringSearch】方法替代。
This commit is contained in:
@@ -20,7 +20,6 @@ using CoreCms.Net.Configuration;
|
||||
using CoreCms.Net.IServices;
|
||||
using CoreCms.Net.Model.Entities;
|
||||
using CoreCms.Net.Model.FromBody;
|
||||
using CoreCms.Net.Model.ViewModels.Options;
|
||||
using CoreCms.Net.Model.ViewModels.UI;
|
||||
using CoreCms.Net.Utility.Extensions;
|
||||
using CoreCms.Net.Utility.Helper;
|
||||
@@ -125,6 +124,7 @@ namespace CoreCms.Net.Web.WebApi.Controllers
|
||||
distributionAgreement = CommonHelper.GetConfigDictionary(allConfigs, SystemSettingConstVars.DistributionAgreement); //分销协议
|
||||
distributionStore = CommonHelper.GetConfigDictionary(allConfigs, SystemSettingConstVars.DistributionStore).ObjectToInt(2); //是否开启店铺
|
||||
}
|
||||
|
||||
var showInviter = CommonHelper.GetConfigDictionary(allConfigs, SystemSettingConstVars.ShowInviterInfo).ObjectToInt(); //是否显示邀请人信息
|
||||
var shareTitle = CommonHelper.GetConfigDictionary(allConfigs, SystemSettingConstVars.ShareTitle); //分享标题
|
||||
var shareDesc = CommonHelper.GetConfigDictionary(allConfigs, SystemSettingConstVars.ShareDesc); //分享描述
|
||||
@@ -148,10 +148,12 @@ namespace CoreCms.Net.Web.WebApi.Controllers
|
||||
|
||||
var agentNotes = string.Empty;
|
||||
var agentAgreement = string.Empty;
|
||||
var agentStore = 2;
|
||||
if (isOpenAgent == 1 && isShowAgentPortal == 1)
|
||||
{
|
||||
agentNotes = CommonHelper.GetConfigDictionary(allConfigs, SystemSettingConstVars.AgentNotes); //用户须知
|
||||
agentAgreement = CommonHelper.GetConfigDictionary(allConfigs, SystemSettingConstVars.AgentAgreement); //分销协议
|
||||
agentStore = CommonHelper.GetConfigDictionary(allConfigs, SystemSettingConstVars.AgentStore).ObjectToInt(2); //是否开启代理店铺
|
||||
}
|
||||
|
||||
|
||||
@@ -159,7 +161,7 @@ namespace CoreCms.Net.Web.WebApi.Controllers
|
||||
{
|
||||
shopLogo,
|
||||
shopName,
|
||||
shopBeiAn = shopBeiAn,
|
||||
shopBeiAn,
|
||||
shopDesc,
|
||||
imageMax,
|
||||
storeSwitch,
|
||||
@@ -197,7 +199,8 @@ namespace CoreCms.Net.Web.WebApi.Controllers
|
||||
isOpenAgent,
|
||||
isShowAgentPortal,
|
||||
agentNotes,
|
||||
agentAgreement
|
||||
agentAgreement,
|
||||
agentStore
|
||||
};
|
||||
jm.data = model;
|
||||
return jm;
|
||||
|
||||
Reference in New Issue
Block a user