取消代发后再发送礼物单

AllBase/Model/DBModel/oms_wei_order_info.cs

@@ -18,7 +18,16 @@ namespace AllBase.Model.DBModel
 {
     public class oms_wei_order_info : PropertyNotifyObject
     {
-        public string OrderBuyType
+		/// <summary>
+		/// 订单对应店铺
+		/// </summary>
+		public ShopLoginInfo Shop
+		{
+			get { return this.GetValue(x => x.Shop); }
+			set { this.SetValue(x => x.Shop, value); }
+		}
+
+		public string OrderBuyType
         {
             get { return this.GetValue(x => x.OrderBuyType); }
             set { this.SetValue(x => x.OrderBuyType, value); }
@@ -33,6 +42,12 @@ namespace AllBase.Model.DBModel
 
         public ObservableCollection<oms_wei_refund_info> refundItems { get; set; } = new ObservableCollection<oms_wei_refund_info>();
 
+		public bool IsWaitBuyOrIsWaitSend
+		{
+			get { return IsWaitBuy || IsWaitSend; }
+			set { }
+		}
+
         /// <summary>
         /// 待采购
         /// </summary>
@@ -596,7 +611,11 @@ namespace AllBase.Model.DBModel
         /// <summary>
         /// 礼物单状态，默认值0：不存在礼物单，1：礼物单已发货，2：礼物单信息已更正
         /// </summary>
-        public int? gift_order_status { get; set; }
+        public int? gift_order_status
+		{
+			get { return this.GetValue(x => x.gift_order_status); }
+			set { this.SetValue(x => x.gift_order_status, value); }
+		}
         /// <summary>
         /// 店铺备注：取微信ext_info.merchant_notes
         /// </summary>
@@ -660,11 +679,9 @@ namespace AllBase.Model.DBModel
 
         public void SetOrderTextProperty()
         {
-            if (order_id == "3737914129536416512")
-            {
+			Shop = GlobalConfig.ShopLoginList.FirstOrDefault(s => s.ErpShopId == shop_id.ParseToString());
 
-            }
-            if (this.orderItems.Any(oi => oi.OrderItemExt?.buy_type == "直发") && this.orderItems.Any(oi => oi.ItemTransitOrderWithVoid != null))
+			if (this.orderItems.Any(oi => oi.OrderItemExt?.buy_type == "直发") && this.orderItems.Any(oi => oi.ItemTransitOrderWithVoid != null))
             {
                 OrderBuyType = "云改直";
                 OrderBuyTypeColor = GlobalConfig.PurpleBrush190;