diff --git a/CoreCms.Net.Web.WebApi/Controllers/CommonController.cs b/CoreCms.Net.Web.WebApi/Controllers/CommonController.cs index 8aa0c0fe..8aa35677 100644 --- a/CoreCms.Net.Web.WebApi/Controllers/CommonController.cs +++ b/CoreCms.Net.Web.WebApi/Controllers/CommonController.cs @@ -169,6 +169,10 @@ namespace CoreCms.Net.Web.WebApi.Controllers var reshipCoordinate = CommonHelper.GetConfigDictionary(allConfigs, SystemSettingConstVars.ReshipCoordinate); //退货坐标 var orderCancelTime = CommonHelper.GetConfigDictionary(allConfigs, SystemSettingConstVars.OrderCancelTime).ObjectToInt(60); //订单取消时间 + var orderAutoEvalTime = CommonHelper.GetConfigDictionary(allConfigs, SystemSettingConstVars.OrderAutoEvalTime).ObjectToInt(3); //订单自动评价时间 + var orderAutoSignTime = CommonHelper.GetConfigDictionary(allConfigs, SystemSettingConstVars.OrderAutoSignTime).ObjectToInt(12); //订单自动确认收货时间 + var orderCompleteTime = CommonHelper.GetConfigDictionary(allConfigs, SystemSettingConstVars.OrderCompleteTime).ObjectToInt(15); //订单自动完成时间 + //代理 var isOpenAgent = CommonHelper.GetConfigDictionary(allConfigs, SystemSettingConstVars.IsOpenAgent).ObjectToInt(); //是否开启代理模块 @@ -183,12 +187,12 @@ namespace CoreCms.Net.Web.WebApi.Controllers agentAgreement = CommonHelper.GetConfigDictionary(allConfigs, SystemSettingConstVars.AgentAgreement); //分销协议 agentStore = CommonHelper.GetConfigDictionary(allConfigs, SystemSettingConstVars.AgentStore).ObjectToInt(2); //是否开启代理店铺 } - + //腾讯地图key var qqMapKey = CommonHelper.GetConfigDictionary(allConfigs, SystemSettingConstVars.QqMapKey); //腾讯地图key - var checkInIsOpen = CommonHelper.GetConfigDictionary(allConfigs, SystemSettingConstVars.CheckInIsOpen).ObjectToInt(2); //订单取消时间 - var isAllowUserSecondBind = CommonHelper.GetConfigDictionary(allConfigs, SystemSettingConstVars.IsAllowUserSecondBind).ObjectToInt(2); //订单取消时间 + var checkInIsOpen = CommonHelper.GetConfigDictionary(allConfigs, SystemSettingConstVars.CheckInIsOpen).ObjectToInt(2); //是否开启签到 + var isAllowUserSecondBind = CommonHelper.GetConfigDictionary(allConfigs, SystemSettingConstVars.IsAllowUserSecondBind).ObjectToInt(2); //是否允许自己注册的用户二次扫码绑定上级 var model = new @@ -237,6 +241,9 @@ namespace CoreCms.Net.Web.WebApi.Controllers reshipAddress, reshipCoordinate, orderCancelTime, + orderAutoEvalTime, + orderAutoSignTime, + orderCompleteTime, isOpenAgent, isShowAgentPortal, agentNotes,