|
|
@@ -392,7 +392,7 @@ public class RedPackApplication : IRedPackApplication, IScopeDependency
|
|
|
.LeftJoin<RedPackRecord>((redPackAudit, order, snapshot, record) => redPackAudit.Id == record.OrderId)
|
|
|
.LeftJoin<Industry>((redPackAudit, order, snapshot, record, industry) => snapshot.IndustryId == industry.Id)
|
|
|
.LeftJoin<IndustryCase>((redPackAudit, order, snapshot, record, industry, industryCase) => snapshot.IndustryCase == industryCase.Id)
|
|
|
- .Where((redPackAudit, order, snapshot, record, industry) => (order.HotspotId == null || order.HotspotId.StartsWith("18") == false) && order.Status >= EOrderStatus.Filed)
|
|
|
+ .Where((redPackAudit, order, snapshot, record, industry) => order.Status >= EOrderStatus.Filed)
|
|
|
.WhereIF(dto.No.NotNullOrEmpty(), (redPackAudit, order, snapshot, record, industry) => order.No.Contains(dto.No))
|
|
|
.WhereIF(dto.Title.NotNullOrEmpty(), (redPackAudit, order, snapshot, record, industry) => order.Title.Contains(dto.Title))
|
|
|
.WhereIF(dto.FromPhone.NotNullOrEmpty(), (redPackAudit, order, snapshot, record, industry) => order.FromPhone.Contains(dto.FromPhone))
|
|
|
@@ -408,7 +408,8 @@ public class RedPackApplication : IRedPackApplication, IScopeDependency
|
|
|
.WhereIF(dto.AcutalAmount.HasValue, (redPackAudit, order, snapshot, record, industry) => redPackAudit.AcutalAmount == dto.AcutalAmount)
|
|
|
.WhereIF(dto.ApprovedAmount.HasValue, (redPackAudit, order, snapshot, record, industry) => redPackAudit.ApprovedAmount == dto.ApprovedAmount)
|
|
|
.WhereIF(dto.IsDanger.HasValue, (redPackAudit, order, snapshot, record, industry) => snapshot.IsDanger == dto.IsDanger)
|
|
|
- .WhereIF(status.HasValue, (redPackAudit, order, snapshot, record, industry) => redPackAudit.Status == status)
|
|
|
+ .WhereIF(status.HasValue && status != ERedPackAuditStatus.Agree, (redPackAudit, order, snapshot, record, industry) => redPackAudit.Status == status && (order.HotspotId == null || order.HotspotId.StartsWith("18") == false))
|
|
|
+ .WhereIF(status.HasValue && status == ERedPackAuditStatus.Agree, (redPackAudit, order, snapshot, record, industry) => redPackAudit.Status == ERedPackAuditStatus.Agree || record.PickupStatus == ERedPackPickupStatus.Received)
|
|
|
.OrderByDescending((redPackAudit, order, snapshot, record, industry) => redPackAudit.CreationTime)
|
|
|
.Select((redPackAudit, order, snapshot, record, industry, industryCase) => new SnapshotOrderAuditItemsOutDto
|
|
|
{
|
qinchaoyue