From 1b317a5ba9f762a03c49b60bf7a624d5e651d94d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A4=A7=E7=81=B0=E7=81=B0?= <jianweie@163.com>
Date: Thu, 17 Apr 2025 09:53:47 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E4=BC=98=E5=8C=96=E3=80=91=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=EF=BC=9A=E8=AE=A2=E5=8D=95=E8=AF=A6=E6=83=85=E5=86=85?=
 =?UTF-8?q?=E3=80=90=E8=AE=A2=E5=8D=95=E8=87=AA=E5=8A=A8=E8=AF=84=E4=BB=B7?=
 =?UTF-8?q?=E6=97=B6=E9=97=B4=E3=80=91=E3=80=90=E8=AE=A2=E5=8D=95=E8=87=AA?=
 =?UTF-8?q?=E5=8A=A8=E7=A1=AE=E8=AE=A4=E6=94=B6=E8=B4=A7=E6=97=B6=E9=97=B4?=
 =?UTF-8?q?=E3=80=91=E3=80=90=E8=AE=A2=E5=8D=95=E8=87=AA=E5=8A=A8=E5=AE=8C?=
 =?UTF-8?q?=E6=88=90=E6=97=B6=E9=97=B4=E3=80=91=E4=BD=BF=E7=94=A8=E5=90=8E?=
 =?UTF-8?q?=E5=8F=B0=E9=85=8D=E7=BD=AE=E4=BF=A1=E6=81=AF=E8=BF=9B=E8=A1=8C?=
 =?UTF-8?q?=E5=B1=95=E7=A4=BA=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Controllers/CommonController.cs                 | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

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,