拒收自动退款功能

AllBase/BaseClass.cs

@@ -36,7 +36,7 @@ namespace AllBase
 		/// 版本ID
 		/// </summary>
 
-        public static int VersionCount = 255;
+        public static int VersionCount = 256;
 
 		public static string ServerUrl { get; set; } = "http://1.13.195.131:9000";
 		public static string DebugUrl { get; set; } = "http://localhost:9000";

AllBase/GetHtml.cs

@@ -1158,16 +1158,27 @@ Mozilla/5.0 (Windows NT 6.1; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrom
 
 				request.KeepAlive = true;
 				request.ContentType = "application/x-www-form-urlencoded; charset=utf-8";
-				request.Headers.Add("sec-ch-ua", @"""Not(A:Brand"";v=""8"", ""Chromium"";v=""144"", ""Google Chrome"";v=""144""");
-				request.Headers.Add("sec-ch-ua-mobile", @"?0");
-				request.Headers.Add("sec-ch-ua-platform", @"""Windows""");
-				request.Headers.Add("Upgrade-Insecure-Requests", @"1");
-				request.UserAgent = "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/144.0.0.0 Safari/537.36";
-				request.Accept = "text/html,application/xhtml+xml,application/xml;q=0.9,image/avif,image/webp,image/apng,*/*;q=0.8,application/signed-exchange;v=b3;q=0.7";
-				request.Headers.Add("Sec-Fetch-Site", @"none");
-				request.Headers.Add("Sec-Fetch-Mode", @"navigate");
-				request.Headers.Add("Sec-Fetch-User", @"?1");
-				request.Headers.Add("Sec-Fetch-Dest", @"document");
+				//request.Headers.Add("sec-ch-ua", @"""Not(A:Brand"";v=""8"", ""Chromium"";v=""144"", ""Google Chrome"";v=""144""");
+				//request.Headers.Add("sec-ch-ua-mobile", @"?0");
+				//request.Headers.Add("sec-ch-ua-platform", @"""Windows""");
+				//request.Headers.Add("Upgrade-Insecure-Requests", @"1");
+				//request.UserAgent = "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/144.0.0.0 Safari/537.36";
+				//request.Accept = "text/html,application/xhtml+xml,application/xml;q=0.9,image/avif,image/webp,image/apng,*/*;q=0.8,application/signed-exchange;v=b3;q=0.7";
+				request.Accept = "*/*";
+				if (timeOut == -1)
+				{
+				    request.Timeout = BaseClass.TimeOut * 1000;
+				    request.ReadWriteTimeout = BaseClass.TimeOut * 1000;
+				}
+				else
+				{
+				    request.Timeout = timeOut * 1000;
+				    request.ReadWriteTimeout = timeOut * 1000;
+				}
+				//request.Headers.Add("Sec-Fetch-Site", @"none");
+				//request.Headers.Add("Sec-Fetch-Mode", @"navigate");
+				//request.Headers.Add("Sec-Fetch-User", @"?1");
+				//request.Headers.Add("Sec-Fetch-Dest", @"document");
 				request.Headers.Set(HttpRequestHeader.AcceptEncoding, "gzip, deflate");
 				request.Headers.Set(HttpRequestHeader.AcceptLanguage, "zh-CN,zh;q=0.9");
                 request.AllowAutoRedirect = false;

AllBase/Model/DBModel/oms_wei_external_procurement_log_info.cs

@@ -94,7 +94,17 @@ namespace AllBase.Model.DBModel
 		/// 超重费用，单位：分
 		/// </summary>
 		public int? over_weight_fee { get; set; }
-
+		/// <summary>
+		/// 0未申请拒收 1已申请拒收 2申请拒收失败 3已拒收成功 5取消拒收
+		/// </summary>
 		public int has_reject { get; set; }
-    }
+		/// <summary>
+		/// 拦截到仓时间
+		/// </summary>
+		public DateTime? blocked_arrival_time { get; set; }
+		/// <summary>
+		/// 拒收时间
+		/// </summary>
+		public DateTime? rejected_time { get; set; }
+	}
 }

AllBase/Model/DBModel/oms_wei_order_item_info.cs

@@ -261,8 +261,11 @@ namespace AllBase.Model.DBModel
 			else
 				TransitOrderWaybillFromWareHouseStr = "仓库物流：" + ItemTransitOrder.express_2_company + "-" + ItemTransitOrder.express_2_waybill;
 
+			if (order_id == "3738552208766960384")
+			{
 
-
+			}
+			TransitWarehouseRejectSuccessTimeStr = this.ItemTransitOrderWithVoid?.rejected_time == null ? "" : this.ItemTransitOrderWithVoid.rejected_time.Value.ToString("yy-MM-dd HH:mm");
 			AddEditTransitWarehouseRejectStr = "申请";
 			if (this.ItemTransitOrderWithVoid?.has_reject == 1)
 				AddEditTransitWarehouseRejectStr = "已申请拒收";
@@ -337,18 +340,24 @@ namespace AllBase.Model.DBModel
 			// 直发买手退货地址
 			this.DirectPddBuyerAfterSaleAddressStr = this.DirectPddBuyerAfterSale?.afterSaleAddress;
 		}
-        /// <summary>
-        /// 仓库拒收按钮文本参数
-        /// </summary>
-        public string AddEditTransitWarehouseRejectStr
-        {
-            get { return this.GetValue(x => x.AddEditTransitWarehouseRejectStr); }
-            set { this.SetValue(x => x.AddEditTransitWarehouseRejectStr, value); }
-        }
-        /// <summary>
-        /// 仓库退货编辑按钮文本参数
-        /// </summary>
-        public string AddEditTransitWarehouseAfterSaleStr
+		/// <summary>
+		/// 仓库拒收按钮文本参数
+		/// </summary>
+		public string AddEditTransitWarehouseRejectStr
+		{
+			get { return this.GetValue(x => x.AddEditTransitWarehouseRejectStr); }
+			set { this.SetValue(x => x.AddEditTransitWarehouseRejectStr, value); }
+		}
+		public string TransitWarehouseRejectSuccessTimeStr
+		{
+			get { return this.GetValue(x => x.TransitWarehouseRejectSuccessTimeStr); }
+			set { this.SetValue(x => x.TransitWarehouseRejectSuccessTimeStr, value); }
+		}
+		
+		/// <summary>
+		/// 仓库退货编辑按钮文本参数
+		/// </summary>
+		public string AddEditTransitWarehouseAfterSaleStr
         {
             get { return this.GetValue(x => x.AddEditTransitWarehouseAfterSaleStr); }
             set { this.SetValue(x => x.AddEditTransitWarehouseAfterSaleStr, value); }