|
@@ -2723,10 +2723,42 @@ namespace OASystem.API.Controllers
|
|
|
|
|
|
if (groupIds.Count > 0)
|
|
|
{
|
|
|
- var groupStatus = _sqlSugar.Updateable<Grp_CreditCardPayment>()
|
|
|
+
|
|
|
+ var ccpInfos = _sqlSugar.Queryable<Grp_CreditCardPayment>().Where(it => it.IsDel == 0 && groupIds.Contains(it.Id)).ToList();
|
|
|
+ var otherTypeCcpIds = ccpInfos.Where(it => it.CTable != 76).Select(it => it.Id).ToList();
|
|
|
+ var hotelTyprCcpIds = ccpInfos.Where(it => it.CTable == 76).Select(it => it.Id).ToList();
|
|
|
+ int groupStatus = 0;
|
|
|
+ if (otherTypeCcpIds.Count > 0)
|
|
|
+ {
|
|
|
+ groupStatus = _sqlSugar.Updateable<Grp_CreditCardPayment>()
|
|
|
.SetColumns(it => it.IsPay == 1)
|
|
|
- .Where(it => groupIds.Contains(it.Id))
|
|
|
+ .Where(it => otherTypeCcpIds.Contains(it.Id))
|
|
|
.ExecuteCommand();
|
|
|
+ }
|
|
|
+
|
|
|
+ if (hotelTyprCcpIds.Count > 1)
|
|
|
+ {
|
|
|
+ if (hotelSubIds.Count > 0)
|
|
|
+ {
|
|
|
+ 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();
|
|
|
+
|
|
|
+
|
|
|
+ }
|
|
|
+
|
|
|
+
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
if (groupStatus > 0)
|
|
|
{
|
|
|
changeStatus = true;
|
|
@@ -2737,14 +2769,7 @@ namespace OASystem.API.Controllers
|
|
|
.Where(it => groupIds.Contains(it.Id) && it.CTable == 76)
|
|
|
.ToList();
|
|
|
List<int> hrIds = ccps.Select(it => it.CId).ToList();
|
|
|
- if (hrIds.Count > 0)
|
|
|
- {
|
|
|
- var hrIspayStatus = _sqlSugar.Updateable<Grp_HotelReservationsContent>()
|
|
|
- .SetColumns(it => it.IsPay == 1)
|
|
|
- .Where(it => hrIds.Contains(it.Id))
|
|
|
- .ExecuteCommand();
|
|
|
-
|
|
|
- }
|
|
|
+
|
|
|
}
|
|
|
}
|
|
|
|