0813修改

OASystem/OASystem.Api/Controllers/GroupsController.cs

@@ -11609,7 +11609,8 @@ FROM
                             {
                                 string FlightsDescription = jpRes.FlightsDescription;
                                 string PriceDescription = jpRes.PriceDescription;
-                                _detail.PriceMsgContent = "航班号：" + jpRes.FlightsCode + "<br/>城市A-B：" + jpRes.FlightsCity + "<br/>航班描述：" + FlightsDescription.Replace("\r\n", "<br/>") + "<br/>价格描述：" + PriceDescription;
+                                string cTableRemark = entity.Remark;
+                                _detail.PriceMsgContent = "航班号：" + jpRes.FlightsCode + "<br/>城市A-B：" + jpRes.FlightsCity + "<br/>航班描述：" + FlightsDescription.Replace("\r\n", "<br/>") + "<br/>价格描述：" + PriceDescription + "<br /> 备注：" + cTableRemark;
                                 _detail.PriceNameContent = "(" + jpRes.FlightsCode + ")";
 
                                 // 处理 退票 其他 等费用类型显示在 航班号后面

OASystem/OASystem.Infrastructure/Repositories/Groups/AirTicketResRepository.cs

@@ -1765,6 +1765,12 @@ public class AirTicketResRepository : BaseRepository<Grp_AirTicketReservations,
                         airEntity.OriginalReservationId = 0;
                     }
 
+                    airEntity.FlightsCode = string.Join("/", item.AirTicketBasicInfos.Select(x => x.FlightsCode));
+                    airEntity.FlightsCity = string.Join("/", item.AirTicketBasicInfos.Select(x => x.FlightsCity));
+                    airEntity.FlightsDate = string.Join("/", item.AirTicketBasicInfos.Select(x => x.FlightsDate));
+                    airEntity.FlightsTime = string.Join("/", item.AirTicketBasicInfos.Select(x => x.FlightsTime));
+                    airEntity.ArrivedTime = string.Join("/", item.AirTicketBasicInfos.Select(x => x.ArrivedTime));
+
                     var airId = await _sqlSugar.Insertable(airEntity).ExecuteReturnIdentityAsync();
 
                     if (airEntity.RecordType == 0)
@@ -1831,6 +1837,13 @@ public class AirTicketResRepository : BaseRepository<Grp_AirTicketReservations,
                     dbAir.PriceDescription = item.PriceDescription;
                     dbAir.RecordType = item.RecordType;
 
+                    dbAir.FlightsCode = string.Join("/", item.AirTicketBasicInfos.Select(x => x.FlightsCode));
+                    dbAir.FlightsCity = string.Join("/", item.AirTicketBasicInfos.Select(x => x.FlightsCity));
+                    dbAir.FlightsDate = string.Join("/", item.AirTicketBasicInfos.Select(x => x.FlightsDate));
+                    dbAir.FlightsTime = string.Join("/", item.AirTicketBasicInfos.Select(x => x.FlightsTime));
+                    dbAir.ArrivedTime = string.Join("/", item.AirTicketBasicInfos.Select(x => x.ArrivedTime));
+
+
                     await _sqlSugar.Updateable(dbAir).ExecuteCommandAsync();
 
                     if (dbCard != null)