淘宝拍单45% 优化中转仓拒收拦截退货等相关操作 拍单地址未修改的拦住付款按钮

AllBase/Model/DBModel/oms_wei_order_item_info.cs

@@ -368,11 +368,8 @@ namespace AllBase.Model.DBModel
 				//else if (this.ItemTransitOrderWithVoid.platform == "XDYYWC") // 义务仓已申请拒收的全部显示失败
 				//	AddEditTransitWarehouseRejectStr = "申请拒收失败*";
 			}
-
-			if (order_id == "3739154342108377600")
-			{
-
-			}
+			if (AddEditTransitWarehouseRejectStr == "申请")
+				AddEditTransitWarehouseRejectStr = "未申请";
 
 
 			RejectOrReturnPackageBtnVisibility = ItemTransitOrderWithVoid != null ? Visibility.Visible : Visibility.Collapsed;
@@ -410,27 +407,23 @@ namespace AllBase.Model.DBModel
 				if (AddEditTransitWarehouseAfterSaleStr == "添加")
 					AddEditTransitWarehouseAfterSaleStr = "";
 			}
+			if (AddEditTransitWarehouseAfterSaleStr == "添加")
+				AddEditTransitWarehouseAfterSaleStr = "未添加";
+
+			// 拦截退回物流单号
 			if (this.ItemTransitOrderAfterSale != null)
 				TransitWarehouseAfterSaleWayBillStr = (this.ItemTransitOrderAfterSale?.downstream_express_code + "-" + this.ItemTransitOrderAfterSale?.downstream_waybill).Trim('-');
 
-
-			// 拦截退回操作信息
+			// 拦截退回操作信息，如果实际拦截成功，则不显示中间报错信息
 			InterceptReturnInfoStr = "";
 			if (this.ItemTransitOrderWithVoid != null && AddEditTransitWarehouseAfterSaleStr != "拦截成功")
 				InterceptReturnInfoStr = this.ItemTransitOrderWithVoid.intercept_return_info;
 
-
+			// 退货仓退货
 			AddEditTransitWarehouseReturnOrderStr = "";
 			if (ItemRefund?.return_detail.StartsWith(GlobalConfig.TransitReturnOrderReturnAddress) == true)
 			{
-				if (order_id == "3738272473468804864")
-				{
-
-				}
-
-				if (AddEditTransitWarehouseAfterSaleStr == "添加")
-					AddEditTransitWarehouseAfterSaleStr = "";
-				AddEditTransitWarehouseReturnOrderStr = DistribReturnOrderInfo == null ? "未创建" : "已添加";
+				AddEditTransitWarehouseReturnOrderStr = DistribReturnOrderInfo == null ? "未创建" : "已创建";
 				if (DistribReturnOrderInfo?.warehouse_status == 1)
 				{
 					if ((DistribReturnOrderInfo?.real_logistics_express_code).IsNullOrEmpty())