diff --git a/Reportapi/MyCode.Project.Domain/Model/JackOrdersItem.cs b/Reportapi/MyCode.Project.Domain/Model/JackOrdersItem.cs index 4191055..8a0fc69 100644 --- a/Reportapi/MyCode.Project.Domain/Model/JackOrdersItem.cs +++ b/Reportapi/MyCode.Project.Domain/Model/JackOrdersItem.cs @@ -79,12 +79,10 @@ namespace MyCode.Project.Domain.Model [SugarColumn(ColumnName="shareOrderDiscountFee")] public decimal? ShareOrderDiscountFee {get;set;} - /// - /// Desc: - /// Default: - /// Nullable:True - /// - [SugarColumn(ColumnName="subTradeId")] + /// + /// 商品明细id(唯一):商品明细的唯一标识。 + /// + [SugarColumn(ColumnName="subTradeId")] public string SubTradeId {get;set;} /// diff --git a/Reportapi/MyCode.Project.Infrastructure/JackYun/TradeFullinfogetResp.cs b/Reportapi/MyCode.Project.Infrastructure/JackYun/TradeFullinfogetResp.cs index d6da001..022d48b 100644 --- a/Reportapi/MyCode.Project.Infrastructure/JackYun/TradeFullinfogetResp.cs +++ b/Reportapi/MyCode.Project.Infrastructure/JackYun/TradeFullinfogetResp.cs @@ -10,10 +10,7 @@ namespace MyCode.Project.Infrastructure.JackYun public class GoodsDetailItem { - /// - /// 商品明细id(唯一):商品明细的唯一标识。 - /// - public string SubTradeld { get; set; } + /// /// @@ -44,9 +41,11 @@ namespace MyCode.Project.Infrastructure.JackYun /// public decimal shareOrderDiscountFee { get; set; } /// - /// + /// 商品明细id(唯一):商品明细的唯一标识。 /// public string subTradeId { get; set; } + + /// /// /// diff --git a/Reportapi/MyCode.Project.Services/Implementation/JackYunTaskService.cs b/Reportapi/MyCode.Project.Services/Implementation/JackYunTaskService.cs index 1f8eda9..05eab20 100644 --- a/Reportapi/MyCode.Project.Services/Implementation/JackYunTaskService.cs +++ b/Reportapi/MyCode.Project.Services/Implementation/JackYunTaskService.cs @@ -2,6 +2,7 @@ using MyCode.Project.Domain.Model; using MyCode.Project.Domain.Repositories; using MyCode.Project.Infrastructure.Common; +using MyCode.Project.Infrastructure.Extensions; using MyCode.Project.Infrastructure.JackYun; using MyCode.Project.Repositories; using MyCode.Project.Repositories.Common; @@ -119,8 +120,13 @@ namespace MyCode.Project.Services.Implementation if(t.tradeOrderAssemblyGoodsDtoList!=null &&t.tradeOrderAssemblyGoodsDtoList.Count>0) { var items = AutoMapperHelper.AutoMappToList(t.tradeOrderAssemblyGoodsDtoList); + var goods = t.goodsDetail.Where(h => h.subTradeId == items[0].SubTradeId).FirstOrDefault(); + decimal price = 0; + if (goods != null) + price = goods.ShareFavourableAfterFee.SafeValue(); items.ForEach(k => { + k.ShareFavourableAfterFee = price; k.Id = Guid.NewGuid(); k.JackOrdersId = jackOrders.Id; });