1

REBORN.Model/Entity/Dmc/Rb_Travel_GuestSurvey.cs

@@ -89,6 +89,10 @@ namespace REBORN.Model.Entity.Dmc
             get;
             set;
         }
+        /// <summary>
+        /// 1（签证订单）  2（跟团订单），3-酒店订单，4-邮轮（景点）订单，5-单机票订单
+        /// </summary>
+        public int IsAllograph { get; set; }
 
     }
 }

REBORN.Repository/Dmc/RB_Travel_GuestRepository.cs

@@ -986,7 +986,7 @@ WHERE g.Status=0 and g.TCID in({tcidList})  and g.IsAllograph = 2 ";
         /// <param name="count">总条数</param>
         /// <param name="isShowDiJie">1-显示,0-不显示</param>
         /// <returns></returns>
-        public List<RB_Travel_Guest_Extend> GetAirTicketGuestPageListRepository(int pageIndex, int pageSize, int airTicketId,int TCID, int checkOutState, out long count, int isShowDiJie = 1)
+        public List<RB_Travel_Guest_Extend> GetAirTicketGuestPageListRepository(int pageIndex, int pageSize, int airTicketId, int TCID, int checkOutState, out long count, int isShowDiJie = 1)
         {
             string sql = $@"
 SELECT o.GroupType,CONCAT(g.SurName, g.`Name`) AS GuestName,g.SurName,g.`Name`,g.IdCard,g.ESurName,g.EName,g.Sex,o.TCID,g.Id,o.AirTicketIds
@@ -1030,7 +1030,7 @@ WHERE g.Status=0  and g.IsAllograph = 2 AND O.OrderState<>4 ";
         /// <param name="count">总条数</param>
         /// <param name="isShowDiJie">1-显示,0-不显示</param>
         /// <returns></returns>
-        public List<RB_Travel_Guest_Extend> GetAirTicketGuestPageList_V2Repository(int pageIndex, int pageSize, int airTicketId,int TCID, int checkOutState, out long count, int isShowDiJie = 1)
+        public List<RB_Travel_Guest_Extend> GetAirTicketGuestPageList_V2Repository(int pageIndex, int pageSize, int airTicketId, int TCID, int checkOutState, out long count, int isShowDiJie = 1)
         {
             string sql = $@"
 SELECT o.GroupType,CONCAT(g.SurName, g.`Name`) AS GuestName,g.SurName,g.`Name`,g.IdCard,g.ESurName,g.EName,g.Sex,o.TCID,g.Id,o.AirTicketIds
@@ -1299,16 +1299,38 @@ WHERE g.Status=0  and g.IsAllograph = 2 AND O.OrderState<>4 ";
             {
                 where += $@" and g.{nameof(RB_Travel_Guest_Extend.IsVisaFree)}={dmodel.IsVisaFree}";
             }
+            if (dmodel.GroupId > 0)
+            {
+                where += $@" and b.{nameof(RB_Travel_Order.RB_Group_Id)}={dmodel.GroupId}";
+            }
 
             if (dmodel.IsAllograph.HasValue && dmodel.IsAllograph > 0)
             {
                 where += $@" and g.{nameof(RB_Travel_Guest_Extend.IsAllograph)}={dmodel.IsAllograph}";
             }
-            string sql = $@"  
-SELECT g.*,c.StartDate as TCStartDate,d.DayNum as StayDay from rb_travel_guest  as g LEFT JOIN rb_travel_order as b on g.OrderId=b.OrderId 
+            string sql = $@"SELECT g.*,c.StartDate as TCStartDate,d.DayNum as StayDay from rb_travel_guest  as g LEFT JOIN rb_travel_order as b on g.OrderId=b.OrderId 
 LEFT JOIN rb_travel_price  as c on c.TCID=b.TCID
 LEFT JOIN rb_travel_config as d on d.ID=c.ConfigID
-where g.Status=0 and b.OrderState<>4 and IFNULL(b.IsChargeLossOrders,0)<>1 and IFNULL(b.IsLeaderOrder,0)!=1  {where} ORDER BY c.StartDate desc";
+where g.Status=0 and b.OrderState<>4 and IFNULL(b.IsChargeLossOrders,0)<>1 and IFNULL(b.IsLeaderOrder,0)!=1  {where} ORDER BY c.StartDate desc ";
+            if (dmodel.IsAllograph == 1)//签证
+            {
+                sql = $@"  ";
+            }
+            else if (dmodel.IsAllograph == 3)//酒店
+            {
+                sql = $@"SELECT g.*,b.OrderDate as TCStartDate,0 as StayDay from rb_travel_guest  as g LEFT JOIN rb_customer_hotelorder as b on g.OrderId=b.OrderId 
+where g.Status=0 and b.OrderStatus==2   {where} ORDER BY b.OrderDate desc ";
+            }
+            else if (dmodel.IsAllograph == 4)//邮轮
+            {
+                sql = $@"SELECT g.*,b.UseDate as TCStartDate,0 as StayDay from rb_travel_guest  as g LEFT JOIN rb_customer_ticketorder as b on g.OrderId=b.OrderId 
+where g.Status=0 and b.OrderStatus==2   {where} ORDER BY b.UseDate desc ";
+            }
+            else if (dmodel.IsAllograph == 5)//单机票
+            {
+                sql = $@"SELECT g.*,b.DepartTime as TCStartDate,0 as StayDay from rb_travel_guest  as g LEFT JOIN {(Common.Config.IsOnline ? "uat_reborn_sell" : "reborn_sell")}.RB_Ticket_Order as b on g.OrderId=b.OrderId 
+where g.Status=0 and b.OrderStatus==2   {where} ORDER BY b.DepartTime desc ";
+            }
             return Get<RB_Travel_Guest_Extend>(sql).ToList();
         }
 

REBORN.Services.SellService/MiniProgramService.cs

@@ -1728,12 +1728,67 @@ namespace REBORN.Services.SellService
             string guestMobile = parm.GetStringValue("guestMobile");
             int type = parm.GetInt("type", 1);//1-手机;2-护照
             int TCID = parm.GetInt("TCID");
-            if (TCID <= 0)
+            string orderIdStr = parm.GetStringValue("c");//订单号
+            string group_IdStr = parm.GetStringValue("g");//集团id
+            string typestr = parm.GetStringValue("t");//订单类型（兼容单项产品信息）
+            List<Model.Extend.Dmc.RB_Travel_Guest_Extend> guestModel = new List<RB_Travel_Guest_Extend>();
+            RB_Travel_Guest_Extend guestWhere = new RB_Travel_Guest_Extend();
+            Rb_Travel_GuestSurvey_Extend guestSurveyWhere = new Rb_Travel_GuestSurvey_Extend();
+            if (!string.IsNullOrWhiteSpace(orderIdStr))//邮轮那边的意见调查信息
             {
-                return ApiResult.Failed("团信息不存在，请与销售联系");
-            }
+                if (string.IsNullOrWhiteSpace(group_IdStr) || string.IsNullOrWhiteSpace(typestr))
+                {
+                    return ApiResult.ParamIsNull();
+                }
 
-            var guestModel = sellOrderModule.GetTravelGuest_V3(new Model.Extend.Dmc.RB_Travel_Guest_Extend { TCID = TCID });
+                string newOrderId = Common.DES.Decrypt(orderIdStr);
+                Int32.TryParse(newOrderId, out int orderId);
+
+                string newGroupId = Common.DES.Decrypt(group_IdStr);
+                Int32.TryParse(newGroupId, out int groupId);
+                string newTypestr = Common.DES.Decrypt(typestr);
+                Int32.TryParse(newTypestr, out int orderType);
+
+                if (orderId == 0 || groupId == 0 || orderType == 0)
+                {
+                    return ApiResult.Failed("订单信息不存在，请与销售联系");
+                }
+                int isAllograph = 0;
+                Common.Enum.ResourceTypeEnum resourceType = (Common.Enum.ResourceTypeEnum)orderType;
+                if (resourceType == ResourceTypeEnum.TeamPrice)//团订单
+                {
+                    isAllograph = 2;
+                }
+                else if (resourceType == ResourceTypeEnum.Visa)
+                {
+                    isAllograph = 1;
+                }
+                else if (resourceType == ResourceTypeEnum.TicketCoupons)
+                {
+                    isAllograph = 4;
+                }
+                else if (resourceType == ResourceTypeEnum.SingleTicket)
+                {
+                    isAllograph = 5;
+                }
+                else if (resourceType == ResourceTypeEnum.Hotel)
+                {
+                    isAllograph = 3;
+                }
+                guestWhere = new RB_Travel_Guest_Extend { OrderId = orderId, GroupId = groupId, IsAllograph = isAllograph };
+                guestSurveyWhere = new Rb_Travel_GuestSurvey_Extend { OrderID = orderId,RB_Group_Id= groupId, IsAllograph = isAllograph };
+            }
+            //c={0}&g={1}&t  //针对邮轮的信息
+            else
+            {
+                guestWhere = new Model.Extend.Dmc.RB_Travel_Guest_Extend { TCID = TCID };
+                guestSurveyWhere = new Rb_Travel_GuestSurvey_Extend { TCID = TCID };
+                if (TCID <= 0)
+                {
+                    return ApiResult.Failed("团信息不存在，请与销售联系");
+                }
+            }
+            guestModel = sellOrderModule.GetTravelGuest_V3(guestWhere);
             if (guestModel == null || !guestModel.Any())
             {
                 return ApiResult.Failed("旅客信息不存在", new Model.Extend.Dmc.RB_Travel_Guest_Extend());
@@ -1748,7 +1803,7 @@ namespace REBORN.Services.SellService
                     }
                 }
                 //过滤当团已评论的人
-                var surveyGuestList = module.GetGuestSurveyList(new Rb_Travel_GuestSurvey_Extend { TCID = TCID });
+                var surveyGuestList = module.GetGuestSurveyList(guestSurveyWhere);
                 var resultList = new List<RB_Travel_Guest_Extend>();
                 foreach (var item in guestModel)
                 {

REBORN.Services.SellService/SellOrderService_V3.cs

@@ -8763,8 +8763,10 @@ namespace REBORN.Services.SellService
             //    RB_Group_Id = orderModel.RB_Group_Id ?? 0;
             //}
             string nweIdStr = Common.DES.Encrypt(Id.ToString(), Common.Config.WebApiKey, Common.Config.WebApiIV);
-            string typeStr = Common.DES.Encrypt(RB_Group_Id.ToString(), Common.Config.WebApiKey, Common.Config.WebApiIV);
-            string url = string.Format(Common.Config.SurveyH5URL + "/?c={0}&g={1}", nweIdStr, typeStr);
+            string groupIdStr = Common.DES.Encrypt(RB_Group_Id.ToString(), Common.Config.WebApiKey, Common.Config.WebApiIV);
+            string typeStr = Common.DES.Encrypt(Type.ToString(), Common.Config.WebApiKey, Common.Config.WebApiIV);
+            string url = string.Format(Common.Config.SurveyH5URL + "?c={0}&g={1}&t={2}", nweIdStr, groupIdStr, typeStr);
+            LogHelper.Write("分享意见调查表的二维码信息:" + url);
             ApiResult apiResult = new ApiResult()
             {
                 data = Common.Plugin.QRCodeHelper.GetQrCode(url),