付款申请 酒店相关费用代码更改

OASystem/OASystem.Api/Controllers/FinancialController.cs

@@ -2673,15 +2673,15 @@ namespace OASystem.API.Controllers
         {
             if (dto.UserId < 1) return Ok(JsonView(false, "请传入有效的UserId参数!"));
 
-            if (string.IsNullOrEmpty(dto.GroupIds))
-            {
-                return Ok(JsonView(false, "请传入有效的GroupIds参数!"));
-            }
+            //if (string.IsNullOrEmpty(dto.GroupIds))
+            //{
+            //    return Ok(JsonView(false, "请传入有效的GroupIds参数!"));
+            //}
 
-            if (string.IsNullOrEmpty(dto.DailyPaymentIds))
-            {
-                return Ok(JsonView(false, "请传入有效的DailyPaymentIds参数!"));
-            }
+            //if (string.IsNullOrEmpty(dto.DailyPaymentIds))
+            //{
+            //    return Ok(JsonView(false, "请传入有效的DailyPaymentIds参数!"));
+            //}
 
 
             List<int> groupIds = new List<int>();
@@ -2740,37 +2740,38 @@ namespace OASystem.API.Controllers
                 {
                     if (hotelSubIds.Count > 0)
                     {
+                        List<int> hrPayIds = new List<int>();
                         var hrIspayStatus = _sqlSugar.Updateable<Grp_HotelReservationsContent>()
                                                    .SetColumns(it => it.IsPay == 1)
                                                    .Where(it => hotelSubIds.Contains(it.Id))
                                                    .ExecuteCommand();
                         //酒店子项是否全部付完款
-                        
                         List<int> hrIds = _sqlSugar.Queryable<Grp_HotelReservationsContent>().Where(it => it.IsDel == 0 && hotelSubIds.Contains(it.Id)).Select(it => it.HrId).Distinct().ToList();
                         if (hrIds.Count > 0 )
                         {
                             var hotelSubFeeData = _sqlSugar.Queryable<Grp_HotelReservationsContent>().Where(it => it.IsDel == 0 && hrIds.Contains(it.HrId)).ToList();
                             var hotelSubFeeGroupData = hotelSubFeeData.GroupBy(it => it.HrId).ToList();
-                            
-
+                            foreach (var item in hotelSubFeeGroupData)
+                            {
+                                var allTotal = item.Where(it => it.Price > 0).ToList().Count;
+                                var paymentTotal = item.Where(it => it.Price > 0 && it.IsPay == 1).ToList().Count;
+                                if (allTotal == paymentTotal)
+                                {
+                                    hrPayIds.Add(item.Key);
+                                }
+                            }
                         }
 
-
+                        if (hrPayIds.Count > 0)
+                        {
+                            //c表更改全部付款的酒店费用
+                            groupStatus = _sqlSugar.Updateable<Grp_CreditCardPayment>()
+                                               .SetColumns(it => it.IsPay == 1)
+                                               .Where(it => it.CTable == 76 && hrPayIds.Contains(it.CId))
+                                               .ExecuteCommand();
+                        }
                     }
                 }
-
-                if (groupStatus > 0)
-                {
-                    changeStatus = true;
-
-
-                    //更改酒店子表支付状态
-                    var ccps = _sqlSugar.Queryable<Grp_CreditCardPayment>()
-                                           .Where(it => groupIds.Contains(it.Id) && it.CTable == 76)
-                                           .ToList();
-                    List<int> hrIds = ccps.Select(it => it.CId).ToList();
-                    
-                }
             }
 
             //if (hotelSubIds.Count > 0)