Merge branch 'master' of http://gitlab.oytour.com/liudong1993/huatu_api

REBORN.Module.SellModule/CustomerOrderModule.cs

@@ -3743,6 +3743,8 @@ namespace REBORN.Module.SellModule
                 }
             }
             else
+            {
+                try
                 {
                     demodel.CouponsId = hotel.ID;
                     #region 组装详情信息
@@ -3771,6 +3773,8 @@ namespace REBORN.Module.SellModule
                     orderId = customer_TicketOrderRepository.Insert(demodel);
                     demodel.OrderId = orderId;
                     if (orderId > 0)
+                    {
+                        try
                         {
                             foreach (var item in demodel.DetailList)
                             {
@@ -3779,6 +3783,12 @@ namespace REBORN.Module.SellModule
                                 item.Unit_Price = Math.Round(item.Money / (item?.Num ?? 1), 2);
                                 bool flagD = customer_TicketOrderDetailRepository.Insert(item) > 0;
                             }
+                        }
+                        catch (Exception ex)
+                        {
+                            flag = false;
+                        }
+
                         if (!string.IsNullOrEmpty(demodel.DiscountsIds))
                         {
                             int affectNum = coupon_AllotRepository.UserUseCouponAllotForB2C(orderId, Common.Enum.Dmc.DirectGoodsTypeEnum.AttractionTickets, demodel.DiscountsIds);
@@ -3801,8 +3811,6 @@ namespace REBORN.Module.SellModule
                         });
 
                         #region 推送企微机器人消息
-
-
                         if (userInfo.SimpleEasy == 1)
                         {
                             string jdName = ticketCouponsRepository.GetEntity(demodel.CouponsId)?.Name ?? "";
@@ -3830,6 +3838,11 @@ namespace REBORN.Module.SellModule
                     }
                     flag = orderId > 0;
                 }
+                catch (Exception ex)
+                {
+                    flag = false;
+                }
+            }
             if (flag)
             {
                 try

REBORN.Services.SellService/CustomerOrderService.cs

@@ -2378,13 +2378,13 @@ namespace REBORN.Services.SellService
                         Common.Plugin.LogHelper.Write(ex, "SetTeavelTeam");
                     }
                 }
-                if ((orderGuestList?.Count) == 0)
+                if ((DetailList?.Count) == 0)
                 {
-                    // return ApiResult.ParamIsNull("请填写入住人员名单");
+                    return ApiResult.ParamIsNull("请选择房间类型");
                 }
                 else
                 {
-                    query.GuestInfo = JsonConvert.SerializeObject(orderGuestList);
+                    query.DetailList = DetailList;
                 }
                 RB_TicketCoupons_Ticket ticket = new RB_TicketCoupons_Ticket
                 {
@@ -3351,7 +3351,8 @@ namespace REBORN.Services.SellService
                 //    y.PassportNo,
                 //    y.Tel
                 //}),
-                OtherContractList = x.OtherContractList?.Select(z=> new { 
+                OtherContractList = x.OtherContractList?.Select(z => new
+                {
                     z.ID,
                     z.T_ContractNum,
                     z.CType,
@@ -3752,7 +3753,8 @@ namespace REBORN.Services.SellService
             {
                 demodel.EnterID = userInfo.EmployeeId;//可以设置销售
             }
-            else {
+            else
+            {
                 //查询一下 公司别
                 demodel.EmpBranchId = CacheManager.User.RbUserCache.GetUserLoginInfo(demodel.EnterID.ToString())?.RB_Branch_id;
             }