增加同步物流类型 结算 查询
This commit is contained in:
1 parent
6ce55f7b58
commit
efa9955bd2
4 files changed
+11
-6
No files matched your search
@@ -131,7 +131,7 @@ namespace KJD_Web.Services.Users
|
|||||||
decimal rebate_amount = 0m; // 正数部分(累计返利)
|
decimal rebate_amount = 0m; // 正数部分(累计返利)
|
||||||
DateTime now = DateTime.Now;
|
DateTime now = DateTime.Now;
|
||||||
|
|
||||||
List<int> UserPaymentTypeFiltert = [16, 20, 23, 26, 31, 34];
|
List<int> UserPaymentTypeFiltert = [16, 20, 23, 26, 31, 34, 55];
|
||||||
var paymentQuery = tr_freeSql.Select<UserPaymentRecordEntity>()
|
var paymentQuery = tr_freeSql.Select<UserPaymentRecordEntity>()
|
||||||
.Where(a => userNames.Contains(a.UserName))
|
.Where(a => userNames.Contains(a.UserName))
|
||||||
.Where(a => UserPaymentTypeFiltert.Contains(a.Type))
|
.Where(a => UserPaymentTypeFiltert.Contains(a.Type))
|
||||||
@@ -258,7 +258,7 @@ namespace KJD_Web.Services.Users
|
|||||||
if (user == null) throw new Exception("错误的用户");
|
if (user == null) throw new Exception("错误的用户");
|
||||||
summary.RechargeTotal = (long)Math.Round((user.RechargeAmountTotal ?? 0) * 100m);
|
summary.RechargeTotal = (long)Math.Round((user.RechargeAmountTotal ?? 0) * 100m);
|
||||||
summary.Balance = (long)Math.Round((user.Balance ?? 0) * 100m);
|
summary.Balance = (long)Math.Round((user.Balance ?? 0) * 100m);
|
||||||
List<int> types = new List<int> { 16, 20, 23, 24, 26, 31 };
|
List<int> types = new List<int> { 16, 20, 23, 24, 26, 31, 55 };
|
||||||
|
|
||||||
|
|
||||||
var data = _freeSql.Select<UserPaymentRecordEntity>()
|
var data = _freeSql.Select<UserPaymentRecordEntity>()
|
||||||
|
|||||||
@@ -94,7 +94,7 @@ public partial class UserService
|
|||||||
{
|
{
|
||||||
var users = GetOEMUsers(oem.OemId);
|
var users = GetOEMUsers(oem.OemId);
|
||||||
var userNames = users.Select(u => u.UserName).ToList();
|
var userNames = users.Select(u => u.UserName).ToList();
|
||||||
List<int> types = [20, 23, 26, 16, 31, 34];
|
List<int> types = [20, 23, 26, 16, 31, 34, 55];
|
||||||
|
|
||||||
var query = _freeSql.Select<UserPaymentRecordEntity>()
|
var query = _freeSql.Select<UserPaymentRecordEntity>()
|
||||||
.Where(a => types.Contains(a.Type))
|
.Where(a => types.Contains(a.Type))
|
||||||
|
|||||||
@@ -238,7 +238,12 @@ public class VirtualLogisticsService : ITransientDependency
|
|||||||
|
|
||||||
public List<OrderStatusResultItem> GetOrderStatus(string[] orders)
|
public List<OrderStatusResultItem> GetOrderStatus(string[] orders)
|
||||||
{
|
{
|
||||||
return _api.GetOrderStatus(orders).Data;
|
var ret = _api.GetOrderStatus(orders);
|
||||||
|
if (ret.Success)
|
||||||
|
{
|
||||||
|
return ret.Data;
|
||||||
|
}
|
||||||
|
throw new Exception(ret.Msg);
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
@@ -129,7 +129,7 @@ internal class GiftLogisticsTest
|
|||||||
public void GetOrderStatus()
|
public void GetOrderStatus()
|
||||||
{
|
{
|
||||||
var logisticsService = _container.Resolve<VirtualLogisticsService>();
|
var logisticsService = _container.Resolve<VirtualLogisticsService>();
|
||||||
var data = logisticsService.GetOrderStatus(["260923-573109716621688"]);
|
var data = logisticsService.GetOrderStatus(["260923-407759756800192"]);
|
||||||
Console.WriteLine(string.Join(" ", data.Select(a => $"{a.OrderSn}:{a.ShopOrder}:{a.DeliveryStatus}")));
|
Console.WriteLine(string.Join(" ", data.Select(a => $"{a.OrderSn}:{a.KuaidiSn}:{a.ShopOrder}:{a.DeliveryStatus}")));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
Reference in new issue
Block a user