Merge branch 'main' of github.com:jtt-fan/29WxOrder

AllBase/Model/DBModel/oms_wei_external_procurement_log_info.cs

@@ -106,5 +106,17 @@ namespace AllBase.Model.DBModel
 		/// 拒收时间
 		/// </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; }
 	}
 }

AllBase/Model/DBModel/oms_wei_order_item_info.cs

@@ -284,8 +284,8 @@ namespace AllBase.Model.DBModel
 			{
 				if (AddEditTransitWarehouseRejectStr == "申请")
 					AddEditTransitWarehouseRejectStr = "";
-				else if (this.ItemTransitOrderWithVoid.platform == "XDYYWC") // 义务仓已申请拒收的全部显示失败
-					AddEditTransitWarehouseRejectStr = "申请拒收失败*";
+				//else if (this.ItemTransitOrderWithVoid.platform == "XDYYWC") // 义务仓已申请拒收的全部显示失败
+				//	AddEditTransitWarehouseRejectStr = "申请拒收失败*";
 			}
 
 			if (order_id == "3738396781943865344")
@@ -297,19 +297,23 @@ namespace AllBase.Model.DBModel
 			AddEditTransitWarehouseAfterSaleStr = "添加";
 			if (this.ItemTransitOrderAfterSale != null) 
 				AddEditTransitWarehouseAfterSaleStr = "已添加";
+			if (this.ItemTransitOrderAfterSale != null && (ItemTransitOrderWithVoid.intercept_return_status == 1 || !string.IsNullOrEmpty(ItemTransitOrderAfterSale.downstream_waybill)))
+				AddEditTransitWarehouseAfterSaleStr = "拦截成功";
+			//if (this.ItemTransitOrderAfterSale != null && ItemTransitOrderWithVoid.intercept_return_status == 2)
+			//	AddEditTransitWarehouseAfterSaleStr = "拦截失败";
 			if (this.ItemTransitOrderWithVoid == null || this.ItemRefund?.type != "REFUND" ||
 				!(this.ItemRefund?.return_waybill_id).IsNullOrEmpty() || !(this.ItemRefund?.return_detail).IsNullOrEmpty() ||
 				(!this.ItemOrder.IsEmergency && !this.ItemOrder.isAbnormal && !this.ItemOrder.IsRefund) || 
 				this.ItemTransitOrderWithVoid.warehouse_status == 0 ||
 				(this.ItemTransitOrderWithVoid.warehouse_status == 1 && !AddEditTransitWarehouseRejectStr.IsNullOrEmpty() && !AddEditTransitWarehouseRejectStr.StartsWith("申请拒收失败")))
 			{
-				if (AddEditTransitWarehouseAfterSaleStr != "已添加")
+				if (AddEditTransitWarehouseAfterSaleStr == "添加")
 					AddEditTransitWarehouseAfterSaleStr = "";
 			}
 			// 退货退款的，不能拦截退回总店。如果是退到退货仓，则退货仓流程，否则店家自行收货退回总店。
 			if (!RefundAddressStr.ParseToString().Trim().IsNullOrEmpty() || this.ItemRefund?.type != "REFUND")
 			{
-				if (AddEditTransitWarehouseAfterSaleStr != "已添加")
+				if (AddEditTransitWarehouseAfterSaleStr == "添加")
 					AddEditTransitWarehouseAfterSaleStr = "";
 			}
 			if (this.ItemTransitOrderAfterSale != null)
@@ -324,7 +328,7 @@ namespace AllBase.Model.DBModel
 				}
 
 				// 关闭中转包裹退回，改为中转分销退货
-				if (AddEditTransitWarehouseAfterSaleStr != "已添加")
+				if (AddEditTransitWarehouseAfterSaleStr == "添加")
 					AddEditTransitWarehouseAfterSaleStr = "";
 				AddEditTransitWarehouseReturnOrderStr = DistribReturnOrderInfo == null ? "添加" : "已添加";
 				if (DistribReturnOrderInfo?.warehouse_status == 1)