chfei/29WxOrder
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'main' of http://git.ts.e57.cn/chfei/29WxOrder

Browse Source
This commit is contained in:
wule committed 2026-11-13 14:48:52 +08:00
2 parents 4ca9c082a1 5f08abec0f
commit 8008dfb527
5 files changed
+101 -151
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

29WxOrderWpf/Ctrls/BuyerCtrls/PDDBuyerOrderReadCtrl.xaml.cs
+5 -51
View File
@@ -575,52 +575,6 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
return transitOrderList;
}
/// <summary>
/// 读取订单详情信息
/// </summary>
/// <param name="order_ids"></param>
/// <returns></returns>
async Task<List<oms_wei_order_info>> GetOrderInfo(string order_ids)
{
if (string.IsNullOrEmpty(order_ids))
return new List<oms_wei_order_info>();
Thread.Sleep(100);
var url1 = BaseClass.Build29WxObjString("order/get_erp_order_list");
var data1 = UserLogin.GetSignaturex();
data1 += "&erp_order_id_in=" + order_ids;
data1 += "&page_size=" + 100;
var html1 = GetHtml.PostUtf8(url1, data1);
if (string.IsNullOrEmpty(html1) || !html1.Contains("\"code\":200"))
html1 = GetHtml.PostUtf8(url1, data1);
if (string.IsNullOrEmpty(html1) || !html1.Contains("\"code\":200"))
{
//BaseMsgWindow.ShowError("订单读取失败 " + BaseRegex.GetStringJson(ref html, "msg"));
//break;
}
List<oms_wei_order_info> orders = new List<oms_wei_order_info>();
try
{
orders = JsonHelper.DeserializeJsonToList<oms_wei_order_info>(JObject.Parse(html1)["data"].ParseToString());
if (orders == null)
orders = new List<oms_wei_order_info>();
var orderItems = await OrderListCtrl.GetOrderItemInfo(order_ids);
foreach (var orderItem in orderItems)
{
var order = orders.FirstOrDefault(o => o.order_id == orderItem.order_id);
orderItem.ItemOrder = order;
order.orderItems.Add(orderItem);
}
return orders;
}
catch
{
return new List<oms_wei_order_info>();
}
}
public static List<order_pdd_buyer_after_sale> GetOrderAfterSales(string order_ids)
{
if (order_ids.IsNullOrEmpty())
@@ -787,7 +741,7 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
var order_id_lst = transitOrderList.Select(ts => ts.order_no).ToList();
order_id_lst.AddRange(orderExtList.Select(ts => ts.order_id));
var order_ids = string.Join(",", order_id_lst.Distinct());
var orders = await GetOrderInfo(order_ids);
var orders = await OrderGetOrderListHelper.GetOrderInfo(order_ids);
//var buyerAfterSales = GetOrderAfterSales(order_ids);
@@ -1130,7 +1084,7 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
order_id_lst.AddRange(orderExtList.Select(ts => ts.order_id));
var order_ids = string.Join(",", order_id_lst.Distinct());
var orders = await GetOrderInfo(order_ids);
var orders = await OrderGetOrderListHelper.GetOrderInfo(order_ids);
foreach (var order in orders)
{
foreach (var orderItem in order.orderItems)
@@ -2250,8 +2204,8 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
var transitOrderList = GetOrderTransitWarehouseInfo(out_order_nos);
var order_ids = string.Join(",", transitOrderList.Select(ts => ts.order_no));
var orders = await GetOrderInfo(order_ids);
foreach (var order in orders)
var orders = await OrderGetOrderListHelper.GetOrderInfo(order_ids);
foreach (var order in orders)
{
foreach (var orderItem in order.orderItems)
{
@@ -2703,7 +2657,7 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
}
// 取最新订单状态
var wxOrder = (await GetOrderInfo(order.ShopOrderIdStr))?.FirstOrDefault();
var wxOrder = (await OrderGetOrderListHelper.GetOrderInfo(order.ShopOrderIdStr))?.FirstOrDefault();
if (wxOrder == null)
throw new Exception("买手单对应微信订单不存在！");
var shop = GlobalConfig.ShopLoginList.FirstOrDefault(s => s.ErpShopId == wxOrder.shop_id.ToString());
29WxOrderWpf/Ctrls/BuyerCtrls/PDDMultiBuyerOrderReadCtrl.xaml.cs
+4 -50
View File
@@ -511,52 +511,6 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
}
return transitOrderList;
}
/// <summary>
/// 读取订单详情信息
/// </summary>
/// <param name="order_ids"></param>
/// <returns></returns>
async Task<List<oms_wei_order_info>> GetOrderInfo(string order_ids)
{
if (string.IsNullOrEmpty(order_ids))
return new List<oms_wei_order_info>();
Thread.Sleep(100);
var url1 = BaseClass.Build29WxObjString("order/get_erp_order_list");
var data1 = UserLogin.GetSignaturex();
data1 += "&erp_order_id_in=" + order_ids;
data1 += "&page_size=" + 100;
var html1 = GetHtml.PostUtf8(url1, data1);
if (string.IsNullOrEmpty(html1) || !html1.Contains("\"code\":200"))
html1 = GetHtml.PostUtf8(url1, data1);
if (string.IsNullOrEmpty(html1) || !html1.Contains("\"code\":200"))
{
//BaseMsgWindow.ShowError("订单读取失败 " + BaseRegex.GetStringJson(ref html, "msg"));
//break;
}
List<oms_wei_order_info> orders = new List<oms_wei_order_info>();
try
{
orders = JsonHelper.DeserializeJsonToList<oms_wei_order_info>(JObject.Parse(html1)["data"].ParseToString());
if (orders == null)
orders = new List<oms_wei_order_info>();
var orderItems = await OrderListCtrl.GetOrderItemInfo(order_ids);
foreach (var orderItem in orderItems)
{
var order = orders.FirstOrDefault(o => o.order_id == orderItem.order_id);
orderItem.ItemOrder = order;
order.orderItems.Add(orderItem);
}
return orders;
}
catch
{
return new List<oms_wei_order_info>();
}
}
public static List<order_pdd_buyer_after_sale> GetOrderAfterSales(string order_ids)
{
@@ -714,7 +668,7 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
var order_id_lst = transitOrderList.Select(ts => ts.order_no).ToList();
order_id_lst.AddRange(orderExtList.Select(ts => ts.order_id));
var order_ids = string.Join(",", order_id_lst.Distinct());
var orders = await GetOrderInfo(order_ids);
var orders = await OrderGetOrderListHelper.GetOrderInfo(order_ids);
//var buyerAfterSales = GetOrderAfterSales(order_ids);
@@ -1062,7 +1016,7 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
order_id_lst.AddRange(orderExtList.Select(ts => ts.order_id));
var order_ids = string.Join(",", order_id_lst.Distinct());
var orders = await GetOrderInfo(order_ids);
var orders = await OrderGetOrderListHelper.GetOrderInfo(order_ids);
foreach (var order in orders)
{
foreach (var orderItem in order.orderItems)
@@ -1816,7 +1770,7 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
var transitOrderList = GetOrderTransitWarehouseInfo(out_order_nos);
var order_ids = string.Join(",", transitOrderList.Select(ts => ts.order_no));
var orders = await GetOrderInfo(order_ids);
var orders = await OrderGetOrderListHelper.GetOrderInfo(order_ids);
foreach (var order in orders)
{
foreach (var orderItem in order.orderItems)
@@ -2257,7 +2211,7 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
}
// 取最新订单状态
var wxOrder = (await GetOrderInfo(order.ShopOrderIdStr)).FirstOrDefault();
var wxOrder = (await OrderGetOrderListHelper.GetOrderInfo(order.ShopOrderIdStr)).FirstOrDefault();
if (wxOrder == null)
throw new Exception("买手单对应微信订单不存在！");
var shop = GlobalConfig.ShopLoginList.FirstOrDefault(s => s.ErpShopId == wxOrder.shop_id.ToString());
29WxOrderWpf/Ctrls/BuyerCtrls/TbBuyerOrderReadCtrl.xaml.cs
+4 -50
View File
@@ -433,52 +433,6 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
return transitOrderList;
}
/// <summary>
/// 读取订单详情信息
/// </summary>
/// <param name="order_ids"></param>
/// <returns></returns>
async Task<List<oms_wei_order_info>> GetOrderInfo(string order_ids)
{
if (string.IsNullOrEmpty(order_ids))
return new List<oms_wei_order_info>();
Thread.Sleep(100);
var url1 = BaseClass.Build29WxObjString("order/get_erp_order_list");
var data1 = UserLogin.GetSignaturex();
data1 += "&erp_order_id_in=" + order_ids;
data1 += "&page_size=" + 100;
var html1 = GetHtml.PostUtf8(url1, data1);
if (string.IsNullOrEmpty(html1) || !html1.Contains("\"code\":200"))
html1 = GetHtml.PostUtf8(url1, data1);
if (string.IsNullOrEmpty(html1) || !html1.Contains("\"code\":200"))
{
//BaseMsgWindow.ShowError("订单读取失败 " + BaseRegex.GetStringJson(ref html, "msg"));
//break;
}
List<oms_wei_order_info> orders = new List<oms_wei_order_info>();
try
{
orders = JsonHelper.DeserializeJsonToList<oms_wei_order_info>(JObject.Parse(html1)["data"].ParseToString());
if (orders == null)
orders = new List<oms_wei_order_info>();
var orderItems = await OrderListCtrl.GetOrderItemInfo(order_ids);
foreach (var orderItem in orderItems)
{
var order = orders.FirstOrDefault(o => o.order_id == orderItem.order_id);
orderItem.ItemOrder = order;
order.orderItems.Add(orderItem);
}
return orders;
}
catch
{
return new List<oms_wei_order_info>();
}
}
public static List<order_tb_buyer_after_sale> GetOrderAfterSales(string order_ids)
{
if (order_ids.IsNullOrEmpty())
@@ -754,7 +708,7 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
var order_id_lst = transitOrderList.Select(ts => ts.order_no).ToList();
order_id_lst.AddRange(orderExtList.Select(ts => ts.order_id));
var order_ids = string.Join(",", order_id_lst.Distinct());
var orders = await GetOrderInfo(order_ids);
var orders = await OrderGetOrderListHelper.GetOrderInfo(order_ids);
//var buyerAfterSales = GetOrderAfterSales(order_ids);
@@ -1103,7 +1057,7 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
order_id_lst.AddRange(orderExtList.Select(ts => ts.order_id));
var order_ids = string.Join(",", order_id_lst.Distinct());
var orders = await GetOrderInfo(order_ids);
var orders = await OrderGetOrderListHelper.GetOrderInfo(order_ids);
foreach (var order in orders)
{
foreach (var orderItem in order.orderItems)
@@ -1673,7 +1627,7 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
var transitOrderList = GetOrderTransitWarehouseInfo(out_order_nos);
var order_ids = string.Join(",", transitOrderList.Select(ts => ts.order_no));
var orders = await GetOrderInfo(order_ids);
var orders = await OrderGetOrderListHelper.GetOrderInfo(order_ids);
foreach (var order in orders)
{
foreach (var orderItem in order.orderItems)
@@ -2119,7 +2073,7 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
}
// 取最新订单状态
var wxOrder = (await GetOrderInfo(order.ShopOrderIdStr)).FirstOrDefault();
var wxOrder = (await OrderGetOrderListHelper.GetOrderInfo(order.ShopOrderIdStr)).FirstOrDefault();
if (wxOrder == null)
throw new Exception("买手单对应微信订单不存在！");
var shop = GlobalConfig.ShopLoginList.FirstOrDefault(s => s.ErpShopId == wxOrder.shop_id.ToString());
29WxOrderWpf/Ctrls/OrderCtrls/OrderGetOrderListHelper.cs
+87
View File
@@ -0,0 +1,87 @@
using _29WxOrderWpf.BaseWindows;
using AllBase;
using AllBase.Helper;
using AllBase.Model.DBModel;
using NaiBa.Util.Extension;
using Newtonsoft.Json.Linq;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading;
using System.Threading.Tasks;
using Work;
namespace _29WxOrderWpf.Ctrls.OrderCtrls;
public class OrderGetOrderListHelper
{
/// <summary>
/// 读取订单详情信息
/// </summary>
/// <param name="orderIds"></param>
/// <returns></returns>
static async Task<List<oms_wei_order_info>> GetOrderInfoBase(string orderIds, string shopIds = null, DateTime? beginUpdateTime = null, DateTime? endUpdateTime = null)
{
if (string.IsNullOrEmpty(orderIds))
return new List<oms_wei_order_info>();
Thread.Sleep(100);
try
{
var url = BaseClass.Build29WxObjString("order/get_erp_order_list");
var data = UserLogin.GetSignaturex();
data += "&erp_order_id_in=" + orderIds;
data += "&page_size=" + 100;
if (!string.IsNullOrWhiteSpace(shopIds))
data += "&erp_shop_id_in=" + shopIds;
if (beginUpdateTime != null && beginUpdateTime != DateTime.MinValue)
{
var startTime = BaseClass.DateTimeToTimestampSeconds(beginUpdateTime.Value);
data += "&start_time=" + startTime;
}
if (endUpdateTime != null && endUpdateTime != DateTime.MinValue)
{
var endTime = BaseClass.DateTimeToTimestampSeconds(endUpdateTime.Value);
data += "&end_time=" + endTime;
}
var html = GetHtml.PostUtf8(url, data);
if (string.IsNullOrEmpty(html) || !html.Contains("\"code\":200"))
html = GetHtml.PostUtf8(url, data);
if (string.IsNullOrEmpty(html) || !html.Contains("\"code\":200"))
{
throw new Exception("订单读取失败 " + BaseRegex.GetStringJson(ref html, "msg"));
}
List<oms_wei_order_info> orders = new List<oms_wei_order_info>();
orders = JsonHelper.DeserializeJsonToList<oms_wei_order_info>(JObject.Parse(html)["data"].ParseToString());
if (orders == null)
orders = new List<oms_wei_order_info>();
var orderItems = await OrderListCtrl.GetOrderItemInfo(orderIds);
foreach (var orderItem in orderItems)
{
var order = orders.FirstOrDefault(o => o.order_id == orderItem.order_id);
orderItem.ItemOrder = order;
order.orderItems.Add(orderItem);
}
return orders;
}
catch (Exception ex)
{
BaseMsgWindow.ShowAnimateMessage(ex.Message, "Error", 6);
return new List<oms_wei_order_info>();
}
}
public static async Task<List<oms_wei_order_info>> GetOrderInfo(string order_ids)
{
return await GetOrderInfoBase(order_ids, null, null);
}
public static async Task<List<oms_wei_order_info>> GetWxOrder‌IncrementAsync()
{
return new List<oms_wei_order_info>();
}
}
29WxOrderWpf/Services/ShipGiftService.cs
+1
View File
@@ -45,6 +45,7 @@ public class ShipGiftService : SingleInstance<ShipGiftService>
if (BaseClass.Setting.AutoSwitchGiftType && (item.product_price ?? 0) > 6 * 100)
{
giftType = GiftType._160;
giftAmount = 1.6m;
}
decimal amount = giftAmount + BaseClass.OemGiftAmount;