需要售后订单处理逻辑优化调整及bug修复
This commit is contained in:
1 parent
854e10ed1a
commit
237fad81eb
9 files changed
+299
-189
No files matched your search
@@ -2518,10 +2518,18 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
|
|||||||
|
|
||||||
public static string GetAfterSaleAddress(BuyerLoginInfo buyer, string orderSn, string afterSalesId)
|
public static string GetAfterSaleAddress(BuyerLoginInfo buyer, string orderSn, string afterSalesId)
|
||||||
{
|
{
|
||||||
//https://mobile.yangkeduo.com/complaints_new_detail.html?after_sales_id=21892258236871&order_sn=260721-113109931520980&refer_page_name=order_detail&refer_page_id=10038_1785055821030_cmczxk3x91&refer_page_sn=10038
|
//https://mobile.yangkeduo.com/complaints_new_detail.html?after_sales_id=21892258236871&order_sn=260721-113109931520980&refer_page_name=order_detail&refer_page_id=10038_1785055821030_cmczxk3x91&refer_page_sn=10038
|
||||||
//&refer_page_name=order_detail&refer_page_id=10038_1785055821030_cmczxk3x91&refer_page_sn=10038
|
//&refer_page_name=order_detail&refer_page_id=10038_1785055821030_cmczxk3x91&refer_page_sn=10038
|
||||||
string url = "https://mobile.yangkeduo.com/complaints_new_detail.html?after_sales_id=" + afterSalesId + "&order_sn=" + orderSn;
|
string refPageId = "10038_" + BaseClass.DateTimeToTimestampSeconds(DateTime.Now) + "_" + Randomx.GetWordNumber(10);
|
||||||
var rst = HttpResponseYkdBLL.YangkeduoGetPageResponse(buyer, url);
|
string url = "https://mobile.yangkeduo.com/complaints_new_detail.html?after_sales_id=" + afterSalesId + "&order_sn=" + orderSn + "&refer_page_name=order_detail&refer_page_id=" + refPageId + "&refer_page_sn=10038";
|
||||||
|
string refere = "https://mobile.yangkeduo.com/order.html?order_sn=" + orderSn + "&page_from=1&main_orders=1&is_tester=1&refer_page_name=my_order" +
|
||||||
|
"&refer_page_id=10032_" + BaseClass.DateTimeToTimestampSeconds(DateTime.Now) + "_" + Randomx.GetWordNumber(10) + "&refer_page_sn=10032&page_id=" + refPageId + "&is_back=1";
|
||||||
|
//url = "https://mobile.yangkeduo.com/complaints_new_detail.html?after_sales_id=22261687961679&order_sn=260819-017951649351926&refer_page_name=order_detail&refer_page_id=10038_1787734305016_cb6b9im8jg&refer_page_sn=10038";
|
||||||
|
//refere = "https://mobile.yangkeduo.com/order.html?order_sn=260819-017951649351926&page_from=1&main_orders=1&is_tester=1&refer_page_name=my_order&refer_page_id=10032_1787734304425_5EGkUPjpA9&refer_page_sn=10032&page_id=10038_1787734305016_cb6b9im8jg&is_back=1";
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
var rst = HttpResponseYkdBLL.YangkeduoGetPageResponse(buyer, url, refere);
|
||||||
return rst;
|
return rst;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -752,168 +752,223 @@
|
|||||||
<ColumnDefinition Width="auto" />
|
<ColumnDefinition Width="auto" />
|
||||||
<ColumnDefinition Width="*" />
|
<ColumnDefinition Width="*" />
|
||||||
</Grid.ColumnDefinitions>
|
</Grid.ColumnDefinitions>
|
||||||
<CheckBox
|
<WrapPanel>
|
||||||
x:Name="chkEmergencyBuyerWaitAfterSale"
|
|
||||||
Grid.Column="0"
|
|
||||||
Margin="6,8"
|
|
||||||
VerticalAlignment="Center"
|
|
||||||
BorderBrush="{StaticResource mainColorBrush}"
|
|
||||||
Click="chkEmergencyBuyerAfterSale_Click"
|
|
||||||
Content="买手待申请售后"
|
|
||||||
FontSize="12" />
|
|
||||||
<Button
|
|
||||||
x:Name="btnBatchRefund"
|
|
||||||
Grid.Column="1"
|
|
||||||
Height="20"
|
|
||||||
MinWidth="48"
|
|
||||||
Margin="0,0,0,0"
|
|
||||||
Padding="4,0"
|
|
||||||
Click="btnBatchRefund_Click"
|
|
||||||
Content="批量申请买手售后"
|
|
||||||
FontSize="12"
|
|
||||||
Style="{StaticResource BasePageButtonStyle}" />
|
|
||||||
|
|
||||||
<CheckBox
|
<CheckBox
|
||||||
x:Name="chkEmergencyBuyerWaitSendBack"
|
x:Name="chkEmergencyWaitSupplierAccept"
|
||||||
Grid.Column="2"
|
Grid.Column="9"
|
||||||
Margin="6,8"
|
Margin="6,8"
|
||||||
VerticalAlignment="Center"
|
VerticalAlignment="Center"
|
||||||
BorderBrush="{StaticResource mainColorBrush}"
|
BorderBrush="{StaticResource mainColorBrush}"
|
||||||
Click="chkEmergencyBuyerAfterSale_Click"
|
Click="chkEmergencyShopAfterSale_Click"
|
||||||
Content="买手待退货"
|
Content="待商家受理"
|
||||||
FontSize="12" />
|
FontSize="12" />
|
||||||
<CheckBox
|
<CheckBox
|
||||||
x:Name="chkEmergencyBuyerWaitSupplierRefund"
|
x:Name="chkEmergencyWaitSupplierReceive"
|
||||||
Grid.Column="3"
|
Grid.Column="9"
|
||||||
Margin="6,8"
|
Margin="6,8"
|
||||||
VerticalAlignment="Center"
|
VerticalAlignment="Center"
|
||||||
BorderBrush="{StaticResource mainColorBrush}"
|
BorderBrush="{StaticResource mainColorBrush}"
|
||||||
Click="chkEmergencyBuyerAfterSale_Click"
|
Click="chkEmergencyShopAfterSale_Click"
|
||||||
Content="买手已寄出待商家退款"
|
Content="待商家收货"
|
||||||
FontSize="12" />
|
FontSize="12" />
|
||||||
<CheckBox
|
<CheckBox
|
||||||
x:Name="chkEmergencyBuyerRefundFail"
|
x:Name="chkEmergencyShopAfterSaleSuccess"
|
||||||
Grid.Column="4"
|
Grid.Column="9"
|
||||||
Margin="6,8"
|
Margin="6,8"
|
||||||
VerticalAlignment="Center"
|
VerticalAlignment="Center"
|
||||||
BorderBrush="{StaticResource mainColorBrush}"
|
BorderBrush="{StaticResource mainColorBrush}"
|
||||||
Click="chkEmergencyBuyerAfterSale_Click"
|
Click="chkEmergencyShopAfterSale_Click"
|
||||||
Content="买手退款失败"
|
Content="店铺退款完成买手需处理"
|
||||||
FontSize="12" />
|
FontSize="12" />
|
||||||
<Polyline
|
|
||||||
Grid.Column="5"
|
|
||||||
Width="10"
|
|
||||||
Margin="5,0"
|
|
||||||
VerticalAlignment="Center"
|
|
||||||
Points="5,0 5,8 5,0"
|
|
||||||
Stroke="{StaticResource mainColorBrush}"
|
|
||||||
StrokeThickness="2" />
|
|
||||||
|
|
||||||
<CheckBox
|
|
||||||
x:Name="chkEmergencyShopCustomRefundHasWaybill"
|
|
||||||
Grid.Column="6"
|
|
||||||
Margin="6,8"
|
|
||||||
VerticalAlignment="Center"
|
|
||||||
BorderBrush="{StaticResource mainColorBrush}"
|
|
||||||
Click="chkEmergencyShopCustomRefundWaybill_Click"
|
|
||||||
Content="店铺客户有退货单号"
|
|
||||||
FontSize="12" />
|
|
||||||
<CheckBox
|
|
||||||
x:Name="chkEmergencyShopCustomRefundNoWaybill"
|
|
||||||
Grid.Column="7"
|
|
||||||
Margin="6,8"
|
|
||||||
VerticalAlignment="Center"
|
|
||||||
BorderBrush="{StaticResource mainColorBrush}"
|
|
||||||
Click="chkEmergencyShopCustomRefundWaybill_Click"
|
|
||||||
Content="店铺客户无退货单号"
|
|
||||||
FontSize="12" />
|
|
||||||
<Polyline
|
|
||||||
Grid.Column="8"
|
|
||||||
Width="10"
|
|
||||||
Margin="5,0"
|
|
||||||
VerticalAlignment="Center"
|
|
||||||
Points="5,0 5,8 5,0"
|
|
||||||
Stroke="{StaticResource mainColorBrush}"
|
|
||||||
StrokeThickness="2" />
|
|
||||||
|
|
||||||
<CheckBox
|
|
||||||
x:Name="chkEmergencyShopAfterSaleSuccess"
|
|
||||||
Grid.Column="9"
|
|
||||||
Margin="6,8"
|
|
||||||
VerticalAlignment="Center"
|
|
||||||
BorderBrush="{StaticResource mainColorBrush}"
|
|
||||||
Click="chkEmergencyShopAfterSale_Click"
|
|
||||||
Content="店铺退款完成"
|
|
||||||
FontSize="12" />
|
|
||||||
<CheckBox
|
|
||||||
x:Name="chkEmergencyShopInAfterSale"
|
|
||||||
Grid.Column="10"
|
|
||||||
Margin="6,8"
|
|
||||||
VerticalAlignment="Center"
|
|
||||||
BorderBrush="{StaticResource mainColorBrush}"
|
|
||||||
Click="chkEmergencyShopAfterSale_Click"
|
|
||||||
Content="店铺退款中"
|
|
||||||
FontSize="12" />
|
|
||||||
|
|
||||||
<Polyline
|
|
||||||
Grid.Column="11"
|
|
||||||
Width="10"
|
|
||||||
Margin="5,0"
|
|
||||||
VerticalAlignment="Center"
|
|
||||||
Points="5,0 5,8 5,0"
|
|
||||||
Stroke="{StaticResource mainColorBrush}"
|
|
||||||
StrokeThickness="2" />
|
|
||||||
|
|
||||||
<CheckBox
|
|
||||||
x:Name="chkEmergencyReturn"
|
|
||||||
Grid.Column="12"
|
|
||||||
Margin="6,8"
|
|
||||||
VerticalAlignment="Center"
|
|
||||||
BorderBrush="{StaticResource mainColorBrush}"
|
|
||||||
Click="chkEmergencyReturnOrRefund_Click"
|
|
||||||
Content="退货退款"
|
|
||||||
FontSize="12" />
|
|
||||||
<CheckBox
|
|
||||||
x:Name="chkEmergencyRefund"
|
|
||||||
Grid.Column="13"
|
|
||||||
Margin="6,8"
|
|
||||||
VerticalAlignment="Center"
|
|
||||||
BorderBrush="{StaticResource mainColorBrush}"
|
|
||||||
Click="chkEmergencyReturnOrRefund_Click"
|
|
||||||
Content="仅退款"
|
|
||||||
FontSize="12" />
|
|
||||||
|
|
||||||
|
|
||||||
<Polyline
|
|
||||||
Grid.Column="14"
|
<CheckBox
|
||||||
Width="10"
|
x:Name="chkEmergencyShopInAfterSale"
|
||||||
Margin="5,0"
|
Grid.Column="10"
|
||||||
VerticalAlignment="Center"
|
Margin="6,8"
|
||||||
Points="5,0 5,8 5,0"
|
VerticalAlignment="Center"
|
||||||
Stroke="{StaticResource mainColorBrush}"
|
BorderBrush="{StaticResource mainColorBrush}"
|
||||||
StrokeThickness="2"
|
Click="chkEmergencyShopAfterSale_Click"
|
||||||
Visibility="Hidden" />
|
Content="店铺退款中"
|
||||||
<CheckBox
|
FontSize="12"
|
||||||
x:Name="chkReturnOrderAddress"
|
Visibility="Collapsed" />
|
||||||
Grid.Column="15"
|
<Polyline
|
||||||
Margin="6,8"
|
Grid.Column="8"
|
||||||
VerticalAlignment="Center"
|
Width="10"
|
||||||
BorderBrush="{StaticResource mainColorBrush}"
|
Margin="5,0"
|
||||||
Click="chkEmergencyReturnOrder_Click"
|
VerticalAlignment="Center"
|
||||||
Content="退货仓"
|
Points="5,0 5,8 5,0"
|
||||||
FontSize="12"
|
Stroke="{StaticResource mainColorBrush}"
|
||||||
Visibility="Hidden" />
|
StrokeThickness="2"
|
||||||
<CheckBox
|
Visibility="Collapsed" />
|
||||||
x:Name="chkNotReturnOrderAddress"
|
<CheckBox
|
||||||
Grid.Column="16"
|
x:Name="chkEmergencyShopCustomRefundHasWaybill"
|
||||||
Margin="6,8"
|
Grid.Column="6"
|
||||||
VerticalAlignment="Center"
|
Margin="6,8"
|
||||||
BorderBrush="{StaticResource mainColorBrush}"
|
VerticalAlignment="Center"
|
||||||
Click="chkEmergencyReturnOrder_Click"
|
BorderBrush="{StaticResource mainColorBrush}"
|
||||||
Content="非退货仓"
|
Click="chkEmergencyShopCustomRefundWaybill_Click"
|
||||||
FontSize="12"
|
Content="店铺客户有退货单号"
|
||||||
IsChecked="True"
|
FontSize="12"
|
||||||
Visibility="Hidden" />
|
Visibility="Collapsed" />
|
||||||
|
<CheckBox
|
||||||
|
x:Name="chkEmergencyShopCustomRefundNoWaybill"
|
||||||
|
Grid.Column="7"
|
||||||
|
Margin="6,8"
|
||||||
|
VerticalAlignment="Center"
|
||||||
|
BorderBrush="{StaticResource mainColorBrush}"
|
||||||
|
Click="chkEmergencyShopCustomRefundWaybill_Click"
|
||||||
|
Content="店铺客户无退货单号"
|
||||||
|
FontSize="12"
|
||||||
|
Visibility="Collapsed" />
|
||||||
|
|
||||||
|
<Polyline
|
||||||
|
Grid.Column="11"
|
||||||
|
Width="10"
|
||||||
|
Margin="5,0"
|
||||||
|
VerticalAlignment="Center"
|
||||||
|
Points="5,0 5,8 5,0"
|
||||||
|
Stroke="{StaticResource mainColorBrush}"
|
||||||
|
StrokeThickness="2" />
|
||||||
|
|
||||||
|
<CheckBox
|
||||||
|
x:Name="chkEmergencyReturn"
|
||||||
|
Grid.Column="12"
|
||||||
|
Margin="6,8"
|
||||||
|
VerticalAlignment="Center"
|
||||||
|
d:Opacity="0.2"
|
||||||
|
d:Visibility="Visible"
|
||||||
|
BorderBrush="{StaticResource mainColorBrush}"
|
||||||
|
Click="chkEmergencyReturnOrRefund_Click"
|
||||||
|
Content="退货退款"
|
||||||
|
FontSize="12"
|
||||||
|
Visibility="Collapsed" />
|
||||||
|
<CheckBox
|
||||||
|
x:Name="chkEmergencyRefund"
|
||||||
|
Grid.Column="13"
|
||||||
|
Margin="6,8"
|
||||||
|
VerticalAlignment="Center"
|
||||||
|
BorderBrush="{StaticResource mainColorBrush}"
|
||||||
|
Click="chkEmergencyReturnOrRefund_Click"
|
||||||
|
Content="仅退款"
|
||||||
|
FontSize="12" />
|
||||||
|
|
||||||
|
|
||||||
|
<Polyline
|
||||||
|
Grid.Column="14"
|
||||||
|
Width="10"
|
||||||
|
Margin="5,0"
|
||||||
|
VerticalAlignment="Center"
|
||||||
|
Points="5,0 5,8 5,0"
|
||||||
|
Stroke="{StaticResource mainColorBrush}"
|
||||||
|
StrokeThickness="2"
|
||||||
|
Visibility="Visible" />
|
||||||
|
|
||||||
|
<CheckBox
|
||||||
|
x:Name="chkEmergencyBuyerWaitAfterSale"
|
||||||
|
Grid.Column="0"
|
||||||
|
Margin="6,8"
|
||||||
|
VerticalAlignment="Center"
|
||||||
|
BorderBrush="{StaticResource mainColorBrush}"
|
||||||
|
Click="chkEmergencyBuyerAfterSale_Click"
|
||||||
|
Content="买手待申请售后"
|
||||||
|
FontSize="12" />
|
||||||
|
<Button
|
||||||
|
x:Name="btnBatchRefund"
|
||||||
|
Grid.Column="1"
|
||||||
|
Height="20"
|
||||||
|
MinWidth="48"
|
||||||
|
Margin="0,0,0,0"
|
||||||
|
Padding="4,0"
|
||||||
|
Click="btnBatchRefund_Click"
|
||||||
|
Content="批量申请买手售后"
|
||||||
|
FontSize="12"
|
||||||
|
Style="{StaticResource BasePageButtonStyle}" />
|
||||||
|
|
||||||
|
<CheckBox
|
||||||
|
x:Name="chkEmergencyBuyerWaitSendBack"
|
||||||
|
Grid.Column="2"
|
||||||
|
Margin="6,8"
|
||||||
|
VerticalAlignment="Center"
|
||||||
|
BorderBrush="{StaticResource mainColorBrush}"
|
||||||
|
Click="chkEmergencyBuyerAfterSale_Click"
|
||||||
|
Content="买手待退货"
|
||||||
|
FontSize="12" />
|
||||||
|
<CheckBox
|
||||||
|
x:Name="chkEmergencyBuyerWaitSupplierRefund"
|
||||||
|
Grid.Column="3"
|
||||||
|
Margin="6,8"
|
||||||
|
VerticalAlignment="Center"
|
||||||
|
BorderBrush="{StaticResource mainColorBrush}"
|
||||||
|
Click="chkEmergencyBuyerAfterSale_Click"
|
||||||
|
Content="买手已寄出待商家退款"
|
||||||
|
FontSize="12" />
|
||||||
|
<CheckBox
|
||||||
|
x:Name="chkEmergencyBuyerRefundFail"
|
||||||
|
Grid.Column="4"
|
||||||
|
Margin="6,8"
|
||||||
|
VerticalAlignment="Center"
|
||||||
|
BorderBrush="{StaticResource mainColorBrush}"
|
||||||
|
Click="chkEmergencyBuyerAfterSale_Click"
|
||||||
|
Content="买手退款失败"
|
||||||
|
FontSize="12" />
|
||||||
|
<Polyline
|
||||||
|
Grid.Column="5"
|
||||||
|
Width="10"
|
||||||
|
Margin="5,0"
|
||||||
|
VerticalAlignment="Center"
|
||||||
|
Points="5,0 5,8 5,0"
|
||||||
|
Stroke="{StaticResource mainColorBrush}"
|
||||||
|
StrokeThickness="2" />
|
||||||
|
<wpf:TitleContent
|
||||||
|
Title="中转拒收状态"
|
||||||
|
Margin="4,0,4,0"
|
||||||
|
VerticalContentAlignment="Center"
|
||||||
|
FontSize="12"
|
||||||
|
Foreground="Black"
|
||||||
|
Placement="Left"
|
||||||
|
TitleVerticalAlignment="Center">
|
||||||
|
<ComboBox
|
||||||
|
x:Name="cmbRejectStatus"
|
||||||
|
Width="80"
|
||||||
|
Height="23"
|
||||||
|
SelectedIndex="0"
|
||||||
|
SelectionChanged="cmbRejectStatus_SelectionChanged"
|
||||||
|
Style="{StaticResource RoundedComboBox}">
|
||||||
|
<ComboBoxItem Content="请选择" />
|
||||||
|
<ComboBoxItem Content="未申请" />
|
||||||
|
<ComboBoxItem Content="申请中" />
|
||||||
|
<ComboBoxItem Content="拒收失败" />
|
||||||
|
<ComboBoxItem Content="拒收成功" />
|
||||||
|
</ComboBox>
|
||||||
|
</wpf:TitleContent>
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
<CheckBox
|
||||||
|
x:Name="chkReturnOrderAddress"
|
||||||
|
Grid.Column="15"
|
||||||
|
Margin="6,8"
|
||||||
|
VerticalAlignment="Center"
|
||||||
|
BorderBrush="{StaticResource mainColorBrush}"
|
||||||
|
Click="chkEmergencyReturnOrder_Click"
|
||||||
|
Content="退货仓"
|
||||||
|
FontSize="12"
|
||||||
|
Visibility="Hidden" />
|
||||||
|
<CheckBox
|
||||||
|
x:Name="chkNotReturnOrderAddress"
|
||||||
|
Grid.Column="16"
|
||||||
|
Margin="6,8"
|
||||||
|
VerticalAlignment="Center"
|
||||||
|
BorderBrush="{StaticResource mainColorBrush}"
|
||||||
|
Click="chkEmergencyReturnOrder_Click"
|
||||||
|
Content="非退货仓"
|
||||||
|
FontSize="12"
|
||||||
|
IsChecked="True"
|
||||||
|
Visibility="Hidden" />
|
||||||
|
</WrapPanel>
|
||||||
</Grid>
|
</Grid>
|
||||||
</Border>
|
</Border>
|
||||||
</TabItem>
|
</TabItem>
|
||||||
@@ -942,6 +997,17 @@
|
|||||||
<ColumnDefinition Width="auto" />
|
<ColumnDefinition Width="auto" />
|
||||||
<ColumnDefinition Width="*" />
|
<ColumnDefinition Width="*" />
|
||||||
</Grid.ColumnDefinitions>
|
</Grid.ColumnDefinitions>
|
||||||
|
<Button
|
||||||
|
x:Name="btnBatchRefund2"
|
||||||
|
Grid.Column="1"
|
||||||
|
Height="20"
|
||||||
|
MinWidth="48"
|
||||||
|
Margin="6,6"
|
||||||
|
Padding="4,0"
|
||||||
|
Click="btnBatchRefund_Click"
|
||||||
|
Content="批量申请买手售后"
|
||||||
|
FontSize="12"
|
||||||
|
Style="{StaticResource BasePageButtonStyle}" />
|
||||||
</Grid>
|
</Grid>
|
||||||
</Border>
|
</Border>
|
||||||
</TabItem>
|
</TabItem>
|
||||||
|
|||||||
@@ -418,7 +418,7 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
|
|||||||
});
|
});
|
||||||
|
|
||||||
// 处理中转仓退货包裹
|
// 处理中转仓退货包裹
|
||||||
BottomMsg = "当前正在处理中转仓退回...";
|
BottomMsg = "当前正在处理拦截退回总店...";
|
||||||
if (string.IsNullOrEmpty(orderIds))
|
if (string.IsNullOrEmpty(orderIds))
|
||||||
AutoUpdateTransitPackageToPddShop();
|
AutoUpdateTransitPackageToPddShop();
|
||||||
|
|
||||||
@@ -893,7 +893,7 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
|
|||||||
|
|
||||||
// };
|
// };
|
||||||
//}
|
//}
|
||||||
if (orderItem.order_id == "3738442174434006784")
|
if (orderItem.order_id == "3738534855500515072")
|
||||||
{
|
{
|
||||||
|
|
||||||
}
|
}
|
||||||
@@ -969,8 +969,8 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
|
|||||||
{
|
{
|
||||||
foreach (var orderItem in order.orderItems)
|
foreach (var orderItem in order.orderItems)
|
||||||
{
|
{
|
||||||
if (orderItem.order_id == "3738598656037525761")
|
if (orderItem.order_id == "3738534855500515072")
|
||||||
{
|
{
|
||||||
|
|
||||||
}
|
}
|
||||||
if (order.OrderBuyType == "直发" || order.OrderBuyType == "云改直")
|
if (order.OrderBuyType == "直发" || order.OrderBuyType == "云改直")
|
||||||
@@ -1482,6 +1482,18 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
|
|||||||
if (!order.IsEmergencyManualReturnOrder)
|
if (!order.IsEmergencyManualReturnOrder)
|
||||||
return true;
|
return true;
|
||||||
|
|
||||||
|
//"System.Windows.Controls.ComboBoxItem: 未申请";
|
||||||
|
var cmbRejectStatusText = cmbRejectStatus.SelectedItem.ParseToString().Replace("System.Windows.Controls.ComboBoxItem: ", "");
|
||||||
|
if (cmbRejectStatusText == "未申请" && !order.orderItems.Any(oi => oi.AddEditTransitWarehouseRejectStr == "申请"))
|
||||||
|
return true;
|
||||||
|
if (cmbRejectStatusText == "申请中" && !order.orderItems.Any(oi => oi.AddEditTransitWarehouseRejectStr == "已申请拒收"))
|
||||||
|
return true;
|
||||||
|
if (cmbRejectStatusText == "拒收成功" && !order.orderItems.Any(oi => oi.AddEditTransitWarehouseRejectStr.StartsWith("申请拒收成功")))
|
||||||
|
return true;
|
||||||
|
if (cmbRejectStatusText == "拒收失败" && !order.orderItems.Any(oi => oi.AddEditTransitWarehouseRejectStr.StartsWith("申请拒收失败")))
|
||||||
|
return true;
|
||||||
|
|
||||||
|
|
||||||
if (chkEmergencyBuyerWaitAfterSale.IsChecked == true && order.orderItems.All(oi => !oi.TransitRefundStatusStr.Contains("需手动申请售后")))
|
if (chkEmergencyBuyerWaitAfterSale.IsChecked == true && order.orderItems.All(oi => !oi.TransitRefundStatusStr.Contains("需手动申请售后")))
|
||||||
return true;
|
return true;
|
||||||
else if (chkEmergencyBuyerWaitSendBack.IsChecked == true && order.orderItems.All(oi => !oi.TransitRefundStatusStr.Contains("待用户发货")))
|
else if (chkEmergencyBuyerWaitSendBack.IsChecked == true && order.orderItems.All(oi => !oi.TransitRefundStatusStr.Contains("待用户发货")))
|
||||||
@@ -1503,11 +1515,17 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
|
|||||||
//else if (chkNotReturnOrderAddress.IsChecked == true && order.orderItems.Any(oi => oi.ItemRefund?.return_detail == GlobalConfig.TransitReturnOrderReturnAddress))
|
//else if (chkNotReturnOrderAddress.IsChecked == true && order.orderItems.Any(oi => oi.ItemRefund?.return_detail == GlobalConfig.TransitReturnOrderReturnAddress))
|
||||||
// return true;
|
// return true;
|
||||||
|
|
||||||
// 退款完成
|
// 商家受理中
|
||||||
if (chkEmergencyShopAfterSaleSuccess.IsChecked == true && order.DeliveryDeadlineDtatusStr != "退款完成")
|
if (chkEmergencyWaitSupplierAccept.IsChecked == true && !order.orderItems.Any(oi => oi.ItemRefund.RefundStatusStr == "商家受理中"))
|
||||||
|
return true;
|
||||||
|
// 待商家收货
|
||||||
|
if (chkEmergencyWaitSupplierReceive.IsChecked == true && !order.orderItems.Any(oi => oi.ItemRefund.RefundStatusStr == "待商家收货"))
|
||||||
|
return true;
|
||||||
|
// 退款完成(但买手没退)
|
||||||
|
if (chkEmergencyShopAfterSaleSuccess.IsChecked == true && order.DeliveryDeadlineStatusStr != "退款完成")
|
||||||
return true;
|
return true;
|
||||||
// 退款中
|
// 退款中
|
||||||
else if (chkEmergencyShopInAfterSale.IsChecked == true && (order.DeliveryDeadlineDtatusStr != "退款中"))
|
else if (chkEmergencyShopInAfterSale.IsChecked == true && (order.DeliveryDeadlineStatusStr != "退款中"))
|
||||||
return true;
|
return true;
|
||||||
|
|
||||||
// 退货退款
|
// 退货退款
|
||||||
@@ -1755,7 +1773,7 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
|
|||||||
if (sender is CheckBox chk)
|
if (sender is CheckBox chk)
|
||||||
{
|
{
|
||||||
var isCheck = !chk.IsChecked.ParseToBool();
|
var isCheck = !chk.IsChecked.ParseToBool();
|
||||||
chkEmergencyShopAfterSaleSuccess.IsChecked = chkEmergencyShopInAfterSale.IsChecked = false;
|
chkEmergencyWaitSupplierReceive.IsChecked = chkEmergencyWaitSupplierAccept.IsChecked = chkEmergencyShopAfterSaleSuccess.IsChecked = chkEmergencyShopInAfterSale.IsChecked = false;
|
||||||
chk.IsChecked = !isCheck;
|
chk.IsChecked = !isCheck;
|
||||||
}
|
}
|
||||||
FilterOrders();
|
FilterOrders();
|
||||||
@@ -1969,7 +1987,7 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
|
|||||||
{
|
{
|
||||||
foreach (var orderItem in order.orderItems)
|
foreach (var orderItem in order.orderItems)
|
||||||
{
|
{
|
||||||
if (order.order_id == "3738480261631214336")
|
if (order.order_id == "3738534855500515072")
|
||||||
{
|
{
|
||||||
|
|
||||||
}
|
}
|
||||||
@@ -2021,6 +2039,11 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
|
|||||||
int index = 0;
|
int index = 0;
|
||||||
foreach (var tmpOrderItem in tmpOrderItems)
|
foreach (var tmpOrderItem in tmpOrderItems)
|
||||||
{
|
{
|
||||||
|
if (tmpOrderItem.order_id == "3738534855500515072")
|
||||||
|
{
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
Dispatcher.Invoke(new Action(() => { BottomMsg = "正在处理买手退货,总计:" + tmpOrderItems.Count + ",已处理:" + index++; }));
|
Dispatcher.Invoke(new Action(() => { BottomMsg = "正在处理买手退货,总计:" + tmpOrderItems.Count + ",已处理:" + index++; }));
|
||||||
|
|
||||||
var pddOrderSn = "";
|
var pddOrderSn = "";
|
||||||
@@ -2103,8 +2126,11 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
|
|||||||
refundAmount = pddBuyerOrderLiteInfo.order_amount,
|
refundAmount = pddBuyerOrderLiteInfo.order_amount,
|
||||||
orderDate = pddOrderSn.ParseToString().Split('-').FirstOrDefault().ParseToInt(),
|
orderDate = pddOrderSn.ParseToString().Split('-').FirstOrDefault().ParseToInt(),
|
||||||
};
|
};
|
||||||
if (orderItem.PddBuyerAfterSale != null)
|
// 根据云仓还是直发判断是哪个买手单
|
||||||
|
if (tmpOrderItem.ItemOrder?.OrderBuyType == "云仓" && orderItem.PddBuyerAfterSale != null)
|
||||||
pddBuyerAfterSale = orderItem.PddBuyerAfterSale;
|
pddBuyerAfterSale = orderItem.PddBuyerAfterSale;
|
||||||
|
if (tmpOrderItem.ItemOrder?.OrderBuyType != "云仓" && orderItem.DirectPddBuyerAfterSale != null)
|
||||||
|
pddBuyerAfterSale = orderItem.DirectPddBuyerAfterSale;
|
||||||
|
|
||||||
bool isSimPddAfterSaleSuccess = true;
|
bool isSimPddAfterSaleSuccess = true;
|
||||||
if (refundStatusStr.Contains("需手动申请售后"))
|
if (refundStatusStr.Contains("需手动申请售后"))
|
||||||
@@ -2199,6 +2225,10 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
|
|||||||
{
|
{
|
||||||
address = BaseRegex.GetStringJson(ref merchantReceiverInfo, "copyValue");
|
address = BaseRegex.GetStringJson(ref merchantReceiverInfo, "copyValue");
|
||||||
}
|
}
|
||||||
|
if (addressRst.Contains("网络异常,请稍后重试"))
|
||||||
|
{
|
||||||
|
BaseMsgWindow.ShowAnimateMessage("买手 " + buyer.buyer_nick + " 网络异常,请手动获取总店退货地址并填写", "Msg", 5);
|
||||||
|
}
|
||||||
|
|
||||||
var url3 = BaseClass.Build29WxObjString("order/wx_add_mdy_buyer_after_sale");
|
var url3 = BaseClass.Build29WxObjString("order/wx_add_mdy_buyer_after_sale");
|
||||||
var data3 = UserLogin.GetSignaturex();
|
var data3 = UserLogin.GetSignaturex();
|
||||||
@@ -2489,6 +2519,11 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private void cmbRejectStatus_SelectionChanged(object sender, SelectionChangedEventArgs e)
|
||||||
|
{
|
||||||
|
FilterOrders();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public class OrderFilterConfig : PropertyNotifyObject
|
public class OrderFilterConfig : PropertyNotifyObject
|
||||||
|
|||||||
@@ -41,7 +41,7 @@
|
|||||||
</Grid.ColumnDefinitions>
|
</Grid.ColumnDefinitions>
|
||||||
<Border x:Name="borderDeadlineHead" Background="#0397b5" CornerRadius="2,0,10,2">
|
<Border x:Name="borderDeadlineHead" Background="#0397b5" CornerRadius="2,0,10,2">
|
||||||
<TextBox Grid.Column="0" Margin="2,0,2,1" Foreground="White" VerticalContentAlignment="Center" VerticalAlignment="Center" Background="Transparent" IsReadOnly="True" MinWidth="20"
|
<TextBox Grid.Column="0" Margin="2,0,2,1" Foreground="White" VerticalContentAlignment="Center" VerticalAlignment="Center" Background="Transparent" IsReadOnly="True" MinWidth="20"
|
||||||
Text="{Binding DeliveryDeadlineDtatusStr}" BorderThickness="0" />
|
Text="{Binding DeliveryDeadlineStatusStr}" BorderThickness="0" />
|
||||||
</Border>
|
</Border>
|
||||||
<TextBox x:Name="txtDeadline" Grid.Column="1" Margin="2,0,2,1" Foreground="#0397b5" VerticalContentAlignment="Center" VerticalAlignment="Center" Background="Transparent" IsReadOnly="True" MinWidth="20"
|
<TextBox x:Name="txtDeadline" Grid.Column="1" Margin="2,0,2,1" Foreground="#0397b5" VerticalContentAlignment="Center" VerticalAlignment="Center" Background="Transparent" IsReadOnly="True" MinWidth="20"
|
||||||
Text="{Binding DeliveryDeadlineStr}" BorderThickness="0" />
|
Text="{Binding DeliveryDeadlineStr}" BorderThickness="0" />
|
||||||
@@ -55,7 +55,7 @@
|
|||||||
</Grid.ColumnDefinitions>
|
</Grid.ColumnDefinitions>
|
||||||
<Border x:Name="borderDeadlineHead" Background="{Binding StatusBoxForeColor}" CornerRadius="2,0,10,2">
|
<Border x:Name="borderDeadlineHead" Background="{Binding StatusBoxForeColor}" CornerRadius="2,0,10,2">
|
||||||
<TextBox Grid.Column="0" Margin="2,0,2,1" Foreground="White" VerticalContentAlignment="Center" VerticalAlignment="Center" Background="Transparent" IsReadOnly="True" MinWidth="20"
|
<TextBox Grid.Column="0" Margin="2,0,2,1" Foreground="White" VerticalContentAlignment="Center" VerticalAlignment="Center" Background="Transparent" IsReadOnly="True" MinWidth="20"
|
||||||
Text="{Binding DeliveryDeadlineDtatusStr}" BorderThickness="0" />
|
Text="{Binding DeliveryDeadlineStatusStr}" BorderThickness="0" />
|
||||||
</Border>
|
</Border>
|
||||||
<TextBox x:Name="txtDeadline" Grid.Column="1" Margin="2,0,2,1" Foreground="{Binding StatusBoxForeColor}" VerticalContentAlignment="Center" VerticalAlignment="Center" Background="Transparent" IsReadOnly="True" MinWidth="20"
|
<TextBox x:Name="txtDeadline" Grid.Column="1" Margin="2,0,2,1" Foreground="{Binding StatusBoxForeColor}" VerticalContentAlignment="Center" VerticalAlignment="Center" Background="Transparent" IsReadOnly="True" MinWidth="20"
|
||||||
Text="{Binding DeliveryDeadlineStr}" BorderThickness="0" />
|
Text="{Binding DeliveryDeadlineStr}" BorderThickness="0" />
|
||||||
|
|||||||
@@ -1556,7 +1556,7 @@
|
|||||||
BorderBrush="Transparent"
|
BorderBrush="Transparent"
|
||||||
BorderThickness="1"
|
BorderThickness="1"
|
||||||
IsReadOnly="True"
|
IsReadOnly="True"
|
||||||
Text="中转仓退回:" />
|
Text="拦截退回总店:" />
|
||||||
<uc:UcWaterMarkTextBox1
|
<uc:UcWaterMarkTextBox1
|
||||||
x:Name="txtTransitWarehouseAfterSale"
|
x:Name="txtTransitWarehouseAfterSale"
|
||||||
Grid.Row="2"
|
Grid.Row="2"
|
||||||
@@ -1568,7 +1568,7 @@
|
|||||||
IsReadOnly="True"
|
IsReadOnly="True"
|
||||||
Text="{Binding TransitWarehouseAfterSaleWayBillStr}"
|
Text="{Binding TransitWarehouseAfterSaleWayBillStr}"
|
||||||
TextWrapping="Wrap"
|
TextWrapping="Wrap"
|
||||||
WaterMark="中转仓退回" />
|
WaterMark="拦截退回总店" />
|
||||||
<!-- Visibility="{Binding Text,RelativeSource={RelativeSource Self},Converter={StaticResource HasTextVisibility}}" -->
|
<!-- Visibility="{Binding Text,RelativeSource={RelativeSource Self},Converter={StaticResource HasTextVisibility}}" -->
|
||||||
<Button
|
<Button
|
||||||
x:Name="btnAddEditTransitWarehouseAfterSale"
|
x:Name="btnAddEditTransitWarehouseAfterSale"
|
||||||
|
|||||||
@@ -117,7 +117,7 @@ namespace _29WxOrderWpf.Windows.OrderWindows
|
|||||||
|
|
||||||
private void btnAdd_Click(object sender, RoutedEventArgs e)
|
private void btnAdd_Click(object sender, RoutedEventArgs e)
|
||||||
{
|
{
|
||||||
if ((OrderItem?.ItemTransitOrder?.warehouse_status).ParseToInt() < 1)
|
if (OrderItem?.ItemOrder?.OrderBuyType == "云仓" && (OrderItem?.ItemTransitOrder?.warehouse_status).ParseToInt() < 1)
|
||||||
{
|
{
|
||||||
BaseMsgWindow.ShowError("当前订单仓库状态不支持创建退货订单!");
|
BaseMsgWindow.ShowError("当前订单仓库状态不支持创建退货订单!");
|
||||||
return;
|
return;
|
||||||
|
|||||||
@@ -36,7 +36,7 @@ namespace AllBase
|
|||||||
/// 版本ID
|
/// 版本ID
|
||||||
/// </summary>
|
/// </summary>
|
||||||
|
|
||||||
public static int VersionCount = 262;
|
public static int VersionCount = 263;
|
||||||
|
|
||||||
public static string ServerUrl { get; set; } = "http://1.13.195.131:9000";
|
public static string ServerUrl { get; set; } = "http://1.13.195.131:9000";
|
||||||
public static string DebugUrl { get; set; } = "http://localhost:9000";
|
public static string DebugUrl { get; set; } = "http://localhost:9000";
|
||||||
|
|||||||
@@ -133,7 +133,8 @@ namespace AllBase.Model.DBModel
|
|||||||
{
|
{
|
||||||
get
|
get
|
||||||
{
|
{
|
||||||
return this.orderItems.All(oi => !string.IsNullOrEmpty(oi.ItemRefund?.return_waybill_id)) && this.orderItems.All(oi => oi.ItemRefund?.return_detail == GlobalConfig.TransitReturnOrderReturnAddress);
|
//return this.orderItems.All(oi => !string.IsNullOrEmpty(oi.ItemRefund?.return_waybill_id)) && this.orderItems.All(oi => oi.ItemRefund?.return_detail == GlobalConfig.TransitReturnOrderReturnAddress);
|
||||||
|
return this.orderItems.All(oi => oi.ItemRefund?.return_detail == GlobalConfig.TransitReturnOrderReturnAddress);
|
||||||
}
|
}
|
||||||
set { }
|
set { }
|
||||||
}
|
}
|
||||||
@@ -213,7 +214,7 @@ namespace AllBase.Model.DBModel
|
|||||||
/// <summary>
|
/// <summary>
|
||||||
/// 订单总状态文本
|
/// 订单总状态文本
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public string DeliveryDeadlineDtatusStr
|
public string DeliveryDeadlineStatusStr
|
||||||
{
|
{
|
||||||
get
|
get
|
||||||
{
|
{
|
||||||
@@ -264,9 +265,9 @@ namespace AllBase.Model.DBModel
|
|||||||
{
|
{
|
||||||
get
|
get
|
||||||
{
|
{
|
||||||
if (DeliveryDeadlineDtatusStr == "退款中" || DeliveryDeadlineStr == "已超时")
|
if (DeliveryDeadlineStatusStr == "退款中" || DeliveryDeadlineStr == "已超时")
|
||||||
return new SolidColorBrush(Color.FromRgb(250, 71, 51)); // #fa4733
|
return new SolidColorBrush(Color.FromRgb(250, 71, 51)); // #fa4733
|
||||||
else if (DeliveryDeadlineDtatusStr == "退款完成" || DeliveryDeadlineStr == "已发货")
|
else if (DeliveryDeadlineStatusStr == "退款完成" || DeliveryDeadlineStr == "已发货")
|
||||||
return new SolidColorBrush(Color.FromRgb(103, 194, 58)); // #67c23a
|
return new SolidColorBrush(Color.FromRgb(103, 194, 58)); // #67c23a
|
||||||
else
|
else
|
||||||
return new SolidColorBrush(Color.FromRgb(3, 151, 181)); // #0397b5
|
return new SolidColorBrush(Color.FromRgb(3, 151, 181)); // #0397b5
|
||||||
@@ -277,9 +278,9 @@ namespace AllBase.Model.DBModel
|
|||||||
{
|
{
|
||||||
get
|
get
|
||||||
{
|
{
|
||||||
if (DeliveryDeadlineDtatusStr == "退款中" || DeliveryDeadlineStr == "已超时")
|
if (DeliveryDeadlineStatusStr == "退款中" || DeliveryDeadlineStr == "已超时")
|
||||||
return new SolidColorBrush(Color.FromArgb(26, 250, 71, 51)); // #fa4733 0.2
|
return new SolidColorBrush(Color.FromArgb(26, 250, 71, 51)); // #fa4733 0.2
|
||||||
else if (DeliveryDeadlineDtatusStr == "退款完成" || DeliveryDeadlineStr == "已发货")
|
else if (DeliveryDeadlineStatusStr == "退款完成" || DeliveryDeadlineStr == "已发货")
|
||||||
return new SolidColorBrush(Color.FromArgb(26, 103, 194, 58)); // #67c23a 0.2
|
return new SolidColorBrush(Color.FromArgb(26, 103, 194, 58)); // #67c23a 0.2
|
||||||
else
|
else
|
||||||
return new SolidColorBrush(Color.FromArgb(26, 3, 151, 181)); // #0397b5 0.2
|
return new SolidColorBrush(Color.FromArgb(26, 3, 151, 181)); // #0397b5 0.2
|
||||||
@@ -290,9 +291,9 @@ namespace AllBase.Model.DBModel
|
|||||||
{
|
{
|
||||||
get
|
get
|
||||||
{
|
{
|
||||||
if (DeliveryDeadlineDtatusStr == "退款中" || DeliveryDeadlineStr == "已超时")
|
if (DeliveryDeadlineStatusStr == "退款中" || DeliveryDeadlineStr == "已超时")
|
||||||
return new SolidColorBrush(Color.FromArgb(50, 250, 71, 51)); // #fa4733 0.2
|
return new SolidColorBrush(Color.FromArgb(50, 250, 71, 51)); // #fa4733 0.2
|
||||||
else if (DeliveryDeadlineDtatusStr == "退款完成" || DeliveryDeadlineStr == "已发货")
|
else if (DeliveryDeadlineStatusStr == "退款完成" || DeliveryDeadlineStr == "已发货")
|
||||||
return new SolidColorBrush(Color.FromArgb(50, 103, 194, 58)); // #67c23a 0.2
|
return new SolidColorBrush(Color.FromArgb(50, 103, 194, 58)); // #67c23a 0.2
|
||||||
else
|
else
|
||||||
return new SolidColorBrush(Color.FromArgb(50, 3, 151, 181)); // #0397b5 0.2
|
return new SolidColorBrush(Color.FromArgb(50, 3, 151, 181)); // #0397b5 0.2
|
||||||
|
|||||||
@@ -305,8 +305,8 @@ namespace AllBase.Model.DBModel
|
|||||||
{
|
{
|
||||||
if (AddEditTransitWarehouseAfterSaleStr != "已添加")
|
if (AddEditTransitWarehouseAfterSaleStr != "已添加")
|
||||||
AddEditTransitWarehouseAfterSaleStr = "";
|
AddEditTransitWarehouseAfterSaleStr = "";
|
||||||
}
|
}
|
||||||
// 退货退款的,不能中转仓退回。如果是退到退货仓,则退货仓流程,否则店家自行收货退回总店。
|
// 退货退款的,不能拦截退回总店。如果是退到退货仓,则退货仓流程,否则店家自行收货退回总店。
|
||||||
if (!RefundAddressStr.ParseToString().Trim().IsNullOrEmpty() || this.ItemRefund?.type != "REFUND")
|
if (!RefundAddressStr.ParseToString().Trim().IsNullOrEmpty() || this.ItemRefund?.type != "REFUND")
|
||||||
{
|
{
|
||||||
if (AddEditTransitWarehouseAfterSaleStr != "已添加")
|
if (AddEditTransitWarehouseAfterSaleStr != "已添加")
|
||||||
|
|||||||
Reference in new issue
Block a user