From d706384253631336b8bb31e3667c56c80ee1b082 Mon Sep 17 00:00:00 2001
From: wule <jtt_fan@qq.com>
Date: Tue, 6 Oct 2026 15:19:58 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=A1=A5=E5=8F=91/=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E7=89=A9=E6=B5=81=E6=8C=89=E9=92=AE=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../BuyerCtrls/PDDBuyerOrderReadCtrl.xaml.cs  |   9 +-
 .../Ctrls/BuyerCtrls/TaobaoBuyOrderCtrl.xaml  |  16 ++-
 .../BuyerCtrls/TaobaoBuyOrderViewModel.cs     | 130 ++++++++++++++++--
 .../OrderCtrls/OrderListRowItemCtrl.xaml.cs   |   7 +
 AllBase/Model/DBModel/oms_wei_order_info.cs   |   2 +-
 5 files changed, 148 insertions(+), 16 deletions(-)

diff --git a/29WxOrderWpf/Ctrls/BuyerCtrls/PDDBuyerOrderReadCtrl.xaml.cs b/29WxOrderWpf/Ctrls/BuyerCtrls/PDDBuyerOrderReadCtrl.xaml.cs
index 698c5cf..4834ac3 100644
--- a/29WxOrderWpf/Ctrls/BuyerCtrls/PDDBuyerOrderReadCtrl.xaml.cs
+++ b/29WxOrderWpf/Ctrls/BuyerCtrls/PDDBuyerOrderReadCtrl.xaml.cs
@@ -2156,7 +2156,12 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
 			foreach (var sOrder in syncOrderList)
 			{
 				var orderSnTrack = orderSnTracks.FirstOrDefault(o => o.order_sn == sOrder.order_id);
-				if (orderSnTrack != null)
+				var pNull = orderSnTracks.Where(p => p.pick_code.IsNullOrEmpty()).ToList();
+				if (orderSnTrack.pick_code == null)
+				{
+
+				}
+				if (orderSnTrack != null && !string.IsNullOrEmpty(orderSnTrack.pick_code))
 				{
 					var pickupCode = orderSnTrack.pick_code.Replace("取件码", "").Replace("取件出示快递单号后五位", "").Trim();
 					if (!string.IsNullOrWhiteSpace(pickupCode))
@@ -2199,7 +2204,7 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
 							{
 								if (combine_track.order_sn == order.order_sn)
 								{
-									pickupCode = combine_track.pick_code.Replace("取件码", "").Replace("取件出示快递单号后五位", "").Trim();
+									pickupCode = combine_track.pick_code.ParseToString().Replace("取件码", "").Replace("取件出示快递单号后五位", "").Trim();
 								}
 							}
 						}
diff --git a/29WxOrderWpf/Ctrls/BuyerCtrls/TaobaoBuyOrderCtrl.xaml b/29WxOrderWpf/Ctrls/BuyerCtrls/TaobaoBuyOrderCtrl.xaml
index c53c3fb..fcebc8c 100644
--- a/29WxOrderWpf/Ctrls/BuyerCtrls/TaobaoBuyOrderCtrl.xaml
+++ b/29WxOrderWpf/Ctrls/BuyerCtrls/TaobaoBuyOrderCtrl.xaml
@@ -323,7 +323,7 @@
 						</wpf:TitleContent>
 
 						<wpf:TitleContent
-							Title="拍单订单号："
+							Title="中转地址："
 							TitleHorizontalAlignment="Right"
 							TitleWidth="{Binding ElementName=tcShopGoodsName, Path=TitleWidth}">
 							<TextBox
@@ -346,7 +346,19 @@
 								Command="{Binding ReMapCommand}"
 								Content="重新关联商品"
 								FontSize="12"
-								Style="{StaticResource BaseButtonLightStyle}" />
+								Style="{StaticResource BasePageButtonLightStyle}" />
+							<Button
+								x:Name="btnManualUpdateBuyOrder"
+								Grid.Column="1"
+								Height="20"
+								MinWidth="48"
+								Margin="0"
+								Padding="4,0"
+								HorizontalAlignment="Right"
+								Command="{Binding ManualUpdateBuyOrderCommand}"
+								Content="手动确认拍单"
+								FontSize="12"
+								Style="{StaticResource BasePageButtonStyle}" />
 						</Grid>
 					</wpf:SpacingStackPanel>
 				</wpf:SpacingStackPanel>
diff --git a/29WxOrderWpf/Ctrls/BuyerCtrls/TaobaoBuyOrderViewModel.cs b/29WxOrderWpf/Ctrls/BuyerCtrls/TaobaoBuyOrderViewModel.cs
index 8a356ec..977ba0c 100644
--- a/29WxOrderWpf/Ctrls/BuyerCtrls/TaobaoBuyOrderViewModel.cs
+++ b/29WxOrderWpf/Ctrls/BuyerCtrls/TaobaoBuyOrderViewModel.cs
@@ -28,6 +28,7 @@ using Work;
 using Work._29Tools.BLL;
 using Work._29Tools.CefTools;
 using Work.BaseForms;
+using static AllBase.DouYinModel.Result.DouOrderListInfo;
 using static System.Windows.Forms.VisualStyles.VisualStyleElement.StartPanel;
 using static WPFCommon.Interop.InteropValues;
 
@@ -50,7 +51,7 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
 		public int CloseAfterSecond { get; set; }
 		public string InitUrl { get; set; } = "";
 
-		private string shopCookieHead = "taobao.com";
+		//private string shopCookieHead = "taobao.com";
 		private string buyerLoginUrl = "https://login.taobao.com/havanaone/login/login.htm";
 		private string MainUrl = "https://i.taobao.com/my_itaobao"; //"https://buyertrade.taobao.com/trade/itemlist/list_bought_items.htm?";
 
@@ -59,6 +60,8 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
 		private oms_wei_order_item_info orderItem = null;
 		WXBuyMapSkusInfo buymapSkuInfo = null;
 		WXBuyMapInfo buyMapInfo = null;
+		string mapSkuIdTmp = null;
+		string sendProvince = null;
 		pddFrontGoods3Lite pddFrontGoodsLite = null;
 
 		/// <summary>
@@ -67,6 +70,10 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
 		public string BuyType { get; set; } = "transit";
 		public TransitWarehouseParam transitWarehouse { get; set; }
 		/// <summary>
+		/// 是否是关联拍单商品
+		/// </summary>
+		public bool IsMappingGoods { get; set; }
+		/// <summary>
 		/// 异常重拍的原中转仓订单信息
 		/// </summary>
 		public oms_wei_external_procurement_log_info AbnormalTransitWarehouseOrderInfo { get; set; } = null;
@@ -254,6 +261,11 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
 		public ICommand CopyUserNameCommand { get; }
 		public ICommand CopyPasswordCommand { get; }
 
+		/// <summary> 重新关联 </summary>
+		public ICommand ReMapCommand { get; }
+		/// <summary> 确认拍单 /// </summary>
+		public ICommand ManualUpdateBuyOrderCommand { get; }
+		/// <summary> 确认商品关联 </summary>
 		public ICommand UpdateTransitWarehouseCommand { get; }
 
 		#endregion
@@ -272,6 +284,8 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
 			StopCommand = new DelegateCommand(StopButton);
 			CopyUserNameCommand = new DelegateCommand(CopyUserName);
 			CopyPasswordCommand = new DelegateCommand(CopyPassword);
+			ReMapCommand = new DelegateCommand(ReMap);
+			ManualUpdateBuyOrderCommand = new DelegateCommand(ManualUpdateBuyOrder);
 			UpdateTransitWarehouseCommand = new DelegateCommand(UpdateTransitWarehouse);
 
 			this.txtShopSkuIdVal = orderItem.sku_id;
@@ -283,9 +297,10 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
 			this.txtShopOrderItemCntVal = orderItem.sku_cnt.ParseToString();
 			this.txtShopOrderItemPriceVal = (orderItem.real_price * 0.01m + orderItem.ItemOrder?.postage_price * 0.01m / orderItem.ItemOrder?.orderItems?.Count).ParseToString();
 
-			this.buyMapInfo = orderItem.TbBuyMap;
-			if (buyMapInfo != null)
+			if (!this.IsMappingGoods && orderItem.TbBuyMap != null)
 			{
+				this.buyMapInfo = orderItem.TbBuyMap;
+				this.mapSkuIdTmp = orderItem.TbBuyMap.map_sku_id;
 				BuyInfoVisivility = Visibility.Visible;
 				MapInfoVisivility = Visibility.Collapsed;
 			}
@@ -526,6 +541,29 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
 					Address = e.NewValue.ParseToString();
 				}));
 			}
+
+			// https://item.taobao.com/item.htm?id=756295486950&skuId=5216824841290
+			if (currentUrl.Contains("item.taobao.com/item.htm?") && currentUrl.Contains("id") && currentUrl.Contains("skuId"))
+			{
+				if (IsMappingGoods && buymapSkuInfo?.map_skus != null)
+				{
+					mapSkuIdTmp = BaseRegex.GetStringQuery(ref currentUrl, "skuId");
+					var pddFrontGoods3 = JsonHelper.DeserializeJsonToObject<pddFrontGoods3Lite>(buymapSkuInfo?.map_skus);
+					var sku = pddFrontGoods3.skus.FirstOrDefault(s => s.skuId.ParseToString() == mapSkuIdTmp);
+					if (sku == null)
+						buyMapInfo = null;
+					else
+					{
+						buyMapInfo = new WXBuyMapInfo
+						{
+							map_spec_name = sku.SpecNameStr,
+							map_sku_id = sku.skuId.ParseToString(),
+						};
+					}
+
+					SetBuyMapValues();
+				}
+			}
 		}
 
 		private void CefWebBrowser_FrameLoadEnd(object sender, CefSharp.FrameLoadEndEventArgs e)
@@ -645,6 +683,7 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
 						pddFrontGoods3.skus.Add(pddFrontSkuInfo);
 					}
 
+
 					this.buymapSkuInfo = new WXBuyMapSkusInfo()
 					{
 						platform = "tb",
@@ -652,20 +691,50 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
 						map_goods_name = BaseRegex.GetStringJson(ref goodsItemStr, "title"),
 						map_url = "929536442189",
 						map_skus = JsonHelper.SerializeObject(pddFrontGoods3),
-					};
-
-					if (buyMapInfo == null)
+					}; 
+					this.sendProvince = BaseRegex.GetStringJson(ref loaderData, "region");
+					var sku = pddFrontGoods3.skus.FirstOrDefault(s => s.skuId.ParseToString() == mapSkuIdTmp);
+					if (sku == null)
+					{
+						buyMapInfo = null;
+						BaseMsgWindow.ShowError("商品关联已失效，请重新关联！");
+						return;
+					}
+					else
+					{
 						buyMapInfo = new WXBuyMapInfo
 						{
-							map_spec_name = pddFrontGoods3.skus.FirstOrDefault()?.SpecNameStr, 
-							map_sku_id = pddFrontGoods3.skus.FirstOrDefault()?.skuID.ParseToString(),
+							map_spec_name = sku.SpecNameStr,
+							map_sku_id = sku.skuId.ParseToString(),
 						};
+					}
 
-					var sendProvince = BaseRegex.GetStringJson(ref loaderData, "region");
-					SetBuyMapValues(buymapSkuInfo, buyMapInfo, sendProvince);
+					if (IsMappingGoods)
+					{
+						SetBuyMapValues();
+					}
+					else
+					{
+						SetBuyGoodsValues();
+					}
 				}
 			}
 
+			if (responseData.Contains("alipayFrontRenderTotalFeeCENT") /*|| responseData.Contains(":1250,")*/)
+			{
+				var dataTmp = responseData.Replace("\\\"", "\"");
+				var totalFeeCENT = BaseRegex.GetStringJson(ref dataTmp, "alipayFrontRenderTotalFeeCENT");
+				this.txtBuyPriceVal = (totalFeeCENT.ParseToDecimal() / 100m).ToString();
+				var quantity = BaseRegex.GetStringJson(ref dataTmp, "quantity");
+				this.txtBuyCntVal = quantity;
+			}
+
+			if (url.StartsWith("https://h5api.m.taobao.com/h5/mtop.trade.order.adjust/6.0"))
+			{
+				var orderLineId = BaseRegex.GetStringJson(ref responseData, "orderLineId");
+				//txtBuyCntVal = 
+			}
+
 			//if (responseData.Contains("karl_malone_32") || responseData.Contains("jtt_fan"))
 			//{
 			//	//https://h5api.m.taobao.com/h5/mtop.user.getusersimple/1.0/?jsv=2.7.2&appKey=12574478&t=1789984970076&sign=6bb7d3b5cd8bd3ab32bd97c1a0df1c0f&jsonpIncPrefix=tbnavnew&api=mtop.user.getUserSimple&v=1.0&dataType=json&type=originaljson&data=%7B%7D
@@ -673,8 +742,11 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
 			//}
 		}
 
-		private void SetBuyMapValues(WXBuyMapSkusInfo skuInfo, WXBuyMapInfo info, string sendProvince = "")
+		private void SetBuyMapValues()
 		{
+			var skuInfo = buymapSkuInfo;
+			var info = buyMapInfo;
+
 			if (skuInfo == null || info == null)
 				return;
 			var goods = JsonHelper.DeserializeJsonToObject<pddFrontGoods3Lite>(skuInfo.map_skus);
@@ -699,6 +771,29 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
 			this.txtMapSkuNameVal = spec;
 			this.txtSendProvinceVal = sendProvince;
 			this.cmbTransitWarehouseVal = "";
+		}
+
+		private void SetBuyGoodsValues()
+		{
+			var skuInfo = buymapSkuInfo;
+			var info = buyMapInfo;
+
+			if (skuInfo == null || info == null)
+				return;
+			var goods = JsonHelper.DeserializeJsonToObject<pddFrontGoods3Lite>(skuInfo.map_skus);
+			if (goods == null)
+				return;
+			var sku = goods.skus.FirstOrDefault(s => s.skuID.ParseToString() == info.map_sku_id);
+			if (sku == null)
+				return;
+
+			var goodsId = skuInfo.map_goods_id;
+			var skuId = info.map_sku_id;
+			var goodsName = skuInfo.map_goods_name;
+			var spec = info.map_spec_name;
+			var oneGoodsPrice = sku.oldGroupPrice.ParseToInt();
+			var buyCnt = orderItem.sku_cnt;
+			var buyPrice = oneGoodsPrice * buyCnt;
 
 			// 自动填写拍单信息界面
 			if (!goodsId.IsNullOrZero()) this.txtBuyGoodsIdVal = goodsId.ParseToString();
@@ -949,6 +1044,19 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
 				}
 			}
 		}
+
+		public void ManualUpdateBuyOrder()
+		{
+
+		}
+
+		public void ReMap()
+		{
+			this.BuyInfoVisivility = Visibility.Collapsed;
+			this.MapInfoVisivility = Visibility.Visible;
+			this.transitWarehouse = null;
+			this.IsMappingGoods = true;
+		}
 	}
 
 	public class TaoBaoSku2Info
diff --git a/29WxOrderWpf/Ctrls/OrderCtrls/OrderListRowItemCtrl.xaml.cs b/29WxOrderWpf/Ctrls/OrderCtrls/OrderListRowItemCtrl.xaml.cs
index f20cc33..b5abb7c 100644
--- a/29WxOrderWpf/Ctrls/OrderCtrls/OrderListRowItemCtrl.xaml.cs
+++ b/29WxOrderWpf/Ctrls/OrderCtrls/OrderListRowItemCtrl.xaml.cs
@@ -526,9 +526,16 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
 			TaobaoBuyOrderCtrl taobaoBuyView = new TaobaoBuyOrderCtrl(GlobalConfig.CurrentTaobaoBuyer, orderItem);
 			//https://item.taobao.com/item.htm?id=756295486950&skuId=5216824841295
 			if (orderItem.TbBuyMap != null)
+			{
+
 				taobaoBuyView.ViewModel.InitUrl = "https://item.taobao.com/item.htm?id=" + orderItem.TbBuyMap.map_goods_id + "&skuId=" + orderItem.TbBuyMap.map_sku_id;
+				taobaoBuyView.ViewModel.InitUrl = "https://i.taobao.com/my_itaobao/receiver-address-pc";
+			}
 			else
+			{
 				taobaoBuyView.ViewModel.InitUrl = "https://s.taobao.com/search?";
+				taobaoBuyView.ViewModel.IsMappingGoods = true;
+			}
 			new DialogWindow()
 			{
 				Title = "淘宝买手登录",
diff --git a/AllBase/Model/DBModel/oms_wei_order_info.cs b/AllBase/Model/DBModel/oms_wei_order_info.cs
index 1039942..62b54e5 100644
--- a/AllBase/Model/DBModel/oms_wei_order_info.cs
+++ b/AllBase/Model/DBModel/oms_wei_order_info.cs
@@ -751,7 +751,7 @@ namespace AllBase.Model.DBModel
 			}
 			IsAbnormal = GetIsAbnormal();
 
-			if (IsWaitBuy || IsWaitSend)
+			if (IsWaitBuy/* || IsWaitSend*/)
 				IsShowChangeWaybillBtn = false;
 			else
 				IsShowChangeWaybillBtn = true;