Browse Source

空派结算查询调整

lzk 3 days ago
parent
commit
1a73e7b8ff

+ 4 - 1
2.Data/XYY.Model.Strandard/MpsOrder/views/View_Order_SettlementConfirm.cs

@@ -9,7 +9,7 @@ namespace XYY.Model.Standard.MpsOrder.views
 {
     public class View_Order_SettlementConfirm
     {
-
+        public View_Order_SettlementConfirm() { GoodsNamesArry = new List<string>(); }
         public int Id
         {
             get; set;
@@ -147,6 +147,7 @@ namespace XYY.Model.Standard.MpsOrder.views
         public string DeliveryChannelCode { get; set; }
         public string OrgId { get; set; }
         public DateTime? ForecastTime { get; set; }
+        public string GoodsNames { get; set; }
 
         [NoDb]
         public bool isSMP { get; set; }
@@ -156,5 +157,7 @@ namespace XYY.Model.Standard.MpsOrder.views
 
         [NoDb]
         public string ReceiveTimeStr { get { return ReceiveTime.ToString_yyyyMMddHHmmss(); } }
+        [NoDb]
+        public List<string> GoodsNamesArry { get; set; }
     }
 }

+ 10 - 1
3.Service/XYY.Service.Standard.Order/FBA/FBAOrderService.cs

@@ -1486,7 +1486,16 @@ where Id in @Ids", 600, new { Ids = Ids });
 
         public async Task<PageResult<View_Order_SettlementConfirm>> GetSettlementConfirmList(QueryModel queryModel)
         {
-            return await this.orderRepository.GetSettlementConfirmList(queryModel);
+             var dbData= await this.orderRepository.GetSettlementConfirmList(queryModel);
+            //处理GoodsNamesArry
+            dbData.Result.ToList().ForEach(x =>
+            {
+                if (!string.IsNullOrEmpty(x.GoodsNames))
+                {
+                    x.GoodsNamesArry = x.GoodsNames.Split(";", StringSplitOptions.RemoveEmptyEntries).ToList();
+                }
+            });
+            return dbData;
         }
         public async Task<byte[]> ExportSettlementConfirm(QueryModel queryModel)
         {