chfei/29WxOrder
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1 订单隐藏功能 2直拍订单前自动取消代发

Browse Source
This commit is contained in:
wule committed 2026-08-13 16:32:00 +08:00
1 parent 2ecc120c5d
commit 314119d4c5
6 files changed
+53 -23
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

29WxOrderWpf/Ctrls/OrderCtrls/OrderListCtrl.xaml
+2 -2
View File
@@ -90,7 +90,7 @@
<Button Grid.Column="9" x:Name="btnFilter" Style="{StaticResource BasePageButtonStyle}" Margin="8,0,0,0" Content="过滤" MinWidth="48" Height="28" Click="btnFilter_Click" Padding="4"/>
<Button Grid.Column="10" x:Name="btnSearch" Style="{StaticResource BasePageButtonStyle}" Margin="4,0,4,0" Content="读单" MinWidth="78" Height="28" Click="btnSearch_Click" Padding="4" IsEnabled="False"/>
<WrapPanel Grid.Column="11" VerticalAlignment="Center" Width="172">
<WrapPanel Grid.Column="11" VerticalAlignment="Center" Width="192">
<Image x:Name="imgLoading" Grid.Column="10" Source="{StaticResource imgLoadingPic}" Width="20" Height="20" Margin="0" IsEnabled="False">
<Image.RenderTransform>
<RotateTransform Angle="45" CenterX="10" CenterY="10"/>
@@ -114,7 +114,7 @@
<CheckBox Content="自动读单" x:Name="chkAutoReadOrder" BorderBrush="{StaticResource mainColorBrush}" FontSize="12" HorizontalAlignment="Left"
Margin="2,0" VerticalAlignment="Center" Checked="chkAutoReadBuyerOrder_CheckedChanged" Unchecked="chkAutoReadBuyerOrder_CheckedChanged" IsChecked="true"/>
<CheckBox Grid.Column="12" Content="隐藏绿旗" x:Name="chkHideGreenFlag" BorderBrush="{StaticResource mainColorBrush}" FontSize="12" HorizontalAlignment="Left"
<CheckBox Grid.Column="12" Content="隐藏标记订单" x:Name="chkHideGreenFlag" BorderBrush="{StaticResource mainColorBrush}" FontSize="12" HorizontalAlignment="Left"
Margin="2,0" VerticalAlignment="Center" Click="chkHideGreenFlag_Click" IsChecked="true"/>
</WrapPanel>
29WxOrderWpf/Ctrls/OrderCtrls/OrderListRowHeaderCtrl.xaml
+6 -2
View File
@@ -81,9 +81,13 @@
<uc:UcWaterMarkTextBox1 WaterMark="该订单共有 1 条不同商品记录" x:Name="txtCount" Grid.Column="9" Margin="8,8,0,8" VerticalAlignment="Center" FontSize="14" Background="Transparent" IsReadOnly="True" BorderThickness="0" />
<Border Grid.Column="11" Width="15" Height="15" Background="Transparent" VerticalAlignment="Center" Cursor="Hand" Margin="2" x:Name="borderFlag" MouseLeftButtonDown="borderFlag_MouseLeftButtonDown">
<Border Grid.Column="11" Width="auto" Height="15" Background="Transparent" VerticalAlignment="Center" Cursor="Hand" Margin="2" x:Name="borderFlag" MouseLeftButtonDown="borderFlag_MouseLeftButtonDown">
<!--<Path Margin="0,0,0,0" Fill="{StaticResource FlagGrayBrush}" Data="M 0,0 L 1,0 L 1,1 L 10,1 L 7,4 L 10,7 L 1,7 L 1,12 L 0,12 Z" Stretch="Uniform" />-->
<Path Margin="0,0,0,0" Fill="{Binding colour_flag,Converter={StaticResource flagColorConverter}}" Data="M 0,0 L 1,0 L 1,1 L 10,1 L 7,4 L 10,7 L 1,7 L 1,12 L 0,12 Z" Stretch="Uniform" />
<WrapPanel VerticalAlignment="Center">
<TextBlock Text="隐藏标记" FontSize="12" VerticalAlignment="Center" Foreground="Gray"></TextBlock>
<Path Margin="2,0,0,0" Height="15" Width="15" Fill="{Binding colour_flag,Converter={StaticResource flagColorConverter}}" Data="M 0,0 L 1,0 L 1,1 L 10,1 L 7,4 L 10,7 L 1,7 L 1,12 L 0,12 Z" Stretch="Uniform" />
</WrapPanel>
</Border>
29WxOrderWpf/Ctrls/OrderCtrls/OrderListRowItemCtrl.xaml.cs
+22 -13
View File
@@ -1173,14 +1173,6 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
return;
}
//if (!GetIsAbnormalOrderRebuy(orderItem) && GlobalConfig.lstOrder.Any(o => o.orderItems
// .Any(oi => oi.ItemTransitOrder?.order_no == orderItem.order_id && oi.ItemTransitOrder?.order_sku_id == orderItem.sku_id)))
//{
// MainWindow.Instance.orderListCtrl.FilterOneOrder(orderItem.ItemOrder);
// BaseMsgWindow.ShowError("已存在中转拍单信息，请核对后再拍单");
// return;
//}
btnBuyOrder.Cursor = Cursors.Wait;
btnBuyOrder.IsEnabled = false;
Task.Run(() =>
@@ -1212,10 +1204,29 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
// 如果是退款单，弹出退款窗口
if (CheckIsRefund(orderItem))
return;
// 检测买手号是否掉线
if (GlobalConfig.CurrentPddBuyer.status == "在线")
// 查询订单是否在代发货中，如果代发需要取消代发
var apiSearchDropship = new WxApiBLL().WxApiDropshipSearch(orderItem.Shop, orderItem.order_id, 100);
if (!apiSearchDropship.Contains("\"errcode\":0"))
{
BaseMsgWindow.ShowError("代发查询失败，" + BaseRegex.GetStringJsonByRegs(ref apiSearchDropship, apiSearchDropship, "errmsg"));
return;
}
if (apiSearchDropship.Contains("ds_order_id_list") && !apiSearchDropship.Contains("\"ds_order_id_list\":[]"))
{
var dsOrderId = JsonHelper.JObjectParse(apiSearchDropship)["ds_order_id_list"].FirstOrDefault().ParseToString();
var apiCancelDropship = new WxApiBLL().WxApiDropshipCancel(orderItem.Shop, orderItem.order_id, dsOrderId, orderItem.product_id, orderItem.sku_id, orderItem.sku_cnt.ParseToInt());
}
apiSearchDropship = new WxApiBLL().WxApiDropshipSearch(orderItem.Shop, orderItem.order_id, 100);
if (!apiSearchDropship.Contains("\"ds_order_id_list\":[]"))
{
BaseMsgWindow.ShowError("代发查询失败，请确商品未加入代发");
return;
}
// 检测买手号是否掉线
if (GlobalConfig.CurrentPddBuyer.status == "在线")
{
PddMobileLoginForm.CheckBuyerLogin(GlobalConfig.CurrentPddBuyer);
}
@@ -1229,8 +1240,6 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
return;
}
//BaseMsgWindow.ShowAnimateMessage("触发成功！" + DateTime.Now.ParseToString(), "Msg", 5);
//return;
// 打开拍单窗口
Dispatcher.Invoke(new Action(() =>
AllBase/BaseClass.cs
+1 -1
View File
@@ -32,7 +32,7 @@ namespace AllBase
/// 版本ID
/// </summary>
public static int VersionCount = 228;
public static int VersionCount = 229;
public static string ServerUrl { get; set; } = "http://1.13.195.131:9000";
public static string DebugUrl { get; set; } = "http://localhost:9000";
Work/_29Tools/BLL/WxApiBLL.cs
+18 -1
View File
@@ -85,7 +85,7 @@ namespace Work._29Tools.BLL
sb.Append(UserLogin.GetSignaturex());
sb.Append("&token=").Append(GetWxToken(shop).accessToken);
sb.Append("&order_id=").Append(orderId);
sb.Append("&dropship_product_list=").Append("[{\"spu_id\":\"" + spuId + "\",\"sku_id\":\"" + skuId + "\",\"product_cnt\":" + cnt + "}]");
sb.Append("&dropship_product_list=").Append("[{\"spu_id\":\"").Append(spuId + "\",\"sku_id\":\"").Append(skuId + "\",\"product_cnt\":").Append(cnt).Append("}]");
var url = BaseClass.Build29WxObjString("product/wx_api_dropship_assign");
var data = sb.ToString();
@@ -94,5 +94,22 @@ namespace Work._29Tools.BLL
html = GetHtml.PostUtf8(url, data);
return html;
}
public string WxApiDropshipCancel(ShopLoginInfo shop, string orderId, string dropShopOrderId, string spuId, string skuId, int cnt)
{
StringBuilder sb = new StringBuilder();
sb.Append(UserLogin.GetSignaturex());
sb.Append("&token=").Append(GetWxToken(shop).accessToken);
sb.Append("&order_id=").Append(orderId);
sb.Append("&ds_order_id=").Append(dropShopOrderId);
sb.Append("&dropship_product_list=").Append("[{\"spu_id\":\"").Append(spuId).Append("\",\"sku_id\":\"").Append(skuId).Append("\",\"product_cnt\":").Append(cnt).Append("}]");
var url = BaseClass.Build29WxObjString("product/wx_api_dropship_cancel");
var data = sb.ToString();
var html = GetHtml.PostUtf8(url, data);
if (string.IsNullOrEmpty(html) || !html.Contains("\"errcode\":0"))
html = GetHtml.PostUtf8(url, data);
return html;
}
}
}
Work/_29Tools/Forms/PddMobileBuyOrderForm.cs
+4 -4
View File
@@ -980,10 +980,10 @@ namespace TemuKJD.ToolForms
if (AbnormalTransitWarehouseOrderInfo == null)
{
JObject body = new JObject();
body["orderNo"] = orderItem.order_id;
body["orderSkuId"] = orderItem.sku_id;
body["outOrderNo"] = txtBuyOrderId.Text.Trim();
body["outAmount"] = (txtBuyPrice.Text.ParseToDecimal() * 100).ParseToInt() + "";
body["orderNo"] = orderItem.order_id; // 微信订单号
body["orderSkuId"] = orderItem.sku_id; // 微信商品skuId
body["outOrderNo"] = txtBuyOrderId.Text.Trim(); // 拍单订单号
body["outAmount"] = (txtBuyPrice.Text.ParseToDecimal() * 100).ParseToInt() + ""; // 外采金额
body["buyerAccount"] = buyer.buyer_nick; // 买手昵称
body["purchaserNote"] = BaseClass.NickName; // 购买软件账户备注
body["express1Company"] = ""; // 物流公司编号