Develop/YunTongJackYunTask
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'jackYun' of http://8.130.121.29:3000/yuyubo/YunTongJackYunTask into jackYun

Browse Source
This commit is contained in:
Administrator 2025-07-23 14:27:56 +08:00
commit c6fd76f937
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Reportapi/MyCode.Project.Infrastructure/JackYun/TradeFullinfogetResp.cs
View File

@ -97,7 +97,7 @@ namespace MyCode.Project.Infrastructure.JackYun
/// Default:
/// Nullable:True
/// </summary>
public string Unit { get; set; }
public string unit { get; set; }
}

14
Reportapi/MyCode.Project.Services/Implementation/JackYunTaskService.cs
View File

@ -14,7 +14,7 @@ using System.Threading.Tasks;
namespace MyCode.Project.Services.Implementation
{
public class JackYunTaskService : ServiceBase , IJackYunTaskService
public class JackYunTaskService : ServiceBase, IJackYunTaskService
{
private IJackYunService _jackYunService;
private IJackOrdersRepository _jackOrdersRepository;
@ -30,7 +30,7 @@ namespace MyCode.Project.Services.Implementation
, IPushKingDeeOrderItemRepository pushKingDeeOrderItemRepository
, IYTKJTShopParameterRepository yTKJTShopParameterRepository
, IJackYunService jackYunService,
IWorkProcessService workProcessService )
IWorkProcessService workProcessService)
{
_yTKJTShopParameterRepository = yTKJTShopParameterRepository;
_pushKingDeeOrderRepository = pushKingDeeOrderRepository;
@ -50,7 +50,7 @@ namespace MyCode.Project.Services.Implementation
{
DateTime runTime = DateTime.Parse(now);
var list = _jackYunService.testTradeFullInfoGet(runTime);
SetOrder(list);
SetOrder(list);
_workProcessService.Add<IJackYunTaskService>(this.MerchantId, "GetAndMergeJackYunOrder", "合并吉客云订单到新表", now, 1);
}
#endregion
@ -108,10 +108,10 @@ namespace MyCode.Project.Services.Implementation
{
var list = _jackOrdersItemRepository.GetPushOrder();
List<string> mesg = new List<string>();
var shopParemList = _yTKJTShopParameterRepository.Queryable().Where(t => t.FDOCUMENTSTATUS == "C").ToList();
List<PushKingDeeOrderItem> pushKingDeeOrderItems = new List<PushKingDeeOrderItem>();
List<PushKingDeeOrder> pushKingDeeOrders = new List<PushKingDeeOrder>();
List<PushKingDeeOrder> pushKingDeeOrders = new List<PushKingDeeOrder>();
list.ForEach(sheet =>
{
if (pushKingDeeOrders.Where(t => t.ShopId == sheet.ShopId && t.WarehouseId == sheet.WarehouseId).Count() > 0)
@ -125,7 +125,7 @@ namespace MyCode.Project.Services.Implementation
pushKingDeeOrder.UpdateTime = DateTime.Now;
pushKingDeeOrders.Add(pushKingDeeOrder);
var tempList = list.Where(t => t.ShopId == sheet.ShopId && t.WarehouseId == sheet.WarehouseId).ToList();
var tempList = list.Where(t => t.ShopId == sheet.ShopId && t.WarehouseId == sheet.WarehouseId).ToList();
tempList.ForEach(item =>
{
PushKingDeeOrderItem pushKingDeeOrderItem = new PushKingDeeOrderItem();
@ -152,7 +152,7 @@ namespace MyCode.Project.Services.Implementation
{
t.Status = 1;
t.UpdateTime = DateTime.Now;
}
}
});
oldList = oldList.Where(t => t.Status == 1).ToList();
_jackOrdersRepository.Update(oldList);