1

REBORN.Repository/Sell/RB_CRMTicket_OrderRepository.cs

@@ -222,8 +222,6 @@ WHERE o.GroupId ={rB_Group_id} and o.IsSaleDrainage =1 and o.OrderStatus <>2 and
             {
                 where += $@" and t.{nameof(RB_CRMTicket_Order_Extend.OrderId)} ={demodel.OrderId}";
             }
-            else
-            {
             if (demodel.GuestId > 0)
             {
                 where += $@" and t.{nameof(RB_CRMTicket_Order_Extend.GuestId)} ={demodel.GuestId}";
@@ -249,6 +247,10 @@ WHERE o.GroupId ={rB_Group_id} and o.IsSaleDrainage =1 and o.OrderStatus <>2 and
                     where += $@" and t.{nameof(RB_CRMTicket_Order_Extend.CreateBy)} ={demodel.CreateBy}";
                 }
             }
+            if (demodel.OpEmpId > 0)
+            {
+                where += $" and aop.OPId=" + demodel.OpEmpId;
+            }
             if (!string.IsNullOrEmpty(demodel.StartCityName))
             {
                 where += $@" and t.{nameof(RB_CRMTicket_Order_Extend.StartCityName)} like @StartCityName";
@@ -295,7 +297,7 @@ or (t.OrderStatus =6 and t.LossFinishTime <='{demodel.FinishETime} 23:59:59'))";
             {
                 where += string.Format(" AND FIND_IN_SET('{0}', t.OrderType) ", demodel.OrderType);
             }
-            }
+
             //if (demodel.OpEmpId > 0)
             //{
             //    where += $@" and t.OrderId in(select * from )";
@@ -314,8 +316,10 @@ or (t.OrderStatus =6 and t.LossFinishTime <='{demodel.FinishETime} 23:59:59'))";
             string sql = $@"
 SELECT t.*,cd.Commission
 FROM RB_Ticket_Order t
+left JOIN rb_appoint_op aop on aop.OrderId=o.OrderId and aop.ResourceType=8
      left join (select d.OrderId,sum(d.Commission) as Commission from rb_ticket_commission_details d where d.Status =0 group by d.OrderId) cd on t.OrderId = cd.OrderId
 WHERE {where} 
+group by t.OrderId
 ORDER BY t.CreateTime DESC";
             return GetPage<RB_CRMTicket_Order_Extend>(pageIndex, pageSize, out count, sql, parameters).ToList();
         }
@@ -370,6 +374,10 @@ ORDER BY t.CreateTime DESC";
                     where += $@" and t.{nameof(RB_CRMTicket_Order_Extend.CreateBy)} ={demodel.CreateBy}";
                 }
             }
+            if (demodel.OpEmpId > 0)
+            {
+                where += $" and aop.OPId=" + demodel.OpEmpId;
+            }
             if (!string.IsNullOrEmpty(demodel.StartCityName))
             {
                 where += $@" and t.{nameof(RB_CRMTicket_Order_Extend.StartCityName)} like @StartCityName";
@@ -428,15 +436,17 @@ or (t.OrderStatus =6 and t.LossFinishTime <='{demodel.FinishETime} 23:59:59'))";
             }
 
             string sql = $@"
-SELECT sum(case when t.OrderStatus <>2 then t.Money else 0 end) as Money
-      ,sum(case when t.OrderStatus <>2 then t.IncomeMoney else 0 end) as IncomeMoney
-      ,sum(case when t.OrderStatus <>2 then t.TaxMoney else 0 end) as TaxMoney
-      ,sum(case when t.OrderStatus <>2 then t.BackMoney else 0 end) as BackMoney
-      ,sum(case when t.OrderStatus <>2 then t.PayMoney else 0 end) as PayMoney
-      ,sum(case when t.OrderStatus <>2 then t.GuestCount else 0 end) as NorNumber
-      ,sum(case when t.OrderStatus =2 then t.GuestCount else 0 end) as CancelNum
+SELECT sum(case when t2.OrderStatus <>2 then t2.Money else 0 end) as Money
+      ,sum(case when t2.OrderStatus <>2 then t2.IncomeMoney else 0 end) as IncomeMoney
+      ,sum(case when t2.OrderStatus <>2 then t2.TaxMoney else 0 end) as TaxMoney
+      ,sum(case when t2.OrderStatus <>2 then t2.BackMoney else 0 end) as BackMoney
+      ,sum(case when t2.OrderStatus <>2 then t2.PayMoney else 0 end) as PayMoney
+      ,sum(case when t2.OrderStatus <>2 then t2.GuestCount else 0 end) as NorNumber
+      ,sum(case when t2.OrderStatus =2 then t2.GuestCount else 0 end) as CancelNum
+select t.* from(
 FROM RB_Ticket_Order t 
-WHERE {where} ";
+left JOIN rb_appoint_op aop on aop.OrderId=o.OrderId and aop.ResourceType=8
+WHERE {where} group by t.OrderId)t2  ";
             return Get<RB_CRMTicket_Order_Extend>(sql, parameters).FirstOrDefault();
         }
     }

REBORN.Services.SellService/CustomerOrderService.cs

@@ -2982,7 +2982,20 @@ namespace REBORN.Services.SellService
             ResultPageModel pmodel = JsonHelper.DeserializeObject<ResultPageModel>(request.msg.ToString());
             RB_CRMTicket_Order_Extend demodel = JsonHelper.DeserializeObject<RB_CRMTicket_Order_Extend>(request.msg.ToString());
             demodel.GroupId = userInfo.RB_Group_id;
-            if (demodel.IsMyOrder == 1) { demodel.EnterID = userInfo.EmployeeId; }
+            if (demodel.IsMyOrder == 1) { 
+                demodel.EnterID = userInfo.EmployeeId;
+            }
+            else {
+                demodel.OpEmpId = userInfo.EmployeeId;
+                if (userInfo != null && userInfo.RB_Post_Id > 0)
+                {
+                    string actionMenu = CacheManager.User.RbUserCache.GetUserActionMenu(userInfo.RB_Post_Id);
+                    if (!string.IsNullOrEmpty(actionMenu) && actionMenu.Contains("S_CheckAllOrder"))//查看全部的订单信息
+                    {
+                        demodel.OpEmpId = 0;
+                    }
+                }
+            }
             if (demodel.OrderStatus <= 0)
             {
                 demodel.IsSelectNormal = 1;