修复部分拍单问题 优化拍单显示

This commit is contained in:
wule_5900x committed 2026-07-13 10:19:19 +08:00
1 parent 87c1b8fc79
commit 5571d227c8
13 files changed
+273 -108

No files matched your search

@@ -266,6 +266,30 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
return;
}
//if (!GlobalConfig.BuyConfig.IsUseAppBalance)
//{
// var url = BaseClass.Build29WxObjString("shop/get_shop_erp_merchant");
// var data = UserLogin.GetSignaturex();
// data += "&corporate_account_user_id=" + orderItem.Shop.ErpCorporateAccountUserId;
// data += "&manage_user_id=" + orderItem.Shop.ErpManageUserId;
// data += "&shop_id=" + orderItem.Shop.ErpShopId;
// var html = GetHtml.PostUtf8(url, data);
// if (string.IsNullOrEmpty(html) || !html.Contains("\"code\":200"))
// html = GetHtml.PostUtf8(url, data);
// if (string.IsNullOrEmpty(html) || !html.Contains("\"code\":200"))
// {
// Dispatcher.Invoke(new Action(() =>
// {
// //BaseMsgWindow.ShowError("未找到店铺账户!" + BaseRegex.GetStringJson(ref html, "msg"));
// //btnBuyOrder.Cursor = Cursors.Hand;
// GlobalConfig.BuyConfig.IsUseAppBalance = true;
// }));
// //return;
// }
//}
orderRetry:
// 拍单前查询账户余额
if (GlobalConfig.BuyConfig.IsUseAppBalance)
{
@@ -292,10 +316,17 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
{
Dispatcher.Invoke(new Action(() =>
{
BaseMsgWindow.ShowError("未找到店铺账户!" + BaseRegex.GetStringJson(ref html, "msg"));
//BaseMsgWindow.ShowError("未找到店铺账户!" + BaseRegex.GetStringJson(ref html, "msg"));
btnBuyOrder.Cursor = Cursors.Hand;
}));
return;
if (orderItem.Shop.ErpCorporateAccountUserId == null && orderItem.Shop.ErpManageUserId == null)
{
GlobalConfig.BuyConfig.IsUseAppBalance = true;
StartUp.SaveBuyConfig();
BaseMsgWindow.ShowError("未找到店铺账户!" + BaseRegex.GetStringJson(ref html, "msg") + ",自动切换为快递余额拍单。");
goto orderRetry;
}
//return;
}
if (!string.IsNullOrEmpty(html) && html.Contains("\"code\":200"))
{
@@ -307,10 +338,14 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
{
Dispatcher.Invoke(new Action(() =>
{
BaseMsgWindow.ShowError("未找到店铺账户!");
//BaseMsgWindow.ShowError("未找到店铺账户!");
btnBuyOrder.Cursor = Cursors.Hand;
}));
return;
GlobalConfig.BuyConfig.IsUseAppBalance = true;
StartUp.SaveBuyConfig();
BaseMsgWindow.ShowError("未找到店铺账户!自动切换为快递余额拍单。");
goto orderRetry;
//return;
}
var balance = erpM.balance.ParseToDecimal();
@@ -573,7 +608,7 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
{
try
{
Clipboard.SetText(orderItem.ItemTransitOrder.out_order_no);
Clipboard.SetText(orderItem.ItemTransitOrderWithVoid.out_order_no);
BaseMsgWindow.ShowAnimateMessage("复制成功");
}
catch (Exception ex)