拒收自动退款功能

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); }