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

REBORN.Common/Enum/Finance/ClientTypeEnum.cs

@@ -22,11 +22,11 @@ namespace REBORN.Common.Enum.Finance
         /// </summary>
         [EnumField("票卷供应商")]
         TicketSupplier = 2,
-        /// <summary>
-        /// 餐厅供应商
-        /// </summary>
-        [EnumField("餐厅供应商")]
-        DiningSupplier = 3,
+        ///// <summary>
+        ///// 餐厅供应商
+        ///// </summary>
+        //[EnumField("餐厅供应商")]
+        //DiningSupplier = 3,
         /// <summary>
         /// 车辆供应商
         /// </summary>
@@ -67,26 +67,26 @@ namespace REBORN.Common.Enum.Finance
         /// </summary>
         [EnumField("其他")]
         Other = 10,
-        /// <summary>
-        /// 地接供应商
-        /// </summary>
-        [EnumField("地接供应商")]
-        DiJie = 11,
-        /// <summary>
-        /// 日本车行供应商
-        /// </summary>
-        [EnumField("日本车行供应商")]
-        JapanSupplier = 12,
+        ///// <summary>
+        ///// 地接供应商
+        ///// </summary>
+        //[EnumField("地接供应商")]
+        //DiJie = 11,
+        ///// <summary>
+        ///// 日本车行供应商
+        ///// </summary>
+        //[EnumField("日本车行供应商")]
+        //JapanSupplier = 12,
         ///// <summary>
         ///// 日本车行客户
         ///// </summary>
         //[EnumField("日本车行客户")]
         //JapanCustomer = 13
-        /// <summary>
-        /// 直客客户
-        /// </summary>
-        [EnumField("直客客户")]
-        DirectCustomer = 14,
+        ///// <summary>
+        ///// 直客客户
+        ///// </summary>
+        //[EnumField("直客客户")]
+        //DirectCustomer = 14,
         /// <summary>
         /// 团队供应商
         /// </summary>

REBORN.Common/Enum/ResourceTypeEnum.cs

@@ -18,44 +18,44 @@ namespace REBORN.Common.Enum
         [EnumField("酒店")]
         Hotel = 1,
 
-        /// <summary>
-        /// 餐厅
-        /// </summary>
-        [EnumField("餐厅")]
-        Dining = 2,
+        ///// <summary>
+        ///// 餐厅
+        ///// </summary>
+        //[EnumField("餐厅")]
+        //Dining = 2,
 
         /// <summary>
-        ///景点
+        ///邮轮
         /// </summary>
 
-        [EnumField("景点")]
+        [EnumField("邮轮")]
         TicketCoupons = 3,
 
-        /// <summary>
-        /// 票务(机票)
-        /// </summary>
+        ///// <summary>
+        ///// 票务(机票)
+        ///// </summary>
 
-        [EnumField("票务")]
-        TicketService = 4,
+        //[EnumField("票务")]
+        //TicketService = 4,
 
 
-        /// <summary>
-        /// 车辆
-        /// </summary>
-        [EnumField("车辆")]
-        Vehicle = 5,
+        ///// <summary>
+        ///// 车辆
+        ///// </summary>
+        //[EnumField("车辆")]
+        //Vehicle = 5,
 
-        /// <summary>
-        /// 领队
-        /// </summary>
-        [EnumField("领队")]
-        Leader = 6,
+        ///// <summary>
+        ///// 领队
+        ///// </summary>
+        //[EnumField("领队")]
+        //Leader = 6,
 
-        /// <summary>
-        /// 购物店
-        /// </summary>
-        [EnumField("购物店")]
-        Shopping = 7,
+        ///// <summary>
+        ///// 购物店
+        ///// </summary>
+        //[EnumField("购物店")]
+        //Shopping = 7,
 
         /// <summary>
         /// 单机票-6
@@ -70,7 +70,7 @@ namespace REBORN.Common.Enum
         /// <summary>
         /// 团-15
         /// </summary>
-        [EnumField("团")]
+        [EnumField("团队")]
         TeamPrice = 10
     }
 

REBORN.Module.SellModule/CustomerOrderModule.cs

@@ -1154,7 +1154,7 @@ namespace REBORN.Module.SellModule
                     #region 推送企微机器人消息
 
                     var dictModel = dictvalueRepository.GetList(new RB_Dictvalue_Extend() { RB_Group_id = demodel.GroupId, DictKey = "Client_OrderPush_Url" }).FirstOrDefault();
-                    if (dictModel != null)
+                    if (dictModel != null && userInfo.SimpleEasy == 0)
                     {
                         string url = dictModel.Content;
                         var postdata = new
@@ -3461,7 +3461,7 @@ namespace REBORN.Module.SellModule
                     Id = 0,
                     OrderId = 0,
                     TicketName = product.TicketName,
-                    Unit_Price = demodel.PeopleNum==0? demodel.Money: Math.Round(demodel.Money / (demodel?.PeopleNum ?? 1),2),
+                    Unit_Price = demodel.PeopleNum == 0 ? demodel.Money : Math.Round(demodel.Money / (demodel?.PeopleNum ?? 1), 2),
                     Num = demodel.PeopleNum,
                     Money = demodel.Money,
                     CurrencyId = 1,
@@ -3518,7 +3518,7 @@ namespace REBORN.Module.SellModule
                     #region 推送企微机器人消息
 
                     var dictModel = dictvalueRepository.GetList(new RB_Dictvalue_Extend() { RB_Group_id = demodel.GroupId, DictKey = "Client_OrderPush_Url" }).FirstOrDefault();
-                    if (dictModel != null && demodel.GroupId == 2)
+                    if (dictModel != null && demodel.GroupId == 2 && userInfo.SimpleEasy == 0)
                     {
                         string url = dictModel.Content;
                         var postdata = new

REBORN.Module.SellModule/SellOrderModule.cs

@@ -6759,7 +6759,7 @@ namespace REBORN.Module.SellModule
                     coupon_AllotRepository.DBSession.Commit();
                     //自动更新候补订单
                     updaeTravelOrderWaitingRepository.UpdateOrderWaitingRepository(tmodel, null);
-                    if (isAddorder)
+                    if (isAddorder&& userInfo.SimpleEasy == 0)
                     {
                         //推送消息到企业微信
                         //新增订单，推送消息

REBORN.Services.DMCService/VisaService.cs

@@ -5251,7 +5251,7 @@ namespace REBORN.Services.DMCService
                 model.OrderSource = model.OrderSource ?? OrderSourceEnum.Internal;
                 flag = visaModule.SetVisaOrder_V2(model, VisaProductModel, tempModel, IsUpdateTCNum, supplierModel, appointOPList, orderGuestList, updateCouponAllotIds);
             }
-            if (flag && isAddOrder)
+            if (flag && isAddOrder && userInfo.SimpleEasy == 0)
             {
                 //新增订单，推送消息
                 Dictionary<string, string> dic = new Dictionary<string, string>();