1订单统计时区问题修复 2退货订单逻辑50% 3其他一些功能小改动
This commit is contained in:
1 parent
342a66f940
commit
24cf1dba7b
11 files changed
+121
-89
No files matched your search
@@ -6,7 +6,7 @@
|
||||
xmlns:local="clr-namespace:_29WxOrderWpf.Windows.OrderWindows"
|
||||
xmlns:userctrls="clr-namespace:_29WxOrderWpf.UserControls" xmlns:buyerctrls="clr-namespace:_29WxOrderWpf.Ctrls.BuyerCtrls"
|
||||
mc:Ignorable="d" Style="{StaticResource BaseNoneBorderWindowStyle}"
|
||||
Title="创建退货单" Height="650" Width="843" ResizeMode="NoResize" Loaded="TransitAfterSaleWindow_Loaded">
|
||||
Title="创建退货单" Height="650" Width="900" ResizeMode="NoResize" Loaded="TransitAfterSaleWindow_Loaded">
|
||||
<Grid Background="Transparent" x:Name="mainGrid" Margin="2">
|
||||
<Grid.RowDefinitions>
|
||||
<RowDefinition Height="50"></RowDefinition>
|
||||
|
||||
@@ -62,21 +62,11 @@ namespace _29WxOrderWpf.Windows.OrderWindows
|
||||
this.cmbExpressName.Items.Add("其他快递");
|
||||
|
||||
if (OrderItem != null)
|
||||
{
|
||||
//if (OrderItem.ItemTransitOrderAfterSale != null)
|
||||
//{
|
||||
// btnAdd.IsEnabled = false;
|
||||
|
||||
// this.txtUser.Text = OrderItem.ItemTransitOrderAfterSale.recipient_name;
|
||||
// this.txtMobile.Text = OrderItem.ItemTransitOrderAfterSale.recipient_phone;
|
||||
// this.txtDetailAddress.Text = OrderItem.ItemTransitOrderAfterSale.refund_detail_address;
|
||||
// this.txtProvince.Text = OrderItem.ItemTransitOrderAfterSale.refund_province;
|
||||
// this.txtCity.Text = OrderItem.ItemTransitOrderAfterSale.refund_city;
|
||||
// this.txtCounty.Text = OrderItem.ItemTransitOrderAfterSale.refund_county;
|
||||
//}
|
||||
|
||||
{
|
||||
// 上海仓默认发货地址
|
||||
txtSendUser.Text = "29供应链";
|
||||
// 随机用户名
|
||||
txtSendUser.Text = TransitWaybillHelper.LastName[Randomx.GetId(TransitWaybillHelper.LastName.Count)] + (Randomx.GetId(2) == 1 ? "先生" : "女士");
|
||||
// 固定手机号及地址
|
||||
txtSendMobile.Text = "13024622251";
|
||||
txtSendProvince.Text = "上海市";
|
||||
txtSendCity.Text = "上海市";
|
||||
@@ -89,7 +79,6 @@ namespace _29WxOrderWpf.Windows.OrderWindows
|
||||
txtSpuId.Text = OrderItem.product_id.ParseToString();
|
||||
txtSpecName.Text = OrderItem.sku_attr_str;
|
||||
|
||||
|
||||
txtWaybillId.Text = OrderItem.ItemRefund?.return_waybill_id;
|
||||
foreach (var cmbItem in cmbExpressName.Items)
|
||||
{
|
||||
@@ -98,8 +87,6 @@ namespace _29WxOrderWpf.Windows.OrderWindows
|
||||
cmbExpressName.SelectedItem = cmbItem;
|
||||
}
|
||||
}
|
||||
//cmbExpressName.SelectedItem =
|
||||
|
||||
|
||||
if (OrderItem.PddBuyerAfterSale != null)
|
||||
{
|
||||
@@ -111,39 +98,54 @@ namespace _29WxOrderWpf.Windows.OrderWindows
|
||||
|
||||
private void btnAdd_Click(object sender, RoutedEventArgs e)
|
||||
{
|
||||
if (OrderItem?.ItemTransitOrder?.warehouse_status != 0 && OrderItem?.ItemTransitOrder?.warehouse_status != 1)
|
||||
if (OrderItem?.ItemTransitOrder?.warehouse_status != 2)
|
||||
{
|
||||
BaseMsgWindow.ShowError("当前订单仓库状态不支持售后,请联系买家直接退回总店!");
|
||||
BaseMsgWindow.ShowError("当前订单仓库状态不支持创建退货订单!");
|
||||
return;
|
||||
}
|
||||
|
||||
//http://localhost:8088/oms-api/external_procurement/createReturnPackage
|
||||
//{
|
||||
// "orderNo": "3737011320735026432",
|
||||
// "orderCode": "4600000167202606117621000767",
|
||||
// "refundProvince": "安徽省",
|
||||
// "refundCity": "合肥市",
|
||||
// "refundCounty": "瑶海区",
|
||||
// "refundDetailAddress": "某街道 1”,
|
||||
// "recipientName": "张三",
|
||||
// "recipientPhone": "13800138000"
|
||||
//} post(json)请求方式,如果使用客户端账户扣款增加一个参数account_user
|
||||
JObject jObj = new JObject();
|
||||
|
||||
JObject data = new JObject();
|
||||
data["orderNo"] = OrderItem.order_id;
|
||||
data["orderCode"] = OrderItem.ItemTransitOrder?.order_code;
|
||||
data["refundProvince"] = txtProvince.Text.Trim();
|
||||
data["refundCity"] = txtCity.Text.Trim();
|
||||
data["refundCounty"] = txtCounty.Text.Trim();
|
||||
data["refundDetailAddress"] = txtDetailAddress.Text.Trim();
|
||||
data["recipientName"] = txtUser.Text.Trim();
|
||||
data["recipientPhone"] = txtMobile.Text.Trim();
|
||||
data["account_user"] = BaseClass.UserName;
|
||||
data["accountUser"] = BaseClass.UserName;
|
||||
//data["platform"] = "WEISHOP";
|
||||
var getTransitAfterSaleUrl = "https://po.e57.cn/prod-api/api/oms-api/external_procurement/createReturnPackage";
|
||||
var getTransitAfterSaleStr = JsonHelper.SerializeObject(data);
|
||||
var getTransitAfterSaleRst = HttpResponseWXBLL.e57PostResponse(getTransitAfterSaleUrl, getTransitAfterSaleStr, "");
|
||||
jObj["orderCodeSource"] = OrderItem.order_id;
|
||||
jObj["logisticsCode"] = cmbExpressName.SelectedItem.ParseToString();
|
||||
jObj["logisticsExpressNo"] = txtWaybillId.Text.Trim();
|
||||
jObj["platform"] = "OTHER";
|
||||
jObj["shopName"] = OrderItem.ItemOrder?.shop_name;
|
||||
jObj["senderName"] = txtSendUser.Text.Trim();
|
||||
jObj["senderPhone"] = txtSendMobile.Text.Trim();
|
||||
jObj["senderProvince"] = txtSendProvince.Text.Trim();
|
||||
jObj["senderCity"] = txtSendCity.Text.Trim();
|
||||
jObj["senderArea"] = txtSendCounty.Text.Trim();
|
||||
jObj["senderAddress"] = txtSendDetailAddress.Text.Trim();
|
||||
jObj["receiverName"] = txtUser.Text.Trim();
|
||||
jObj["receiverPhone"] = txtMobile.Text.Trim();
|
||||
jObj["receiverProvince"] = txtProvince.Text.Trim();
|
||||
jObj["receiverCity"] = txtCity.Text.Trim();
|
||||
jObj["receiverArea"] = txtCounty.Text.Trim();
|
||||
jObj["receiverAddress"] = txtDetailAddress.Text.Trim();
|
||||
jObj["orderCreateTime"] = (OrderItem.ItemOrder?.CreateDateTime).ParseToString();
|
||||
jObj["userAccount"] = BaseClass.UserName;
|
||||
jObj["platformCode"] = "WEISHOP";
|
||||
jObj["afterSaleNo"] = OrderItem.ItemRefund?.after_sale_order_id;
|
||||
jObj["platformOrderNo"] = OrderItem.order_id;
|
||||
jObj["firstWeightFee"] = OrderItem.ItemTransitOrder.postage;
|
||||
|
||||
JObject jItemObj = new JObject();
|
||||
jItemObj["spuCode"] = OrderItem.product_id.ParseToString();
|
||||
jItemObj["spuName"] = OrderItem.title;
|
||||
jItemObj["skuCode"] = OrderItem.sku_id.ParseToString();
|
||||
jItemObj["specInfo"] = OrderItem.sku_attr_str;
|
||||
jItemObj["skuUrl"] = OrderItem.thumb_img;
|
||||
jItemObj["picUrl"] = OrderItem.thumb_img;
|
||||
jItemObj["returnQuantity"] = OrderItem.sku_cnt;
|
||||
jObj["orderDetailsList"] = new JArray();
|
||||
(jObj["orderDetailsList"] as JArray).Add(jItemObj);
|
||||
|
||||
|
||||
|
||||
var createReturnOrderUrl = "https://po.e57.cn/prod-api/api/oms-api/api/distribution/returns/addReturnOrder";
|
||||
var createReturnOrderStr = JsonHelper.SerializeObject(jObj);
|
||||
var getTransitAfterSaleRst = HttpResponseWXBLL.e57PostResponse(createReturnOrderUrl, createReturnOrderStr, "");
|
||||
if (!getTransitAfterSaleRst.ParseToString().Contains("<code>200</code>") && !getTransitAfterSaleRst.ParseToString().Contains("<code>0</code>"))
|
||||
{
|
||||
string msg = BaseRegex.GetStringXml(ref getTransitAfterSaleRst, "msg");
|
||||
|
||||
Reference in new issue
Block a user