1. 修改手机端OP地接费用录入逻辑

OASystem/OASystem.Infrastructure/Repositories/CRM/NewClientDataRepository.cs

@@ -47,9 +47,11 @@ namespace OASystem.Infrastructure.Repositories.CRM
                 #region 下拉框初始化数据
                 //负责人下拉框
                 List<dynamic> _Users = new List<dynamic>();
-                List<Sys_Users> users = _sqlSugar.Queryable<Sys_Users>().Where(u => u.IsDel == 0 && u.CompanyId == 2).ToList();
+                List<Sys_Users> users = _sqlSugar.Queryable<Sys_Users>().Where(u => u.IsDel == 0 
+                //&& u.CompanyId == 2
+                ).ToList();
 
-                foreach (Sys_Users user in users)
+                foreach (Sys_Users user in users)   
                 {
                     var data = new
                     {

OASystem/OASystem.Infrastructure/Repositories/Groups/CarTouristGuideGroundRepository.cs

@@ -872,11 +872,30 @@ namespace OASystem.Infrastructure.Repositories.Groups
                     }
                 }
 
+                Regex regex = new Regex("^[\u4e00-\u9fa5]{0,}$");
+
                 //修改C表数据
                 //List<Grp_CarTouristGuideGroundReservationsContent> carTouristListEnd = _sqlSugar.Queryable<Grp_CarTouristGuideGroundReservationsContent>().Where(a=>a.DiId==dto.DiId && a.CTGGRId==dto.CTGGRId && a.IsDel==0).ToList();
                 Grp_CreditCardPayment c = new Grp_CreditCardPayment();
                 c.PaymentCurrency = dto.Currency;
-                c.PayMoney = carTouristList.Sum(x => x.Price * x.Count);
+
+                for (int i = 0; i < dto.SelectCheck.Count; i++) {
+                    if (!regex.IsMatch(dto.SelectCheck[i]))
+                    {
+                        for(int j = 0; j < carTouristList.Count; j++)
+                        {
+                            if (int.Parse(dto.SelectCheck[i]) == carTouristList[j].SId)
+                            {
+                                c.PayMoney += carTouristList[j].Price * carTouristList[j].Count;
+                            }
+                        }
+                    } else
+                    {
+                        c.PayMoney = carTouristList.Sum(x => x.Price * x.Count);
+                        break;
+                    }
+                }
+
                 c.PayPercentage = dto.PayPercentage;
                 c.ConsumptionDate= DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
                 c.CTable = 79;