From 99bbfe3c95e2cf4be173869db0b96f5d5701c80f Mon Sep 17 00:00:00 2001 From: yuyubo <1870149533@qq.com> Date: Thu, 10 Jul 2025 15:31:54 +0800 Subject: [PATCH] 333 --- .../OrderTradeFullInfoGetRequestBizData.cs | 4 +- .../MyCode.Project.Domain/Model/JackOrders.cs | 7 + .../Model/YTKJTShopParameter.cs | 129 ++++++++++++++++++ .../IYTKJTShopParameterRepository.cs | 18 +++ .../JackYun/TradeFullinfogetResp.cs | 7 +- .../YTKJTShopParameterRepository.cs | 26 ++++ .../Implementation/JackYunService.cs | 69 ++++++---- 7 files changed, 227 insertions(+), 33 deletions(-) create mode 100644 Reportapi/MyCode.Project.Domain/Model/YTKJTShopParameter.cs create mode 100644 Reportapi/MyCode.Project.Domain/Repositories/IYTKJTShopParameterRepository.cs create mode 100644 Reportapi/MyCode.Project.Repositories/YTKJTShopParameterRepository.cs diff --git a/Reportapi/MyCode.Project.Domain/Message/Request/JackYun/OrderTradeFullInfoGetRequestBizData.cs b/Reportapi/MyCode.Project.Domain/Message/Request/JackYun/OrderTradeFullInfoGetRequestBizData.cs index 0a2b336..0f033d0 100644 --- a/Reportapi/MyCode.Project.Domain/Message/Request/JackYun/OrderTradeFullInfoGetRequestBizData.cs +++ b/Reportapi/MyCode.Project.Domain/Message/Request/JackYun/OrderTradeFullInfoGetRequestBizData.cs @@ -81,9 +81,9 @@ namespace MyCode.Project.Domain.Message.Request.JackYun /// /// 订单类型 销售单类型（1：零售业务；2：代发货（来自分销商）；3：预售订单；4：周期性订购；5：代销售（供货商发货）；6：现款现货；7：售后发货；8：售后退货；9：批发业务（B2B）；10：试销业务；11：错漏调整；12：仅退款；13：销售返利；14：大B2B业务；15物流买赔；16销售对账差异 91：自定义1；92：自定义2；93：自定义3...100：自定义10） - /// 只抓 零售业务，售后发货，售后退货 + /// 只抓 1 零售业务，7 售后发货，8 售后退货 /// - public string TradeType { get; set; } + public int TradeType { get; set; } /// /// 网店订单号 diff --git a/Reportapi/MyCode.Project.Domain/Model/JackOrders.cs b/Reportapi/MyCode.Project.Domain/Model/JackOrders.cs index 911da42..2c63a24 100644 --- a/Reportapi/MyCode.Project.Domain/Model/JackOrders.cs +++ b/Reportapi/MyCode.Project.Domain/Model/JackOrders.cs @@ -223,5 +223,12 @@ namespace MyCode.Project.Domain.Model [SugarColumn(ColumnName="tradeStatus")] public int? TradeStatus {get;set;} + /// + /// Desc:订单类型 销售单类型（1：零售业务；2：代发货（来自分销商）；3：预售订单；4：周期性订购；5：代销售（供货商发货）；6：现款现货；7：售后发货；8：售后退货；9：批发业务（B2B）；10：试销业务；11：错漏调整；12：仅退款；13：销售返利；14：大B2B业务；15物流买赔；16销售对账差异 91：自定义1；92：自定义2；93：自定义3...100：自定义10） + /// Default: + /// Nullable:True + /// + public int? TradeType {get;set;} + } } diff --git a/Reportapi/MyCode.Project.Domain/Model/YTKJTShopParameter.cs b/Reportapi/MyCode.Project.Domain/Model/YTKJTShopParameter.cs new file mode 100644 index 0000000..08d6cc0 --- /dev/null +++ b/Reportapi/MyCode.Project.Domain/Model/YTKJTShopParameter.cs @@ -0,0 +1,129 @@ +using System; +using System.Linq; +using System.Text; +using SqlSugar; + +namespace MyCode.Project.Domain.Model +{ + /// + /// + /// + [SugarTable("YTKJ_t_ShopParameter")] + public partial class YTKJTShopParameter + { + public YTKJTShopParameter(){ + + + } + /// + /// Desc: + /// Default: + /// Nullable:False + /// + [SugarColumn(IsPrimaryKey=true)] + public long FID {get;set;} + + /// + /// Desc: + /// Default: + /// Nullable:False + /// + public string FBILLNO {get;set;} + + /// + /// Desc: + /// Default: + /// Nullable:False + /// + public string FDOCUMENTSTATUS {get;set;} + + /// + /// Desc: + /// Default: + /// Nullable:False + /// + [SugarColumn(ColumnName="F_SHOPCODE")] + public string FSHOPCODE {get;set;} + + /// + /// Desc: + /// Default: + /// Nullable:False + /// + [SugarColumn(ColumnName="F_SHOPNAME")] + public string FSHOPNAME {get;set;} + + /// + /// Desc: + /// Default: + /// Nullable:False + /// + [SugarColumn(ColumnName="F_YTKJ_TEXT2")] + public string FYTKJTEXT2 {get;set;} + + /// + /// Desc: + /// Default:1 + /// Nullable:False + /// + [SugarColumn(ColumnName="F_SYNCHRONIZEKINGDEE")] + public string FSYNCHRONIZEKINGDEE {get;set;} + + /// + /// Desc: + /// Default:1 + /// Nullable:False + /// + [SugarColumn(ColumnName="F_SYNCHRONIZEWMS")] + public string FSYNCHRONIZEWMS {get;set;} + + /// + /// Desc: + /// Default:0 + /// Nullable:False + /// + [SugarColumn(ColumnName="F_SALESCUSTOMERS")] + public int FSALESCUSTOMERS {get;set;} + + /// + /// Desc: + /// Default:0 + /// Nullable:False + /// + [SugarColumn(ColumnName="F_WAREHOUSE")] + public int FWAREHOUSE {get;set;} + + /// + /// Desc: + /// Default: + /// Nullable:False + /// + [SugarColumn(ColumnName="F_CANGKUHUOZHU")] + public string FCANGKUHUOZHU {get;set;} + + /// + /// Desc: + /// Default: + /// Nullable:False + /// + [SugarColumn(ColumnName="F_COMPANYID")] + public string FCOMPANYID {get;set;} + + /// + /// Desc: + /// Default: + /// Nullable:False + /// + [SugarColumn(ColumnName="F_DACANG")] + public string FDACANG {get;set;} + + /// + /// Desc: + /// Default:0 + /// Nullable:False + /// + [SugarColumn(ColumnName="F_TAXRATE")] + public decimal FTAXRATE {get;set;} + + } +} diff --git a/Reportapi/MyCode.Project.Domain/Repositories/IYTKJTShopParameterRepository.cs b/Reportapi/MyCode.Project.Domain/Repositories/IYTKJTShopParameterRepository.cs new file mode 100644 index 0000000..15106e6 --- /dev/null +++ b/Reportapi/MyCode.Project.Domain/Repositories/IYTKJTShopParameterRepository.cs @@ -0,0 +1,18 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using MyCode.Project.Infrastructure; +using MyCode.Project.Domain; +using MyCode.Project.Domain.Model; +using MyCode.Project.Infrastructure.Common; +using MyCode.Project.Domain.Message; + +namespace MyCode.Project.Domain.Repositories +{ + public interface IYTKJTShopParameterRepository : IRepository + { + + } +} diff --git a/Reportapi/MyCode.Project.Infrastructure/JackYun/TradeFullinfogetResp.cs b/Reportapi/MyCode.Project.Infrastructure/JackYun/TradeFullinfogetResp.cs index 6b58fe1..473e4f7 100644 --- a/Reportapi/MyCode.Project.Infrastructure/JackYun/TradeFullinfogetResp.cs +++ b/Reportapi/MyCode.Project.Infrastructure/JackYun/TradeFullinfogetResp.cs @@ -192,12 +192,17 @@ namespace MyCode.Project.Infrastructure.JackYun /// public DateTime? payTime { get; set; } + /// + /// 订单类型 销售单类型（1：零售业务；2：代发货（来自分销商）；3：预售订单；4：周期性订购；5：代销售（供货商发货）；6：现款现货；7：售后发货；8：售后退货；9：批发业务（B2B）；10：试销业务；11：错漏调整；12：仅退款；13：销售返利；14：大B2B业务；15物流买赔；16销售对账差异 91：自定义1；92：自定义2；93：自定义3...100：自定义10） + /// 只抓 1 零售业务，7 售后发货，8 售后退货 + /// + public int TradeType { get; set; } /// /// Desc:发货时间 /// Default: /// Nullable:True /// - + public DateTime? consignTime { get; set; } } diff --git a/Reportapi/MyCode.Project.Repositories/YTKJTShopParameterRepository.cs b/Reportapi/MyCode.Project.Repositories/YTKJTShopParameterRepository.cs new file mode 100644 index 0000000..146b90b --- /dev/null +++ b/Reportapi/MyCode.Project.Repositories/YTKJTShopParameterRepository.cs @@ -0,0 +1,26 @@ +using MyCode.Project.Repositories.Common; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using MyCode.Project.Domain.Message; +using MyCode.Project.Domain.Model; +using MyCode.Project.Domain.Repositories; +using MyCode.Project.Infrastructure.Common; +using MyCode.Project.Infrastructure.Search; + +namespace MyCode.Project.Repositories +{ + public class YTKJTShopParameterRepository: Repository, IYTKJTShopParameterRepository + { + public YTKJTShopParameterRepository(MyCodeSqlSugarClient context) : base(context) + { } + + + + + + + } +} \ No newline at end of file diff --git a/Reportapi/MyCode.Project.Services/Implementation/JackYunService.cs b/Reportapi/MyCode.Project.Services/Implementation/JackYunService.cs index 1c1b43b..3f766b1 100644 --- a/Reportapi/MyCode.Project.Services/Implementation/JackYunService.cs +++ b/Reportapi/MyCode.Project.Services/Implementation/JackYunService.cs @@ -60,7 +60,7 @@ namespace MyCode.Project.Services.Implementation requestBizData.HasTotal = total; requestBizData.PageSize = 200; requestBizData.PageIndex = 0; - requestBizData.Fields = "goodsDetail.barcode,tradeNo,orderNo,shopName,companyName,warehouseName,logisticName,mainPostid,goodsDetail.goodsNo,flagNames,columnExt,sourceAfterNo,goodsDetail.outerId,pickUpCode,expense.expenseFee,expense.expenseItemName,billDate,goodsPlatDiscountFee,goodsDetail.shareOrderDiscountFee,goodsDetail.shareOrderPlatDiscountFee,customizeGoodsColumn9,goodsDetail.goodsId,goodsDetail.sellCount,goodsDetail.needProcessCount,goodsDetail.baseUnitSellCount,goodsDetail.assessmentCost,goodsDetail.compassSourceContentTypem,sourceTradeNo,shopId,warehouseId,scrollId"; + requestBizData.Fields = "TradeType,goodsDetail.barcode,tradeNo,orderNo,shopName,companyName,warehouseName,logisticName,mainPostid,goodsDetail.goodsNo,flagNames,columnExt,sourceAfterNo,goodsDetail.outerId,pickUpCode,expense.expenseFee,expense.expenseItemName,billDate,goodsPlatDiscountFee,goodsDetail.shareOrderDiscountFee,goodsDetail.shareOrderPlatDiscountFee,customizeGoodsColumn9,goodsDetail.goodsId,goodsDetail.sellCount,goodsDetail.needProcessCount,goodsDetail.baseUnitSellCount,goodsDetail.assessmentCost,goodsDetail.compassSourceContentTypem,sourceTradeNo,shopId,warehouseId,scrollId"; requestBizData.StartCreated = "";// DateTime.ParseExact(value, "yyyy -MM-dd HH:mm:ss", System.Globalization.CultureInfo.InvariantCulture, System.Globalization.DateTimeStyles.None); requestBizData.EndCreated = "";// DateTime.ParseExact(value1, "yyyy -MM-dd HH:mm:ss", System.Globalization.CultureInfo.InvariantCulture, System.Globalization.DateTimeStyles.None); requestBizData.StartAuditTime = "";// DateTime.ParseExact(value, "yyyy-MM-dd HH:mm:ss", System.Globalization.CultureInfo.InvariantCulture, System.Globalization.DateTimeStyles.None); @@ -126,7 +126,7 @@ namespace MyCode.Project.Services.Implementation requestBizData.HasTotal = total; requestBizData.PageSize = 200; requestBizData.PageIndex = 0; - requestBizData.Fields = "tradeStatus,consignTime,payTime,goodsDetail.barcode,tradeNo,orderNo,shopName,companyName,warehouseName,logisticName,mainPostid,goodsDetail.goodsNo,flagNames,columnExt,sourceAfterNo,goodsDetail.outerId,pickUpCode,expense.expenseFee,expense.expenseItemName,billDate,goodsPlatDiscountFee,goodsDetail.shareOrderDiscountFee,goodsDetail.shareOrderPlatDiscountFee,customizeGoodsColumn9,goodsDetail.goodsId,goodsDetail.sellCount,goodsDetail.needProcessCount,goodsDetail.baseUnitSellCount,goodsDetail.assessmentCost,goodsDetail.compassSourceContentTypem,sourceTradeNo,shopId,warehouseId,scrollId"; + requestBizData.Fields = "TradeType,tradeStatus,consignTime,payTime,goodsDetail.barcode,tradeNo,orderNo,shopName,companyName,warehouseName,logisticName,mainPostid,goodsDetail.goodsNo,flagNames,columnExt,sourceAfterNo,goodsDetail.outerId,pickUpCode,expense.expenseFee,expense.expenseItemName,billDate,goodsPlatDiscountFee,goodsDetail.shareOrderDiscountFee,goodsDetail.shareOrderPlatDiscountFee,customizeGoodsColumn9,goodsDetail.goodsId,goodsDetail.sellCount,goodsDetail.needProcessCount,goodsDetail.baseUnitSellCount,goodsDetail.assessmentCost,goodsDetail.compassSourceContentTypem,sourceTradeNo,shopId,warehouseId,scrollId"; requestBizData.StartCreated ="";// DateTime.ParseExact(value, "yyyy -MM-dd HH:mm:ss", System.Globalization.CultureInfo.InvariantCulture, System.Globalization.DateTimeStyles.None); requestBizData.EndCreated = "";// DateTime.ParseExact(value1, "yyyy -MM-dd HH:mm:ss", System.Globalization.CultureInfo.InvariantCulture, System.Globalization.DateTimeStyles.None); requestBizData.StartAuditTime = "";// DateTime.ParseExact(value, "yyyy-MM-dd HH:mm:ss", System.Globalization.CultureInfo.InvariantCulture, System.Globalization.DateTimeStyles.None); @@ -134,41 +134,50 @@ namespace MyCode.Project.Services.Implementation requestBizData.StartConsignTime = value;// value;// DateTime.ParseExact(value, "yyyy-MM-dd HH:mm:ss", System.Globalization.CultureInfo.InvariantCulture, System.Globalization.DateTimeStyles.None); requestBizData.EndConsignTime = value1;// value1;// DateTime.ParseExact(value1, "yyyy-MM-dd HH:mm:ss", System.Globalization.CultureInfo.InvariantCulture, System.Globalization.DateTimeStyles.None); //requestBizData.TradeStatus = 1010; - //requestBizData.TradeType = 1; + requestBizData.TradeType = 1; requestBizData.SourceTradeNos = ""; requestBizData.ShopIds = null;// new long[] { 378761130654261100, 378761130654261100 }; - string lggl = JsonHelper.ToJson(requestBizData); - LogHelper.Info(lggl); - JackyunResponse response = Call(EnumAttribute.GetAttribute(ApiEnum.TRADEFULLINFOGET).Value, "1.0", requestBizData); - string ll = JsonHelper.ToJson(response); - LogHelper.Info(ll); + List TradeTypeList = new List(); + TradeTypeList.Add(1); + TradeTypeList.Add(7); + TradeTypeList.Add(8); List trades = new List(); - if (response.code == "200") - { - var orderjson = JsonHelper.ToJson(response.result); - var list1 = JsonHelper.ToObject(orderjson); - int pageIndex = 1; - while (list1.data.trades != null && list1.data.trades.Count > 0) + TradeTypeList.ForEach(ty => { - - trades.AddRange(list1.data.trades); - requestBizData.PageIndex = pageIndex; - pageIndex++; - Thread.Sleep(100); - response = Call(EnumAttribute.GetAttribute(ApiEnum.TRADEFULLINFOGET).Value, "1.0", requestBizData); + requestBizData.TradeType = ty; + string lggl = JsonHelper.ToJson(requestBizData); + LogHelper.Info(lggl); + JackyunResponse response = Call(EnumAttribute.GetAttribute(ApiEnum.TRADEFULLINFOGET).Value, "1.0", requestBizData); + string ll = JsonHelper.ToJson(response); + LogHelper.Info(ll); + if (response.code == "200") { - orderjson = JsonHelper.ToJson(response.result); - list1 = JsonHelper.ToObject(orderjson); + var orderjson = JsonHelper.ToJson(response.result); + var list1 = JsonHelper.ToObject(orderjson); + int pageIndex = 1; + while (list1.data.trades != null && list1.data.trades.Count > 0) + { + 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.TRADEFULLINFOGET).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); - } - + else + { + string msg = response.msg; + throw new BaseException(msg); + } + }); return trades; }