额外拍单等相关逻辑处理

This commit is contained in:
wule committed 2026-11-20 14:20:29 +08:00
1 parent 0f70b5e37c
commit 477ed75771
6 files changed
+55 -68

No files matched your search

@@ -195,13 +195,13 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
private void UserControl_Loaded(object sender, RoutedEventArgs e)
{
//this.DataContext = this;
this.lbPddBuyer.ItemsSource = GlobalConfig.PDDBuyerLoginList;
buyerReadOrderConfig = NaiBa.Util.Helper.ConfigHelper.LoadConfig<BuyerReadOrderConfig>("pdd_buyer_read_order_config");
if (buyerReadOrderConfig == null)
buyerReadOrderConfig = new BuyerReadOrderConfig();
// 命令行参数设置开发票的账户不要自动读单
if (Environment.GetCommandLineArgs().Contains("aro=f"))
{
buyerReadOrderConfig.IsAutoReadOrder = false;
@@ -2385,12 +2385,12 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
// 修改提前取号
else if (order.sendStatus == "提前取号" || order.sendStatus == "提前取号(旧订单)")
{
if (order.TransitPickupTime.AddHours(23) > DateTime.Now)
//if (order.TransitCreateTime.AddHours(23) > DateTime.Now)
{
order.sendStatus = "提前取号流程进行中";
return;
}
//if (order.TransitPickupTime.AddHours(23) > DateTime.Now)
////if (order.TransitCreateTime.AddHours(23) > DateTime.Now)
//{
// order.sendStatus = "提前取号流程进行中";
// return;
//}
string url2 = "https://po.e57.cn/prod-api/api/oms-api/external_procurement/update-upstream-waybill";
var data = new JObject();
@@ -1948,12 +1948,12 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
// 修改提前取号
else if (order.sendStatus == "提前取号" || order.sendStatus == "提前取号(旧订单)")
{
if (order.TransitPickupTime.AddHours(23) > DateTime.Now)
//if (order.TransitCreateTime.AddHours(23) > DateTime.Now)
{
order.sendStatus = "提前取号流程进行中";
return;
}
//if (order.TransitPickupTime.AddHours(23) > DateTime.Now)
////if (order.TransitCreateTime.AddHours(23) > DateTime.Now)
//{
// order.sendStatus = "提前取号流程进行中";
// return;
//}
string url2 = "https://po.e57.cn/prod-api/api/oms-api/external_procurement/update-upstream-waybill";
var data = new JObject();
@@ -1810,12 +1810,12 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
// 修改提前取号
else if (order.sendStatus == "提前取号" || order.sendStatus == "提前取号(旧订单)")
{
if (order.TransitPickupTime.AddHours(23) > DateTime.Now)
//if (order.TransitCreateTime.AddHours(23) > DateTime.Now)
{
order.sendStatus = "提前取号流程进行中";
return;
}
//if (order.TransitPickupTime.AddHours(23) > DateTime.Now)
////if (order.TransitCreateTime.AddHours(23) > DateTime.Now)
//{
// order.sendStatus = "提前取号流程进行中";
// return;
//}
string url2 = "https://po.e57.cn/prod-api/api/oms-api/external_procurement/update-upstream-waybill";
var data = new JObject();
@@ -47,7 +47,8 @@ namespace _29WxOrderWpf.Windows.OrderWindows
TransitOrder = _transitInfo?.oms_wei_external_procurement_log_info;
else if (_transitInfo?.oms_wei_transfer_extra_package != null)
ExtraPackage = _transitInfo?.oms_wei_transfer_extra_package;
PackType = _transitInfo?.TransitTypeStr == "额外包裹" ? 2 : 1;
//PackType = _transitInfo?.TransitTypeStr == "额外包裹" ? 2 : 1;
PackType = (_transitInfo?.TransitPackType).ParseToInt();
}
private void mainGrid_Loaded(object sender, RoutedEventArgs e)
@@ -195,6 +196,11 @@ namespace _29WxOrderWpf.Windows.OrderWindows
private async void btnAddReturnPackage_Click(object sender, RoutedEventArgs e)
{
if (PackType > 0 == false)
{
BaseMsgWindow.ShowError("添加退货包裹失败,包裹类型不存在!", "", this);
}
if (string.IsNullOrEmpty(lblWorkOrderMsg.Content.ParseToString()))
{
// 后续为独立创建工单
@@ -76,6 +76,7 @@ public class oms_wei_order_item_transit_model : PropertyNotifyObject
ShopName = OrderItem.ItemOrder.shop_name,
TransitTypeStr = "发货包裹",
TransitPackType = 1,
OrderCode = transitOrder.order_code,
SourceCode = transitOrder.random_code,
@@ -190,7 +191,7 @@ public class oms_wei_order_item_transit_model : PropertyNotifyObject
transitDetail.RejectPackageBtnVisibility = OrderItem?.ItemOrder?.GetIsWaitBuy() != true && transitOrder.warehouse_status == 0 ? Visibility.Visible : Visibility.Collapsed; /* 拒收发货包裹按钮 */
transitDetail.ReturnPackageBtnVisibility = (transitOrder.warehouse_status == 1 || transitOrder.warehouse_status == 3 || !transitOrder.location_code.IsNullOrEmpty()) &&
!OrderItem.ItemTransitOrderAfterSales.Any(af => af.pack_type == 1 && af.order_code == transitDetail.OrderCode && af.order_void_status != 1) &&
!OrderItem.ItemTransitExtraOrders.Any(af => af.pack_type == "1" && af.order_code == transitDetail.OrderCode && af.order_void_status != 1) ?
!OrderItem.ItemTransitExtraOrders.Any(af => af.pack_type == "2" && af.order_code == transitDetail.OrderCode && af.order_void_status != 1) ?
Visibility.Visible : Visibility.Collapsed; /* 发回退货包裹按钮 */
transitDetail.InterceptPackageBtnVisibility = transitOrder.warehouse_status == 2 &&
!OrderItem.ItemTransitOrderAfterSales.Any(af => af.pack_type == 1 && af.order_code == transitDetail.OrderCode && af.order_void_status != 1) &&
@@ -199,7 +200,8 @@ public class oms_wei_order_item_transit_model : PropertyNotifyObject
transitDetail.ExtraPackagesBtnVisibility = ((transitOrder.warehouse_status == 0 || transitOrder.warehouse_status == 1 || transitOrder.warehouse_status == 3 || !transitOrder.location_code.IsNullOrEmpty()) &&
!(transitDetail.CreateTime > DateTime.Now.AddDays(-2)) &&
!OrderItem.ItemTransitOrderAfterSales.Any(af => af.pack_type == 1 && af.order_code == transitDetail.OrderCode && af.order_void_status != 1) &&
!OrderItem.ItemTransitExtraOrders.Any(af => af.pack_type == "2" && af.order_code == transitDetail.OrderCode && af.order_void_status != 1)) ||
!OrderItem.ItemTransitExtraOrders.Any(af => af.pack_type == "2" && af.order_code == transitDetail.OrderCode && af.order_void_status != 1) &&
!OrderItem.ItemTransitExtraOrders.Any(af => af.pack_type == "3" && af.order_void_status != 1)) ||
OrderItem._itemOrderIsAbnormal == true ?
Visibility.Visible : Visibility.Collapsed; /* 额外发货包裹按钮 */
@@ -247,6 +249,7 @@ public class oms_wei_order_item_transit_model : PropertyNotifyObject
ShopName = OrderItem.ItemOrder.shop_name,
TransitPackType = transitAftersaleOrder.pack_type.ParseToInt(),
TransitTypeStr = "退货包裹", /* 拦截退回 */
OrderCode = transitAftersaleOrder.order_code + " / " + transitAftersaleOrder.external_order_no,
@@ -357,6 +360,7 @@ public class oms_wei_order_item_transit_model : PropertyNotifyObject
ShopName = OrderItem.ItemOrder.shop_name,
TransitPackType = transitExtraOrder.pack_type.ParseToInt(),
TransitTypeStr = "额外包裹",
OrderCode = transitExtraOrder.order_code + " / " + transitExtraOrder.batchId,
@@ -454,12 +458,15 @@ public class oms_wei_order_item_transit_model : PropertyNotifyObject
transitDetail.VoidPackageBtnVisibility = (transitExtraOrder.warehouse_status == null || transitExtraOrder.warehouse_status == 0 || transitExtraOrder.warehouse_status == 1 || transitExtraOrder.warehouse_status == 3) &&
transitExtraOrder.order_void_status != 1 ? Visibility.Visible : Visibility.Collapsed; /* 作废额外包裹 */
// 额外包裹在仓库只能作废,出仓以后才能拦截退回
//transitDetail.ReturnPackageBtnVisibility = (transitExtraOrder.warehouse_status == 1 || transitExtraOrder.warehouse_status == 3 || !transitExtraOrder.location_code.IsNullOrEmpty()) &&
// transitExtraOrder.pack_type == "2" && !OrderItem.ItemTransitOrderAfterSales.Any(af => af.pack_type == 2 && af.order_code == transitDetail.OrderCode && af.order_void_status != 1) ?
// Visibility.Visible : Visibility.Collapsed; /* 退货包裹按钮 */
// 秒退额外包裹才有转寄总店按钮
transitDetail.ReturnPackageBtnVisibility = (transitExtraOrder.warehouse_status == 1 || transitExtraOrder.warehouse_status == 3 || !transitExtraOrder.location_code.IsNullOrEmpty()) &&
transitExtraOrder.pack_type == "3" &&
!OrderItem.ItemTransitOrderAfterSales.Any(af => af.pack_type == 2 && af.order_code == transitDetail.OrderCode && af.order_void_status != 1) ?
Visibility.Visible : Visibility.Collapsed; /* 退货包裹按钮 */
// 所有额外包裹都有拦截退回总店按钮
transitDetail.InterceptPackageBtnVisibility = (transitExtraOrder.warehouse_status == 2 || transitExtraOrder.outbound_time > DateTime.MinValue || !transitExtraOrder.real_logistics_express_code.IsNullOrEmpty()) &&
transitExtraOrder.pack_type == "2" && !OrderItem.ItemTransitOrderAfterSales.Any(af => af.pack_type == 2 && af.order_code == transitDetail.OrderCode && af.order_void_status != 1) ?
(transitExtraOrder.pack_type == "1" || transitExtraOrder.pack_type == "2" || transitExtraOrder.pack_type == "3") &&
!OrderItem.ItemTransitOrderAfterSales.Any(af => af.pack_type.ToString() == transitExtraOrder.pack_type && af.order_code == transitDetail.OrderCode && af.order_void_status != 1) ?
Visibility.Visible : Visibility.Collapsed; /* 拦截退货包裹按钮 */
//transitDetail.VoidPackageBtnVisibility = Visibility.Visible; /* 作废额外包裹 */
@@ -534,6 +541,12 @@ public class oms_wei_order_item_transit_detail_info : PropertyNotifyObject
set { this.SetValue(x => x.ShopName, value); }
}
public int? TransitPackType
{
get { return this.GetValue(x => x.TransitPackType); }
set { this.SetValue(x => x.TransitPackType, value); }
}
/// <summary> 仓库类型: 发货包裹 退货包裹 额外包裹 </summary>
public string TransitTypeStr
{
+9 -41
View File
@@ -1671,15 +1671,19 @@ namespace TemuKJD.ToolForms
else if (BuyType == "transit_extra")
{
#region 秒退额外拍单
#region 秒退额外拍单或者多包裹订单
if (AbnormalTransitWarehouseOrderInfo == null)
{
JObject body = new JObject();
body["packType"] = "3"; // 额外单类型
body["orderNo"] = orderItem.order_id; // 微信订单号
body["orderSkuId"] = orderItem.sku_id; // 微信商品skuId
body["batchId"] = txtBuyOrderId.Text.Trim(); // 拍单订单号-额外拍单的流水单号需手动填写
body["orderCode"] = txtBuyOrderId.Text.Trim();
body["outOrderNo"] = txtBuyOrderId.Text.Trim(); // 拍单订单号
body["outAmount"] = (txtBuyPrice.Text.ParseToDecimal() * 100).ParseToInt() + ""; // 外采金额
body["buyerId"] = buyer.buyer_id; // 买手ID
body["accountUser"] = buyer.buyer_nick; // 买手昵称-额外拍单传的参数
body["buyerAccount"] = buyer.buyer_nick; // 买手昵称
body["purchaserNote"] = BaseClass.NickName; // 购买软件账户备注
body["express1Company"] = ""; // 物流公司编号
@@ -1701,7 +1705,7 @@ namespace TemuKJD.ToolForms
body["oemAmount"] = (BaseClass.PostageOemAmount * 100).ParseToInt().ParseToString();
body["postage"] = ((basePostage + BaseClass.ParentPostageOemAmount + BaseClass.PostageOemAmount) * 100).ParseToInt().ParseToString();
}
var url = "https://po.e57.cn/prod-api/api/oms-api/externalProcurement/saveOrUpdate";
var url = "https://po.e57.cn/prod-api/api/oms-api/external_procurement/extra-packages/save";
var dataStr = JsonHelper.SerializeObject(body);
var exportRst = await HttpResponseWXBLL.e57PostResponseAsync(url, dataStr);
if (!exportRst.ParseToString().Contains("\"code\":200"))
@@ -1725,19 +1729,20 @@ namespace TemuKJD.ToolForms
if (updateBalanceAction != null)
await updateBalanceAction();
orderItem.ItemTransitOrders.Insert(0, new oms_wei_external_procurement_log_info()
orderItem.ItemTransitExtraOrders.Insert(0, new oms_wei_transfer_extra_package()
{
buyer_account = buyer.buyer_nick,
id = 0,
order_void_status = 0,
platform = transit.TransId,
order_no = orderItem.order_id,
order_sku_id = orderItem.sku_id,
out_sku_id = orderItem.sku_id,
out_amount = (txtBuyPrice.Text.ParseToDecimal() * 100).ParseToInt(),
out_order_no = txtBuyOrderId.Text.Trim(),
order_code = txtBuyOrderId.Text.Trim(),
purchaser_note = body["purchaserNote"].ParseToString(),
created_time = DateTime.Now,
pack_type = "3",
});
orderItem.SetOrderItemTextProperty();
// 利润计算重置为最小值,控件Resource更新时将计算利润
@@ -1749,43 +1754,6 @@ namespace TemuKJD.ToolForms
{
await filterOrderAction(order, true);
}
//// 前一天的订单直接提前取号
//if (DateTime.Now.Date > BaseClass.StampToDateTime(order.create_time).Date)
//{
// JObject data = new JObject();
// data["outOrderNo"] = txtBuyOrderId.Text.Trim();
// //data2["outOrderNo"] = orderItem.ItemTransitOrder.order_code;
// data["warehouseCode"] = transit.TransId; // 中转仓仓库对应编码 XDYSZC XDYYWC ...
// //data["warehouseCode"] = txtBuyOrderId.Text.Trim(); // 中转仓仓库对应编码
// data["platform"] = "WEISHOP";
// var getVirtualTicketUrl = "https://po.e57.cn/prod-api/api/oms-api/external_procurement/order/virtual/create";
// var getVirtualTicketDataStr = JsonHelper.SerializeObject(data);
// var getVirtualTicketRst = HttpResponseWXBLL.e57PostResponse(getVirtualTicketUrl, getVirtualTicketDataStr, "");
// if (!getVirtualTicketRst.ParseToString().Contains("<code>200</code>") && !getVirtualTicketRst.ParseToString().Contains("<code>0</code>"))
// {
// string msg = "";
// string code = "";
// try
// {
// System.Xml.XmlDocument xmlDoc = new System.Xml.XmlDocument();
// xmlDoc.LoadXml(getVirtualTicketRst);
// code = xmlDoc["AjaxResult"]["code"].InnerText;
// msg = xmlDoc["AjaxResult"]["msg"].InnerText;
// }
// catch
// {
// msg = getVirtualTicketRst.ParseToString();
// }
// if (!IsAutoBuy)
// BaseMsgForm.ShowError("拍单信息保存成功,接收到服务端传递的错误消息:" + msg, "订单提前取号失败");
// else if (this.Created)
// Invoke(() => { lblErrMsg.Text = "拍单信息保存成功,接收到服务端传递的错误消息:" + msg; });
// btnManualUpdateBuyOrder.Enabled = true;
// return;
// }
//}
}
#endregion
}