diff --git a/29WxOrderWpf/Ctrls/OrderCtrls/OrderTransitListDetailCtrl.xaml b/29WxOrderWpf/Ctrls/OrderCtrls/OrderTransitListDetailCtrl.xaml
index daa2f63..3f6893a 100644
--- a/29WxOrderWpf/Ctrls/OrderCtrls/OrderTransitListDetailCtrl.xaml
+++ b/29WxOrderWpf/Ctrls/OrderCtrls/OrderTransitListDetailCtrl.xaml
@@ -113,7 +113,7 @@
d:Background="{StaticResource PageOkBrush}"
d:BorderBrush="{StaticResource PageOkBrush}"
Background="{Binding TransitDetailRefundStatusBackColor}"
- BorderBrush="{Binding TransitDeatilRefundStatusBackColor}"
+ BorderBrush="{Binding TransitDetailRefundStatusBackColor}"
BorderThickness="1"
CornerRadius="2"
Visibility="{Binding TransitDetailRefundStatusStrVisibility}">
diff --git a/AllBase/Model/DBModel/oms_wei_order_item_info.cs b/AllBase/Model/DBModel/oms_wei_order_item_info.cs
index 33dfc68..8d4ee04 100644
--- a/AllBase/Model/DBModel/oms_wei_order_item_info.cs
+++ b/AllBase/Model/DBModel/oms_wei_order_item_info.cs
@@ -1415,54 +1415,61 @@ namespace AllBase.Model.DBModel
catch { SkuAttrStr = "获取失败"; }
}
- ///
- /// 拼多多秒退异常重拍按钮可见条件
- ///
- public Visibility BtnAbnormalBtnVisibility
- {
- get { return this.GetValue(x => x.BtnAbnormalBtnVisibility); }
- set { this.SetValue(x => x.BtnAbnormalBtnVisibility, value); }
- }
- ///
- /// 直发按钮可见条件
- ///
- public Visibility BtnDirectBuyOrderVisibility
- {
- get { return this.GetValue(x => x.BtnDirectBuyOrderVisibility); }
- set { this.SetValue(x => x.BtnDirectBuyOrderVisibility, value); }
- }
- public void SetAbnormalAndDirectBtnVisibility()
- {
- // 买手秒退异常重拍
- BtnAbnormalBtnVisibility = Visibility.Visible;
- // 不是异常单的不可异常重拍
- if (this.ItemOrder?.IsAbnormal != true)
- BtnAbnormalBtnVisibility = Visibility.Collapsed;
- // 买手未退款的，中转正式取号以后的，不可异常重拍
- else if (this.ItemTransitOrder?.refund_status != "买手退款成功" ||
- this.WarehouseWaybillStatusStr == "中转已取号" || this.WarehouseWaybillStatusStr == "中转已入库" ||
+ ///
+ /// 作废按钮可见性
+ ///
+ public Visibility BtnVoidTransitOrderVisibility
+ {
+ get { return this.GetValue(x => x.BtnVoidTransitOrderVisibility); }
+ set { this.SetValue(x => x.BtnVoidTransitOrderVisibility, value); }
+ }
+ ///
+ /// 异常重拍按钮可见性
+ ///
+ public Visibility BtnAbnormalOrderRebuyVisibility
+ {
+ get { return this.GetValue(x => x.BtnAbnormalOrderRebuyVisibility); }
+ set { this.SetValue(x => x.BtnAbnormalOrderRebuyVisibility, value); }
+ }
+ ///
+ /// 直发按钮可见条件
+ ///
+ public Visibility BtnDirectBuyOrderVisibility
+ {
+ get { return this.GetValue(x => x.BtnDirectBuyOrderVisibility); }
+ set { this.SetValue(x => x.BtnDirectBuyOrderVisibility, value); }
+ }
+ public void SetAbnormalAndDirectBtnVisibility()
+ {
+ bool? _itemOrderIsAbnormal = ItemOrder?.GetIsAbnormal();
+ bool? _itemOrderIsWaitBuy = ItemOrder?.GetIsWaitBuy();
+
+ // 买手秒退异常重拍
+ var _btnAbnormalOrderRebuyVisibility = Visibility.Visible;
+ // 不是异常单的不可异常重拍
+ if (_itemOrderIsAbnormal != true)
+ _btnAbnormalOrderRebuyVisibility = Visibility.Collapsed;
+ // 买手未退款的，中转正式取号以后的，不可异常重拍
+ else if (this.ItemTransitOrder?.refund_status != "买手退款成功" ||
+ this.WarehouseWaybillStatusStr == "中转已取号" || this.WarehouseWaybillStatusStr == "中转已入库" ||
this.WarehouseWaybillStatusStr == "中转已出库" || this.WarehouseWaybillStatusStr == "中转拦截到仓")
- BtnAbnormalBtnVisibility = Visibility.Collapsed;
- // 已正式取号的，不可异常重拍
- if (this.ItemTransitOrder?.pre_allocated_order_no == 1 || this.ItemTransitOrder?.pre_allocated_order_no == 3)
- BtnAbnormalBtnVisibility = Visibility.Collapsed;
- // 仓库异常的异常单不可异常重拍
- List rawMsgKeyWords = new List { "取号异常", "无法调用" };
- if (rawMsgKeyWords.Any(k => (this.ItemTransitOrderWithVoid?.raw_message).ParseToString().Contains(k)) && this.ItemTransitOrderWithVoid?.transfer_warehouse_status != 1)
- BtnAbnormalBtnVisibility = Visibility.Collapsed;
+ _btnAbnormalOrderRebuyVisibility = Visibility.Collapsed;
+ // 已正式取号的，不可异常重拍
+ else if (this.ItemTransitOrder?.pre_allocated_order_no == 1 || this.ItemTransitOrder?.pre_allocated_order_no == 3)
+ _btnAbnormalOrderRebuyVisibility = Visibility.Collapsed;
+ // 仓库异常的异常单不可异常重拍
+ List rawMsgKeyWords = new List { "取号异常", "无法调用" };
+ if (rawMsgKeyWords.Any(k => (this.ItemTransitOrderWithVoid?.raw_message).ParseToString().Contains(k)) && this.ItemTransitOrderWithVoid?.transfer_warehouse_status != 1)
+ _btnAbnormalOrderRebuyVisibility = Visibility.Collapsed;
+ BtnAbnormalOrderRebuyVisibility = _btnAbnormalOrderRebuyVisibility;
- if (order_id == "3738706885587395328")
- {
-
- }
-
- // 直拍按钮
- BtnDirectBuyOrderVisibility = Visibility.Collapsed;
+ // 直拍按钮
+ BtnDirectBuyOrderVisibility = Visibility.Collapsed;
//if (GlobalConfig.CurrentBuyPlatform == "pdd")
{
- if (this.ItemOrder?.GetIsWaitBuy() == true && this.BuyGoodsBtnTxt != "关联拍单")
+ if (_itemOrderIsWaitBuy == true && this.BuyGoodsBtnTxt != "关联拍单")
BtnDirectBuyOrderVisibility = Visibility.Visible;
- if (this.ItemOrder?.GetIsAbnormal() == true && this.refund_status <= 1)
+ if (_itemOrderIsAbnormal == true && this.refund_status <= 1)
{
//if (BtnAbnormalBtnVisibility == Visibility.Collapsed && (this.ItemOrder.out_order_no.IsNullOrEmpty() || this.ItemOrder.out_after_sale_status == "退款成功"))
if (this.ItemOrder.out_order_no.IsNullOrEmpty() || this.ItemOrder.out_after_sale_status == "退款成功")
@@ -1472,7 +1479,7 @@ namespace AllBase.Model.DBModel
//else if (GlobalConfig.CurrentBuyPlatform == "tb")
{
}
- }
+ }
public string RefundStatusStr
{
@@ -1485,17 +1492,6 @@ namespace AllBase.Model.DBModel
set { this.SetValue(x => x.RefundStatusStrVisibility, value); }
}
- public Visibility BtnVoidTransitOrderVisibility
- {
- get { return this.GetValue(x => x.BtnVoidTransitOrderVisibility); }
- set { this.SetValue(x => x.BtnVoidTransitOrderVisibility, value); }
- }
- public Visibility BtnAbnormalOrderRebuyVisibility
- {
- get { return this.GetValue(x => x.BtnAbnormalOrderRebuyVisibility); }
- set { this.SetValue(x => x.BtnAbnormalOrderRebuyVisibility, value); }
- }
-
public Visibility OutOrderNoVisibility
{
get { return this.GetValue(x => x.OutOrderNoVisibility); }
@@ -1506,152 +1502,152 @@ namespace AllBase.Model.DBModel
/// 订单商品表数据库id
///
public long id { get; set; }
- public long shop_id { get; set; }
- ///
- /// 商户ID
- ///
- public long merchant_id { get; set; }
- ///
- /// 订单id（平台订单id）
- ///
- public string order_id { get; set; }
- ///
- /// 商品spuid
- ///
- public string product_id { get; set; }
- public string sku_id { get; set; }
- ///
- /// sku小图
- ///
- public string thumb_img
+ public long shop_id { get; set; }
+ ///
+ /// 商户ID
+ ///
+ public long merchant_id { get; set; }
+ ///
+ /// 订单id（平台订单id）
+ ///
+ public string order_id { get; set; }
+ ///
+ /// 商品spuid
+ ///
+ public string product_id { get; set; }
+ public string sku_id { get; set; }
+ ///
+ /// sku小图
+ ///
+ public string thumb_img
{
get { return this.GetValue(x => x.thumb_img); }
set { this.SetValue(x => x.thumb_img, value); IsLoadThumbImg = !string.IsNullOrEmpty(value); ThumbImgStr = thumb_img + "?imageView2/1/w/100/h/100/format/jpg/q/80"; }
}
- ///
- /// sku数量
- ///
- public int? sku_cnt { get; set; }
- ///
- /// 售卖单价（单位：分）
- ///
- public int? sale_price { get; set; }
- ///
- /// 商品名称
- ///
- public string title { get; set; }
- ///
- /// 正在售后/退款流程中的 sku 数量
- ///
- public int? on_aftersale_sku_cnt { get; set; }
- ///
- /// 完成售后/退款的 sku 数量
- ///
- public int? finish_aftersale_sku_cnt { get; set; }
- ///
- /// 商品编码
- ///
- public string sku_code { get; set; }
- ///
- /// 市场单价（单位：分）
- ///
- public int? market_price { get; set; }
- ///
- /// sku属性JSON
- ///
- public string sku_attrs
+ ///
+ /// sku数量
+ ///
+ public int? sku_cnt { get; set; }
+ ///
+ /// 售卖单价（单位：分）
+ ///
+ public int? sale_price { get; set; }
+ ///
+ /// 商品名称
+ ///
+ public string title { get; set; }
+ ///
+ /// 正在售后/退款流程中的 sku 数量
+ ///
+ public int? on_aftersale_sku_cnt { get; set; }
+ ///
+ /// 完成售后/退款的 sku 数量
+ ///
+ public int? finish_aftersale_sku_cnt { get; set; }
+ ///
+ /// 商品编码
+ ///
+ public string sku_code { get; set; }
+ ///
+ /// 市场单价（单位：分）
+ ///
+ public int? market_price { get; set; }
+ ///
+ /// sku属性JSON
+ ///
+ public string sku_attrs
{
get { return this.GetValue(x => x.sku_attrs); }
set { this.SetValue(x => x.sku_attrs, value); SetSkuAttrStr(); }
}
- ///
- /// sku实付总价，取estimate_price和change_price中较小值
- ///
- public int? real_price { get; set; }
- ///
- /// 商品外部spuid
- ///
- public string out_product_id { get; set; }
- ///
- /// 采购价
- ///
- public int? purchase_price { get; set; }
- ///
- /// 运费
- ///
- public int? freight { get; set; }
- ///
- /// 商品外部skuid
- ///
- public string out_sku_id { get; set; }
- ///
- /// 是否有优惠金额，非必填，默认为false
- ///
- public string is_discounted { get; set; }
- ///
- /// 优惠后sku总价，非必填，is_discounted为true时有值
- ///
- public int? estimate_price { get; set; }
- ///
- /// 是否修改过价格，非必填，默认为false
- ///
- public string is_change_price { get; set; }
- ///
- /// 改价后sku总价，非必填，is_change_price为true时有值
- ///
- public int? change_price { get; set; }
- ///
- /// 订单内商品维度平台券优惠金额(利润需要计算这个金额在内)
- ///
- public int? cash_coupon_discounted_price { get; set; }
- ///
- /// 区域库存id
- ///
- public string out_warehouse_id { get; set; }
- ///
- /// 退货地址
- ///
- public string return_address { get; set; }
- ///
- /// 商品发货信息JSON
- ///
- public string sku_deliver_info { get; set; }
- ///
- /// 商品额外服务信息JSON
- ///
- public string extra_service { get; set; }
- ///
- /// 是否使用了会员积分抵扣
- ///
- public string use_deduction { get; set; }
- ///
- /// 会员积分抵扣金额，单位为分
- ///
- public int? deduction_price { get; set; }
- ///
- /// 平台服务费（微信小店：预计技术服务费），单位为分
- ///
- public int? predict_commission_fee { get; set; }
- ///
- /// 达人佣金（微信小店：分账金额），单位为分
- ///
- public int? commission_amount { get; set; }
- ///
- /// 商品优惠券信息，逐步替换 order.order_detail.coupon_info
- ///
- public string order_product_coupon_info_list { get; set; }
- ///
- /// 商品id(o_goods外键)
- ///
- public long? erp_goods_id { get; set; }
- ///
- /// 商品skuid(o_goods_sku外键)
- ///
- public long? erp_goods_sku_id { get; set; }
- ///
- /// 售后状态 1：无售后或售后关闭，2：售后处理中，3：退款中，4：退款成功，11：已取消(售后完成订单取消)
- ///
- public int? refund_status
+ ///
+ /// sku实付总价，取estimate_price和change_price中较小值
+ ///
+ public int? real_price { get; set; }
+ ///
+ /// 商品外部spuid
+ ///
+ public string out_product_id { get; set; }
+ ///
+ /// 采购价
+ ///
+ public int? purchase_price { get; set; }
+ ///
+ /// 运费
+ ///
+ public int? freight { get; set; }
+ ///
+ /// 商品外部skuid
+ ///
+ public string out_sku_id { get; set; }
+ ///
+ /// 是否有优惠金额，非必填，默认为false
+ ///
+ public string is_discounted { get; set; }
+ ///
+ /// 优惠后sku总价，非必填，is_discounted为true时有值
+ ///
+ public int? estimate_price { get; set; }
+ ///
+ /// 是否修改过价格，非必填，默认为false
+ ///
+ public string is_change_price { get; set; }
+ ///
+ /// 改价后sku总价，非必填，is_change_price为true时有值
+ ///
+ public int? change_price { get; set; }
+ ///
+ /// 订单内商品维度平台券优惠金额(利润需要计算这个金额在内)
+ ///
+ public int? cash_coupon_discounted_price { get; set; }
+ ///
+ /// 区域库存id
+ ///
+ public string out_warehouse_id { get; set; }
+ ///
+ /// 退货地址
+ ///
+ public string return_address { get; set; }
+ ///
+ /// 商品发货信息JSON
+ ///
+ public string sku_deliver_info { get; set; }
+ ///
+ /// 商品额外服务信息JSON
+ ///
+ public string extra_service { get; set; }
+ ///
+ /// 是否使用了会员积分抵扣
+ ///
+ public string use_deduction { get; set; }
+ ///
+ /// 会员积分抵扣金额，单位为分
+ ///
+ public int? deduction_price { get; set; }
+ ///
+ /// 平台服务费（微信小店：预计技术服务费），单位为分
+ ///
+ public int? predict_commission_fee { get; set; }
+ ///
+ /// 达人佣金（微信小店：分账金额），单位为分
+ ///
+ public int? commission_amount { get; set; }
+ ///
+ /// 商品优惠券信息，逐步替换 order.order_detail.coupon_info
+ ///
+ public string order_product_coupon_info_list { get; set; }
+ ///
+ /// 商品id(o_goods外键)
+ ///
+ public long? erp_goods_id { get; set; }
+ ///
+ /// 商品skuid(o_goods_sku外键)
+ ///
+ public long? erp_goods_sku_id { get; set; }
+ ///
+ /// 售后状态 1：无售后或售后关闭，2：售后处理中，3：退款中，4：退款成功，11：已取消(售后完成订单取消)
+ ///
+ public int? refund_status
{
get { return this.GetValue(x => x.refund_status); }
set
@@ -1670,11 +1666,11 @@ namespace AllBase.Model.DBModel
}
}
- public void SetOrderItemTextProperty()
- {
- CreateDateTime = BaseClass.StampToDateTime((ItemOrder?.create_time).ParseToInt());
- CreateDateTimeStr = CreateDateTime.ToString("yy-MM-dd HH:mm:ss");
- UpdateTimeStr = BaseClass.StampToDateTime((ItemOrder?.update_time).ParseToInt()).ToString("yy-MM-dd HH:mm:ss");
+ public void SetOrderItemTextProperty()
+ {
+ CreateDateTime = BaseClass.StampToDateTime((ItemOrder?.create_time).ParseToInt());
+ CreateDateTimeStr = CreateDateTime.ToString("yy-MM-dd HH:mm:ss");
+ UpdateTimeStr = BaseClass.StampToDateTime((ItemOrder?.update_time).ParseToInt()).ToString("yy-MM-dd HH:mm:ss");
//if (PurpleBrush == null && GlobalConfig.Dispatcher != null)
//{
@@ -1686,14 +1682,13 @@ namespace AllBase.Model.DBModel
//}
this.SetItemRefund();
- this.SetTransitOrder();
- this.SetDirectOrder();
- this.SetBuyerTransitWaybillStatusStr();
- this.SetWarehouseWaybillStatusStr();
+ this.SetTransitOrder();
+ this.SetDirectOrder();
+ this.SetBuyerTransitWaybillStatusStr();
+ this.SetWarehouseWaybillStatusStr();
- // 拍单、代发等信息判断并控制拍单按钮
- this.UpdateOrderItemBuyButton();
- this.SetAbnormalAndDirectBtnVisibility();
+ // 拍单、代发等信息判断并控制拍单按钮
+ this.UpdateOrderItemBuyButton();
SetEWaybillInfo();
SetOutOrderTimeQualifiedStr();
@@ -1711,12 +1706,19 @@ namespace AllBase.Model.DBModel
ItemTransitOutOrderBuyerStrVisibility = (ItemTransitOrderWithVoid?.OutOrderBuyerStr).IsNullOrEmpty() ? Visibility.Collapsed : Visibility.Visible;
ItemTransitOutOrderNoStrVisibility = (ItemTransitOrderWithVoid?.OutOrderNumStr).IsNullOrEmpty() ? Visibility.Collapsed : Visibility.Visible;
}
+
+
+ //oms_wei_order_item_transit_model transitInfo = new oms_wei_order_item_transit_model()
+ //{
+ // OrderItem = this,
+ //};
+ //TransitPackageList = [.. transitInfo.OrderItemTransitDetailList];
}
/// 初始化物流明细信息
public void SetEWaybillInfo()
{
- if(order_id == "3738794693820307200")
+ if (order_id == "3738794693820307200")
{
}
@@ -1812,11 +1814,8 @@ namespace AllBase.Model.DBModel
BtnVoidTransitOrderVisibility = Visibility.Visible;
else
BtnVoidTransitOrderVisibility = Visibility.Collapsed;
- // 异常重拍
- if (order_item.GetIsAbnormalOrderRebuy())
- BtnAbnormalOrderRebuyVisibility = Visibility.Visible;
- else
- BtnAbnormalOrderRebuyVisibility = Visibility.Collapsed;
+ // 异常重拍和直拍按钮
+ SetAbnormalAndDirectBtnVisibility();
}
///
@@ -1826,7 +1825,7 @@ namespace AllBase.Model.DBModel
///
public bool GetIsAbnormalOrderRebuy()
{
- if (order_id == "3740040052771291904")
+ if (order_id == "3740287208579314176")
{
}
@@ -1834,11 +1833,12 @@ namespace AllBase.Model.DBModel
var order_item = this;
// 不是异常单的不可异常重拍
- if (order_item?.ItemOrder?.IsAbnormal != true)
+ if (order_item?.ItemOrder?.GetIsAbnormal() != true)
return false;
// 买手未退款的，中转正式取号以后的，不可异常重拍
if (order_item.ItemTransitOrderWithVoid?.refund_status != "买手退款成功" ||
- order_item.WarehouseWaybillStatusStr == "中转已取号" || order_item.WarehouseWaybillStatusStr == "中转已入库" || order_item.WarehouseWaybillStatusStr == "中转已出库")
+ this.WarehouseWaybillStatusStr == "中转已取号" || this.WarehouseWaybillStatusStr == "中转已入库" ||
+ this.WarehouseWaybillStatusStr == "中转已出库" || this.WarehouseWaybillStatusStr == "中转拦截到仓")
return false;
// 已正式取号的，不可异常重拍
if (order_item.ItemTransitOrderWithVoid?.pre_allocated_order_no == 1 || order_item.ItemTransitOrderWithVoid?.pre_allocated_order_no == 3)
@@ -1851,4 +1851,4 @@ namespace AllBase.Model.DBModel
return true;
}
}
-}
+}
\ No newline at end of file