1中转仓订单退货功能 2中转仓订单运费根据oem或管理员设定调整 3其他一些问题修复

AllBase/Model/DBModel/oms_wei_order_info.cs

@@ -81,6 +81,11 @@ namespace AllBase.Model.DBModel
             get { return refundItems?.Count > 0 && refundItems.Any(r => r.status != "USER_CANCELD"); }
             set { }
         }
+        public bool IsRefundWithCancel
+        {
+            get { return refundItems?.Count > 0; }
+            set { }
+        }
         /// <summary>
         /// 紧急订单
         /// </summary>
@@ -88,6 +93,10 @@ namespace AllBase.Model.DBModel
         {
             get
             {
+                if (orderItems.Any(oi => oi.id == 3737775520624572928))
+                {
+
+                }
                 if (orderItems.Any(oi => oi.refund_status > 0 && oi.ItemTransitOrders.Count > 0 &&
                                          oi.ItemTransitOrders.Any(t => !string.IsNullOrEmpty(t.refund_status) &&
                                                                        !t.refund_status.Contains("退款成功") &&

AllBase/Model/DBModel/oms_wei_order_item_info.cs

@@ -22,22 +22,106 @@ namespace AllBase.Model.DBModel
             get { return this.GetValue(x => x.Shop); }
             set { this.SetValue(x => x.Shop, value); }
         }
+
         public oms_wei_order_info ItemOrder
         {
             get { return this.GetValue(x => x.ItemOrder); }
             set { this.SetValue(x => x.ItemOrder, value); }
         }
+
         public oms_wei_refund_info ItemRefund
         {
             get { return this.GetValue(x => x.ItemRefund); }
             set { this.SetValue(x => x.ItemRefund, value); }
         }
-        public void SetItemRefund(List<oms_wei_refund_info> itemRefunds)
+        public void SetItemRefund()
         {
-            if (itemRefunds?.Count == 1)
+            if (ItemOrder?.refundItems?.Count == 1)
                 ItemRefund = ItemOrder?.refundItems?.FirstOrDefault();
             else
                 ItemRefund = ItemOrder?.refundItems?.FirstOrDefault(r => r.sku_id == this.sku_id);
+
+            if (ItemRefund?.status != "MERCHANT_REFUND_SUCCESS" && ItemRefund?.status != "MERCHANT_RETURN_SUCCESS")
+                this.RefundResultStr = "";
+            else
+                this.RefundResultStr = "商品退款数量：" + ItemRefund.count + "，订单状态：" + ItemOrder.orderStatusStr;
+            this.ReturnWaybillId = ItemRefund?.return_waybill_id;
+            this.RefundTimeStr = BaseClass.StampToDateTime((ItemRefund?.create_time).ParseToInt()).ToString("yyyy-MM-dd HH:mm:ss");
+            this.RefundTimeVisibility = ItemRefund?.create_time > 0 ? Visibility.Visible : Visibility.Collapsed;
+        }
+
+        public List<oms_wei_external_procurement_log_info> ItemTransitOrders { get; set; } = new List<oms_wei_external_procurement_log_info>();
+        /// <summary>
+        /// 当前仓库订单（不可以是作废单）
+        /// </summary>
+        public oms_wei_external_procurement_log_info ItemTransitOrder
+        {
+            get { return this.GetValue(x => x.ItemTransitOrder); }
+            set { this.SetValue(x => x.ItemTransitOrder, value); }
+        }
+        /// <summary>
+        /// 当前仓库订单（可以是作废单）
+        /// </summary>
+        public oms_wei_external_procurement_log_info ItemTransitOrderWithVoid
+        {
+            get { return this.GetValue(x => x.ItemTransitOrderWithVoid); }
+            set { this.SetValue(x => x.ItemTransitOrderWithVoid, value); }
+        }
+
+        public List<oms_wei_external_procurement_after_sale_info> ItemTransitOrderAfterSales { get; set; } = new List<oms_wei_external_procurement_after_sale_info>();
+        public oms_wei_external_procurement_after_sale_info ItemTransitOrderAfterSale
+        {
+            get { return this.GetValue(x => x.ItemTransitOrderAfterSale); }
+            set { this.SetValue(x => x.ItemTransitOrderAfterSale, value); }
+        }
+
+        public List<order_pdd_buyer_order> PddBuyerOrders { get; set; } = new List<order_pdd_buyer_order>();
+        public order_pdd_buyer_order PddBuyerOrder
+        {
+            get { return this.GetValue(x => x.PddBuyerOrder); }
+            set { this.SetValue(x => x.PddBuyerOrder, value); }
+        }
+        public void SetTransitOrder()
+        {
+            this.ItemTransitOrder = ItemTransitOrders.FirstOrDefault(t => t.order_void_status != 1);
+            this.ItemTransitOrderWithVoid = ItemTransitOrders.FirstOrDefault();
+            this.PddBuyerOrder = PddBuyerOrders?.FirstOrDefault();
+            this.ItemTransitOrderAfterSale = ItemTransitOrderAfterSales.FirstOrDefault();
+
+            // 直接取号和更正取号显示的买手到仓库物流
+            if (ItemTransitOrder?.pre_allocated_order_no != 1 && ItemTransitOrder?.pre_allocated_order_no != 3)
+                this.TransitOrderWaybillToWareHouseStr = null;
+            else
+                this.TransitOrderWaybillToWareHouseStr = "买手物流：" + ItemTransitOrder.express_1_company + "-" + ItemTransitOrder.express_1_waybill;
+
+            // 提前取号物流
+            if (ItemTransitOrder?.pre_allocated_order_no != 2)
+                this.TransitOrderWaybillFakeStr = null;
+            else
+                this.TransitOrderWaybillFakeStr = "取号物流：" + ItemTransitOrder.express_1_company + "-" + ItemTransitOrder.express_1_waybill;
+
+            // 仓库下游物流
+            if (ItemTransitOrder == null || ItemTransitOrder.express_2_company.IsNullOrEmpty() || ItemTransitOrder.express_2_waybill.IsNullOrEmpty())
+                TransitOrderWaybillFromWareHouseStr = null;
+            else
+                TransitOrderWaybillFromWareHouseStr = "仓库物流：" + ItemTransitOrder.express_2_company + "-" + ItemTransitOrder.express_2_waybill;
+
+
+            if (this.order_id == "3737713100455836416")
+            {
+
+            }
+            // 仓库物流售后按钮上的文字，仓库作废单不存在仓库物流，所以此处必须是有效的仓库单（含作废失败）
+            if (this.ItemTransitOrder == null || !this.ItemOrder.IsRefundWithCancel)
+                AddEditTransitWarehouseAfterSaleStr = "";
+            else
+                AddEditTransitWarehouseAfterSaleStr = this.ItemTransitOrderAfterSale == null ? "添加" : "查看";
+        }
+
+        public string AddEditTransitWarehouseAfterSaleStr
+        {
+            get { return this.GetValue(x => x.AddEditTransitWarehouseAfterSaleStr); }
+            set { this.SetValue(x => x.AddEditTransitWarehouseAfterSaleStr, value); }
         }
 
         /// <summary>
@@ -79,72 +163,29 @@ namespace AllBase.Model.DBModel
             set { this.SetValue(x => x.IsBuyGoodsBtnEnabled, value); }
         }
 
-        public List<oms_wei_external_procurement_log_info> ItemTransitOrders { get; set; } = new List<oms_wei_external_procurement_log_info>();
-        /// <summary>
-        /// 当前仓库订单（不可以是作废单）
-        /// </summary>
-        public oms_wei_external_procurement_log_info ItemTransitOrder
-        {
-            get { return ItemTransitOrders.FirstOrDefault(t => t.order_void_status != 1); }
-            set { }
-        }
-        /// <summary>
-        /// 当前仓库订单（可以是作废单）
-        /// </summary>
-        public oms_wei_external_procurement_log_info ItemTransitOrderWithVoid
-        {
-            get { return ItemTransitOrders.FirstOrDefault(); }
-            set { }
-        }
-
-        public List<order_pdd_buyer_order> PddBuyerOrders { get; set; } = new List<order_pdd_buyer_order>();
-        public order_pdd_buyer_order PddBuyerOrder
-        {
-            get { return PddBuyerOrders.FirstOrDefault(); }
-            set { }
-        }
-
         /// <summary>
         /// 拍单物流
         /// </summary>
         public string TransitOrderWaybillToWareHouseStr
         {
-            get
-            {
-                // 直接取号和更正取号
-                if (ItemTransitOrder?.pre_allocated_order_no != 1 && ItemTransitOrder?.pre_allocated_order_no != 3)
-                    return null;
-                return "买手物流：" + ItemTransitOrder.express_1_company + "-" + ItemTransitOrder.express_1_waybill;
-            }
-            set { }
+            get { return this.GetValue(x => x.TransitOrderWaybillToWareHouseStr); }
+            set { this.SetValue(x => x.TransitOrderWaybillToWareHouseStr, value); }
         }
         /// <summary>
         /// 提前取号物流
         /// </summary>
         public string TransitOrderWaybillFakeStr
         {
-            get
-            {
-                // 提前取号
-                if (ItemTransitOrder?.pre_allocated_order_no != 2)
-                    return null;
-                return "取号物流：" + ItemTransitOrder.express_1_company + "-" + ItemTransitOrder.express_1_waybill;
-            }
-            set { }
+            get { return this.GetValue(x => x.TransitOrderWaybillFakeStr); }
+            set { this.SetValue(x => x.TransitOrderWaybillFakeStr, value); }
         }
         /// <summary>
         /// 仓库物流
         /// </summary>
         public string TransitOrderWaybillFromWareHouseStr
         {
-            get
-            {
-                // 仓库下游物流
-                if (ItemTransitOrder == null || ItemTransitOrder.express_2_company.IsNullOrEmpty() || ItemTransitOrder.express_2_waybill.IsNullOrEmpty())
-                    return null;
-                return "仓库物流：" + ItemTransitOrder.express_2_company + "-" + ItemTransitOrder.express_2_waybill;
-            }
-            set { }
+            get { return this.GetValue(x => x.TransitOrderWaybillFromWareHouseStr); }
+            set { this.SetValue(x => x.TransitOrderWaybillFromWareHouseStr, value); }
         }
         public string BuyerTransitWaybillStatusStr
         {
@@ -483,44 +524,33 @@ namespace AllBase.Model.DBModel
         /// <summary>
         /// 退款状态文本
         /// </summary>
-        public string refundResultStr
+        public string RefundResultStr
         {
-            get
-            {
-                if (ItemRefund == null)
-                    return "";
-                if (ItemRefund.status != "MERCHANT_REFUND_SUCCESS" && ItemRefund.status != "MERCHANT_RETURN_SUCCESS")
-                    return "";
-                
-                return "商品退款数量：" + ItemRefund.count + "，订单状态：" + ItemOrder.orderStatusStr; 
-            }
-            set { }
+            get { return this.GetValue(x => x.RefundResultStr); }
+            set { this.SetValue(x => x.RefundResultStr, value); }
         }
 
         public string ReturnWaybillId
         {
-            get { return ItemRefund?.return_waybill_id; }
-            set { }
+            get { return this.GetValue(x => x.ReturnWaybillId); }
+            set { this.SetValue(x => x.ReturnWaybillId, value); }
         }
 
         /// <summary>
         /// 订单退款时间
         /// </summary>
-        public string refund_time_str
+        public string RefundTimeStr
         {
-            get { return BaseClass.StampToDateTime((ItemRefund?.create_time).ParseToInt()).ToString("yyyy-MM-dd HH:mm:ss"); }
-            set { }
+            get { return this.GetValue(x => x.RefundTimeStr); }
+            set { this.SetValue(x => x.RefundTimeStr, value); }
         }
         /// <summary>
         /// 订单退款时间可见
         /// </summary>
-        public Visibility refund_time_visibility
+        public Visibility RefundTimeVisibility
         {
-            get 
-            { 
-                return (this.ItemRefund?.create_time) > 0 ? Visibility.Visible : Visibility.Collapsed; 
-            }
-            set { }
+            get { return this.GetValue(x => x.RefundTimeVisibility); }
+            set { this.SetValue(x => x.RefundTimeVisibility, value); }
         }
 
         /// <summary>