diff --git a/Reportapi/MyCode.Project.Domain/Message/Request/JackYun/ReturnChangeGetRequestBizData.cs b/Reportapi/MyCode.Project.Domain/Message/Request/JackYun/ReturnChangeGetRequestBizData.cs new file mode 100644 index 0000000..2b92cc6 --- /dev/null +++ b/Reportapi/MyCode.Project.Domain/Message/Request/JackYun/ReturnChangeGetRequestBizData.cs @@ -0,0 +1,176 @@ + +using MyCode.Project.Infrastructure.JackYun; +using System; +using System.Collections.Generic; +using static System.Net.Mime.MediaTypeNames; + +namespace MyCode.Project.Domain.Message.Request.JackYun +{ + public class ReturnChangeGetRequestBizData : BaseRequestBizData + { + /// + /// 每页显示数据量 + /// + public int? PageSize { get; set; } = 50; + + /// + /// 当前页码 + /// + public int? PageIndex { get; set; } = 0; + + /// + /// 最后修改时间（起始） + /// + public string StartModified { get; set; } + + /// + /// 最后修改时间（截止） + /// + public string EndModified { get; set; } + + /// + /// 退换单号，多个单号用逗号分隔 + /// + public string ReturnChangeNo { get; set; } + + /// + /// 订单号，多个单号用逗号分隔 + /// + public string TradeNo { get; set; } + + /// + /// 创建时间（起始） + /// + public string StartGmtCreate { get; set; } + + /// + /// 创建时间（结束） + /// + public string EndGmtCreate { get; set; } + + /// + /// 审核时间（起始） + /// + public string StartAuditDate { get; set; } + + /// + /// 审核时间（结束） + /// + public string EndAuditDate { get; set; } + + /// + /// 收货时间（起始） + /// + public string StartDeliveryDate { get; set; } + + /// + /// 收货时间（结束） + /// + public string EndDeliveryDate { get; set; } + + /// + /// 结算时间（起始） + /// + public string StartSettlementDate { get; set; } + + /// + /// 结算时间（结束） + /// + public string EndSettlementDate { get; set; } + + /// + /// 处理状态（1000：异常件待处理；1001：待审核；1002：待收货；1003：待结算；1004：已结算待收货；1005：已收货待结算；1007：已完成；1008：已取消；1009：已拒绝；1010：待支付；1014：待退货-待通知退货；1015：待退货-已通知退货；10081：已取消-被合并；10082：已取消-被拆分） + /// + public string ProcessStatusList { get; set; } + + /// + /// 销售渠道 + /// + public string ShopName { get; set; } + + /// + /// 退货仓库名称 + /// + public string WarehouseName { get; set; } + + /// + /// 退货仓库ID集合 + /// + public List WarehouseIdList { get; set; } + + /// + /// 退换原因 + /// + public string ReasonDesc { get; set; } + + /// + /// 是否获取总记录数（1：是；0：否） + /// + public int? HasTotal { get; set; } = 1; + + /// + /// 网店订单号 + /// + public string SourceTradeNo { get; set; } + + /// + /// 网店售后单号 + /// + public string SourceTradeAfterNo { get; set; } + + /// + /// 是否软删除 + /// + public bool? Deleted { get; set; } = false; + + /// + /// 店铺ID集合 + /// + public List ShopIds { get; set; } + + /// + /// 是否查询组合装子件信息（1：是；0：否） + /// + public string SelectSubParts { get; set; } = "1"; + + /// + /// 是否同时返回未删除和回收站中的数据 + /// + public bool? AllDeleteStatus { get; set; } = true; + + /// + /// 完成时间开始时间 + /// + public string StartCompleteTime { get; set; } + + /// + /// 完成时间结束时间 + /// + public string EndCompleteTime { get; set; } + + /// + /// 是否归档（0：未归档；1：已归档） + /// + public string QueryHistory { get; set; } = "0"; + + /// + /// 销售平台 + /// + public string PlatName { get; set; } + + /// + /// 申请时间开始时间 + /// + public string ApplyTimeBegin { get; set; } + + /// + /// 申请时间结束时间 + /// + public string ApplyTimeEnd { get; set; } + + + } + + +} + diff --git a/Reportapi/MyCode.Project.Domain/MyCode.Project.Domain.csproj b/Reportapi/MyCode.Project.Domain/MyCode.Project.Domain.csproj index 0f51101..49fff2e 100644 --- a/Reportapi/MyCode.Project.Domain/MyCode.Project.Domain.csproj +++ b/Reportapi/MyCode.Project.Domain/MyCode.Project.Domain.csproj @@ -67,6 +67,7 @@ + diff --git a/Reportapi/MyCode.Project.Infrastructure/Enumeration/ApiEnum.cs b/Reportapi/MyCode.Project.Infrastructure/Enumeration/ApiEnum.cs index cafbcfe..aaca28d 100644 --- a/Reportapi/MyCode.Project.Infrastructure/Enumeration/ApiEnum.cs +++ b/Reportapi/MyCode.Project.Infrastructure/Enumeration/ApiEnum.cs @@ -288,7 +288,12 @@ namespace MyCode.Project.Infrastructure.Enumeration /// 创建入库申请单并入库 /// [Enum("创建入库申请单并入库", "erp.stock.createandstockin")] - CREATEANDSTOCKIN, + CREATEANDSTOCKIN, + /// + /// 分页查询退换补发单（新） + /// + [Enum("分页查询退换补发单（新）", "ass-business.returnchange.fullinfoget")] + RETURNCHANGE, } } diff --git a/Reportapi/MyCode.Project.Infrastructure/JackYun/ReturnChangeListResp.cs b/Reportapi/MyCode.Project.Infrastructure/JackYun/ReturnChangeListResp.cs new file mode 100644 index 0000000..e527951 --- /dev/null +++ b/Reportapi/MyCode.Project.Infrastructure/JackYun/ReturnChangeListResp.cs @@ -0,0 +1,796 @@ +using SqlSugar; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace MyCode.Project.Infrastructure.JackYun +{ + + + public class ReturnChangeData + { + /// + /// 退货订单 + /// + public List returnChangeList { get; set; } + /// + /// 总数（Integer类型，长度4） + /// + public int TotalResults { get; set; } + + /// + /// 每页显示数据量（Integer类型，长度4） + /// + public int PageSize { get; set; } + + /// + /// 当前页码（Integer类型，长度4） + /// + public int PageIndex { get; set; } + + /// + /// 敏感数据标识（Boolean类型，长度10） + /// + public bool SensitiveData { get; set; } + + /// + /// 总数（Integer类型，长度100） + /// + public int TotalRecords { get; set; } + + /// + /// 分页信息（Object类型，无长度） + /// + public PageInfo PageInfo { get; set; } + } + + + /// + /// 退换补发单结果集合 + /// + public class ReturnChangeListResp + { + /// + /// 售后单系统Id + /// + public long TradeAfterId { get; set; } + + /// + /// 售后单编号 + /// + public string ReturnChangeNo { get; set; } + + /// + /// 售后单来源（1：手工新建；4：纠纷单；5：Excel导入；6：门店；7：网店下载；8：错漏；9：异常件创建） + /// + public int TradeAfterFrom { get; set; } + + /// + /// 售后单状态（1000：预入库待确认；1001：待审核；1002：待收货；1003：待结算；1004：已结算待收货；1005：已收货待结算；1007：已完成；1008：已取消；1009：已拒绝；1010：待支付；1014：待退货-待通知退货；1015：待退货-已通知退货；10081：已取消-被合并；10082：已取消-被拆分） + /// + public string TradeAfterStatus { get; set; } + + /// + /// 系统订单id + /// + public long TradeId { get; set; } + + /// + /// 系统订单号 + /// + public string TradeNo { get; set; } + + /// + /// 网店订单号 + /// + public string SourceTradeNo { get; set; } + + /// + /// 网点售后单号 + /// + public string SourceTradeAfterNo { get; set; } + + /// + /// 退货仓库id + /// + public long WarehouseId { get; set; } + + /// + /// 退货仓库编码 + /// + public string WarehouseCode { get; set; } + + /// + /// 退货仓库名称 + /// + public string WarehouseName { get; set; } + + /// + /// 物流公司id + /// + public long LogisticId { get; set; } + + /// + /// 物流名称 + /// + public string LogisticName { get; set; } + + /// + /// 发货仓库id + /// + public long SendWarehouseId { get; set; } + + /// + /// 发货仓库名称 + /// + public string SendWarehouseName { get; set; } + + /// + /// 物流单号 + /// + public string MainPostid { get; set; } + + /// + /// 销售渠道id + /// + public long ShopId { get; set; } + + /// + /// 销售渠道 + /// + public string ShopName { get; set; } + + /// + /// 销售渠道Code + /// + public string ShopCode { get; set; } + + /// + /// 公司ID + /// + public long CompanyId { get; set; } + + /// + /// 公司名称 + /// + public string CompanyName { get; set; } + + /// + /// 原订单渠道id + /// + public long SourceShopId { get; set; } + + /// + /// 原订单渠道 + /// + public string SourceShopName { get; set; } + + /// + /// 售后原因描述 + /// + public string ReasonDesc { get; set; } + + /// + /// 取消售后原因描述 + /// + public string CancelReasonDesc { get; set; } + + /// + /// 拒绝售后原因描述 + /// + public string RejectReasonDesc { get; set; } + + /// + /// 问题描述 + /// + public string ProbleamDesc { get; set; } + + /// + /// 客户备注 + /// + public string CustomerRemark { get; set; } + + /// + /// 客服备注 + /// + public string ServiceRemark { get; set; } + + /// + /// 审核时间 + /// + public string AuditTime { get; set; } + + /// + /// 收货时间 + /// + public string DeliveryTime { get; set; } + + /// + /// 发货时间 + /// + public string ConsignTime { get; set; } + + /// + /// 货品摘要 + /// + public string Goodslist { get; set; } + + /// + /// 标记id + /// + public string FlagIds { get; set; } + + /// + /// 标记名称 + /// + public string FlagNames { get; set; } + + /// + /// 登记人id + /// + public long RegisterId { get; set; } + + /// + /// 登记人 + /// + public string Registrant { get; set; } + + /// + /// 责任人code + /// + public long ResponsiblePersonCode { get; set; } + + /// + /// 责任人描述 + /// + public string ResponsiblePersonDesc { get; set; } + + /// + /// 三方仓入库单号 + /// + public string StockInNo { get; set; } + + /// + /// 收货单号 + /// + public string DeliveryNo { get; set; } + + /// + /// 收货经办人 + /// + public string DeliveryPerson { get; set; } + + /// + /// 审核人id + /// + public long AuditorId { get; set; } + + /// + /// 审核人 + /// + public string Auditor { get; set; } + + /// + /// 源仓库id + /// + public long SourceWarehouseId { get; set; } + + /// + /// 源仓库名称 + /// + public string SourceWarehouseName { get; set; } + + /// + /// 订单摘要 + /// + public string TradeOrderSummary { get; set; } + + /// + /// 冻结标记（1：冻结；0：未冻结） + /// + public int IsFreeze { get; set; } + + /// + /// 冻结原因 + /// + public string FreezeReason { get; set; } + + /// + /// 建单时间 + /// + public string GmtCreate { get; set; } + + /// + /// 最后修改时间 + /// + public string GmtModified { get; set; } + + /// + /// 原销售单状态 + /// + public int SourceTradeStatus { get; set; } + + /// + /// 货品信息 + /// + public List ReturnChangeGoodsDetail { get; set; } + + + + + + /// + /// 售后类型（String类型，无长度） + /// + public string TradeAfterType { get; set; } + + /// + /// 售后类型说明（String类型，无长度） + /// + public string TradeAfterTypeExplain { get; set; } + + + } + + + public class PageInfo + { + /// + /// 当前页码 + /// + public int pageIndex { get; set; } + /// + /// 每页显示数据量 + /// + public int pageSize { get; set; } + /// + /// 排序字段 + /// + public string sortOrder { get; set; } + /// + /// 倒序或升序文本 + /// + public string sortField { get; set; } + /// + /// 总数（ + /// + public int total { get; set; } + } + + + + /// + /// 货品信息 + /// + public class ReturnChangeGoodsDetail + { + /// + /// 售后订单id + /// + public long TradeAfterId { get; set; } + + /// + /// 货品id + /// + public long SubTradeId { get; set; } + + /// + /// 货品编号id + /// + public long GoodsId { get; set; } + + /// + /// 货品编号 + /// + public string GoodsNo { get; set; } + + /// + /// 货品名称 + /// + public string GoodsName { get; set; } + + /// + /// 规格id + /// + public long SpecId { get; set; } + + /// + /// 规格名称 + /// + public string SpecName { get; set; } + + /// + /// 单位 + /// + public string Unit { get; set; } + + /// + /// 单价 + /// + public decimal Price { get; set; } + + /// + /// 销售单数量 + /// + public decimal SellCount { get; set; } + + /// + /// 售后原因描述 + /// + public string ReasonDesc { get; set; } + + /// + /// 退货数量 + /// + public decimal ReturnCount { get; set; } + + /// + /// 退货金额 + /// + public decimal ReturnFee { get; set; } + + /// + /// 发货数量 + /// + public decimal SendCount { get; set; } + + /// + /// 退货优惠 + /// + public decimal ReturnDiscounts { get; set; } + + /// + /// 发货优惠 + /// + public decimal SendDiscounts { get; set; } + + /// + /// 发货金额 + /// + public decimal SendFee { get; set; } + + /// + /// 应退金额 + /// + public decimal ShouldReturnFee { get; set; } + + /// + /// 备注 + /// + public string Remark { get; set; } + + /// + /// 货品业务特性（1：定制生产（转生产后发货）；2：虚拟物品/服务（无仓储作业）；3：卡券（结算冲抵）；4：代销（转供应商发货）；5：预售品（转预售单）；6：序列号管理（单品跟踪）；7：需上门安装（发货后转工单）） + /// + public int GoodsAttribute { get; set; } + + /// + /// 修改时间 + /// + public string GmtModified { get; set; } + + /// + /// 退换单创建时间 + /// + public string GmtCreate { get; set; } + + /// + /// 条码 + /// + public string Barcode { get; set; } + + /// + /// 金额 + /// + public decimal SellTotal { get; set; } + + /// + /// 实退数量 + /// + public decimal DeliveryCount { get; set; } + + /// + /// 组合装标记（1：是组合装；0：不是组合装） + /// + public int IsFit { get; set; } + + /// + /// 赠品标记（1：是赠品；0：不是赠品） + /// + public int IsGift { get; set; } + + /// + /// 分摊后退货金额 + /// + public decimal ShareReturnFee { get; set; } + + /// + /// 分摊后发货金额 + /// + public decimal ShareSendFee { get; set; } + + /// + /// 分摊后应退金额 + /// + public decimal ShareShouldReturnFee { get; set; } + + /// + /// 货品批次信息 + /// + public List GoodsBatchInfoList { get; set; } + + /// + /// 网店子订单编号 + /// + public string SourceSubtradeNo { get; set; } + + /// + /// 次品数量 + /// + public string DefectiveAmount { get; set; } + + /// + /// 品牌 + /// + public string BrandName { get; set; } + + /// + /// 唯一码 + /// + public string GoodsSerial { get; set; } + + /// + /// 平台商品ID + /// + public string PlatGoodsId { get; set; } + } + + /// + /// 货品批次信息 + /// + public class GoodsBatchInfo + { + /// + /// 批次号 + /// + public string BatchNo { get; set; } + + /// + /// 批次数量 + /// + public decimal BatchAmount { get; set; } + + /// + /// 生产日期 + /// + public string ProductionDate { get; set; } + + /// + /// 到期日期 + /// + public string ExpirationDate { get; set; } + } + + /// + /// 售后订单主表 + /// + public class TradeAfter + { + /// + /// 售后订单ID + /// + public long TradeAfterId { get; set; } + + /// + /// 货品信息列表 + /// + public List GoodsInfoList { get; set; } + + /// + /// 结算信息 + /// + public ReturnChangePay PaymentInfo { get; set; } + + /// + /// 收件人信息 + /// + public ReturnChangeReceiver ReceiverInfo { get; set; } + + /// + /// 补发销售单号列表 + /// + public List SendTradeNo { get; set; } + + /// + /// 退货销售单号列表 + /// + public List ReturnTradeNo { get; set; } + } + + /// + /// 售后订单货品信息 + /// + public class TradeAfterGoods + { + /// + /// 货品ID + /// + public long SubTradeId { get; set; } + + /// + /// 货品编号ID + /// + public long GoodsId { get; set; } + + /// + /// 货品编号 + /// + public string GoodsNo { get; set; } + + /// + /// 货品名称 + /// + public string GoodsName { get; set; } + + /// + /// 规格ID + /// + public long SpecId { get; set; } + + /// + /// 规格名称 + /// + public string SpecName { get; set; } + + /// + /// 单位 + /// + public string Unit { get; set; } + + /// + /// 单价 + /// + public decimal Price { get; set; } + + /// + /// 销售单数量 + /// + public decimal SellCount { get; set; } + + /// + /// 售后原因描述 + /// + public string ReasonDesc { get; set; } + + /// + /// 退货数量 + /// + public decimal ReturnCount { get; set; } + + /// + /// 退货金额 + /// + public decimal ReturnFee { get; set; } + + /// + /// 发货数量 + /// + public decimal SendCount { get; set; } + + /// + /// 发货金额 + /// + public decimal SendFee { get; set; } + + /// + /// 应退金额 + /// + public decimal ShouldReturnFee { get; set; } + + /// + /// 备注 + /// + public string Remark { get; set; } + + /// + /// 货品批次信息列表 + /// + public List GoodsBatchInfoList { get; set; } + } + + + /// + /// 结算信息 + /// + public class ReturnChangePay + { + /// + /// 退货金额 + /// + public decimal ReturnAccounts { get; set; } + + /// + /// 发货金额 + /// + public decimal SendAccounts { get; set; } + + /// + /// 应退合计 + /// + public decimal ReturnTotal { get; set; } + + /// + /// 结算币种 + /// + public string SettlementCurrency { get; set; } + + /// + /// 结算币种code + /// + public string SettlementCurrencyCode { get; set; } + + /// + /// 付款状态（0：未付款；1：部分付款；2：已付款） + /// + public int PayStatus { get; set; } + + /// + /// 付款金额 + /// + public decimal PayAccounts { get; set; } + + /// + /// 付款时间 + /// + public string PayTime { get; set; } + } + + /// + /// 收件人信息 + /// + public class ReturnChangeReceiver + { + /// + /// 客户名称 + /// + public string CustomerName { get; set; } + + /// + /// 客户账户 + /// + public string CustomerAccount { get; set; } + + /// + /// 邮编 + /// + public string Zip { get; set; } + + /// + /// 国家 + /// + public string Country { get; set; } + + /// + /// 省 + /// + public string State { get; set; } + + /// + /// 城市 + /// + public string City { get; set; } + + /// + /// 区县 + /// + public string District { get; set; } + + /// + /// 街道 + /// + public string Town { get; set; } + } + +} diff --git a/Reportapi/MyCode.Project.Infrastructure/JackYun/TradeFullinfogetResp.cs b/Reportapi/MyCode.Project.Infrastructure/JackYun/TradeFullinfogetResp.cs index 304bafd..1f0bc10 100644 --- a/Reportapi/MyCode.Project.Infrastructure/JackYun/TradeFullinfogetResp.cs +++ b/Reportapi/MyCode.Project.Infrastructure/JackYun/TradeFullinfogetResp.cs @@ -247,7 +247,7 @@ namespace MyCode.Project.Infrastructure.JackYun public string scrollId { get; set; } } - public class TradeFullinfogetResp + public class TradeFullinfogetResp { /// /// @@ -256,7 +256,7 @@ namespace MyCode.Project.Infrastructure.JackYun /// /// /// - public TradeFullinfogetData data { get; set; } + public T data { get; set; } /// /// /// diff --git a/Reportapi/MyCode.Project.Infrastructure/MyCode.Project.Infrastructure.csproj b/Reportapi/MyCode.Project.Infrastructure/MyCode.Project.Infrastructure.csproj index b13ddf2..62a3de6 100644 --- a/Reportapi/MyCode.Project.Infrastructure/MyCode.Project.Infrastructure.csproj +++ b/Reportapi/MyCode.Project.Infrastructure/MyCode.Project.Infrastructure.csproj @@ -267,6 +267,7 @@ + diff --git a/Reportapi/MyCode.Project.Services/IServices/IJackYunService.cs b/Reportapi/MyCode.Project.Services/IServices/IJackYunService.cs index 67f646d..f325ae9 100644 --- a/Reportapi/MyCode.Project.Services/IServices/IJackYunService.cs +++ b/Reportapi/MyCode.Project.Services/IServices/IJackYunService.cs @@ -22,5 +22,13 @@ namespace MyCode.Project.Services /// List testTradeFullInfoGet(DateTime now); + + /// + /// 退货查询 + /// + /// 截止日期 + /// + /// + List GetReturnChangeList(DateTime now); } } diff --git a/Reportapi/MyCode.Project.Services/IServices/IJackYunTaskService.cs b/Reportapi/MyCode.Project.Services/IServices/IJackYunTaskService.cs index 1a25911..ad2d490 100644 --- a/Reportapi/MyCode.Project.Services/IServices/IJackYunTaskService.cs +++ b/Reportapi/MyCode.Project.Services/IServices/IJackYunTaskService.cs @@ -18,5 +18,11 @@ namespace MyCode.Project.Services /// string GetAndMergeJackYunOrder(string now); + + /// + /// 调度运行抓吉客云退货订单 + /// + /// + void TaskGetReturnChangeList(string now); } } diff --git a/Reportapi/MyCode.Project.Services/Implementation/JackYunService.cs b/Reportapi/MyCode.Project.Services/Implementation/JackYunService.cs index d800d9a..7546a99 100644 --- a/Reportapi/MyCode.Project.Services/Implementation/JackYunService.cs +++ b/Reportapi/MyCode.Project.Services/Implementation/JackYunService.cs @@ -106,7 +106,7 @@ namespace MyCode.Project.Services.Implementation if (response.code == "200") { var orderjson = JsonHelper.ToJson(response.result); - var list1 = JsonHelper.ToObject(orderjson); + var list1 = JsonHelper.ToObject>(orderjson); int pageIndex = 1; @@ -122,7 +122,7 @@ namespace MyCode.Project.Services.Implementation if (response.code == "200") { orderjson = JsonHelper.ToJson(response.result); - list1 = JsonHelper.ToObject(orderjson); + list1 = JsonHelper.ToObject>(orderjson); } } @@ -139,7 +139,93 @@ namespace MyCode.Project.Services.Implementation } #endregion + #region 退货查询 + /// + /// 退货查询 + /// + /// 截止日期 + /// + /// + public List GetReturnChangeList(DateTime now) + { + int total = 1; + var shopConfigs = _yTKJTShopParameterRepository.Queryable().Where(t => t.FDOCUMENTSTATUS == "C").ToList(); + + ReturnChangeGetRequestBizData requestBizData = new ReturnChangeGetRequestBizData(); + //string value = "2025-06-15 00:00:00";// DateTime.Now.Date.AddDays(-5).ToString("yyyy-MM-dd HH:mm:ss") ; + //string value1 = "2025-06-20 00:00:00";//DateTime.Now.Date.ToString("yyyy-MM-dd HH:mm:ss"); + string value = now.Date.AddDays(-7).ToString("yyyy-MM-dd"); + string value1 = now.Date.ToString("yyyy-MM-dd"); + if (now.Date.AddDays(-7) < startTime) + { + value = startTime.ToString("yyyy-MM-dd"); + } + + requestBizData.StartModified = "";// DateTime.ParseExact(value, "yyyy-MM-dd HH:mm:ss", System.Globalization.CultureInfo.InvariantCulture, System.Globalization.DateTimeStyles.None); + requestBizData.StartDeliveryDate = value; + requestBizData.EndDeliveryDate = value1; + requestBizData.EndModified = ""; //DateTime.ParseExact(value1, "yyyy-MM-dd HH:mm:ss", System.Globalization.CultureInfo.InvariantCulture, System.Globalization.DateTimeStyles.None); + requestBizData.TradeNo = ""; + requestBizData.HasTotal = total; + requestBizData.PageSize = 200; + requestBizData.PageIndex = 0; + + + + requestBizData.StartModified = null;// DateTime.ParseExact(value, "yyyy-MM-dd HH:mm:ss", System.Globalization.CultureInfo.InvariantCulture, System.Globalization.DateTimeStyles.None); + //requestBizData.TradeStatus = 1010; + + requestBizData.ShopIds = null; // new long[] { 378761130654261100, 378761130654261100 }; + List TradeTypeList = new List(); + TradeTypeList.Add(1005); + + List trades = new List(); + TradeTypeList.ForEach(ty => + { + requestBizData.ProcessStatusList = ty.ToString(); + string lggl = JsonHelper.ToJson(requestBizData); + LogHelper.Info(lggl); + JackyunResponse response = Call(EnumAttribute.GetAttribute(ApiEnum.RETURNCHANGE).Value, "1.0", requestBizData); + string ll = JsonHelper.ToJson(response); + LogHelper.Info(ll); + + if (response.code == "200") + { + var orderjson = JsonHelper.ToJson(response.result); + var list1 = JsonHelper.ToObject>(orderjson); + + + int pageIndex = 1; + int TotalResults = list1.data.TotalResults; + while (requestBizData.PageIndex* requestBizData.PageSize< TotalResults) + { + //list1.data.trades.ForEach(h => h.TradeType = ty); + + //trades.AddRange(list1.data.trades); + requestBizData.PageIndex = pageIndex; + pageIndex++; + Thread.Sleep(100); + response = Call(EnumAttribute.GetAttribute(ApiEnum.RETURNCHANGE).Value, "1.0", requestBizData); + if (response.code == "200") + { + orderjson = JsonHelper.ToJson(response.result); + list1 = JsonHelper.ToObject>(orderjson); + + } + } + } + else + { + string msg = response.msg; + throw new BaseException(msg); + } + }); + var shocodes = shopConfigs.Select(t => t.FSHOPCODE).ToList(); + trades = trades.Where(t => shocodes.Contains(t.shopCode)).ToList(); + return trades; + } + #endregion } diff --git a/Reportapi/MyCode.Project.Services/Implementation/JackYunTaskService.cs b/Reportapi/MyCode.Project.Services/Implementation/JackYunTaskService.cs index 25ed0bc..f5610d7 100644 --- a/Reportapi/MyCode.Project.Services/Implementation/JackYunTaskService.cs +++ b/Reportapi/MyCode.Project.Services/Implementation/JackYunTaskService.cs @@ -178,7 +178,21 @@ namespace MyCode.Project.Services.Implementation return JsonHelper.ToJson(list); } - #endregion + #endregion + + #region TaskGetReturnChangeList(调度运行抓吉客云退货订单) + /// + /// 调度运行抓吉客云退货订单 + /// + /// + public void TaskGetReturnChangeList(string now) + { + DateTime runTime = DateTime.Parse(now); + var list = _jackYunService.GetReturnChangeList(runTime); + //SetOrder(list); + //_workProcessService.Add(this.MerchantId, "GetAndMergeJackYunOrder", "合并吉客云订单到新表", now, 1); + } + #endregion } } diff --git a/Reportapi/MyCode.Project.WebApi/Controllers/TestController.cs b/Reportapi/MyCode.Project.WebApi/Controllers/TestController.cs index 6c6d28c..1dcad28 100644 --- a/Reportapi/MyCode.Project.WebApi/Controllers/TestController.cs +++ b/Reportapi/MyCode.Project.WebApi/Controllers/TestController.cs @@ -54,6 +54,19 @@ namespace MyCode.Project.WebApi.Controllers #endregion + #region 调度运行抓吉客云退货订单 + + /// + /// 调度运行抓吉客云退货订单 + /// + [HttpGet] + [AllowAnonymous] + public void TaskGetReturnChangeList(string now) + { + _jackYunTaskService.TaskGetReturnChangeList(now); + } + #endregion + #region 抓WMS订单 /// /// 抓WMS订单 diff --git a/Reportapi/MyCode.Project.WebApi/Web.config b/Reportapi/MyCode.Project.WebApi/Web.config index 44ed88f..87d7b74 100644 --- a/Reportapi/MyCode.Project.WebApi/Web.config +++ b/Reportapi/MyCode.Project.WebApi/Web.config @@ -22,9 +22,11 @@ - - - + + + + +