1淘宝拍单 2修复直发售后处理逻辑错误问题
This commit is contained in:
1 parent
b1e03ddbb1
commit
da4f20ef3b
8 files changed
+525
-111
No files matched your search
@@ -1821,7 +1821,7 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
|
||||
if (cmbRejectStatusText == "拒收成功" && !order.orderItems.Any(oi => oi.AddEditTransitWarehouseRejectStr.StartsWith("拒收成功")))
|
||||
return true;
|
||||
|
||||
if (order.order_id == "3738674216947317248")
|
||||
if (order.order_id == "3739296914665288192")
|
||||
{
|
||||
|
||||
}
|
||||
@@ -2335,7 +2335,7 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
|
||||
{
|
||||
foreach (var orderItem in order.orderItems)
|
||||
{
|
||||
if (order.order_id == "3739105285145538816")
|
||||
if (order.order_id == "3739296914665288192")
|
||||
{
|
||||
|
||||
}
|
||||
@@ -2356,7 +2356,7 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
|
||||
{
|
||||
foreach (var orderItem in tmpOrderItems)
|
||||
{
|
||||
if (orderItem.order_id == "3738564728075491584")
|
||||
if (orderItem.order_id == "3739296914665288192")
|
||||
{
|
||||
|
||||
}
|
||||
@@ -2385,7 +2385,7 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
|
||||
{
|
||||
foreach (var orderItem in order.orderItems)
|
||||
{
|
||||
if (order.order_id == "3739105285145538816")
|
||||
if (order.order_id == "3739296914665288192")
|
||||
{
|
||||
|
||||
}
|
||||
@@ -2400,16 +2400,18 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
|
||||
// 退货地址是退货仓的,直接申请退货退款,取到地址后直接去填写退货仓退货信息
|
||||
if (orderItem?.ItemOrder?.OrderBuyType == "云仓")
|
||||
{
|
||||
if (!string.IsNullOrEmpty(orderItem.ItemTransitOrderWithVoid?.out_order_no) && orderItem.PddBuyerAfterSaleAddressStr.IsNullOrEmpty() &&
|
||||
(orderItem.TransitRefundStatusStr.Contains("需手动申请售后") || orderItem.TransitRefundStatusStr.Contains("需手动申请售后") || orderItem.TransitRefundStatusStr.IsNullOrEmpty()))
|
||||
if (!string.IsNullOrEmpty(orderItem.ItemTransitOrderWithVoid?.out_order_no) && orderItem.PddBuyerAfterSaleAddressStr.IsNullOrEmpty() && GetNeedBuyerAfterSale(orderItem.TransitRefundStatusStr))
|
||||
tmpOrderItems.Add(orderItem);
|
||||
if (!string.IsNullOrEmpty(orderItem.ItemTransitOrderWithVoid?.out_order_no) && GetNeedBuyerNewAfterSale(orderItem.TransitRefundStatusStr))
|
||||
tmpOrderItems.Add(orderItem);
|
||||
}
|
||||
|
||||
if (orderItem?.ItemOrder?.OrderBuyType == "直发")
|
||||
{
|
||||
if (orderItem != null && !string.IsNullOrEmpty(orderItem.ItemOrder?.out_order_no) && orderItem.DirectPddBuyerAfterSaleAddressStr.IsNullOrEmpty() &&
|
||||
((orderItem.ItemOrder?.out_after_sale_status).ParseToString().Contains("需手动申请售后") || (orderItem.ItemOrder?.out_after_sale_status).ParseToString().Contains("待用户发货") ||
|
||||
(orderItem.ItemOrder?.out_after_sale_status).IsNullOrEmpty()))
|
||||
GetNeedBuyerAfterSale(orderItem.ItemOrder?.out_after_sale_status))
|
||||
tmpOrderItems.Add(orderItem);
|
||||
if (orderItem != null && !string.IsNullOrEmpty(orderItem.ItemOrder?.out_order_no) && GetNeedBuyerNewAfterSale(orderItem.ItemOrder?.out_after_sale_status))
|
||||
tmpOrderItems.Add(orderItem);
|
||||
}
|
||||
|
||||
@@ -2417,8 +2419,9 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
|
||||
if (orderItem?.ItemOrder?.OrderBuyType == "云改直")
|
||||
{
|
||||
if (orderItem != null && !string.IsNullOrEmpty(orderItem.ItemOrder?.out_order_no) && orderItem.DirectPddBuyerAfterSaleAddressStr.IsNullOrEmpty() &&
|
||||
((orderItem.ItemOrder?.out_after_sale_status).ParseToString().Contains("需手动申请售后") || (orderItem.ItemOrder?.out_after_sale_status).ParseToString().Contains("待用户发货") ||
|
||||
(orderItem.ItemOrder?.out_after_sale_status).IsNullOrEmpty()))
|
||||
GetNeedBuyerAfterSale(orderItem.ItemOrder?.out_after_sale_status))
|
||||
tmpOrderItems.Add(orderItem);
|
||||
if (orderItem != null && !string.IsNullOrEmpty(orderItem.ItemOrder?.out_order_no) && GetNeedBuyerNewAfterSale(orderItem.ItemOrder?.out_after_sale_status))
|
||||
tmpOrderItems.Add(orderItem);
|
||||
}
|
||||
}
|
||||
@@ -2439,7 +2442,7 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
|
||||
int index = 0;
|
||||
foreach (var tmpOrderItem in tmpOrderItems)
|
||||
{
|
||||
if (tmpOrderItem.order_id == "3739105285145538816")
|
||||
if (tmpOrderItem.order_id == "3739296914665288192")
|
||||
{
|
||||
|
||||
}
|
||||
@@ -2501,8 +2504,7 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
|
||||
refundStatusStr = (order.out_after_sale_status).ParseToString();
|
||||
AfterSaleAddressStr = orderItem.DirectPddBuyerAfterSaleAddressStr;
|
||||
}
|
||||
if (string.IsNullOrEmpty(outOrderNo) || !AfterSaleAddressStr.IsNullOrEmpty() ||
|
||||
(!refundStatusStr.Contains("需手动申请售后") && !refundStatusStr.Contains("待用户发货") && !refundStatusStr.IsNullOrEmpty()))
|
||||
if (string.IsNullOrEmpty(outOrderNo) || !(AfterSaleAddressStr.IsNullOrEmpty() || GetNeedBuyerNewAfterSale(refundStatusStr)) || !GetNeedBuyerAfterSale(refundStatusStr))
|
||||
continue;
|
||||
|
||||
PddBuyerOrderLiteInfo pddBuyerOrderLiteInfo = new PddBuyerOrderLiteInfo();
|
||||
@@ -2534,7 +2536,7 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
|
||||
pddBuyerAfterSale = orderItem.DirectPddBuyerAfterSale;
|
||||
|
||||
bool isSimPddAfterSaleSuccess = true;
|
||||
if (refundStatusStr.Contains("需手动申请售后") || string.IsNullOrEmpty(refundStatusStr))
|
||||
if (GetNeedBuyerNewAfterSale(refundStatusStr))
|
||||
{
|
||||
isSimPddAfterSaleSuccess = false;
|
||||
// pddBuyerAfterSale作为参数传入,获取退货退款金额
|
||||
@@ -3052,6 +3054,20 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
|
||||
chkNoPickupNumOrderIsChecked = chkNoPickupNumOrder.IsChecked.ParseToBool();
|
||||
FilterOrders();
|
||||
}
|
||||
|
||||
public static bool GetNeedBuyerAfterSale(string buyerAfterSaleStatus)
|
||||
{
|
||||
if (buyerAfterSaleStatus.Contains("待用户发货") || GetNeedBuyerNewAfterSale(buyerAfterSaleStatus))
|
||||
return true;
|
||||
return false;
|
||||
}
|
||||
|
||||
public static bool GetNeedBuyerNewAfterSale(string buyerAfterSaleStatus)
|
||||
{
|
||||
if (buyerAfterSaleStatus.Contains("需手动申请售后") || buyerAfterSaleStatus.Contains("已申请售后 退款失败") || buyerAfterSaleStatus.Contains("已取消申请") || string.IsNullOrEmpty(buyerAfterSaleStatus))
|
||||
return true;
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
public class OrderFilterConfig : PropertyNotifyObject
|
||||
|
||||
@@ -673,7 +673,7 @@
|
||||
Title="采购账户:"
|
||||
Cursor="Hand"
|
||||
Foreground="#0099ff"
|
||||
MouseLeftButtonUp="TransitOrderBuye_Click"
|
||||
MouseLeftButtonUp="TransitOrderBuy_Click"
|
||||
Visibility="{Binding ElementName=txtTransitOrderBuyerStr, Path=Text, Converter={StaticResource HasTextVisibility}}">
|
||||
<WrapPanel Orientation="Horizontal">
|
||||
<uc:UcWaterMarkTextBox1
|
||||
|
||||
@@ -55,8 +55,8 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
|
||||
public OrderListRowItemCtrl()
|
||||
{
|
||||
InitializeComponent();
|
||||
txtTransitOrderBuyerStr.AddHandler(TextBox.MouseUpEvent, new MouseButtonEventHandler(TransitOrderBuye_Click), true);
|
||||
txtTransitOrderNumStr.AddHandler(TextBox.MouseUpEvent, new MouseButtonEventHandler(TransitOrderBuye_Click), true);
|
||||
txtTransitOrderBuyerStr.AddHandler(TextBox.MouseUpEvent, new MouseButtonEventHandler(TransitOrderBuy_Click), true);
|
||||
txtTransitOrderNumStr.AddHandler(TextBox.MouseUpEvent, new MouseButtonEventHandler(TransitOrderBuy_Click), true);
|
||||
txtDirectBuyer.AddHandler(TextBox.MouseUpEvent, new MouseButtonEventHandler(txtDirectOrderNumStr_MouseLeftButtonUp), true);
|
||||
txtDirectBuyerOrderNo.AddHandler(TextBox.MouseUpEvent, new MouseButtonEventHandler(txtDirectOrderNumStr_MouseLeftButtonUp), true);
|
||||
txtRefundId.AddHandler(TextBox.MouseUpEvent, new MouseButtonEventHandler(txtRefundId_MouseLeftButtonUp), true);
|
||||
@@ -397,14 +397,17 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
|
||||
return;
|
||||
|
||||
// 拍单前检测买手号是否在线
|
||||
if (GlobalConfig.CurrentPddBuyer.status == "在线")
|
||||
if (GlobalConfig.CurrentBuyPlatform == "pdd")
|
||||
{
|
||||
PddMobileLoginViewModel.CheckBuyerLogin(GlobalConfig.CurrentPddBuyer);
|
||||
}
|
||||
if (GlobalConfig.CurrentPddBuyer.status != "在线")
|
||||
{
|
||||
BaseMsgWindow.ShowError("买手号掉线");
|
||||
return;
|
||||
if (GlobalConfig.CurrentPddBuyer.status == "在线")
|
||||
{
|
||||
PddMobileLoginViewModel.CheckBuyerLogin(GlobalConfig.CurrentPddBuyer);
|
||||
}
|
||||
if (GlobalConfig.CurrentPddBuyer.status != "在线")
|
||||
{
|
||||
BaseMsgWindow.ShowError("买手号掉线");
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
orderRetry:
|
||||
@@ -767,7 +770,7 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
|
||||
|
||||
return true;
|
||||
}
|
||||
private void TransitOrderBuye_Click(object sender, MouseButtonEventArgs e)
|
||||
private void TransitOrderBuy_Click(object sender, MouseButtonEventArgs e)
|
||||
{
|
||||
var buyerName = txtTransitOrderBuyerStr.Text;
|
||||
var outOrderId = txtTransitOrderNumStr.Text;
|
||||
|
||||
@@ -0,0 +1,140 @@
|
||||
// 填写信息
|
||||
function changeReactInputValue(inputDom, newText) {
|
||||
let lastValue = inputDom.value;
|
||||
inputDom.value = newText;
|
||||
let event = new Event('input', { bubbles: true });
|
||||
event.simulated = true;
|
||||
let tracker = inputDom._valueTracker;
|
||||
if (tracker) {
|
||||
tracker.setValue(lastValue);
|
||||
}
|
||||
inputDom.dispatchEvent(event);
|
||||
}
|
||||
|
||||
// 异步 sleep
|
||||
function sleep(ms) {
|
||||
return new Promise(resolve => setTimeout(resolve, ms));
|
||||
}
|
||||
|
||||
// 查找元素(支持选择器或XPath)
|
||||
function findElement(selector, isXPath = true) {
|
||||
if (isXPath) {
|
||||
return document.evaluate(
|
||||
selector,
|
||||
document,
|
||||
null,
|
||||
XPathResult.FIRST_ORDERED_NODE_TYPE,
|
||||
null
|
||||
).singleNodeValue;
|
||||
} else {
|
||||
return document.querySelector(selector);
|
||||
}
|
||||
}
|
||||
|
||||
// 完整流程
|
||||
async function changeTbAddress(data = {}) {
|
||||
const {
|
||||
transitAddress = ''
|
||||
} = data;
|
||||
|
||||
console.log('📝 开始自动填写地址...');
|
||||
|
||||
// 1. 点击"修改"按钮,弹出修改地址框
|
||||
var btnType = findElement('(//a[contains(text(), "修改")])[1]');
|
||||
for (i = 0; i < 10; i++) {
|
||||
if (!btnType) {
|
||||
console.warn('⚠️ 找不到"修改"按钮,等待重试' + i);
|
||||
await sleep(500);
|
||||
btnType = findElement('(//a[contains(text(), "修改")])[1]');
|
||||
}
|
||||
}
|
||||
if (!btnType) {
|
||||
console.warn('⚠️ 找不到"修改"按钮');
|
||||
return false;
|
||||
}
|
||||
btnType.click();
|
||||
console.log('✅ 已点击"修改"按钮');
|
||||
await sleep(500);
|
||||
|
||||
return true;
|
||||
|
||||
// // 2. 填充并自动识别收货地址
|
||||
// const invoiceTitle = findElement('//label[contains(text(), "发票抬头")]/following-sibling::textarea[1]') ||
|
||||
// findElement('//*[contains(text(), "发票抬头")]/following-sibling::textarea[1]');
|
||||
// if (invoiceTitle) {
|
||||
// changeReactInputValue(invoiceTitle, title);
|
||||
// console.log('✅ 发票抬头已填充');
|
||||
// } else {
|
||||
// console.warn('⚠️ 未找到发票抬头控件');
|
||||
// }
|
||||
|
||||
// // 3. 查找并填充税号
|
||||
// const taxNumberInput = findElement('//label[contains(text(), "税号")]/following-sibling::input[1]') ||
|
||||
// findElement('//*[contains(text(), "税号")]/following-sibling::input[1]');
|
||||
// if (taxNumberInput) {
|
||||
// changeReactInputValue(taxNumberInput, taxNumber);
|
||||
// console.log('✅ 税号已填充');
|
||||
// } else {
|
||||
// console.warn('⚠️ 未找到税号控件');
|
||||
// }
|
||||
|
||||
// await sleep(300);
|
||||
|
||||
// // 4. 查找并点击"申请发票"按钮
|
||||
// const applyBtn = findElement('//*[contains(text(), "申请发票")]');
|
||||
// if (!applyBtn) {
|
||||
// console.error('❌ 未找到"申请发票"按钮');
|
||||
// return false;
|
||||
// }
|
||||
|
||||
// applyBtn.scrollIntoView({ behavior: 'smooth', block: 'center' });
|
||||
// await sleep(300);
|
||||
// applyBtn.click();
|
||||
// console.log('✅ 已点击"申请发票"按钮');
|
||||
|
||||
// // 5. 等待弹窗/状态出现
|
||||
// await sleep(300);
|
||||
|
||||
// // 6. 判断状态
|
||||
// // 检查是否有"已经申请过"的提示
|
||||
// const alreadyApplied = findElement('//*[contains(text(), "您已经提交过发票申请了")]')
|
||||
|
||||
|
||||
// if (alreadyApplied) {
|
||||
// console.log('✅ 已经申请过,无需重复操作');
|
||||
// return true;
|
||||
// }
|
||||
// const successElement = findElement('//*[text()="确认发票信息无误后再提交"]');
|
||||
// if (successElement == null) {
|
||||
// return false;
|
||||
// }
|
||||
// // 检查是否有"确认开具"按钮或提示
|
||||
// const confirmBtn = findElement('//*[text()= "确认"]');
|
||||
|
||||
// if (confirmBtn) {
|
||||
// console.log('✅ 找到"确认"按钮,准备点击...');
|
||||
// await sleep(200);
|
||||
// confirmBtn.click();
|
||||
// console.log('✅ 已点击"确认"按钮');
|
||||
// return true;
|
||||
// }
|
||||
|
||||
// // 如果都没有找到
|
||||
// console.warn('⚠️ 未找到"已经申请过"或"确认"按钮,请手动检查');
|
||||
// return false;
|
||||
}
|
||||
|
||||
// ========== 调用 ==========
|
||||
(async function () {
|
||||
try {
|
||||
const result = await changeTbAddress({
|
||||
transitAddress: '{中转仓地址}'
|
||||
});
|
||||
console.log('执行结果:', result);
|
||||
// 批量开票时,C# 端轮询该变量获取执行结果
|
||||
window.__invoiceApplyResult = result;
|
||||
} catch (ex) {
|
||||
console.error('执行异常:', ex);
|
||||
window.__invoiceApplyResult = false;
|
||||
}
|
||||
})();
|
||||
Reference in new issue
Block a user