1

REBORN.Repository/Sell/RB_CRMTicket_OrderRepository.cs

@@ -316,7 +316,7 @@ 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 {(Config.IsOnline ? "uat_reborn_dmc" : "reborn_dmc")}.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
@@ -445,7 +445,7 @@ SELECT sum(case when t2.OrderStatus <>2 then t2.Money else 0 end) as Money
       ,sum(case when t2.OrderStatus =2 then t2.GuestCount else 0 end) as CancelNum
 select t.* from(
 FROM RB_Ticket_Order t 
-left JOIN rb_appoint_op aop on aop.OrderId=o.OrderId and aop.ResourceType=8
+left JOIN {(Config.IsOnline ? "uat_reborn_dmc" : "reborn_dmc")}.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

@@ -3341,10 +3341,6 @@ namespace REBORN.Services.SellService
                 return ApiResult.ParamIsNull("请选择线路");
             }
             if (!demodel.OrderType.Contains("3")) { demodel.LineId = 0; demodel.LineName = ""; }
-            if (demodel.OrderId > 0 && demodel.SupplierId <= 0)
-            {
-                return ApiResult.ParamIsNull("请选择供应商");
-            }
 
             //出行人员名单（姓名、电话、出生年月日是必须的、护照号、身份证号、护照有效期非必填）
             string guestInfoStr = parms.GetStringValue("OrderGuestList");