中转订单自动退货仓退货全流程

AllBase/Model/DBModel/TransitWarehouseParam.cs

@@ -45,7 +45,7 @@ XDYBJC     ;北京仓   ;胡萍     ;18565773752 ;北京市顺义区光明街道
 XDYGZC     ;广州仓   ;何外华   ;13826339849 ;广州市从化区太平镇高埔细埔街99号东门4栋3楼 ;6 ;76 ;692 ;广东省 ;广州市
 XDYWHC     ;武汉2仓  ;杨先生   ;13044121071 ;湖北省武汉市汉阳区洲头街道汉新大道2号3栋17楼 ;13 ;180 ;1548 ;湖北省 ;武汉市
 XDYSHANDC  ;山东2仓  ;鸿鹄小申 ;13044121239 ;山东省临沂市费县南外环东转盘往东200米顺通快递有限公司（仓库二楼） ;22 ;292 ;2415 ;山东省 ;临沂市
-XDYSHC     ;上海新仓 ;纪先生   ;13044121150 ;上海市上海市普陀区真如镇街道真北路2653弄G区 ;25 ;321 ;2709 ;上海市 ;上海市
+XDYSHC     ;上海新仓 ;纪先生   ;13044121150 ;上海市上海市普陀区真如镇街道真北路2653弄T区 ;25 ;321 ;2709 ;上海市 ;上海市
 XDYSZC     ;深圳仓   ;峰峰     ;15343351331 ;广东省东莞市凤岗镇浸校塘东良巷逸乐轩E栋5号楼 ;6 ;79 ;732 ;广东省 ;东莞市";
         //XDYJJC     ;晋江仓   ;安群     ;19905951984 ;福建省泉州市南安市霞美镇温山村431号鸿鹄大厦 ;4 ;58 ;569 ;福建省 ;泉州市
         //XDYCDC     ;成都仓   ;谢春虹   ;15828201479 ;四川省资阳市乐至县仙鹤大道桑都街15-19号仓库（不要放驿站，送到仓库） ;26 ;340 ;2898 ;四川省 ;资阳市

AllBase/Model/DBModel/distrib_receiver_info.cs

@@ -0,0 +1,36 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace AllBase.Model.DBModel
+{
+	public class distrib_receiver_info
+	{
+		/// <summary>
+		/// 收货人姓名
+		/// </summary>
+		public string receiver_name { get; set; }
+		/// <summary>
+		/// 收货人电话
+		/// </summary>
+		public string receiver_phone { get; set; }
+		/// <summary>
+		/// 收货省份
+		/// </summary>
+		public string receiver_province { get; set; }
+		/// <summary>
+		/// 收货城市
+		/// </summary>
+		public string receiver_city { get; set; }
+		/// <summary>
+		/// 收货区县
+		/// </summary>
+		public string receiver_area { get; set; }
+		/// <summary>
+		/// 收货详细地址
+		/// </summary>
+		public string receiver_address { get; set; }
+	}
+}

AllBase/Model/DBModel/distrib_return_order_info.cs

@@ -9,6 +9,17 @@ using System.Threading.Tasks;
 
 namespace AllBase.Model.DBModel
 {
+	public class distrib_return_order_ext : distrib_return_order_info
+	{
+		public string SenderProvince { get; set; }
+		public string SenderCity { get; set; }
+		public string SenderArea { get; set; }
+		public string SenderAddress { get; set; }
+		public string OrderCreateTime { get; set; }
+		public string UserAccount { get; set; }
+		public string PlatformCode { get; set; }
+	}
+
 	/// <summary>
 	/// 分销退货表
 	/// </summary>
@@ -148,14 +159,14 @@ namespace AllBase.Model.DBModel
 		/// </summary>
 		public int? postage { get; set; }
 		[JsonIgnore]
-		public ObservableCollection<distrib_return_order_item> distrib_return_order_items
+		public ObservableCollection<distrib_return_order_item_info> distrib_return_order_items
 		{
 			get { return this.GetValue(x => x.distrib_return_order_items); }
 			set { this.SetValue(x => x.distrib_return_order_items, value); }
 		}
 	}
 
-	public class distrib_return_order_item : PropertyNotifyObject
+	public class distrib_return_order_item_info : PropertyNotifyObject
 	{
 		public long id { get; set; }
 		public string order_code { get; set; }
@@ -177,7 +188,7 @@ namespace AllBase.Model.DBModel
 				if (value != null)
 				{
 					if (value.distrib_return_order_items == null)
-						value.distrib_return_order_items = new ObservableCollection<distrib_return_order_item>();
+						value.distrib_return_order_items = new ObservableCollection<distrib_return_order_item_info>();
 
 					//if (value.distrib_return_order_items.FirstOrDefault(it => it.spu_code + it.sku_code == this.spu_code + this.sku_code) is distrib_return_order_item item)
 					//{
@@ -187,7 +198,7 @@ namespace AllBase.Model.DBModel
 					//{
 					//	value.distrib_return_order_items.Add(this);
 					//}
-					while (value.distrib_return_order_items.FirstOrDefault(it => it.spu_code + it.sku_code == this.spu_code + this.sku_code) is distrib_return_order_item item)
+					while (value.distrib_return_order_items.FirstOrDefault(it => it.spu_code + it.sku_code == this.spu_code + this.sku_code) is distrib_return_order_item_info item)
 					{
 						value.distrib_return_order_items.Remove(item);
 					}

AllBase/Model/DBModel/oms_wei_order_info.cs

@@ -387,10 +387,16 @@ namespace AllBase.Model.DBModel
             }
         }
 
-        /// <summary>
-        /// 是否被选中
-        /// </summary>
-        public bool IsSelect
+		public string GiftOrderStatusStr
+		{
+			get { return this.GetValue(x => x.GiftOrderStatusStr); }
+			set { this.SetValue(x => x.GiftOrderStatusStr, value); }
+		}
+
+		/// <summary>
+		/// 是否被选中
+		/// </summary>
+		public bool IsSelect
         {
             get { return this.GetValue(x => x.IsSelect); }
             set { this.SetValue(x => x.IsSelect, value); }
@@ -616,12 +622,22 @@ namespace AllBase.Model.DBModel
         /// </summary>
         public string supplier_remark_exception { get; set; }
         /// <summary>
-        /// 礼物单状态，默认值0：不存在礼物单，1：礼物单已发货，2：礼物单信息已更正
+        /// 礼物单状态，默认值0：不存在礼物单，1：礼物单已发货，2：礼物单信息已更正 3 礼物单发货失败
         /// </summary>
         public int? gift_order_status
 		{
 			get { return this.GetValue(x => x.gift_order_status); }
-			set { this.SetValue(x => x.gift_order_status, value); }
+			set
+			{
+				this.SetValue(x => x.gift_order_status, value);
+				if (value == 1 || value == 2)
+					GiftOrderStatusStr = "礼品单已购买";
+				else if (value == 3)
+					GiftOrderStatusStr = "礼品单购买失败";
+				else
+					GiftOrderStatusStr = "";
+				return;
+			}
 		}
         /// <summary>
         /// 店铺备注：取微信ext_info.merchant_notes

AllBase/Model/DBModel/oms_wei_order_item_info.cs

@@ -302,10 +302,21 @@ namespace AllBase.Model.DBModel
 			AddEditTransitWarehouseReturnOrderStr = "";
 			if (ItemRefund?.return_detail == GlobalConfig.TransitReturnOrderReturnAddress)
 			{
+				if (order_id == "3738272473468804864")
+				{
+
+				}
+
 				// 关闭中转包裹退回，改为中转分销退货
 				if (AddEditTransitWarehouseAfterSaleStr != "已添加")
 					AddEditTransitWarehouseAfterSaleStr = "";
 				AddEditTransitWarehouseReturnOrderStr = DistribReturnOrderInfo == null ? "添加" : "已添加";
+				if (DistribReturnOrderInfo?.warehouse_status == 1)
+					AddEditTransitWarehouseReturnOrderStr = "已创建";
+				if (DistribReturnOrderInfo?.warehouse_status == 2)
+					AddEditTransitWarehouseReturnOrderStr = "创建异常";
+				if (DistribReturnOrderInfo?.warehouse_status == 3)
+					AddEditTransitWarehouseReturnOrderStr = "处理中";
 			}
 
 			// 云仓买手退货地址
@@ -368,16 +379,16 @@ namespace AllBase.Model.DBModel
         {
             get { return this.GetValue(x => x.TransitOrderWaybillFromWareHouseStr); }
             set { this.SetValue(x => x.TransitOrderWaybillFromWareHouseStr, value); }
-        }
-        public string TransitWarehouseAfterSaleWayBillStr
-        {
-            get { return this.GetValue(x => x.TransitWarehouseAfterSaleWayBillStr); }
-            set { this.SetValue(x => x.TransitWarehouseAfterSaleWayBillStr, value); }
-        }
-        #endregion
+		}
+		public string TransitWarehouseAfterSaleWayBillStr
+		{
+			get { return this.GetValue(x => x.TransitWarehouseAfterSaleWayBillStr); }
+			set { this.SetValue(x => x.TransitWarehouseAfterSaleWayBillStr, value); }
+		}
+		#endregion
 
-        #region 买手物流参数
-        public string BuyerTransitWaybillStatusStr
+		#region 买手物流参数
+		public string BuyerTransitWaybillStatusStr
         {
             get { return this.GetValue(x => x.BuyerTransitWaybillStatusStr); }
             set { this.SetValue(x => x.BuyerTransitWaybillStatusStr, value); }