|
|
@@ -3180,6 +3180,20 @@ public class OrderController : BaseController
|
|
|
[HttpGet("history_all")]
|
|
|
public async Task<PagedDto<OrderDto>> QueryAll([FromQuery] QueryOrderHistoryDto dto)
|
|
|
{
|
|
|
+ var query = _orderRepository.Queryable()
|
|
|
+ .WhereIF(!string.IsNullOrEmpty(dto.PhoneNo), d => d.Contact == dto.PhoneNo)
|
|
|
+ .WhereIF(!string.IsNullOrEmpty(dto.OrderId), d => d.Id != dto.OrderId)
|
|
|
+ .WhereIF(!string.IsNullOrEmpty(dto.Keyword), d => d.Title.Contains(dto.Keyword!) || d.No.Contains(dto.Keyword!));
|
|
|
+
|
|
|
+ //随手拍
|
|
|
+ bool.TryParse(
|
|
|
+ _systemSettingCacheManager.GetSetting(SettingConstants.Snapshot)?.SettingValue[0],
|
|
|
+ out bool isSnapshotEnable);
|
|
|
+ if (isSnapshotEnable)
|
|
|
+ {
|
|
|
+
|
|
|
+ }
|
|
|
+
|
|
|
var (total, items) = await _orderRepository.Queryable()
|
|
|
.WhereIF(!string.IsNullOrEmpty(dto.PhoneNo), d => d.Contact == dto.PhoneNo)
|
|
|
.WhereIF(!string.IsNullOrEmpty(dto.OrderId), d => d.Id != dto.OrderId)
|
xf