1 客人名单备注 + 邮轮订单取消完结 + 今日订单 根据公司查询

REBORN.Model/Extend/Dmc/RB_Customer_HotelOrder_Extend.cs

@@ -222,5 +222,10 @@ namespace REBORN.Model.Extend.Dmc
             get;
             set;
         }
+
+        /// <summary>
+        /// 备注
+        /// </summary>
+        public string Remarks { get; set; }
     }
 }

REBORN.Module.SellModule/CustomerOrderModule.cs

@@ -4539,8 +4539,9 @@ namespace REBORN.Module.SellModule
         /// </summary>
         /// <param name="visaOrderId"></param>
         /// <param name="userInfo"></param>
+        /// <param name="type">0完结  1取消完结</param>
         /// <returns></returns>
-        public string SetTicketOrderFinish(string visaOrderId, UserInfo userInfo)
+        public string SetTicketOrderFinish(string visaOrderId, UserInfo userInfo, int type=0)
         {
             bool flag = false;
             var list = customer_TicketOrderRepository.GetList(new RB_Customer_TicketOrder_Extend() { GroupId = userInfo.RB_Group_id, OrderIds = visaOrderId });
@@ -4551,7 +4552,7 @@ namespace REBORN.Module.SellModule
             foreach (var item in list)
             {
                 Dictionary<string, object> keyValues = new Dictionary<string, object>() {
-                    { nameof(RB_Customer_TicketOrder_Extend.IsFinish), 1},
+                    { nameof(RB_Customer_TicketOrder_Extend.IsFinish), type==0? 1: 0},
                     { nameof(RB_Customer_TicketOrder_Extend.FinishEmpId), userInfo.EmployeeId},
                     { nameof(RB_Customer_TicketOrder_Extend.FinishTime), DateTime.Now}
                 };

REBORN.Services.DMCService/VisaService.cs

@@ -5056,6 +5056,7 @@ namespace REBORN.Services.DMCService
                                     PassportIssued = jobj.GetDateTime("PassportIssued"),
                                     PassportNo = jobj.GetStringValue("PassportNo"),
                                     Tel = jobj.GetStringValue("Tel"),
+                                    Remarks = jobj.GetStringValue("Remarks")
                                 });
                             }
                         }

REBORN.Services.SellService/CRMService.cs

@@ -64,7 +64,8 @@ namespace REBORN.Services.SellService
                 IsMyOrder = parms.GetInt("IsMyOrder"),
                 CommissionType = parms.GetInt("CommissionType"),
                 GroupId = userInfo.RB_Group_id,
-                EmployeeId = userInfo.EmployeeId
+                EmployeeId = userInfo.EmployeeId,
+                BranchId = parms.GetInt("BranchId"),
             };
 
             //非crm查询看权限
@@ -132,7 +133,8 @@ namespace REBORN.Services.SellService
                 TCNUM = parms.GetStringValue("TCNUM"),
                 TravelType = parms.GetInt("TravelType"),
                 GroupId = userInfo.RB_Group_id,
-                EmployeeId = userInfo.EmployeeId
+                EmployeeId = userInfo.EmployeeId,
+                BranchId = parms.GetInt("BranchId"),
             };
 
             //非crm查询看权限

REBORN.Services.SellService/CustomerOrderService.cs

@@ -783,6 +783,7 @@ namespace REBORN.Services.SellService
                                     PassportIssued = jobj.GetDateTime("PassportIssued"),
                                     PassportNo = jobj.GetStringValue("PassportNo"),
                                     Tel = jobj.GetStringValue("Tel"),
+                                    Remarks = jobj.GetStringValue("Remarks")
                                 });
                             }
                         }
@@ -1066,6 +1067,7 @@ namespace REBORN.Services.SellService
                                     PassportIssued = jobj.GetDateTime("PassportIssued"),
                                     PassportNo = jobj.GetStringValue("PassportNo"),
                                     Tel = jobj.GetStringValue("Tel"),
+                                    Remarks = jobj.GetStringValue("Remarks")
                                 });
                                 travelGuestList.Add(new RB_Travel_Guest_Extend
                                 {
@@ -1077,6 +1079,7 @@ namespace REBORN.Services.SellService
                                     PassportIssued = jobj.GetDateTime("PassportIssued"),
                                     PassportNo = jobj.GetStringValue("PassportNo"),
                                     Tel = jobj.GetStringValue("Tel"),
+                                    Remarks = jobj.GetStringValue("Remarks")
                                 });
                             }
                         }
@@ -2090,11 +2093,12 @@ namespace REBORN.Services.SellService
             UserInfo userInfo = CacheManager.User.RbUserCache.GetUserLoginInfo(request.uid);
             JObject parm = JObject.Parse(request.msg.ToString());
             string VisaOrderIds = parm.GetStringValue("TticketOrderIds");
+            int Type = parm.GetInt("Type", 0);
             if (string.IsNullOrEmpty(VisaOrderIds))
             {
                 return ApiResult.ParamIsNull();
             }
-            string msg = customerOrderModule.SetTicketOrderFinish(VisaOrderIds, userInfo);
+            string msg = customerOrderModule.SetTicketOrderFinish(VisaOrderIds, userInfo, Type);
             if (msg == "")
             {
                 return ApiResult.Success();
@@ -2339,6 +2343,7 @@ namespace REBORN.Services.SellService
                                     PassportIssued = jobj.GetDateTime("PassportIssued"),
                                     PassportNo = jobj.GetStringValue("PassportNo"),
                                     Tel = jobj.GetStringValue("Tel"),
+                                    Remarks = jobj.GetStringValue("Remarks")
                                 });
 
                                 travelGuestList.Add(new RB_Travel_Guest_Extend
@@ -2351,6 +2356,7 @@ namespace REBORN.Services.SellService
                                     PassportIssued = jobj.GetDateTime("PassportIssued"),
                                     PassportNo = jobj.GetStringValue("PassportNo"),
                                     Tel = jobj.GetStringValue("Tel"),
+                                    Remarks = jobj.GetStringValue("Remarks")
                                 });
                             }
                         }
@@ -3683,6 +3689,7 @@ namespace REBORN.Services.SellService
                                 IdCard = jobj.GetStringValue("IdCard"),
                                 PassportNo = jobj.GetStringValue("PassportNo"),
                                 Tel = jobj.GetStringValue("Tel"),
+                                Remarks = jobj.GetStringValue("Remarks")
                             };
                             if (!string.IsNullOrEmpty(jobj.GetStringValue("Birthday"))) { gmodel.Birthday = jobj.GetDateTime("Birthday"); }
                             if (!string.IsNullOrEmpty(jobj.GetStringValue("PassportExpiry"))) { gmodel.PassportExpiry = jobj.GetDateTime("PassportExpiry"); }
@@ -3700,6 +3707,7 @@ namespace REBORN.Services.SellService
                                 PassportIssued = jobj.GetDateTime("PassportIssued"),
                                 PassportNo = jobj.GetStringValue("PassportNo"),
                                 Tel = jobj.GetStringValue("Tel"),
+                                Remarks = jobj.GetStringValue("Remarks")
                             });
                         }
                         orderGuestList = orderGuestList?.Distinct()?.ToList() ?? new List<OrderGuestList>();

REBORN.Services.SellService/SellOrderService.cs

@@ -6782,6 +6782,7 @@ namespace REBORN.Services.SellService
                                     PassportIssued = jobj.GetDateTime("PassportIssued"),
                                     PassportNo = jobj.GetStringValue("PassportNo"),
                                     Tel = jobj.GetStringValue("Tel"),
+                                    Remarks = jobj.GetStringValue("Remarks")
                                 });
                             }
                             //orderGuestList = orderGuestList?.Distinct()?.ToList() ?? new List<RB_Travel_Guest_Extend>();
@@ -7574,6 +7575,7 @@ namespace REBORN.Services.SellService
                                 PassportIssued = jobj.GetDateTime("PassportIssued"),
                                 PassportNo = jobj.GetStringValue("PassportNo"),
                                 Tel = jobj.GetStringValue("Tel"),
+                                Remarks = jobj.GetStringValue("Remarks")
                             });
                         }
                         //orderGuestList = orderGuestList?.Distinct()?.ToList() ?? new List<RB_Travel_Guest_Extend>();