1

REBORN.Module.SellModule/CustomerOrderModule.cs

@@ -4026,7 +4026,7 @@ namespace REBORN.Module.SellModule
                 }
                 #endregion
                 //其它合同
-                var otherContractList = travel_ContractRepository.GetTravelContractListRepository(new RB_Travel_Contract_Extend() { RB_Group_Id = userInfo.RB_Group_id, Type = Common.Enum.ResourceTypeEnum.TicketCoupons, QOrderIds = orderIds, Status = -1 });
+                var otherContractList = travel_ContractRepository.GetTravelContractListNewRepository(new RB_Travel_Contract_Extend() { RB_Group_Id = userInfo.RB_Group_id, Type = Common.Enum.ResourceTypeEnum.TicketCoupons, QOrderIds = orderIds, Status = -1 });
                 List<RB_Travel_Guest_Extend> guestlist = new List<RB_Travel_Guest_Extend>();
                 RB_Travel_Guest_Extend guestmodel = new RB_Travel_Guest_Extend()
                 {

REBORN.Repository/Dmc/RB_Customer_TicketOrderRepository.cs

@@ -205,13 +205,29 @@ where {where} order by o.OrderId desc";
                 parameters.Add("CouponsName", "%" + demodel.CouponsName + "%");
             }
 
-            string sql = $@"select o.*,t.Name as CouponsName from RB_Customer_TicketOrder o
+            string sql = $@"select o.OrderId,t.Name as CouponsName from RB_Customer_TicketOrder o
 left join rb_ticketcoupons t on o.CouponsId = t.ID
 left join RB_Customer_TicketOrderDetail d on o.OrderId = d.OrderId
 {((userInfo?.SimpleEasy ?? 0) == 1 ? (" left JOIN rb_appoint_op aop on aop.OrderId=o.OrderId and aop.ResourceType=" + (int)Common.Enum.ResourceTypeEnum.TicketCoupons) : "")}
 {(!string.IsNullOrEmpty(demodel.Name) ? " left join rb_travel_guest g on o.OrderId=g.OrderId and g.IsAllograph=4 and g.Status=0" : "")}
 where {where} group by o.OrderId order by o.OrderId desc";
-            return GetPage<RB_Customer_TicketOrder_Extend>(pageIndex, pageSize, out count, sql, parameters).ToList();
+            var list = GetPage<RB_Customer_TicketOrder_Extend>(pageIndex, pageSize, out count, sql, parameters).ToList();
+            if (list.Any())
+            {
+                //根据订单Id 查询
+                var flist = GetList(new RB_Customer_TicketOrder_Extend() { GroupId = demodel.GroupId, OrderIds = string.Join(",", list.Select(x => x.OrderId)) });
+                if (flist.Any())
+                {
+                    List<RB_Customer_TicketOrder_Extend> RList = new List<RB_Customer_TicketOrder_Extend>();
+                    foreach (var item in list)
+                    {
+                        var fmodel = flist.Where(x => x.OrderId == item.OrderId).FirstOrDefault();
+                        RList.Add(fmodel);
+                    }
+                    return RList;
+                }
+            }
+            return list;
         }
 
         /// <summary>

REBORN.Repository/Dmc/RB_Travel_ContractRepository.cs

@@ -102,7 +102,7 @@ WHERE 1=1
         {
             StringBuilder builder = new StringBuilder();
             builder.AppendFormat(@"
-SELECT A.ID,A.CType,A.T_ContractNum,A.Tourists_Name,A.TCID,A.OrderId,A.ContractTemplete,A.ThirdContractID,A.ThirdContractFileUrl,A.ThirdContractState,A.Status
+SELECT A.ID,A.CType,A.T_ContractNum,A.Tourists_Name,A.TCID,A.OrderId,A.Type,A.ContractTemplete,A.ThirdContractID,A.ThirdContractFileUrl,A.ThirdContractState,A.Status
 FROM RB_Travel_Contract AS A
 WHERE 1=1 
 ");