取消代发后再发送礼物单
This commit is contained in:
1 parent
a7f1891dd3
commit
7ef75f8134
17 files changed
+3028
-1718
No files matched your search
@@ -0,0 +1,24 @@
|
||||
using NaiBa.Util.Extension;
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Globalization;
|
||||
using System.Linq;
|
||||
using System.Text;
|
||||
using System.Threading.Tasks;
|
||||
using System.Windows;
|
||||
using System.Windows.Data;
|
||||
|
||||
namespace _29WxOrderWpf.Converters
|
||||
{
|
||||
public class MoreThanZeroVisibilityConverter : IValueConverter
|
||||
{
|
||||
public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
|
||||
{
|
||||
return value.ParseToInt() > 0 ? Visibility.Visible : Visibility.Collapsed;
|
||||
}
|
||||
public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
|
||||
{
|
||||
throw new NotImplementedException(); // 单向绑定可不实现
|
||||
}
|
||||
}
|
||||
}
|
||||
File diff suppressed because it is too large.
Load diff
@@ -84,21 +84,21 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
|
||||
AutoGetOrder();
|
||||
}
|
||||
|
||||
public void GetOrderTest()
|
||||
{
|
||||
for (int i = 0; i < 10000; i++)
|
||||
{
|
||||
//lstOrder.Add(new oms_wei_order_info() { id = 1, IsSelect = false, order_id = ("3737033423685556736".ParseToLong() + Randomx.GetId(0,100)).ParseToString(), shop_name = "媛卡曦工厂优选" });
|
||||
GlobalConfig.lstOrder.Add(new oms_wei_order_info() { id = 1, IsSelect = false, order_id = Randomx.GetId(1000, 10000).ParseToString(), shop_name = "媛卡曦工厂优选" });
|
||||
}
|
||||
//GlobalConfig.lstOrder.SortDesc(o => o.order_id.ParseToLong());
|
||||
}
|
||||
//public void GetOrderTest()
|
||||
//{
|
||||
// for (int i = 0; i < 10000; i++)
|
||||
// {
|
||||
// //lstOrder.Add(new oms_wei_order_info() { id = 1, IsSelect = false, order_id = ("3737033423685556736".ParseToLong() + Randomx.GetId(0,100)).ParseToString(), shop_name = "媛卡曦工厂优选" });
|
||||
// GlobalConfig.lstOrder.Add(new oms_wei_order_info() { id = 1, IsSelect = false, order_id = Randomx.GetId(1000, 10000).ParseToString(), shop_name = "媛卡曦工厂优选" });
|
||||
// }
|
||||
// //GlobalConfig.lstOrder.SortDesc(o => o.order_id.ParseToLong());
|
||||
//}
|
||||
|
||||
public void AutoGetOrder()
|
||||
{
|
||||
Task.Run(() =>
|
||||
{
|
||||
Thread.Sleep(5000);
|
||||
//Thread.Sleep(5000);
|
||||
while (true)
|
||||
{
|
||||
if (!IsAutoReadOrder)
|
||||
@@ -136,6 +136,11 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
|
||||
/// <param name="filterGetCondition">按过滤条件读取读取服务端订单</param>
|
||||
public void GetOrder(string orderIds = "", bool filterGetCondition = false)
|
||||
{
|
||||
while (!MainWindow.Instance.hasReadShop)
|
||||
{
|
||||
Thread.Sleep(100);
|
||||
}
|
||||
|
||||
BottomMsg = "开始读取订单...";
|
||||
StartProgress();
|
||||
Dispatcher.Invoke(new Action(() =>
|
||||
@@ -934,6 +939,11 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
|
||||
if (order == null)
|
||||
return true;
|
||||
|
||||
if (order.order_id == "3738456804637165312")
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
// 过滤id
|
||||
if (!string.IsNullOrEmpty(txtOrderId.Text.Trim()))
|
||||
{
|
||||
@@ -1190,11 +1200,6 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
|
||||
});
|
||||
Task.Run(() =>
|
||||
{
|
||||
while (!MainWindow.Instance.hasReadShop)
|
||||
{
|
||||
Thread.Sleep(100);
|
||||
}
|
||||
|
||||
GetOrder();
|
||||
nextGetOrderTime = DateTime.Now.AddMinutes(25);
|
||||
});
|
||||
@@ -1881,19 +1886,27 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
|
||||
}
|
||||
else
|
||||
{
|
||||
giftType = GiftType._155;
|
||||
giftType = GiftType._160;
|
||||
}
|
||||
int index = 1;
|
||||
int sucessCount = 0;
|
||||
int errorCount = 0;
|
||||
foreach (oms_wei_order_info item in list)
|
||||
{
|
||||
var ret = await _shipGiftService.Send(item.order_id, giftType);
|
||||
if (ret)
|
||||
var rst = await WxApiBLL.WxSearchAndDropshipCancel(item.Shop, item);
|
||||
if (rst == "success")
|
||||
{
|
||||
sucessCount++;
|
||||
item.gift_order_status = 1;
|
||||
this.FilterOneOrder(item, true);
|
||||
var ret = await _shipGiftService.Send(item.order_id, giftType);
|
||||
if (ret)
|
||||
{
|
||||
sucessCount++;
|
||||
item.gift_order_status = 1;
|
||||
this.FilterOneOrder(item, true);
|
||||
}
|
||||
else
|
||||
{
|
||||
errorCount++;
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
|
||||
@@ -35,21 +35,6 @@
|
||||
<RowDefinition Height="auto"></RowDefinition>
|
||||
<RowDefinition Height="6"></RowDefinition>
|
||||
</Grid.RowDefinitions>
|
||||
<!--<Border Visibility="{Binding order_item1_visibility}" Grid.Row="1">
|
||||
<local:OrderListRowItemCtrl x:Name="item1" Grid.Row="1" DataContext="{Binding order_item1}" VerticalAlignment="Center" VerticalContentAlignment="Center"></local:OrderListRowItemCtrl>
|
||||
</Border>
|
||||
<Border Visibility="{Binding order_item2_visibility}" Grid.Row="2">
|
||||
<local:OrderListRowItemCtrl x:Name="item2" Grid.Row="2" DataContext="{Binding order_item2}" VerticalAlignment="Center" VerticalContentAlignment="Center"></local:OrderListRowItemCtrl>
|
||||
</Border>
|
||||
<Border Visibility="{Binding order_item3_visibility}" Grid.Row="3">
|
||||
<local:OrderListRowItemCtrl x:Name="item3" Grid.Row="3" DataContext="{Binding order_item3}" VerticalAlignment="Center" VerticalContentAlignment="Center"></local:OrderListRowItemCtrl>
|
||||
</Border>
|
||||
<Border Visibility="{Binding order_item4_visibility}" Grid.Row="4">
|
||||
<local:OrderListRowItemCtrl x:Name="item4" Grid.Row="4" DataContext="{Binding order_item4}" VerticalAlignment="Center" VerticalContentAlignment="Center"></local:OrderListRowItemCtrl>
|
||||
</Border>
|
||||
<Border Visibility="{Binding order_item5_visibility}" Grid.Row="5">
|
||||
<local:OrderListRowItemCtrl x:Name="item5" Grid.Row="5" DataContext="{Binding order_item5}" VerticalAlignment="Center" VerticalContentAlignment="Center"></local:OrderListRowItemCtrl>
|
||||
</Border>-->
|
||||
</Grid>
|
||||
</Border>
|
||||
</Grid>
|
||||
|
||||
@@ -66,8 +66,8 @@
|
||||
<Image Grid.Column="5" Margin="8,8,0,8" Width="24" Height="24" Source="{StaticResource imgOrderWeishopIcon}"></Image>
|
||||
<uc:UcWaterMarkTextBox1 WaterMark="店铺状态" x:Name="txtShopLoginStatus" Grid.Column="5" HorizontalAlignment="Right" Margin="0,12,-6,0" Padding="0" FontWeight="Bold"
|
||||
VerticalAlignment="Center" FontSize="7" Background="{StaticResource ListHeadBackColorBrush}" IsReadOnly="True"
|
||||
Text="{Binding order_item1.Shop.LoginStatusStr}" BorderThickness="0"
|
||||
Foreground="{Binding order_item1.Shop.LoginStatusStr, Converter={StaticResource statusToColorBrushConverter}}"/>
|
||||
Text="{Binding Shop.LoginStatusStr}" BorderThickness="0"
|
||||
Foreground="{Binding Shop.LoginStatusStr, Converter={StaticResource statusToColorBrushConverter}}"/>
|
||||
<uc:UcWaterMarkTextBox1 Grid.Column="6" Foreground="{StaticResource PageLinkBrush}" Cursor="Hand" WaterMark="店铺名称" x:Name="txtShopName" Margin="4,8,4,8" VerticalAlignment="Center"
|
||||
FontSize="14" Background="Transparent" IsReadOnly="True" Text="{Binding shop_name}" BorderThickness="0" />
|
||||
|
||||
|
||||
File diff suppressed because it is too large.
Load diff
@@ -1217,7 +1217,7 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
|
||||
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());
|
||||
var apiCancelDropship = new WxApiBLL().WxApiDropshipCancel(orderItem.Shop, orderItem.ItemOrder, dsOrderId);
|
||||
}
|
||||
apiSearchDropship = new WxApiBLL().WxApiDropshipSearch(orderItem.Shop, orderItem.order_id, 100);
|
||||
if (!apiSearchDropship.Contains("\"ds_order_id_list\":[]"))
|
||||
@@ -1377,20 +1377,24 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
|
||||
}
|
||||
else
|
||||
{
|
||||
giftType = GiftType._155;
|
||||
giftType = GiftType._160;
|
||||
}
|
||||
Task.Run(async () =>
|
||||
{
|
||||
try
|
||||
{
|
||||
var ret = await MainWindow.Instance.orderListCtrl._shipGiftService.Send(orderItem.order_id, giftType);
|
||||
if (ret)
|
||||
var rst = await WxApiBLL.WxSearchAndDropshipCancel(orderItem.Shop, orderItem.ItemOrder);
|
||||
if (rst == "success")
|
||||
{
|
||||
Application.Current.Dispatcher.Invoke(() =>
|
||||
var ret = await MainWindow.Instance.orderListCtrl._shipGiftService.Send(orderItem.order_id, giftType);
|
||||
if (ret)
|
||||
{
|
||||
orderItem.ItemOrder.gift_order_status = 1;
|
||||
MainWindow.Instance.orderListCtrl.FilterOneOrder(orderItem.ItemOrder, true);
|
||||
});
|
||||
Application.Current.Dispatcher.Invoke(() =>
|
||||
{
|
||||
orderItem.ItemOrder.gift_order_status = 1;
|
||||
MainWindow.Instance.orderListCtrl.FilterOneOrder(orderItem.ItemOrder, true);
|
||||
});
|
||||
}
|
||||
}
|
||||
}
|
||||
catch (Exception ex)
|
||||
|
||||
@@ -41,7 +41,8 @@ namespace _29WxOrderWpf.Ctrls.ShopCtrls
|
||||
{
|
||||
this.lbxShop.ItemsSource = GlobalConfig.ShopLoginList;
|
||||
|
||||
Task.Run(() => {
|
||||
Task.Run(() =>
|
||||
{
|
||||
while(MainWindow.Instance.hasReadShop == false)
|
||||
{
|
||||
Thread.Sleep(100);
|
||||
|
||||
@@ -65,8 +65,8 @@ public class ShipGiftService
|
||||
userId = BaseClass.UserId,
|
||||
userName = BaseClass.UserName,
|
||||
giftOrderType = (int)giftType,
|
||||
amount = amount * 100,
|
||||
oemAmount = BaseClass.OemGiftAmount * 100
|
||||
amount = (int)(amount * 100),
|
||||
oemAmount = (int)(BaseClass.OemGiftAmount * 100)
|
||||
});
|
||||
Debug.WriteLine($"礼品单:{data}");
|
||||
string ret = await HttpResponseWXBLL.e57PostResponseAsync("https://po.e57.cn//prod-api/api/oms-api/gift/order/deliveryFor29Erp", data, "");
|
||||
|
||||
@@ -1,29 +1,29 @@
|
||||
<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
|
||||
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
|
||||
<SolidColorBrush x:Key="mainColorBrush" Color="#FF98638f"/>
|
||||
<SolidColorBrush x:Key="mainColorLightBrush" Color="#f5ebff"/>
|
||||
<SolidColorBrush x:Key="mainColorDarkBrush" Color="#FF6b5393"/>
|
||||
<SolidColorBrush x:Key="mainForegroundColorBrush" Color="#FF666666"/>
|
||||
<LinearGradientBrush x:Key="mainLinearColorBrush" StartPoint="0,0" EndPoint="1,0" >
|
||||
<GradientStop Color="#FF98638f" Offset="0.0"/>
|
||||
<GradientStop Color="#FF6b5393" Offset="1.0"/>
|
||||
<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
|
||||
<SolidColorBrush x:Key="mainColorBrush" Color="#FF98638f" />
|
||||
<SolidColorBrush x:Key="mainColorLightBrush" Color="#f5ebff" />
|
||||
<SolidColorBrush x:Key="mainColorDarkBrush" Color="#FF6b5393" />
|
||||
<SolidColorBrush x:Key="mainForegroundColorBrush" Color="#FF666666" />
|
||||
<LinearGradientBrush x:Key="mainLinearColorBrush" StartPoint="0,0" EndPoint="1,0">
|
||||
<GradientStop Offset="0.0" Color="#FF98638f" />
|
||||
<GradientStop Offset="1.0" Color="#FF6b5393" />
|
||||
</LinearGradientBrush>
|
||||
<SolidColorBrush x:Key="pageColorBrush" Color="#FF98638f"/>
|
||||
<SolidColorBrush x:Key="pageColorLightBrush" Color="#f5ebff"/>
|
||||
<SolidColorBrush x:Key="pageColorDarkBrush" Color="#FF6b5393"/>
|
||||
<SolidColorBrush x:Key="pageColorBrush" Color="#FF98638f" />
|
||||
<SolidColorBrush x:Key="pageColorLightBrush" Color="#f5ebff" />
|
||||
<SolidColorBrush x:Key="pageColorDarkBrush" Color="#FF6b5393" />
|
||||
|
||||
<SolidColorBrush x:Key="ListCtrlBackColorBrush" Color="#FFFFFFFF"/>
|
||||
<SolidColorBrush x:Key="ListHeadBackColorBrush" Color="#FFf8f8f9"/>
|
||||
<SolidColorBrush x:Key="ListHeadBorderColorBrush" Color="#FFe9e9ea"/>
|
||||
<SolidColorBrush x:Key="ListBackColorBrush" Color="#FFFFFFFF"/>
|
||||
<SolidColorBrush x:Key="ListRowTitleBackColorBrush" Color="#FFf5f7fa"/>
|
||||
<SolidColorBrush x:Key="ListRowBorderColorBrush" Color="#FFf8f8f9"/>
|
||||
<SolidColorBrush x:Key="ListRowHoverBackColorBrush" Color="#FFf5f7fa"/>
|
||||
<SolidColorBrush x:Key="ListCtrlBackColorBrush" Color="#FFFFFFFF" />
|
||||
<SolidColorBrush x:Key="ListHeadBackColorBrush" Color="#FFf8f8f9" />
|
||||
<SolidColorBrush x:Key="ListHeadBorderColorBrush" Color="#FFe9e9ea" />
|
||||
<SolidColorBrush x:Key="ListBackColorBrush" Color="#FFFFFFFF" />
|
||||
<SolidColorBrush x:Key="ListRowTitleBackColorBrush" Color="#FFf5f7fa" />
|
||||
<SolidColorBrush x:Key="ListRowBorderColorBrush" Color="#FFf8f8f9" />
|
||||
<SolidColorBrush x:Key="ListRowHoverBackColorBrush" Color="#FFf5f7fa" />
|
||||
|
||||
<SolidColorBrush x:Key="HorizontalGridLinesBrush" Color="#FFf5f7fa"/>
|
||||
<SolidColorBrush x:Key="VerticalGridLinesBrush" Color="#FFFFFFFF"/>
|
||||
<SolidColorBrush x:Key="HorizontalGridLinesBrush" Color="#FFf5f7fa" />
|
||||
<SolidColorBrush x:Key="VerticalGridLinesBrush" Color="#FFFFFFFF" />
|
||||
|
||||
<SolidColorBrush x:Key="PageOkBrush" Color="#FF67c23a" />
|
||||
<SolidColorBrush x:Key="PageOkBrush50" Color="#5067c23a" />
|
||||
<SolidColorBrush x:Key="PageWarningBrush" Color="#FFfa4733" />
|
||||
<SolidColorBrush x:Key="PageWarningBrushCC" Color="#CCfa4733" />
|
||||
<SolidColorBrush x:Key="PageWarningBrush80" Color="#80fa4733" />
|
||||
|
||||
Reference in new issue
Block a user