修复同步单错误无法提交问题
This commit is contained in:
1 parent
ce8fb3f311
commit
e1d940fa8c
5 files changed
+38
-7
No files matched your search
@@ -984,6 +984,7 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// 填写取件码
|
||||||
if (order.WxSendTypeStr == "直发")
|
if (order.WxSendTypeStr == "直发")
|
||||||
{
|
{
|
||||||
if (GlobalConfig.BuyConfig.IsSyncDirectBuyOrderWaybill && !string.IsNullOrEmpty(order.tracking_number))
|
if (GlobalConfig.BuyConfig.IsSyncDirectBuyOrderWaybill && !string.IsNullOrEmpty(order.tracking_number))
|
||||||
@@ -2177,12 +2178,18 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
|
|||||||
{
|
{
|
||||||
var mainOrder = GlobalConfig.lstOrder.FirstOrDefault(o => o.order_id == order.ShopOrderIdStr);
|
var mainOrder = GlobalConfig.lstOrder.FirstOrDefault(o => o.order_id == order.ShopOrderIdStr);
|
||||||
if (mainOrder != null)
|
if (mainOrder != null)
|
||||||
mainOrder.SyncLogisticsMsg = ex.Message;
|
{
|
||||||
|
var orderItem = mainOrder.orderItems?.FirstOrDefault(oi => oi.sku_id == order.ShopOrderSkuIdStr);
|
||||||
|
if (orderItem != null)
|
||||||
|
orderItem.SyncLogisticsMsg = ex.Message;
|
||||||
|
}
|
||||||
|
|
||||||
var url3 = BaseClass.Build29WxObjString("order/wx_add_mdy_buyer_order");
|
var url3 = BaseClass.Build29WxObjString("order/wx_add_mdy_buyer_order");
|
||||||
var data3 = UserLogin.GetSignaturex();
|
var data3 = UserLogin.GetSignaturex();
|
||||||
data3 += "&sync_logistics_msg=" + ex.Message;
|
data3 += "&sync_logistics_msg=" + ex.Message;
|
||||||
data3 += "&pdd_order_sn=" + order.order_sn;
|
data3 += "&pdd_order_sn=" + order.order_sn;
|
||||||
|
data3 += "&wx_order_id=" + order.ShopOrderIdStr;
|
||||||
|
data3 += "&wx_send_type=1";
|
||||||
var html3 = GetHtml.PostUtf8(url3, data3);
|
var html3 = GetHtml.PostUtf8(url3, data3);
|
||||||
if (string.IsNullOrEmpty(html3) || !html3.Contains("\"code\":200"))
|
if (string.IsNullOrEmpty(html3) || !html3.Contains("\"code\":200"))
|
||||||
html3 = GetHtml.PostUtf8(url3, data3);
|
html3 = GetHtml.PostUtf8(url3, data3);
|
||||||
|
|||||||
@@ -1001,6 +1001,7 @@
|
|||||||
Margin="-2,2,4,2"
|
Margin="-2,2,4,2"
|
||||||
Padding="0"
|
Padding="0"
|
||||||
VerticalAlignment="Center"
|
VerticalAlignment="Center"
|
||||||
|
d:Text="同步物流单"
|
||||||
Background="Transparent"
|
Background="Transparent"
|
||||||
BorderThickness="0"
|
BorderThickness="0"
|
||||||
IsReadOnly="True"
|
IsReadOnly="True"
|
||||||
@@ -1012,6 +1013,7 @@
|
|||||||
Margin="-2,2,4,2"
|
Margin="-2,2,4,2"
|
||||||
Padding="0"
|
Padding="0"
|
||||||
VerticalAlignment="Center"
|
VerticalAlignment="Center"
|
||||||
|
d:Text="取件码"
|
||||||
Background="Transparent"
|
Background="Transparent"
|
||||||
BorderThickness="0"
|
BorderThickness="0"
|
||||||
IsReadOnly="True"
|
IsReadOnly="True"
|
||||||
@@ -1019,6 +1021,18 @@
|
|||||||
TextWrapping="Wrap"
|
TextWrapping="Wrap"
|
||||||
WaterMark="取件码" />
|
WaterMark="取件码" />
|
||||||
|
|
||||||
|
<uc:UcWaterMarkTextBox1
|
||||||
|
Margin="-2,2,4,2"
|
||||||
|
Padding="0"
|
||||||
|
VerticalAlignment="Center"
|
||||||
|
d:Text="同步单信息"
|
||||||
|
Background="Transparent"
|
||||||
|
BorderThickness="0"
|
||||||
|
IsReadOnly="True"
|
||||||
|
Text="{Binding SyncLogisticsMsg}"
|
||||||
|
TextWrapping="Wrap"
|
||||||
|
WaterMark="同步单信息" />
|
||||||
|
|
||||||
<!--<Button
|
<!--<Button
|
||||||
x:Name="btnGetSyncWaybillDetail"
|
x:Name="btnGetSyncWaybillDetail"
|
||||||
Margin="4,0,0,0"
|
Margin="4,0,0,0"
|
||||||
|
|||||||
@@ -365,11 +365,6 @@ namespace AllBase.Model.DBModel
|
|||||||
set { this.SetValue(x => x.GiftErrorMsg, value); }
|
set { this.SetValue(x => x.GiftErrorMsg, value); }
|
||||||
}
|
}
|
||||||
|
|
||||||
public string SyncLogisticsMsg
|
|
||||||
{
|
|
||||||
get { return this.GetValue(x => x.SyncLogisticsMsg); }
|
|
||||||
set { this.SetValue(x => x.SyncLogisticsMsg, value); }
|
|
||||||
}
|
|
||||||
public ConcurrentList<yh_sync_logistics> SyncLogisticsList
|
public ConcurrentList<yh_sync_logistics> SyncLogisticsList
|
||||||
{
|
{
|
||||||
get { return this.GetValue(x => x.SyncLogisticsList); }
|
get { return this.GetValue(x => x.SyncLogisticsList); }
|
||||||
|
|||||||
@@ -875,7 +875,20 @@ namespace AllBase.Model.DBModel
|
|||||||
public order_pdd_buyer_order DirectPddBuyerOrder
|
public order_pdd_buyer_order DirectPddBuyerOrder
|
||||||
{
|
{
|
||||||
get { return this.GetValue(x => x.DirectPddBuyerOrder); }
|
get { return this.GetValue(x => x.DirectPddBuyerOrder); }
|
||||||
set { this.SetValue(x => x.DirectPddBuyerOrder, value); }
|
set
|
||||||
|
{
|
||||||
|
if (order_id == "3739364384891083264")
|
||||||
|
{
|
||||||
|
|
||||||
|
}
|
||||||
|
this.SetValue(x => x.DirectPddBuyerOrder, value);
|
||||||
|
SyncLogisticsMsg = DirectPddBuyerOrder?.sync_logistics_msg;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
public string SyncLogisticsMsg
|
||||||
|
{
|
||||||
|
get { return this.GetValue(x => x.SyncLogisticsMsg); }
|
||||||
|
set { this.SetValue(x => x.SyncLogisticsMsg, value); }
|
||||||
}
|
}
|
||||||
public string DirectOrderBuyTimeStr
|
public string DirectOrderBuyTimeStr
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -33,5 +33,7 @@ namespace AllBase.Model.DBModel
|
|||||||
public string order_detail { get; set; }
|
public string order_detail { get; set; }
|
||||||
public DateTime add_time { get; set; }
|
public DateTime add_time { get; set; }
|
||||||
public DateTime mdy_time { get; set; }
|
public DateTime mdy_time { get; set; }
|
||||||
|
|
||||||
|
public string sync_logistics_msg { get; set; }
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
Reference in new issue
Block a user