优化中转仓处理拍单流程 隐藏部分不可用功能
This commit is contained in:
1 parent
27ac748f33
commit
518365a0d3
30 files changed
+1237
-634
No files matched your search
@@ -1399,7 +1399,7 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
|
||||
if (!lstPddBuyerOrderVoidAfterSaleOrderSn.Contains(orderItem.order_id + orderItem.sku_id))
|
||||
{
|
||||
lstPddBuyerOrderVoidAfterSaleOrderSn.Add(orderItem.order_id + orderItem.sku_id);
|
||||
await OrderListRowItemCtrl.VoidOrder(orderItem, null, true);
|
||||
await OrderTransitService.VoidOrder(orderItem, null, true);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -209,7 +209,6 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
|
||||
foreach (var orderItem in order.orderItems)
|
||||
{
|
||||
orderItem.UpdateOrderItemBuyButton();
|
||||
orderItem.SetAbnormalAndDirectBtnVisibility();
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -224,7 +223,6 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
|
||||
foreach (var orderItem in order.orderItems)
|
||||
{
|
||||
orderItem.UpdateOrderItemBuyButton();
|
||||
orderItem.SetAbnormalAndDirectBtnVisibility();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1340,7 +1340,7 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
|
||||
if (!lstPddBuyerOrderVoidAfterSaleOrderSn.Contains(orderItem.order_id + orderItem.sku_id))
|
||||
{
|
||||
lstPddBuyerOrderVoidAfterSaleOrderSn.Add(orderItem.order_id + orderItem.sku_id);
|
||||
await OrderListRowItemCtrl.VoidOrder(orderItem, null, true);
|
||||
await OrderTransitService.VoidOrder(orderItem, null, true);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -626,11 +626,11 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
|
||||
var pddFrontSkuInfo = new frontSkuInfo3()
|
||||
{
|
||||
skuId = key.ParseToLong(),
|
||||
skuID = key.ParseToLong(),
|
||||
//skuID = key.ParseToLong(),
|
||||
goodsId = pddFrontGoods3.goodsId,
|
||||
thumbUrl = thumbUrl,
|
||||
quantity = tbSku2.quantity,
|
||||
isOnsale = 1,
|
||||
//quantity = tbSku2.quantity,
|
||||
//isOnsale = 1,
|
||||
spec = taobaoSku?.propPath, // 淘宝格式与拼多多存在差异,包含冒号与父类型id
|
||||
specs = pddSpecs,
|
||||
price = tbSku2.price.priceMoney.ParseToInt() + 100,
|
||||
@@ -732,7 +732,7 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
|
||||
var goods = JsonHelper.DeserializeJsonToObject<pddFrontGoods3Lite>(skuInfo.map_skus);
|
||||
if (goods == null)
|
||||
return;
|
||||
var sku = goods.skus.FirstOrDefault(s => s.skuID.ParseToString() == info.map_sku_id);
|
||||
var sku = goods.skus.FirstOrDefault(s => s.skuId.ParseToString() == info.map_sku_id);
|
||||
if (sku == null)
|
||||
return;
|
||||
|
||||
@@ -763,7 +763,7 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
|
||||
var goods = JsonHelper.DeserializeJsonToObject<pddFrontGoods3Lite>(skuInfo.map_skus);
|
||||
if (goods == null)
|
||||
return;
|
||||
var sku = goods.skus.FirstOrDefault(s => s.skuID.ParseToString() == info.map_sku_id);
|
||||
var sku = goods.skus.FirstOrDefault(s => s.skuId.ParseToString() == info.map_sku_id);
|
||||
if (sku == null)
|
||||
return;
|
||||
|
||||
@@ -1151,7 +1151,8 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
|
||||
order_no = orderItem.order_id,
|
||||
order_sku_id = orderItem.sku_id,
|
||||
out_amount = (txtBuyPriceVal.ParseToDecimal() * 100).ParseToInt(),
|
||||
out_order_no = "tb_" + txtBuyOrderIdVal.Trim(),
|
||||
out_order_no = txtBuyOrderIdVal.Trim(),
|
||||
order_code = txtBuyOrderIdVal.Trim(),
|
||||
purchaser_note = body["purchaserNote"].ParseToString(),
|
||||
created_time = DateTime.Now,
|
||||
});
|
||||
|
||||
@@ -1334,11 +1334,11 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
|
||||
var pddFrontSkuInfo = new frontSkuInfo3()
|
||||
{
|
||||
skuId = key.ParseToLong(),
|
||||
skuID = key.ParseToLong(),
|
||||
//skuID = key.ParseToLong(),
|
||||
goodsId = pddFrontGoods3.goodsId,
|
||||
thumbUrl = thumbUrl,
|
||||
quantity = tbSku2.quantity,
|
||||
isOnsale = 1,
|
||||
//quantity = tbSku2.quantity,
|
||||
//isOnsale = 1,
|
||||
spec = taobaoSku?.propPath, // 淘宝格式与拼多多存在差异,包含冒号与父类型id
|
||||
specs = pddSpecs,
|
||||
price = tbSku2.price?.priceMoney.ParseToInt() + 100,
|
||||
@@ -1440,7 +1440,7 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
|
||||
var goods = JsonHelper.DeserializeJsonToObject<pddFrontGoods3Lite>(skuInfo.map_skus);
|
||||
if (goods == null)
|
||||
return;
|
||||
var sku = goods.skus.FirstOrDefault(s => s.skuID.ParseToString() == info.map_sku_id);
|
||||
var sku = goods.skus.FirstOrDefault(s => s.skuId.ParseToString() == info.map_sku_id);
|
||||
if (sku == null)
|
||||
return;
|
||||
|
||||
@@ -1471,7 +1471,7 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
|
||||
var goods = JsonHelper.DeserializeJsonToObject<pddFrontGoods3Lite>(skuInfo.map_skus);
|
||||
if (goods == null)
|
||||
return;
|
||||
var sku = goods.skus.FirstOrDefault(s => s.skuID.ParseToString() == info.map_sku_id);
|
||||
var sku = goods.skus.FirstOrDefault(s => s.skuId.ParseToString() == info.map_sku_id);
|
||||
if (sku == null)
|
||||
return;
|
||||
|
||||
@@ -1543,7 +1543,7 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
|
||||
}
|
||||
else
|
||||
{
|
||||
return "获取失败,请关闭拍单窗口重试 " + BaseRegex.GetStringXml(ref sourceCodeRst, "msg", sourceCodeRst);
|
||||
return "溯源码获取失败,请关闭拍单窗口重试 " + BaseRegex.GetStringXml(ref sourceCodeRst, "msg", sourceCodeRst);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1866,6 +1866,7 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
|
||||
order_sku_id = orderItem.sku_id,
|
||||
out_amount = (txtBuyPriceVal.ParseToDecimal() * 100).ParseToInt(),
|
||||
out_order_no = "tb_" + txtBuyOrderIdVal.Trim(),
|
||||
order_code = "tb_" + txtBuyOrderIdVal.Trim(),
|
||||
purchaser_note = body["purchaserNote"].ParseToString(),
|
||||
created_time = DateTime.Now,
|
||||
});
|
||||
|
||||
@@ -1356,7 +1356,7 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
|
||||
if (!lstTbBuyerOrderVoidAfterSaleOrderSn.Contains(orderItem.order_id + orderItem.sku_id))
|
||||
{
|
||||
lstTbBuyerOrderVoidAfterSaleOrderSn.Add(orderItem.order_id + orderItem.sku_id);
|
||||
await OrderListRowItemCtrl.VoidOrder(orderItem, null, true);
|
||||
await OrderTransitService.VoidOrder(orderItem, null, true);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user