diff --git a/TradeManageNew/Models/Shage/GetOrderUsedSaleDto.cs b/TradeManageNew/Models/Shage/GetOrderUsedSaleDto.cs index 9b78ccd..d0f0978 100644 --- a/TradeManageNew/Models/Shage/GetOrderUsedSaleDto.cs +++ b/TradeManageNew/Models/Shage/GetOrderUsedSaleDto.cs @@ -11,6 +11,41 @@ namespace TradeManageNew.Models.Shage /// public string OrderCode { get; set; } + /// + /// 平台单号 + /// + public string PlatOrderCode { get; set; } + + /// + /// 收件人 + /// + public string RevName { get; set; } + + /// + /// 收件国家 + /// + public string RevCountry { get; set; } + + /// + /// 收件地址 + /// + public string RevAddr { get; set; } + + /// + /// 收件人电话 + /// + public string RevPhone { get; set; } + + /// + /// 邮编 + /// + public string RevPostCode { get; set; } + + /// + /// 店铺名称 + /// + public string ShopName { get; set; } + /// /// sku明细 /// @@ -38,5 +73,10 @@ namespace TradeManageNew.Models.Shage /// sku编码 /// public string SkuCode { get; set; } + + /// + /// 数量 + /// + public int Quantity { get; set; } } } \ No newline at end of file diff --git a/TradeManageNew/OuterService/ShageService.ashx.cs b/TradeManageNew/OuterService/ShageService.ashx.cs index 474e6c9..2edbcf6 100644 --- a/TradeManageNew/OuterService/ShageService.ashx.cs +++ b/TradeManageNew/OuterService/ShageService.ashx.cs @@ -1516,25 +1516,49 @@ namespace TradeManageNew.OuterService var spuIds = skus.Select(x => x.GoodsId).Distinct().ToList(); var spus = db.HW_GoodsInfo.Where(x => spuIds.Contains(x.GoodsId)); - var order = db.DT_OrderInfo.FirstOrDefault(x => - x.OrderId == orderUsedSaleEntryList.First().OrderId); + var orderInfo = (from order in db.DT_OrderInfo + join orderXxInfo in db.DT_OrderXXInfo on order.OrderId equals orderXxInfo.OrderId + join shop in db.JC_Shop on order.ShopId equals shop.ShopId + where order.OrderId == orderUsedSaleEntryList.First().OrderId + select new + { + order.OrderId, + order.OrderCode, + order.PlatOrderCode, + orderXxInfo.RevName, + orderXxInfo.RevCountry, + orderXxInfo.RevAddr, + orderXxInfo.RevPhone, + orderXxInfo.RevPostCode, + shop.ShopName + }).FirstOrDefault(); var result = new GetOrderUsedSaleDto { - OrderId = order.OrderId, - OrderCode = order.OrderCode, - Items = skus.Select(o => - { - var spu = spus.FirstOrDefault(x => x.GoodsId == o.GoodsId); - - return new GetOrderUsedSaleItemDto + OrderId = orderInfo.OrderId, + OrderCode = orderInfo.OrderCode, + PlatOrderCode = orderInfo.PlatOrderCode, + RevName = orderInfo.RevName, + RevCountry = orderInfo.RevCountry, + RevAddr = orderInfo.RevAddr, + RevPhone = orderInfo.RevPhone, + RevPostCode = orderInfo.RevPostCode, + ShopName = orderInfo.ShopName, + Items = groupOrderUsedSaleEntry.Select(o => { - ProductCode = spu?.GoodsCode, - ProductDescription = spu?.GoodsEnglisgName, - GoodsDetailId = o.DetailId, - SkuCode = o.SKU1 - }; - }).ToList() + var sku = skus.First(x => x.DetailId == o.Key); + var spu = spus.FirstOrDefault(x => x.GoodsId == o.Key); + + return new GetOrderUsedSaleItemDto + { + ProductCode = spu?.GoodsCode, + ProductDescription = spu?.GoodsEnglisgName, + GoodsDetailId = sku.DetailId, + SkuCode = sku.SKU1, + Quantity = o.Quantity + }; + }) + .ToList() }; md.Code = "100"; diff --git a/TradeUsedSale/Repositories/ErpDbContext.cs b/TradeUsedSale/Repositories/ErpDbContext.cs index c3f46c7..b2253c9 100644 --- a/TradeUsedSale/Repositories/ErpDbContext.cs +++ b/TradeUsedSale/Repositories/ErpDbContext.cs @@ -18,6 +18,7 @@ namespace TradeUsedSale.Repositories WriteTraceLine = TraceCallback; } public ITable DT_OrderInfo => this.GetTable(); + public ITable DT_OrderXXInfo => this.GetTable(); public ITable DT_OrderGoods => this.GetTable(); public ITable HW_GoodsInfo => this.GetTable(); public ITable HW_GoodsDetail => this.GetTable(); @@ -25,5 +26,6 @@ namespace TradeUsedSale.Repositories public ITable DT_OrderUsedSale => this.GetTable(); public ITable DT_OrderUsedSaleEntry => this.GetTable(); public ITable DT_OrderUsedSalePlatform => this.GetTable(); + public ITable JC_Shop => this.GetTable(); } } diff --git a/TradeUsedSale/Repositories/Models/DT_OrderReturn.cs b/TradeUsedSale/Repositories/Models/DT_OrderReturn.cs index 3361451..b9e6256 100644 --- a/TradeUsedSale/Repositories/Models/DT_OrderReturn.cs +++ b/TradeUsedSale/Repositories/Models/DT_OrderReturn.cs @@ -3,10 +3,9 @@ using System; namespace TradeUsedSale.Repositories.Models { - public partial class DT_OrderReturn + public class DT_OrderReturn { - [PrimaryKey, Identity] - public int id { get; set; } + [PrimaryKey, Identity] public int id { get; set; } public int? orderid { get; set; } public string ordercode { get; set; } public string asin { get; set; } @@ -39,49 +38,60 @@ namespace TradeUsedSale.Repositories.Models public string ImgUrl3 { get; set; } public string ImgUrl4 { get; set; } public string ImgUrl5 { get; set; } + /// /// 在美国OfferUp二手平台是否上架 /// public int? IsOfferUp { get; set; } + /// /// 在美国MaketPlace二手平台是否上架 /// public int? IsMaketPlace { get; set; } + /// /// 本条退货是否二手商品 /// public bool? isSecondHand { get; set; } + /// /// 二手订单条形码 /// public string SecondHandCode { get; set; } + /// /// 二手订单状态 /// public int? SecondHandType { get; set; } + /// /// 二手订单客户提货码 /// public string SecondHandImgUrl { get; set; } + /// /// 是否存在二手订单客户预约单 /// public bool? isSecondHandBuyer { get; set; } + /// /// 二手订单客户姓名 /// public string SecondHandBuyerName { get; set; } + /// /// 二手订单客户电话 /// public string SecondHandBuyerPhone { get; set; } + /// /// 二手订单客户到达时间 /// public string SecondHandBuyerTime { get; set; } + /// /// 二手售卖价 /// public decimal? SecondHandSalePrice { get; set; } } -} +} \ No newline at end of file diff --git a/TradeUsedSale/Repositories/Models/DT_OrderXXInfo.cs b/TradeUsedSale/Repositories/Models/DT_OrderXXInfo.cs new file mode 100644 index 0000000..d1134e4 --- /dev/null +++ b/TradeUsedSale/Repositories/Models/DT_OrderXXInfo.cs @@ -0,0 +1,218 @@ +using System; +using LinqToDB.Mapping; + +namespace TradeUsedSale.Repositories.Models +{ + public class DT_OrderXXInfo + { + [PrimaryKey, Identity] public int Id { get; set; } + public int? OrderId { get; set; } + public decimal? TotalWeight { get; set; } + public decimal? TotalSoild { get; set; } + + /// + /// 货币 + /// + public string MoneyType { get; set; } + + /// + /// Sku + /// + public string CustomID { get; set; } + + /// + /// 客户id + /// + public string SKU { get; set; } + + /// + /// 收件人 + /// + public string RevName { get; set; } + + /// + /// 买家国家 + /// + public string RevCountry { get; set; } + + /// + /// 收件地址 + /// + public string RevAddr { get; set; } + + /// + /// 电话 + /// + public string RevPhone { get; set; } + + /// + /// 手机 + /// + public string RevMoblie { get; set; } + + /// + /// 邮箱 + /// + public string RevMail { get; set; } + + /// + /// 传真 + /// + public string RevFax { get; set; } + + /// + /// 收件人邮编 + /// + public string RevPostCode { get; set; } + + /// + /// 提交信息 + /// + public string SendInfo { get; set; } + + /// + /// 异常信息 + /// + public string ErrorInfo { get; set; } + + /// + /// 购买备注 + /// + public string BuyRemark { get; set; } + + /// + /// 留言 + /// + public string LeaveWord { get; set; } + + /// + /// 计费方式 + /// + public int? FeeType { get; set; } + + /// + /// 是否挂号 + /// + public int? IsRegister { get; set; } + + /// + /// 运输方式 + /// + public int? Post { get; set; } + + /// + /// 运输费用 + /// + public decimal? PostFee { get; set; } + + /// + /// 包装费用 + /// + public decimal? BoxFee { get; set; } + + /// + /// 货物货值 + /// + public decimal? GoodsFee { get; set; } + + /// + /// 我方银行账户 + /// + public string BankCode { get; set; } + + /// + /// 银行流水号 + /// + public string BankNo { get; set; } + + /// + /// 客户银行账户 + /// + public string CustomBankCode { get; set; } + + /// + /// 客户类型1平台2直销 + /// + public int? CustomType { get; set; } + + /// + /// 错发图片id + /// + public string ErrorImage { get; set; } + + /// + /// 渠道 + /// + public int? Channel { get; set; } + + /// + /// 物品地址 + /// + public string GoodsAddr { get; set; } + + /// + /// 跟踪码 + /// + public string TrackCode { get; set; } + + /// + /// 发货仓库 + /// + public int? StoreId { get; set; } + + /// + /// 快递信息 + /// + public string PostInfo { get; set; } + + /// + /// 订单状态1正常2有留言3异常 + /// + public int? OrderState { get; set; } + + /// + /// 收件省,州 + /// + public string RevProvince { get; set; } + + /// + /// 收件城市 + /// + public string RevCity { get; set; } + + /// + /// 收件人区县 + /// + public string RevArea { get; set; } + + public string PostError { get; set; } + public string CountryCode { get; set; } + public string CountryName { get; set; } + public int? SendAddr { get; set; } + public int? TrackState { get; set; } + public DateTime? TrackDate { get; set; } + public int? IsLeaveWord { get; set; } + public int? InnerPost { get; set; } + public decimal? InnerPostFee { get; set; } + + /// + /// 前置跟踪码 + /// + public string FontTrackCode { get; set; } + + public string OnlinePostId { get; set; } + public string PostOneCode { get; set; } + public string TrackCode2 { get; set; } + public int? LogisticsId { get; set; } + public decimal? Fee1 { get; set; } + public decimal? Fee2 { get; set; } + public decimal? Fee3 { get; set; } + public decimal? Fee4 { get; set; } + public string RevProvinceCode { get; set; } + public decimal? Fee11 { get; set; } + public decimal? Fee12 { get; set; } + public decimal? Fee13 { get; set; } + public int? IsAutoTrack { get; set; } + public string Zone { get; set; } + } +} \ No newline at end of file diff --git a/TradeUsedSale/Repositories/Models/HW_GoodsInfo.cs b/TradeUsedSale/Repositories/Models/HW_GoodsInfo.cs index da0d7ab..30567a8 100644 --- a/TradeUsedSale/Repositories/Models/HW_GoodsInfo.cs +++ b/TradeUsedSale/Repositories/Models/HW_GoodsInfo.cs @@ -1,9 +1,11 @@ using System; +using LinqToDB.Mapping; namespace TradeUsedSale.Repositories.Models { public class HW_GoodsInfo { + [PrimaryKey, Identity] public int GoodsId { get; set; } /// diff --git a/TradeUsedSale/Repositories/Models/JC_Shop.cs b/TradeUsedSale/Repositories/Models/JC_Shop.cs new file mode 100644 index 0000000..1217949 --- /dev/null +++ b/TradeUsedSale/Repositories/Models/JC_Shop.cs @@ -0,0 +1,114 @@ +using System; +using LinqToDB.Mapping; + +namespace TradeUsedSale.Repositories.Models +{ + public class JC_Shop + { + [PrimaryKey, Identity] public int ShopId { get; set; } + + /// + /// 店铺名称 + /// + public string ShopName { get; set; } + + /// + /// 1速卖通2亚马逊3Ebay4Wish + /// + public int? PlatType { get; set; } + + /// + /// 所属部门 + /// + public int? DeptId { get; set; } + + /// + /// 添加日期 + /// + public DateTime? InDate { get; set; } + + public int? CompanyId { get; set; } + + /// + /// 最大请求次数 + /// + public int? RequestMaxNumber { get; set; } + + /// + /// 当前请求次数 + /// + public int? RequestNumber { get; set; } + + /// + /// 开发者帐号,速卖通AppKey,亚马逊accessKeyId + /// + public string Appkey { get; set; } + + /// + /// 开发者密钥,速卖通DeveKey,亚马逊secretAccessKey + /// + public string DeveKey { get; set; } + + /// + /// 速卖通长时令牌,亚马逊卖家ID + /// + public string RefreshToken { get; set; } + + /// + /// 速卖通短时令牌,亚马逊店铺ID,Ebay与Wish的Token + /// + public string AccessToken { get; set; } + + /// + /// 亚马逊API请求服务器国家地址 + /// + public string Country { get; set; } + + /// + /// 长时令牌保存时间 + /// + public DateTime? RefreshTokenSaveTime { get; set; } + + /// + /// 短时令牌更新时间 + /// + public DateTime? AccessTokenUpdateTime { get; set; } + + /// + /// 是否每天自动读取API订单 + /// + public bool? IsAutoReadData { get; set; } + + /// + /// 店铺匹配优先级 + /// + public int? LevelGrade { get; set; } + + /// + /// 是否有FBA店铺 + /// + public bool? IsFba { get; set; } + + public int? OutDay { get; set; } + public string Master { get; set; } + public string Buyer { get; set; } + public string ShopUser { get; set; } + public string ShopNo { get; set; } + public string LoginName { get; set; } + public string Password { get; set; } + public decimal? PersonFee { get; set; } + public string Code { get; set; } + public string ReUrl { get; set; } + public DateTime? FeeDate { get; set; } + public decimal? TXFee { get; set; } + public int? state { get; set; } + public string sendname { get; set; } + public string store_id { get; set; } + public decimal? dayfee { get; set; } + + /// + /// 是否自己上传面单 1 是,2不同步 + /// + public int? Upload_label { get; set; } + } +} \ No newline at end of file diff --git a/TradeUsedSale/TradeUsedSale.csproj b/TradeUsedSale/TradeUsedSale.csproj index f3e683e..dcdfb9e 100644 --- a/TradeUsedSale/TradeUsedSale.csproj +++ b/TradeUsedSale/TradeUsedSale.csproj @@ -55,8 +55,10 @@ + +