From be8c629c25a8471077f0863b7b5bd08c3d3629bd Mon Sep 17 00:00:00 2001
From: wule <jtt_fan@qq.com>
Date: Tue, 1 Sep 2026 13:41:31 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=AD=E8=BD=AC=E4=BB=93=E8=AE=A2=E5=8D=95?=
 =?UTF-8?q?=E5=8C=85=E8=A3=B9=E6=8B=A6=E6=88=AA=E9=80=80=E5=9B=9E=E6=96=B0?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 KJD_WebService/BLL/WXXD/WXOrderManage.cs             | 10 ++++++++--
 .../WxModel/oms_wei_external_procurement_log.cs      | 12 ++++++++++++
 KJD_WebService/Web.config                            |  4 ++--
 3 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/KJD_WebService/BLL/WXXD/WXOrderManage.cs b/KJD_WebService/BLL/WXXD/WXOrderManage.cs
index 03d54cc..c0eaa74 100644
--- a/KJD_WebService/BLL/WXXD/WXOrderManage.cs
+++ b/KJD_WebService/BLL/WXXD/WXOrderManage.cs
@@ -792,6 +792,9 @@ namespace KJD_Web.BLL.WXXD
 						has_reject = row["has_reject"].ParseToInt(),
 						blocked_arrival_time = row["blocked_arrival_time"].ParseToNullableString().ParseToDateTimeNullable(),
 						rejected_time = row["rejected_time"].ParseToNullableString().ParseToDateTimeNullable(),
+					    intercept_return_info = row["intercept_return_info"].ParseToNullableString(),
+						intercept_return_status = row["intercept_return_status"].ParseToNullableInt(),
+						intercept_return_time = row["intercept_return_status"].ParseToNullableString().ParseToDateTimeNullable(),
 					});
 				}
 				return oms_wei_external_procurement_log_list;
@@ -2167,6 +2170,9 @@ namespace KJD_Web.BLL.WXXD
 		/// <returns></returns>
 		public string GetWxTaskStatus(string inputData, bool isDetail = false)
 		{
+			// 暂时先拿掉
+			//return "{\"code\":19999,\"msg\":\"参数为空\"}";
+
 			if (string.IsNullOrEmpty(inputData))
 				return "{\"code\":19999,\"msg\":\"参数为空\"}";
 
@@ -2191,8 +2197,8 @@ namespace KJD_Web.BLL.WXXD
 				endTime = TimeUtils.StampMillisecondsToDateTime(end_Time.ParseToLong());
 			if (endTime <= startTime)
 				throw new ArgumentException("结束时间必须大于开始时间");
-			//if (endTime > startTime.AddDays(10))
-			//	throw new ArgumentException("时间范围不能超过10天");
+			if (endTime > startTime.AddDays(10))
+				throw new ArgumentException("时间范围不能超过10天");
 			int startTimestamp = TimeUtils.DateTimeToTimestampSeconds(startTime);
 			int endTimestamp = TimeUtils.DateTimeToTimestampSeconds(endTime);
 
diff --git a/KJD_WebService/Model/WxModel/oms_wei_external_procurement_log.cs b/KJD_WebService/Model/WxModel/oms_wei_external_procurement_log.cs
index e8cbbd6..a5fcfe8 100644
--- a/KJD_WebService/Model/WxModel/oms_wei_external_procurement_log.cs
+++ b/KJD_WebService/Model/WxModel/oms_wei_external_procurement_log.cs
@@ -71,5 +71,17 @@ namespace KJD_Web.Model.WxModel
         /// 拒收时间
         /// </summary>
         public DateTime? rejected_time { get; set; }
+        /// <summary>
+        /// 拦截退回状态：0未处理，1已退回，2退回失败
+        /// </summary>
+        public int? intercept_return_status { get; set; }
+        /// <summary>
+        /// 拦截退回时间
+        /// </summary>
+        public DateTime? intercept_return_time { get; set; }
+        /// <summary>
+        /// 拦截退回操作信息/回调信息
+        /// </summary>
+        public string intercept_return_info { get; set; }
     }
 }
\ No newline at end of file
diff --git a/KJD_WebService/Web.config b/KJD_WebService/Web.config
index 5580f4b..0dbffb7 100644
--- a/KJD_WebService/Web.config
+++ b/KJD_WebService/Web.config
@@ -5,8 +5,8 @@
 -->
 <configuration>
   <connectionStrings>
-    <!--<add name="ConnKJD" connectionString="Max Pool Size=512;Database='kjd';Data Source='nj-cynosdbmysql-grp-hl51pkfr.sql.tencentcdb.com';Port=27660;User Id='kjd';Password='Temukjd0625';Charset=utf8mb4;"/>-->
-	<add name="ConnKJD" connectionString="Server=localhost;Port=3306;Database=mysql;Uid=root;Pwd=123456;"/>
+    <add name="ConnKJD" connectionString="Max Pool Size=512;Database='kjd';Data Source='nj-cynosdbmysql-grp-hl51pkfr.sql.tencentcdb.com';Port=27660;User Id='kjd';Password='Temukjd0625';Charset=utf8mb4;"/>
+	<!--<add name="ConnKJD" connectionString="Server=localhost;Port=3306;Database=mysql;Uid=root;Pwd=123456;"/>-->
     <add name="ConnKJDBAK" connectionString="Max Pool Size=512;Database='kjd';Data Source='nj-cynosdbmysql-grp-9s7x16mt.sql.tencentcdb.com';Port=24049;User Id='kjdbak';Password='Temukjd0126';Charset=utf8mb4;"/>
     <add name="UpdateVersion" connectionString="99999"/>
     <add name="UpdateFileDir" connectionString="C:\inetpub\wwwroot\kjd_update"/>