guadan
This commit is contained in:
@@ -24,12 +24,12 @@ public class guadanOrderController : ApiController
|
||||
var query = _db.GuaDanOrder
|
||||
.Where(a => a.IsCancel == false)
|
||||
.Where(a => a.IsDeleted == false);
|
||||
if(search.guadanUser != null)
|
||||
if (search.guadanUser != null)
|
||||
{
|
||||
query = query.Where(order => order.BookerName == search.guadanUser);
|
||||
}
|
||||
if (search.startDate != null && search.endDate != null)
|
||||
{
|
||||
{
|
||||
query = query.Where(order => order.StartDate >= search.startDate)
|
||||
.Where(order => order.EndDate <= search.endDate);
|
||||
}
|
||||
@@ -56,11 +56,28 @@ public class guadanOrderController : ApiController
|
||||
created_at = a.CreatedAt,
|
||||
updated_at = a.UpdatedAt,
|
||||
notes = a.Notes,
|
||||
activity = _db.activities
|
||||
.Where(act => act.num == a.ActivityNum)
|
||||
.Select(act => new
|
||||
{
|
||||
subject = act.subject
|
||||
})
|
||||
.FirstOrDefault(),
|
||||
bookerName = a.BookerName,
|
||||
guest_count = _db.GuaDanOrderGuest
|
||||
.Where(c => c.GuaDanOrderNo == a.GuaDanOrderNo && c.IsDeleted == false)
|
||||
.Where(c => c.RegionRoomBedStatus.Code != GuaDanOrderGuest.STATUS_CANCELLED)
|
||||
.Count(),
|
||||
statusName = _db.GuaDanOrderGuest
|
||||
.Where(g => g.GuaDanOrderNo == a.GuaDanOrderNo)
|
||||
.All(g => g.StatusCode == "404") ? "預約" :
|
||||
_db.GuaDanOrderGuest
|
||||
.Where(g => g.GuaDanOrderNo == a.GuaDanOrderNo)
|
||||
.All(g => g.StatusCode == "403") ? "全部退房" :
|
||||
_db.GuaDanOrderGuest
|
||||
.Where(g => g.GuaDanOrderNo == a.GuaDanOrderNo)
|
||||
.Any(g => g.StatusCode == "401") ? "正在入住" :
|
||||
"混合狀態"
|
||||
})
|
||||
.Skip((search.page - 1) * search.pageSize)
|
||||
.Take(search.pageSize)
|
||||
@@ -81,7 +98,7 @@ public class guadanOrderController : ApiController
|
||||
.FirstOrDefaultAsync();
|
||||
if (order == null)
|
||||
{
|
||||
return BadRequest("未找到对应订单");
|
||||
return BadRequest("未找到對應訂單");
|
||||
}
|
||||
var result = new
|
||||
{
|
||||
@@ -115,7 +132,7 @@ public class guadanOrderController : ApiController
|
||||
}
|
||||
if (model.Uuid.HasValue)
|
||||
{
|
||||
return BadRequest("已存在对应挂单资料");
|
||||
return BadRequest("已存在對應掛單資料");
|
||||
}
|
||||
try
|
||||
{
|
||||
@@ -174,7 +191,7 @@ public class guadanOrderController : ApiController
|
||||
var order = await _db.GuaDanOrder.FindAsync(model.Uuid.Value);
|
||||
if (order == null)
|
||||
{
|
||||
return BadRequest("未找到对应挂单资料");
|
||||
return BadRequest("未找到對應掛單資料");
|
||||
}
|
||||
order.StartDate = model.startdate;
|
||||
order.EndDate = model.enddate;
|
||||
@@ -194,9 +211,9 @@ public class guadanOrderController : ApiController
|
||||
{
|
||||
return NotFound();
|
||||
}
|
||||
if(_db.GuaDanOrderGuest.Any(a => a.GuaDanOrderNo == guadan.GuaDanOrderNo) )
|
||||
if (_db.GuaDanOrderGuest.Any(a => a.GuaDanOrderNo == guadan.GuaDanOrderNo))
|
||||
{
|
||||
return BadRequest($"该挂单已经存在挂单莲友,不能取消!");
|
||||
return BadRequest($"該掛單已經存在掛單蓮友,不能取消!");
|
||||
}
|
||||
using (var transaction = _db.Database.BeginTransaction())
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user