From 65caf003aaf98e10ad3512d526b1978a08b6d17f Mon Sep 17 00:00:00 2001 From: wule Date: Thu, 19 Nov 2026 18:05:10 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=8B=8D=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- 29WxOrderWpf/Ctrls/BuyerCtrls/PddBuyOrderViewModel.cs | 1 + .../Ctrls/BuyerCtrls/TaobaoBuyOrderViewModel.cs | 1 + .../Ctrls/OrderCtrls/OrderListRowItemCtrl.xaml | 1 - AllBase/Model/DBModel/oms_wei_order_item_info.cs | 10 ++++++++++ Work/_29Tools/Forms/PddMobileBuyOrderForm.cs | 5 +++-- 5 files changed, 15 insertions(+), 3 deletions(-) diff --git a/29WxOrderWpf/Ctrls/BuyerCtrls/PddBuyOrderViewModel.cs b/29WxOrderWpf/Ctrls/BuyerCtrls/PddBuyOrderViewModel.cs index 6dd6821..ad26a40 100644 --- a/29WxOrderWpf/Ctrls/BuyerCtrls/PddBuyOrderViewModel.cs +++ b/29WxOrderWpf/Ctrls/BuyerCtrls/PddBuyOrderViewModel.cs @@ -1097,6 +1097,7 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls body["orderSkuId"] = orderItem.sku_id; // 微信商品skuId body["outOrderNo"] = "tb_" + txtBuyOrderIdVal.Trim(); // 拍单订单号 body["outAmount"] = (txtBuyPriceVal.ParseToDecimal() * 100).ParseToInt() + ""; // 外采金额 + body["buyerId"] = buyer.buyer_id; // 买手ID body["buyerAccount"] = buyer.buyer_id; // 买手ID body["purchaserNote"] = BaseClass.NickName; // 购买软件账户备注 body["express1Company"] = ""; // 物流公司编号 diff --git a/29WxOrderWpf/Ctrls/BuyerCtrls/TaobaoBuyOrderViewModel.cs b/29WxOrderWpf/Ctrls/BuyerCtrls/TaobaoBuyOrderViewModel.cs index 04fcc56..0c5c273 100644 --- a/29WxOrderWpf/Ctrls/BuyerCtrls/TaobaoBuyOrderViewModel.cs +++ b/29WxOrderWpf/Ctrls/BuyerCtrls/TaobaoBuyOrderViewModel.cs @@ -1812,6 +1812,7 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls body["orderSkuId"] = orderItem.sku_id; // 微信商品skuId body["outOrderNo"] = "tb_" + txtBuyOrderIdVal.Trim(); // 拍单订单号 body["outAmount"] = (txtBuyPriceVal.ParseToDecimal() * 100).ParseToInt() + ""; // 外采金额 + body["buyerId"] = buyer.buyer_id; // 买手ID body["buyerAccount"] = buyer.buyer_id; // 买手ID body["purchaserNote"] = BaseClass.NickName; // 购买软件账户备注 body["express1Company"] = ""; // 物流公司编号 diff --git a/29WxOrderWpf/Ctrls/OrderCtrls/OrderListRowItemCtrl.xaml b/29WxOrderWpf/Ctrls/OrderCtrls/OrderListRowItemCtrl.xaml index e3f0e16..f41063e 100644 --- a/29WxOrderWpf/Ctrls/OrderCtrls/OrderListRowItemCtrl.xaml +++ b/29WxOrderWpf/Ctrls/OrderCtrls/OrderListRowItemCtrl.xaml @@ -1485,7 +1485,6 @@ Margin="0,0,0,0" HorizontalAlignment="Center" d:Visibility="Visible" - Click="btnAbnormalOrderRebuy_Click" Content="额外拍单" Style="{StaticResource BasePageButtonLightStyle}" Visibility="{Binding BtnAbnormalOrderExtraBuyVisibility}" /> diff --git a/AllBase/Model/DBModel/oms_wei_order_item_info.cs b/AllBase/Model/DBModel/oms_wei_order_item_info.cs index 56f2316..8f11c83 100644 --- a/AllBase/Model/DBModel/oms_wei_order_item_info.cs +++ b/AllBase/Model/DBModel/oms_wei_order_item_info.cs @@ -1546,6 +1546,14 @@ namespace AllBase.Model.DBModel set { this.SetValue(x => x.BtnAbnormalOrderRebuyVisibility, value); } } /// + /// 异常额外包裹按钮可见性 + /// + public Visibility BtnAbnormalOrderExtraBuyVisibility + { + get { return this.GetValue(x => x.BtnAbnormalOrderExtraBuyVisibility); } + set { this.SetValue(x => x.BtnAbnormalOrderExtraBuyVisibility, value); } + } + /// /// 直发按钮可见条件 /// public Visibility BtnDirectBuyOrderVisibility @@ -1583,6 +1591,8 @@ namespace AllBase.Model.DBModel _btnAbnormalOrderRebuyVisibility = Visibility.Collapsed; BtnAbnormalOrderRebuyVisibility = _btnAbnormalOrderRebuyVisibility; + BtnAbnormalOrderExtraBuyVisibility = Visibility.Collapsed; + // 直拍按钮 BtnDirectBuyOrderVisibility = Visibility.Collapsed; if (BaseClass.Setting.SwitchEnableDirectBuy && this.ItemOrder?.status < 30) diff --git a/Work/_29Tools/Forms/PddMobileBuyOrderForm.cs b/Work/_29Tools/Forms/PddMobileBuyOrderForm.cs index 702a804..4e7ac3e 100644 --- a/Work/_29Tools/Forms/PddMobileBuyOrderForm.cs +++ b/Work/_29Tools/Forms/PddMobileBuyOrderForm.cs @@ -1500,6 +1500,7 @@ namespace TemuKJD.ToolForms body["orderSkuId"] = orderItem.sku_id; // 微信商品skuId body["outOrderNo"] = txtBuyOrderId.Text.Trim(); // 拍单订单号 body["outAmount"] = (txtBuyPrice.Text.ParseToDecimal() * 100).ParseToInt() + ""; // 外采金额 + body["buyerId"] = buyer.buyer_id; // 买手ID body["buyerAccount"] = buyer.buyer_nick; // 买手昵称 body["purchaserNote"] = BaseClass.NickName; // 购买软件账户备注 body["express1Company"] = ""; // 物流公司编号 @@ -1670,8 +1671,7 @@ namespace TemuKJD.ToolForms else if (BuyType == "transit_extra") { - - #region 正常中转拍单 + #region 秒退额外拍单 if (AbnormalTransitWarehouseOrderInfo == null) { JObject body = new JObject(); @@ -1679,6 +1679,7 @@ namespace TemuKJD.ToolForms body["orderSkuId"] = orderItem.sku_id; // 微信商品skuId body["outOrderNo"] = txtBuyOrderId.Text.Trim(); // 拍单订单号 body["outAmount"] = (txtBuyPrice.Text.ParseToDecimal() * 100).ParseToInt() + ""; // 外采金额 + body["buyerId"] = buyer.buyer_id; // 买手ID body["buyerAccount"] = buyer.buyer_nick; // 买手昵称 body["purchaserNote"] = BaseClass.NickName; // 购买软件账户备注 body["express1Company"] = ""; // 物流公司编号