Merge branch 'main' of github.com:KJD2025/29WxOrder
This commit is contained in:
commit
05099584c8
5 files changed
+76
-51
No files matched your search
@@ -2202,7 +2202,7 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
|
|||||||
int index = 0;
|
int index = 0;
|
||||||
foreach (var tmpOrderItem in tmpOrderItems)
|
foreach (var tmpOrderItem in tmpOrderItems)
|
||||||
{
|
{
|
||||||
if (tmpOrderItem.order_id == "3738534855500515072")
|
if (tmpOrderItem.order_id == "3739068430223324416")
|
||||||
{
|
{
|
||||||
|
|
||||||
}
|
}
|
||||||
@@ -2237,7 +2237,8 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
|
|||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
MainWindow.Instance.orderListCtrl.GetOrder(tmpOrderItem.order_id);
|
await Task.Run(() => { MainWindow.Instance.orderListCtrl.GetOrder(tmpOrderItem.order_id); });
|
||||||
|
|
||||||
|
|
||||||
oms_wei_order_info order = null;
|
oms_wei_order_info order = null;
|
||||||
Dispatcher.Invoke(new Action(() => { order = GlobalConfig.lstOrder.FirstOrDefault(oi => oi.order_id == tmpOrderItem.order_id); }));
|
Dispatcher.Invoke(new Action(() => { order = GlobalConfig.lstOrder.FirstOrDefault(oi => oi.order_id == tmpOrderItem.order_id); }));
|
||||||
@@ -2353,7 +2354,7 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
|
|||||||
{
|
{
|
||||||
BaseMsgWindow.ShowAnimateMessage("买手退款信息更新成功" + orderItem.order_id, "Msg", 3);
|
BaseMsgWindow.ShowAnimateMessage("买手退款信息更新成功" + orderItem.order_id, "Msg", 3);
|
||||||
isSimPddAfterSaleSuccess = true;
|
isSimPddAfterSaleSuccess = true;
|
||||||
Thread.Sleep(Randomx.GetId(10000, 12001));
|
await Task.Run(() => { Thread.Sleep(Randomx.GetId(10000, 12001)); });
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
@@ -2368,7 +2369,7 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
|
|||||||
{
|
{
|
||||||
BaseMsgWindow.ShowAnimateMessage("买手退款信息更新成功", "Msg", 3);
|
BaseMsgWindow.ShowAnimateMessage("买手退款信息更新成功", "Msg", 3);
|
||||||
isSimPddAfterSaleSuccess = true;
|
isSimPddAfterSaleSuccess = true;
|
||||||
Thread.Sleep(Randomx.GetId(10000, 12001));
|
await Task.Run(() => { Thread.Sleep(Randomx.GetId(10000, 12001)); });
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -207,6 +207,7 @@
|
|||||||
|
|
||||||
<wpf:TitleContent Title="发货时间:" Visibility="{Binding ItemOrder.ship_done_time_visibility}">
|
<wpf:TitleContent Title="发货时间:" Visibility="{Binding ItemOrder.ship_done_time_visibility}">
|
||||||
<uc:UcWaterMarkTextBox1
|
<uc:UcWaterMarkTextBox1
|
||||||
|
d:Text="00-01-01 01:01:01"
|
||||||
Background="Transparent"
|
Background="Transparent"
|
||||||
BorderThickness="0"
|
BorderThickness="0"
|
||||||
IsReadOnly="True"
|
IsReadOnly="True"
|
||||||
@@ -217,6 +218,7 @@
|
|||||||
|
|
||||||
<wpf:TitleContent Title="退款时间:" Visibility="{Binding RefundTimeVisibility}">
|
<wpf:TitleContent Title="退款时间:" Visibility="{Binding RefundTimeVisibility}">
|
||||||
<uc:UcWaterMarkTextBox1
|
<uc:UcWaterMarkTextBox1
|
||||||
|
d:Text="00-01-01 01:01:01"
|
||||||
Background="Transparent"
|
Background="Transparent"
|
||||||
BorderThickness="0"
|
BorderThickness="0"
|
||||||
IsReadOnly="True"
|
IsReadOnly="True"
|
||||||
@@ -245,6 +247,16 @@
|
|||||||
WaterMark="售价" />
|
WaterMark="售价" />
|
||||||
</wpf:TitleContent>
|
</wpf:TitleContent>
|
||||||
|
|
||||||
|
<wpf:TitleContent Title="店铺运费:">
|
||||||
|
<uc:UcWaterMarkTextBox1
|
||||||
|
Background="Transparent"
|
||||||
|
BorderThickness="0"
|
||||||
|
IsReadOnly="True"
|
||||||
|
Text="{Binding PostagePriceStr}"
|
||||||
|
TextWrapping="Wrap"
|
||||||
|
WaterMark="店铺运费" />
|
||||||
|
</wpf:TitleContent>
|
||||||
|
|
||||||
<wpf:TitleContent Title="平台优惠:">
|
<wpf:TitleContent Title="平台优惠:">
|
||||||
<uc:UcWaterMarkTextBox1
|
<uc:UcWaterMarkTextBox1
|
||||||
d:Text="¥100.00"
|
d:Text="¥100.00"
|
||||||
@@ -256,24 +268,25 @@
|
|||||||
WaterMark="平台优惠" />
|
WaterMark="平台优惠" />
|
||||||
</wpf:TitleContent>
|
</wpf:TitleContent>
|
||||||
|
|
||||||
<wpf:TitleContent Title="进价:" Visibility="{Binding purchase_price_visibility}">
|
<wpf:TitleContent Title="进价:" Visibility="{Binding PurchasePriceVisibility}">
|
||||||
<uc:UcWaterMarkTextBox1
|
<uc:UcWaterMarkTextBox1
|
||||||
d:Text="¥100.00"
|
d:Text="¥100.00"
|
||||||
Background="Transparent"
|
Background="Transparent"
|
||||||
BorderThickness="0"
|
BorderThickness="0"
|
||||||
IsReadOnly="True"
|
IsReadOnly="True"
|
||||||
Text="{Binding purchase_price_str}"
|
Text="{Binding PurchasePriceStr}"
|
||||||
TextWrapping="Wrap"
|
TextWrapping="Wrap"
|
||||||
Visibility="{Binding purchase_price_visibility}"
|
Visibility="{Binding PurchasePriceVisibility}"
|
||||||
WaterMark="进价" />
|
WaterMark="进价" />
|
||||||
</wpf:TitleContent>
|
</wpf:TitleContent>
|
||||||
|
|
||||||
<wpf:TitleContent Title="运费:" Visibility="{Binding FreightVisibility}">
|
<wpf:TitleContent Title="运费:" Visibility="{Binding FreightVisibility}">
|
||||||
<uc:UcWaterMarkTextBox1
|
<uc:UcWaterMarkTextBox1
|
||||||
|
d:Text="¥100.00"
|
||||||
Background="Transparent"
|
Background="Transparent"
|
||||||
BorderThickness="0"
|
BorderThickness="0"
|
||||||
IsReadOnly="True"
|
IsReadOnly="True"
|
||||||
Text="{Binding freight_str}"
|
Text="{Binding FreightStr}"
|
||||||
TextWrapping="Wrap"
|
TextWrapping="Wrap"
|
||||||
Visibility="{Binding FreightVisibility}"
|
Visibility="{Binding FreightVisibility}"
|
||||||
WaterMark="运费" />
|
WaterMark="运费" />
|
||||||
@@ -565,15 +578,10 @@
|
|||||||
Orientation="Vertical"
|
Orientation="Vertical"
|
||||||
VerticalSpacing="2">
|
VerticalSpacing="2">
|
||||||
|
|
||||||
<!-- 状态标签行(原 Row 1-2) -->
|
<!-- 状态标签行 -->
|
||||||
<WrapPanel
|
|
||||||
x:Name="wpTransitBuyerRefundStatus"
|
|
||||||
HorizontalAlignment="Center"
|
|
||||||
VerticalAlignment="Center" />
|
|
||||||
|
|
||||||
<WrapPanel
|
<WrapPanel
|
||||||
x:Name="wpTransitWaybillStatus"
|
x:Name="wpTransitWaybillStatus"
|
||||||
Margin="0,0,0,4"
|
Margin="0,0,0,2"
|
||||||
HorizontalAlignment="Center">
|
HorizontalAlignment="Center">
|
||||||
<Border
|
<Border
|
||||||
x:Name="borderBuyStatas"
|
x:Name="borderBuyStatas"
|
||||||
@@ -698,7 +706,7 @@
|
|||||||
<WrapPanel Orientation="Horizontal">
|
<WrapPanel Orientation="Horizontal">
|
||||||
<uc:UcWaterMarkTextBox1
|
<uc:UcWaterMarkTextBox1
|
||||||
x:Name="txtTransitOrderNumStr"
|
x:Name="txtTransitOrderNumStr"
|
||||||
Margin="-2,2"
|
Margin="-2,0"
|
||||||
Padding="0"
|
Padding="0"
|
||||||
VerticalAlignment="Top"
|
VerticalAlignment="Top"
|
||||||
Background="Transparent"
|
Background="Transparent"
|
||||||
@@ -736,7 +744,7 @@
|
|||||||
Visibility="{Binding ElementName=txtOutOrderTimeQualifiedStr, Path=Text, Converter={StaticResource HasTextVisibility}}">
|
Visibility="{Binding ElementName=txtOutOrderTimeQualifiedStr, Path=Text, Converter={StaticResource HasTextVisibility}}">
|
||||||
<uc:UcWaterMarkTextBox1
|
<uc:UcWaterMarkTextBox1
|
||||||
x:Name="txtOutOrderTimeQualifiedStr"
|
x:Name="txtOutOrderTimeQualifiedStr"
|
||||||
Margin="-2,2"
|
Margin="-2,0"
|
||||||
Padding="0"
|
Padding="0"
|
||||||
VerticalAlignment="Top"
|
VerticalAlignment="Top"
|
||||||
Background="Transparent"
|
Background="Transparent"
|
||||||
@@ -754,7 +762,7 @@
|
|||||||
Foreground="{StaticResource PageOkBrush}"
|
Foreground="{StaticResource PageOkBrush}"
|
||||||
Visibility="{Binding TransitOrderWaybillToWareHouseStr, Converter={StaticResource HasTextVisibility}}">
|
Visibility="{Binding TransitOrderWaybillToWareHouseStr, Converter={StaticResource HasTextVisibility}}">
|
||||||
<uc:UcWaterMarkTextBox1
|
<uc:UcWaterMarkTextBox1
|
||||||
Margin="-2,2"
|
Margin="-2,0"
|
||||||
Padding="0"
|
Padding="0"
|
||||||
VerticalAlignment="Top"
|
VerticalAlignment="Top"
|
||||||
Background="Transparent"
|
Background="Transparent"
|
||||||
@@ -784,7 +792,7 @@
|
|||||||
<!-- 仓库物流 -->
|
<!-- 仓库物流 -->
|
||||||
<wpf:TitleContent Title="仓库物流:" Visibility="{Binding TransitOrderWaybillFromWareHouseStr, Converter={StaticResource HasTextVisibility}}">
|
<wpf:TitleContent Title="仓库物流:" Visibility="{Binding TransitOrderWaybillFromWareHouseStr, Converter={StaticResource HasTextVisibility}}">
|
||||||
<uc:UcWaterMarkTextBox1
|
<uc:UcWaterMarkTextBox1
|
||||||
Margin="-2,2"
|
Margin="-2,0"
|
||||||
Padding="0"
|
Padding="0"
|
||||||
VerticalAlignment="Top"
|
VerticalAlignment="Top"
|
||||||
Background="Transparent"
|
Background="Transparent"
|
||||||
@@ -1170,7 +1178,7 @@
|
|||||||
Background="Transparent"
|
Background="Transparent"
|
||||||
Cursor="Hand"
|
Cursor="Hand"
|
||||||
MouseLeftButtonDown="pathDirectBuyerAfterSaleAddress_MouseLeftButtonDown"
|
MouseLeftButtonDown="pathDirectBuyerAfterSaleAddress_MouseLeftButtonDown"
|
||||||
Visibility="{Binding ElementName=txtBuyerRefundAddress, Path=Visibility}">
|
Visibility="{Binding ElementName=txtDirectBuyerRefundAddress, Path=Visibility}">
|
||||||
<Path
|
<Path
|
||||||
Data="M80 432a128 128 0 0 1 128-128h384a128 128 0 0 1 128 128v384a128 128 0 0 1-128 128h-384a128 128 0 0 1-128-128v-384z m128-64a64 64 0 0 0-64 64v384a64 64 0 0 0 64 64h384a64 64 0 0 0 64-64v-384a64 64 0 0 0-64-64h-384z M816 144h-384a64 64 0 0 0-64 64 32 32 0 0 1-64 0 128 128 0 0 1 128-128h384a128 128 0 0 1 128 128v384a128 128 0 0 1-128 128 32 32 0 0 1 0-64 64 64 0 0 0 64-64v-384a64 64 0 0 0-64-64z"
|
Data="M80 432a128 128 0 0 1 128-128h384a128 128 0 0 1 128 128v384a128 128 0 0 1-128 128h-384a128 128 0 0 1-128-128v-384z m128-64a64 64 0 0 0-64 64v384a64 64 0 0 0 64 64h384a64 64 0 0 0 64-64v-384a64 64 0 0 0-64-64h-384z M816 144h-384a64 64 0 0 0-64 64 32 32 0 0 1-64 0 128 128 0 0 1 128-128h384a128 128 0 0 1 128 128v384a128 128 0 0 1-128 128 32 32 0 0 1 0-64 64 64 0 0 0 64-64v-384a64 64 0 0 0-64-64z"
|
||||||
Fill="{StaticResource PageLinkBrush}"
|
Fill="{StaticResource PageLinkBrush}"
|
||||||
|
|||||||
@@ -652,13 +652,11 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
|
|||||||
//wpBuyOrderId.Visibility = Visibility.Collapsed;
|
//wpBuyOrderId.Visibility = Visibility.Collapsed;
|
||||||
//wpBuyTime.Visibility = Visibility.Collapsed;
|
//wpBuyTime.Visibility = Visibility.Collapsed;
|
||||||
//wpTransitWaybillStatus.Visibility = Visibility.Collapsed;
|
//wpTransitWaybillStatus.Visibility = Visibility.Collapsed;
|
||||||
//wpTransitBuyerRefundStatus.Visibility = Visibility.Collapsed;
|
|
||||||
|
|
||||||
wpBuyAccount.Opacity = 0.5;
|
wpBuyAccount.Opacity = 0.5;
|
||||||
wpBuyOrderId.Opacity = 0.5;
|
wpBuyOrderId.Opacity = 0.5;
|
||||||
wpBuyTime.Opacity = 0.5;
|
wpBuyTime.Opacity = 0.5;
|
||||||
wpTransitWaybillStatus.Opacity = 0.5;
|
wpTransitWaybillStatus.Opacity = 0.5;
|
||||||
wpTransitBuyerRefundStatus.Opacity = 0.5;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -207,7 +207,7 @@ namespace AllBase.Model.DBModel
|
|||||||
/// </summary>
|
/// </summary>
|
||||||
public string ship_done_time_str
|
public string ship_done_time_str
|
||||||
{
|
{
|
||||||
get { return BaseClass.StampToDateTime(this.ship_done_time.ParseToInt()).ToString("yyyy-MM-dd HH:mm:ss"); }
|
get { return BaseClass.StampToDateTime(this.ship_done_time.ParseToInt()).ToString("yy-MM-dd HH:mm:ss"); }
|
||||||
set { }
|
set { }
|
||||||
}
|
}
|
||||||
/// <summary>
|
/// <summary>
|
||||||
@@ -666,6 +666,10 @@ namespace AllBase.Model.DBModel
|
|||||||
/// 中转仓的状态 0未使用,1已创建,2创建失败(购买失败),3已创建未有上游快递单号,4已创建有上游快递单号
|
/// 中转仓的状态 0未使用,1已创建,2创建失败(购买失败),3已创建未有上游快递单号,4已创建有上游快递单号
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public decimal? transfer_warehouse_status { get; set; }
|
public decimal? transfer_warehouse_status { get; set; }
|
||||||
|
/// <summary>
|
||||||
|
/// 店铺运费
|
||||||
|
/// </summary>
|
||||||
|
public int? postage_price { get; set; }
|
||||||
|
|
||||||
public void SetOrderTextProperty()
|
public void SetOrderTextProperty()
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -227,20 +227,20 @@ namespace AllBase.Model.DBModel
|
|||||||
}
|
}
|
||||||
public List<order_pdd_buyer_after_sale> PddBuyerAfterSales { get; set; } = new List<order_pdd_buyer_after_sale>();
|
public List<order_pdd_buyer_after_sale> PddBuyerAfterSales { get; set; } = new List<order_pdd_buyer_after_sale>();
|
||||||
public order_pdd_buyer_after_sale PddBuyerAfterSale
|
public order_pdd_buyer_after_sale PddBuyerAfterSale
|
||||||
{
|
{
|
||||||
get { return this.GetValue(x => x.PddBuyerAfterSale); }
|
get { return this.GetValue(x => x.PddBuyerAfterSale); }
|
||||||
set { this.SetValue(x => x.PddBuyerAfterSale, value); }
|
set
|
||||||
|
{
|
||||||
|
this.SetValue(x => x.PddBuyerAfterSale, value);
|
||||||
|
// 云仓买手退货地址
|
||||||
|
this.PddBuyerAfterSaleAddressStr = this.PddBuyerAfterSale?.afterSaleAddress;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
public string PddBuyerAfterSaleAddressStr
|
public string PddBuyerAfterSaleAddressStr
|
||||||
{
|
{
|
||||||
get { return this.GetValue(x => x.PddBuyerAfterSaleAddressStr); }
|
get { return this.GetValue(x => x.PddBuyerAfterSaleAddressStr); }
|
||||||
set { this.SetValue(x => x.PddBuyerAfterSaleAddressStr, value); }
|
set { this.SetValue(x => x.PddBuyerAfterSaleAddressStr, value); }
|
||||||
}
|
}
|
||||||
public string DirectPddBuyerAfterSaleAddressStr
|
|
||||||
{
|
|
||||||
get { return this.GetValue(x => x.DirectPddBuyerAfterSaleAddressStr); }
|
|
||||||
set { this.SetValue(x => x.DirectPddBuyerAfterSaleAddressStr, value); }
|
|
||||||
}
|
|
||||||
public void SetTransitOrder()
|
public void SetTransitOrder()
|
||||||
{
|
{
|
||||||
|
|
||||||
@@ -360,16 +360,6 @@ namespace AllBase.Model.DBModel
|
|||||||
AddEditTransitWarehouseReturnOrderStr = "";
|
AddEditTransitWarehouseReturnOrderStr = "";
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// 云仓买手退货地址
|
|
||||||
this.PddBuyerAfterSaleAddressStr = this.PddBuyerAfterSale?.afterSaleAddress;
|
|
||||||
|
|
||||||
if (this.order_id == "3739062243856391936")
|
|
||||||
{
|
|
||||||
|
|
||||||
}
|
|
||||||
// 直发买手退货地址
|
|
||||||
this.DirectPddBuyerAfterSaleAddressStr = this.DirectPddBuyerAfterSale?.afterSaleAddress;
|
|
||||||
}
|
}
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 仓库拒收按钮文本参数
|
/// 仓库拒收按钮文本参数
|
||||||
@@ -861,11 +851,26 @@ namespace AllBase.Model.DBModel
|
|||||||
|
|
||||||
public List<order_pdd_buyer_after_sale> DirectPddBuyerAfterSales { get; set; } = new List<order_pdd_buyer_after_sale>();
|
public List<order_pdd_buyer_after_sale> DirectPddBuyerAfterSales { get; set; } = new List<order_pdd_buyer_after_sale>();
|
||||||
public order_pdd_buyer_after_sale DirectPddBuyerAfterSale
|
public order_pdd_buyer_after_sale DirectPddBuyerAfterSale
|
||||||
{
|
{
|
||||||
get { return this.GetValue(x => x.DirectPddBuyerAfterSale); }
|
get { return this.GetValue(x => x.DirectPddBuyerAfterSale); }
|
||||||
set { this.SetValue(x => x.DirectPddBuyerAfterSale, value); }
|
set
|
||||||
}
|
{
|
||||||
public string DirectRefundStatusStr
|
if (order_id == "3738766466298321152")
|
||||||
|
{
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
this.SetValue(x => x.DirectPddBuyerAfterSale, value);
|
||||||
|
// 直发买手退货地址
|
||||||
|
this.DirectPddBuyerAfterSaleAddressStr = DirectPddBuyerAfterSale?.afterSaleAddress;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
public string DirectPddBuyerAfterSaleAddressStr
|
||||||
|
{
|
||||||
|
get { return this.GetValue(x => x.DirectPddBuyerAfterSaleAddressStr); }
|
||||||
|
set { this.SetValue(x => x.DirectPddBuyerAfterSaleAddressStr, value); }
|
||||||
|
}
|
||||||
|
public string DirectRefundStatusStr
|
||||||
{
|
{
|
||||||
get { return this.GetValue(x => x.DirectRefundStatusStr); }
|
get { return this.GetValue(x => x.DirectRefundStatusStr); }
|
||||||
set { this.SetValue(x => x.DirectRefundStatusStr, value); }
|
set { this.SetValue(x => x.DirectRefundStatusStr, value); }
|
||||||
@@ -935,11 +940,18 @@ namespace AllBase.Model.DBModel
|
|||||||
set { }
|
set { }
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public string PostagePriceStr
|
||||||
|
{
|
||||||
|
|
||||||
|
get { return "¥" + (ItemOrder?.postage_price * 0.01m / ItemOrder?.orderItems.Count).ParseToDecimal().ToString("0.00"); }
|
||||||
|
set { }
|
||||||
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 采购价文本
|
/// 采购价文本
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public string purchase_price_str
|
public string PurchasePriceStr
|
||||||
{
|
{
|
||||||
//get { return "¥" + (order_items.Sum(oi => oi.purchase_price.ParseToInt()) * 0.01m).ParseToDecimal().ToString("0.00"); }
|
//get { return "¥" + (order_items.Sum(oi => oi.purchase_price.ParseToInt()) * 0.01m).ParseToDecimal().ToString("0.00"); }
|
||||||
get { return "¥" + (purchase_price * 0.01m).ParseToDecimal().ToString("0.00"); }
|
get { return "¥" + (purchase_price * 0.01m).ParseToDecimal().ToString("0.00"); }
|
||||||
set { }
|
set { }
|
||||||
@@ -947,7 +959,7 @@ namespace AllBase.Model.DBModel
|
|||||||
/// <summary>
|
/// <summary>
|
||||||
/// 采购价文本是否可见
|
/// 采购价文本是否可见
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public Visibility purchase_price_visibility
|
public Visibility PurchasePriceVisibility
|
||||||
{
|
{
|
||||||
get { if (ItemOrder.out_amount > 0 || ItemTransitOrder?.out_amount > 0) return Visibility.Collapsed; return Visibility.Visible; }
|
get { if (ItemOrder.out_amount > 0 || ItemTransitOrder?.out_amount > 0) return Visibility.Collapsed; return Visibility.Visible; }
|
||||||
set { }
|
set { }
|
||||||
@@ -956,7 +968,7 @@ namespace AllBase.Model.DBModel
|
|||||||
/// <summary>
|
/// <summary>
|
||||||
/// 运费文本
|
/// 运费文本
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public string freight_str
|
public string FreightStr
|
||||||
{
|
{
|
||||||
//get { return "¥" + (order_items.Sum(oi => oi.freight.ParseToInt()) * 0.01m).ParseToDecimal().ToString("0.00"); }
|
//get { return "¥" + (order_items.Sum(oi => oi.freight.ParseToInt()) * 0.01m).ParseToDecimal().ToString("0.00"); }
|
||||||
get { return "¥" + (freight * 0.01m).ParseToDecimal().ToString("0.00"); }
|
get { return "¥" + (freight * 0.01m).ParseToDecimal().ToString("0.00"); }
|
||||||
@@ -1024,7 +1036,9 @@ namespace AllBase.Model.DBModel
|
|||||||
{
|
{
|
||||||
//ItemOrder.out_amount ItemTransitOrder.out_amount 只有一个有值
|
//ItemOrder.out_amount ItemTransitOrder.out_amount 只有一个有值
|
||||||
var out_amount = ItemTransitOrder?.out_amount ?? ItemOrder.out_amount / ItemOrder.orderItems.Count;
|
var out_amount = ItemTransitOrder?.out_amount ?? ItemOrder.out_amount / ItemOrder.orderItems.Count;
|
||||||
profitCount = ((real_price.ParseToInt() + cash_coupon_discounted_price.ParseToInt() - purchase_price.ParseToInt() - freight.ParseToInt() - predict_commission_fee.ParseToInt() -
|
var postage_price = ItemOrder?.postage_price ?? ItemOrder.postage_price / ItemOrder.orderItems.Count;
|
||||||
|
profitCount = ((real_price.ParseToInt() + cash_coupon_discounted_price.ParseToInt() + postage_price -
|
||||||
|
purchase_price.ParseToInt() - freight.ParseToInt() - predict_commission_fee.ParseToInt() -
|
||||||
commission_amount.ParseToInt() - out_amount.ParseToInt()) * 0.01m).ParseToDecimal();
|
commission_amount.ParseToInt() - out_amount.ParseToInt()) * 0.01m).ParseToDecimal();
|
||||||
}
|
}
|
||||||
return profitCount;
|
return profitCount;
|
||||||
|
|||||||
Reference in new issue
Block a user