diff --git a/KJD_WebService/Services/Users/UserService.FeeRecord.cs b/KJD_WebService/Services/Users/UserService.FeeRecord.cs index d1f7749..1be71f7 100644 --- a/KJD_WebService/Services/Users/UserService.FeeRecord.cs +++ b/KJD_WebService/Services/Users/UserService.FeeRecord.cs @@ -131,7 +131,7 @@ namespace KJD_Web.Services.Users decimal rebate_amount = 0m; // 正数部分(累计返利) DateTime now = DateTime.Now; - List UserPaymentTypeFiltert = [16, 20, 23, 26, 31, 34]; + List UserPaymentTypeFiltert = [16, 20, 23, 26, 31, 34, 55]; var paymentQuery = tr_freeSql.Select() .Where(a => userNames.Contains(a.UserName)) .Where(a => UserPaymentTypeFiltert.Contains(a.Type)) @@ -258,7 +258,7 @@ namespace KJD_Web.Services.Users if (user == null) throw new Exception("错误的用户"); summary.RechargeTotal = (long)Math.Round((user.RechargeAmountTotal ?? 0) * 100m); summary.Balance = (long)Math.Round((user.Balance ?? 0) * 100m); - List types = new List { 16, 20, 23, 24, 26, 31 }; + List types = new List { 16, 20, 23, 24, 26, 31, 55 }; var data = _freeSql.Select() @@ -274,133 +274,133 @@ namespace KJD_Web.Services.Users - // /// - // /// 填充历史数据 - // /// - // public void FillHistoryOemAmount() - // { - // List data = new List(); - // string path = @"d:\ddddd.json"; - // if (File.Exists(path)) - // { - // data = JsonConvert.DeserializeObject>(File.ReadAllText(path)); - // } - // else - // { - // data = _freeSql.Select() - // .Where(a => a.type == 20 || a.type == 26) - // .Where(a => a.create_time < DateTime.Parse("2026-09-01 00:00:00")) - // .OrderBy(a => a.id) - // .ToList(); - // } - // Debug.WriteLine($"共;{data.Count}"); - // int max = 500; - // int count = 0; - // List list = new List(); - // foreach (var item in data) - // { - // //if (item.IsFill) continue; - // try - // { - // if (!string.IsNullOrEmpty(item.remark)) - // { - // var ls = item.remark.Split(':'); - // if (ls.Length != 2) continue; - // item.OrderId = ls[1]; - // list.Add(item); - // if (list.Count == max) - // { - // var orderNames = list.Select(a => a.OrderId); - // List orders = _freeSql.Select() - // .Where(a => orderNames.Contains(a.order_id)) - // .ToList(); - // fillOemAmount(list, orders); - // var uCount = _freeSql.Update() - // .SetSource(list) - // .UpdateColumns(a => new { a.oem_amount }) - // .ExecuteAffrows(); - // if (uCount != list.Count) - // { - // Debug.WriteLine("数量不对"); - // } - // list.ForEach(a => a.IsFill = true); - // File.WriteAllText(path, JsonConvert.SerializeObject(data)); - // count += list.Count; - // Debug.WriteLine($"成功修改;{list.Count}"); - // list.Clear(); - // Debug.WriteLine($"共修改;{count}"); + // /// + // /// 填充历史数据 + // /// + // public void FillHistoryOemAmount() + // { + // List data = new List(); + // string path = @"d:\ddddd.json"; + // if (File.Exists(path)) + // { + // data = JsonConvert.DeserializeObject>(File.ReadAllText(path)); + // } + // else + // { + // data = _freeSql.Select() + // .Where(a => a.type == 20 || a.type == 26) + // .Where(a => a.create_time < DateTime.Parse("2026-09-01 00:00:00")) + // .OrderBy(a => a.id) + // .ToList(); + // } + // Debug.WriteLine($"共;{data.Count}"); + // int max = 500; + // int count = 0; + // List list = new List(); + // foreach (var item in data) + // { + // //if (item.IsFill) continue; + // try + // { + // if (!string.IsNullOrEmpty(item.remark)) + // { + // var ls = item.remark.Split(':'); + // if (ls.Length != 2) continue; + // item.OrderId = ls[1]; + // list.Add(item); + // if (list.Count == max) + // { + // var orderNames = list.Select(a => a.OrderId); + // List orders = _freeSql.Select() + // .Where(a => orderNames.Contains(a.order_id)) + // .ToList(); + // fillOemAmount(list, orders); + // var uCount = _freeSql.Update() + // .SetSource(list) + // .UpdateColumns(a => new { a.oem_amount }) + // .ExecuteAffrows(); + // if (uCount != list.Count) + // { + // Debug.WriteLine("数量不对"); + // } + // list.ForEach(a => a.IsFill = true); + // File.WriteAllText(path, JsonConvert.SerializeObject(data)); + // count += list.Count; + // Debug.WriteLine($"成功修改;{list.Count}"); + // list.Clear(); + // Debug.WriteLine($"共修改;{count}"); - // } - // } - // } - // finally - // { + // } + // } + // } + // finally + // { - // } - // } - // } + // } + // } + // } - // private void fillOemAmount(List list, List orders) - // { - // foreach (var item in list) - // { - // var order = orders.FirstOrDefault(a => a.order_id == item.OrderId); - // if (order != null) - // { - // item.oem_amount = getoemamount(order.province_name, item.amount.Value, item.type); - // } - // } - // } - // private Dictionary DicWarehousePostage = new Dictionary - // { - // { "湖北", 2.2m }, - //{ "湖南", 2.2m }, - //{ "江西", 2.2m }, - //{ "河南", 2.2m }, - //{ "上海", 3m }, - //{ "浙江", 2.2m }, - //{ "安徽", 2.2m }, - //{ "江苏", 2.2m }, - //{ "河北", 2.2m }, - //{ "山东", 2.2m }, - //{ "福建", 2.2m }, - //{ "广东", 2.2m }, - //{ "深圳", 2.8m }, - //{ "天津", 2.2m }, - //{ "北京", 3.2m }, - //{ "山西", 2.2m }, - //{ "陕西", 2.2m }, - //{ "广西", 2.2m }, - //{ "云南", 2.2m }, - //{ "贵州", 2.2m }, - //{ "四川", 2.2m }, - //{ "重庆", 2.2m }, - //{ "黑龙江", 2.7m }, - //{ "吉林", 2.7m }, - //{ "辽宁", 2.7m }, - //{ "青海", 2.7m }, - //{ "宁夏", 2.7m }, - //{ "甘肃", 2.7m }, - //{ "内蒙", 4.5m }, - //{ "海南", 4.5m }, - //{ "新疆", 12.5m }, - //{ "西藏", 12.5m }, - // }; - // private decimal getoemamount(string province, decimal amount, int type) - // { - // foreach (var item in DicWarehousePostage) - // { - // if (province.StartsWith(item.Key)) - // { - // if (type == 20) - // return amount - item.Value; - // if (type == 26) - // return amount - item.Value - 0.3m; + // private void fillOemAmount(List list, List orders) + // { + // foreach (var item in list) + // { + // var order = orders.FirstOrDefault(a => a.order_id == item.OrderId); + // if (order != null) + // { + // item.oem_amount = getoemamount(order.province_name, item.amount.Value, item.type); + // } + // } + // } + // private Dictionary DicWarehousePostage = new Dictionary + // { + // { "湖北", 2.2m }, + //{ "湖南", 2.2m }, + //{ "江西", 2.2m }, + //{ "河南", 2.2m }, + //{ "上海", 3m }, + //{ "浙江", 2.2m }, + //{ "安徽", 2.2m }, + //{ "江苏", 2.2m }, + //{ "河北", 2.2m }, + //{ "山东", 2.2m }, + //{ "福建", 2.2m }, + //{ "广东", 2.2m }, + //{ "深圳", 2.8m }, + //{ "天津", 2.2m }, + //{ "北京", 3.2m }, + //{ "山西", 2.2m }, + //{ "陕西", 2.2m }, + //{ "广西", 2.2m }, + //{ "云南", 2.2m }, + //{ "贵州", 2.2m }, + //{ "四川", 2.2m }, + //{ "重庆", 2.2m }, + //{ "黑龙江", 2.7m }, + //{ "吉林", 2.7m }, + //{ "辽宁", 2.7m }, + //{ "青海", 2.7m }, + //{ "宁夏", 2.7m }, + //{ "甘肃", 2.7m }, + //{ "内蒙", 4.5m }, + //{ "海南", 4.5m }, + //{ "新疆", 12.5m }, + //{ "西藏", 12.5m }, + // }; + // private decimal getoemamount(string province, decimal amount, int type) + // { + // foreach (var item in DicWarehousePostage) + // { + // if (province.StartsWith(item.Key)) + // { + // if (type == 20) + // return amount - item.Value; + // if (type == 26) + // return amount - item.Value - 0.3m; - // } - // } - // return amount; - // } + // } + // } + // return amount; + // } } diff --git a/KJD_WebService/Services/Users/UserService.OEM.cs b/KJD_WebService/Services/Users/UserService.OEM.cs index a42419b..84612cf 100644 --- a/KJD_WebService/Services/Users/UserService.OEM.cs +++ b/KJD_WebService/Services/Users/UserService.OEM.cs @@ -94,7 +94,7 @@ public partial class UserService { var users = GetOEMUsers(oem.OemId); var userNames = users.Select(u => u.UserName).ToList(); - List types = [20, 23, 26, 16, 31, 34]; + List types = [20, 23, 26, 16, 31, 34, 55]; var query = _freeSql.Select() .Where(a => types.Contains(a.Type)) diff --git a/Store.SyncLogistics/Services/VirtualLogisticsService.cs b/Store.SyncLogistics/Services/VirtualLogisticsService.cs index e61301f..2251af3 100644 --- a/Store.SyncLogistics/Services/VirtualLogisticsService.cs +++ b/Store.SyncLogistics/Services/VirtualLogisticsService.cs @@ -238,7 +238,12 @@ public class VirtualLogisticsService : ITransientDependency public List GetOrderStatus(string[] orders) { - return _api.GetOrderStatus(orders).Data; + var ret = _api.GetOrderStatus(orders); + if (ret.Success) + { + return ret.Data; + } + throw new Exception(ret.Msg); } } diff --git a/test/WebServiceTest/GiftLogisticsTest.cs b/test/WebServiceTest/GiftLogisticsTest.cs index 4ada594..b8a61b1 100644 --- a/test/WebServiceTest/GiftLogisticsTest.cs +++ b/test/WebServiceTest/GiftLogisticsTest.cs @@ -129,7 +129,7 @@ internal class GiftLogisticsTest public void GetOrderStatus() { var logisticsService = _container.Resolve(); - var data = logisticsService.GetOrderStatus(["260923-573109716621688"]); - Console.WriteLine(string.Join(" ", data.Select(a => $"{a.OrderSn}:{a.ShopOrder}:{a.DeliveryStatus}"))); + var data = logisticsService.GetOrderStatus(["260923-407759756800192"]); + Console.WriteLine(string.Join(" ", data.Select(a => $"{a.OrderSn}:{a.KuaidiSn}:{a.ShopOrder}:{a.DeliveryStatus}"))); } }