订单分类显示 快递金额明细统计, 快递在线充值 等
This commit is contained in:
1 parent
7264835cc6
commit
e00209cb24
37 files changed
+2764
-520
No files matched your search
@@ -62,11 +62,12 @@ namespace TemuKJD.ToolForms
|
||||
private WXBuyMapInfo buyMap = null;
|
||||
// 订单仓库
|
||||
private TransitWarehouseParam transitWarehouse = null;
|
||||
// (拍单后)回调函数
|
||||
// (拍单后)回调函数,过滤订单
|
||||
private Action<oms_wei_order_info, bool> filterOrderAction = null;
|
||||
// (拍单后)回调函数,更新拍单余额
|
||||
private Action updateBalanceAction = null;
|
||||
|
||||
|
||||
public PddMobileBuyOrderForm(Action<oms_wei_order_info, bool> filterOrder, oms_wei_order_item_info orderItemInfo, BuyerLoginInfo buyerInfo, WXBuyMapInfo buy_map = null)
|
||||
public PddMobileBuyOrderForm(Action<oms_wei_order_info, bool> filterOrder, Action updateBalance, oms_wei_order_item_info orderItemInfo, BuyerLoginInfo buyerInfo, WXBuyMapInfo buy_map = null)
|
||||
{
|
||||
InitializeComponent();
|
||||
|
||||
@@ -75,6 +76,7 @@ namespace TemuKJD.ToolForms
|
||||
this.buyMap = buy_map;
|
||||
|
||||
filterOrderAction = filterOrder;
|
||||
updateBalanceAction = updateBalance;
|
||||
}
|
||||
|
||||
private void PddBuyOrderForm_Load(object sender, EventArgs e)
|
||||
@@ -648,7 +650,7 @@ namespace TemuKJD.ToolForms
|
||||
jsStr1 = @"(function() { var elements = document.getElementsByTagName('div');
|
||||
for (i = elements.length - 1; i >= 0; i--){
|
||||
var element = elements[i];
|
||||
if (element.innerHTML.indexOf('" + txtBuyTransitWarehouse.Text.Trim() + @"') >= 0) {
|
||||
if (element.innerHTML.indexOf('" + txtBuyTransitWarehouse.Text.Trim() + @"') >= 0 && element.innerHTML.indexOf('" + txtSourceCode.Text.Trim() + @"') >= 0) {
|
||||
element.click();
|
||||
return 'success';
|
||||
}
|
||||
@@ -819,7 +821,6 @@ namespace TemuKJD.ToolForms
|
||||
|
||||
if (filterOrderAction != null)
|
||||
{
|
||||
GlobalConfig.lstFilterOrder.Remove(order);
|
||||
filterOrderAction(order, false);
|
||||
}
|
||||
}
|
||||
@@ -940,14 +941,8 @@ namespace TemuKJD.ToolForms
|
||||
return;
|
||||
}
|
||||
|
||||
url = BaseClass.Build29WxObjString("user/get_all_user");
|
||||
var data = UserLogin.GetSignaturex();
|
||||
data += "&search_user_name=" + BaseClass.UserName;
|
||||
var html = GetHtml.PostUtf8(url, data);
|
||||
if (string.IsNullOrEmpty(html) || !html.Contains("\"code\":200"))
|
||||
html = GetHtml.PostUtf8(url, data);
|
||||
if (html.Contains("\"code\":200"))
|
||||
BaseClass.Balance = BaseRegex.GetDecimalJson(ref html, "balance");
|
||||
if (updateBalanceAction != null)
|
||||
updateBalanceAction();
|
||||
|
||||
orderItem.ItemTransitOrders.Insert(0, new oms_wei_external_procurement_log_info()
|
||||
{
|
||||
@@ -959,14 +954,12 @@ namespace TemuKJD.ToolForms
|
||||
out_order_no = txtBuyOrderId.Text.Trim(),
|
||||
purchaser_note = body["purchaserNote"].ParseToString(),
|
||||
});
|
||||
|
||||
orderItem.SetTransitOrder();
|
||||
orderItem.SetOrderItemTextProperty();
|
||||
// 利润计算重置为最小值,控件Resource更新时将计算利润
|
||||
orderItem.ProfitCount = decimal.MinValue;
|
||||
var order = orderItem.ItemOrder;
|
||||
if (filterOrderAction != null)
|
||||
var order = GlobalConfig.lstFilterOrder.FirstOrDefault(o => o.order_id == orderItem.order_id);
|
||||
if (filterOrderAction != null && order != null)
|
||||
{
|
||||
GlobalConfig.lstFilterOrder.Remove(order);
|
||||
filterOrderAction(order, true);
|
||||
}
|
||||
|
||||
@@ -1030,27 +1023,28 @@ namespace TemuKJD.ToolForms
|
||||
if (string.IsNullOrEmpty(html) || !html.Contains("\"code\":200"))
|
||||
{
|
||||
var msg = BaseRegex.GetStringJsonByRegs(ref html, html, "msg");
|
||||
BaseMsgForm.ShowError("异常单重拍保存失败");
|
||||
BaseMsgForm.ShowError("异常订单重拍保存失败");
|
||||
btnManualUpdateBuyOrder.Enabled = true;
|
||||
return;
|
||||
}
|
||||
|
||||
orderItem.ItemTransitOrder.buyer_account = buyer.buyer_nick;
|
||||
orderItem.ItemTransitOrder.id = 0;
|
||||
orderItem.ItemTransitOrder.order_no = orderItem.order_id;
|
||||
orderItem.ItemTransitOrder.order_sku_id = orderItem.sku_id;
|
||||
orderItem.ItemTransitOrder.out_amount = (txtBuyPrice.Text.ParseToDecimal() * 100).ParseToInt();
|
||||
orderItem.ItemTransitOrder.out_order_no = txtBuyOrderId.Text.Trim();
|
||||
orderItem.ItemTransitOrder.purchaser_note = BaseClass.UserName + "-" + BaseClass.NickName;
|
||||
orderItem.ItemTransitOrder.refund_status = "";
|
||||
|
||||
orderItem.SetTransitOrder();
|
||||
if (orderItem.ItemTransitOrder != null)
|
||||
{
|
||||
orderItem.ItemTransitOrder.buyer_account = buyer.buyer_nick;
|
||||
orderItem.ItemTransitOrder.id = 0;
|
||||
orderItem.ItemTransitOrder.order_no = orderItem.order_id;
|
||||
orderItem.ItemTransitOrder.order_sku_id = orderItem.sku_id;
|
||||
orderItem.ItemTransitOrder.out_amount = (txtBuyPrice.Text.ParseToDecimal() * 100).ParseToInt();
|
||||
orderItem.ItemTransitOrder.out_order_no = txtBuyOrderId.Text.Trim();
|
||||
orderItem.ItemTransitOrder.purchaser_note = BaseClass.UserName + "-" + BaseClass.NickName;
|
||||
orderItem.ItemTransitOrder.refund_status = "";
|
||||
}
|
||||
orderItem.SetOrderItemTextProperty();
|
||||
// 利润计算重置为最小值,控件Resource更新时将计算利润
|
||||
orderItem.ProfitCount = decimal.MinValue;
|
||||
var order = orderItem.ItemOrder;
|
||||
if (filterOrderAction != null)
|
||||
var order = GlobalConfig.lstFilterOrder.FirstOrDefault(o => o.order_id == orderItem.order_id);
|
||||
if (filterOrderAction != null && order != null)
|
||||
{
|
||||
GlobalConfig.lstFilterOrder.Remove(order);
|
||||
filterOrderAction(order, true);
|
||||
}
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user