增加 同步物流服务,并扣款

This commit is contained in:
chfei committed 2026-09-23 16:22:34 +08:00
1 parent f27428b5f9
commit 6863194328
24 files changed
+538 -114

No files matched your search

@@ -1,7 +1,7 @@
using KJD_Web.Entitys;
using KJD_Web.Model.WxModel;
using KJD_Web.Model.WxModel;
using MySqlX.XDevAPI;
using Newtonsoft.Json;
using Store.Contracts.User.Entitys;
using System;
using System.Collections.Generic;
using System.Data.Common;
@@ -272,11 +272,11 @@ namespace KJD_Web.Services.Users
}
/// <summary>
/// 填充历史数据
/// </summary>
// /// <summary>
// /// 填充历史数据
// /// </summary>
// public void FillHistoryOemAmount()
// {
// List<UserPaymentRecordSmall> data = new List<UserPaymentRecordSmall>();
@@ -289,7 +289,7 @@ namespace KJD_Web.Services.Users
// {
// data = _freeSql.Select<UserPaymentRecordSmall>()
// .Where(a => a.type == 20 || a.type == 26)
// .Where(a => a.create_time > DateTime.Parse("2026-09-01 00:00:00"))
// .Where(a => a.create_time < DateTime.Parse("2026-09-01 00:00:00"))
// .OrderBy(a => a.id)
// .ToList();
// }
@@ -304,7 +304,9 @@ namespace KJD_Web.Services.Users
// {
// if (!string.IsNullOrEmpty(item.remark))
// {
// item.OrderId = item.remark.Split(':')[1];
// var ls = item.remark.Split(':');
// if (ls.Length != 2) continue;
// item.OrderId = ls[1];
// list.Add(item);
// if (list.Count == max)
// {
@@ -324,8 +326,8 @@ namespace KJD_Web.Services.Users
// list.ForEach(a => a.IsFill = true);
// File.WriteAllText(path, JsonConvert.SerializeObject(data));
// count += list.Count;
// list.Clear();
// Debug.WriteLine($"成功修改;{list.Count}");
// list.Clear();
// Debug.WriteLine($"共修改;{count}");
// }
@@ -399,38 +401,38 @@ namespace KJD_Web.Services.Users
// }
// return amount;
// }
//}
}
//[FreeSql.DataAnnotations.Table(Name = "wxxd.user_payment_record")]
//public class UserPaymentRecordSmall()
//{
// public long id { get; set; }
// public int type { get; set; }
// /// <summary>
// /// 金额(元)
// /// </summary>
// public decimal? amount { get; set; }
// /// <summary>
// /// 归属oem用户的金额
// /// </summary>
// public decimal? oem_amount { get; set; }
// public string remark { get; set; }
[FreeSql.DataAnnotations.Table(Name = "wxxd.user_payment_record")]
public class UserPaymentRecordSmall()
{
public long id { get; set; }
public int type { get; set; }
/// <summary>
/// 金额(元)
/// </summary>
public decimal? amount { get; set; }
/// <summary>
/// 归属oem用户的金额
/// </summary>
public decimal? oem_amount { get; set; }
public string remark { get; set; }
// public DateTime create_time { get; set; }
public DateTime create_time { get; set; }
// [FreeSql.DataAnnotations.Column(IsIgnore = true)]
// public bool IsFill { get; set; }
[FreeSql.DataAnnotations.Column(IsIgnore = true)]
public bool IsFill { get; set; }
// [FreeSql.DataAnnotations.Column(IsIgnore = true)]
// public string OrderId { get; set; }
//}
//[FreeSql.DataAnnotations.Table(Name = "erp.oms_wei_order")]
//public class weiOrder
//{
// public string order_id { get; set; }
// public string province_name { get; set; }
//}
[FreeSql.DataAnnotations.Column(IsIgnore = true)]
public string OrderId { get; set; }
}
[FreeSql.DataAnnotations.Table(Name = "erp.oms_wei_order")]
public class weiOrder
{
public string order_id { get; set; }
public string province_name { get; set; }
}
public class UserAmountSummary