本地直发逻辑

This commit is contained in:
wule committed 2026-07-30 18:31:28 +08:00
1 parent ac0430f3f7
commit f00cdee502
19 files changed
+1590 -520

No files matched your search

+58 -7
View File
@@ -1,6 +1,7 @@
using AllBase.Helper;
using AllBase.Model.MvvmBaseClasses;
using NaiBa.Util.Extension;
using NPOI.OpenXmlFormats.Dml.Diagram;
using NPOI.OpenXmlFormats.Spreadsheet;
using System;
using System.Collections.Generic;
@@ -11,11 +12,23 @@ using System.Text;
using System.Threading.Tasks;
using System.Windows;
using System.Windows.Media;
using static System.Windows.Forms.VisualStyles.VisualStyleElement.StartPanel;
namespace AllBase.Model.DBModel
{
public class oms_wei_order_info : PropertyNotifyObject
{
public string OrderBuyType
{
get { return this.GetValue(x => x.OrderBuyType); }
set { this.SetValue(x => x.OrderBuyType, value); }
}
public SolidColorBrush OrderBuyTypeColor
{
get { return this.GetValue(x => x.OrderBuyTypeColor); }
set { this.SetValue(x => x.OrderBuyTypeColor, value); }
}
public ObservableCollection<oms_wei_order_item_info> orderItems { get; set; } = new ObservableCollection<oms_wei_order_item_info>();
public oms_wei_order_item_info order_item1 { get { return orderItems?.Count > 0 ? orderItems[0] : null; } }
@@ -38,7 +51,7 @@ namespace AllBase.Model.DBModel
{
get
{
if (order_id == "3737846414389704448")
if (order_id == "3738070866253717760")
{
}
if (status != 20 && status != 21) return false;
@@ -47,9 +60,11 @@ namespace AllBase.Model.DBModel
if (gift_order_status == 1 || gift_order_status == 2) return false;
if (!string.IsNullOrEmpty(out_order_no))
{
var oi = orderItems.FirstOrDefault(o => o.ItemTransitOrders.Any(t => t.out_order_no == out_order_no && t.order_void_status == 1));
if (oi == null && out_after_sale_status != "退款成功")
return false;
//var oi = orderItems.FirstOrDefault(o => o.ItemTransitOrders.Any(t => t.out_order_no == out_order_no && t.order_void_status == 1));
//if (oi == null && out_after_sale_status != "退款成功")
// return false;
if (out_after_sale_status != "退款成功")
return false;
}
return true;
}
@@ -63,7 +78,7 @@ namespace AllBase.Model.DBModel
//get { return (purchase_status == 1 || !string.IsNullOrEmpty(out_order_no)) && (status == 20 || status == 21); }
get
{
if (order_id == "3737846414389704448")
if (order_id == "3738070866253717760")
{
}
@@ -74,8 +89,10 @@ namespace AllBase.Model.DBModel
if (gift_order_status == 1 || gift_order_status == 2) return false;
if (!string.IsNullOrEmpty(out_order_no))
{
var oi = orderItems.FirstOrDefault(o => o.ItemTransitOrders.Any(t => t.out_order_no == out_order_no && t.order_void_status == 1));
if (oi != null || out_after_sale_status == "退款成功")
//var oi = orderItems.FirstOrDefault(o => o.ItemTransitOrders.Any(t => t.out_order_no == out_order_no && t.order_void_status == 1));
//if (oi != null || out_after_sale_status == "退款成功")
// return false;
if (out_after_sale_status == "退款成功")
return false;
}
return true;
@@ -460,7 +477,21 @@ namespace AllBase.Model.DBModel
set
{
this.SetValue(x => x.house_number, value);
this.AddressStr = user_name + " " + tel_number + " " + province_name + " " + city_name + " " + county_name + " " + detail_info;
if (GlobalConfig.DicDecryptOrderAddress.ContainsKey(this.order_id))
{
var addressOrder = GlobalConfig.DicDecryptOrderAddress[this.order_id];
this.user_name = addressOrder.user_name;
this.tel_number = addressOrder.tel_number;
this.tel_number_ext_info = addressOrder.tel_number_ext_info;
this.province_name = addressOrder.province_name;
this.city_name = addressOrder.city_name;
this.county_name = addressOrder.county_name;
this.detail_info = addressOrder.detail_info;
this.AddressStr = addressOrder.AddressStr;
}
}
}
/// <summary>
@@ -595,5 +626,25 @@ namespace AllBase.Model.DBModel
/// 中转仓的状态 0未使用,1已创建,2创建失败(购买失败),3已创建未有上游快递单号,4已创建有上游快递单号
/// </summary>
public decimal? transfer_warehouse_status { get; set; }
public void SetOrderTextProperty()
{
if (order_id == "3737914129536416512")
{
}
if (this.orderItems.Any(oi => oi.OrderItemExt?.buy_type == "直发"))
{
OrderBuyType = "直发";
OrderBuyTypeColor = GlobalConfig.RedTextBrush205;
}
else if (this.orderItems.Any(oi => oi.ItemTransitOrderWithVoid != null))
{
OrderBuyType = "云仓";
OrderBuyTypeColor = GlobalConfig.GreenTextBrush;
}
else
OrderBuyType = "";
}
}
}