|
@@ -122,7 +122,7 @@ public class RedPackApplication : IRedPackApplication, IScopeDependency
|
|
|
PhoneNumber = order.FromPhone,
|
|
|
No = order.No,
|
|
|
PickupStatus = ERedPackPickupStatus.Unreceived,
|
|
|
- DistributionState = EReadPackSendStatus.Unsend,
|
|
|
+ DistributionState = EReadPackSendStatus.Successful,
|
|
|
};
|
|
|
if (redPackAudit.ApprovedAmount.HasValue)
|
|
|
entity.Amount = redPackAudit.ApprovedAmount.Value;
|
|
@@ -513,10 +513,11 @@ public class RedPackApplication : IRedPackApplication, IScopeDependency
|
|
|
.WhereIF(dto.IsReceive.HasValue && dto.IsReceive == true, m => m.PickupStatus == ERedPackPickupStatus.Received)
|
|
|
.WhereIF(dto.IsReceive.HasValue && dto.IsReceive == false, m => m.PickupStatus == ERedPackPickupStatus.Unreceived)
|
|
|
.WhereIF(dto.BeginCreationTime.HasValue && dto.EndCreationTime.HasValue, m => m.CreationTime >= dto.BeginCreationTime && m.CreationTime <= dto.EndCreationTime)
|
|
|
- .Select(m => new SnapshotRedPackRecordSendOutDto
|
|
|
+ .Select((m, snapshot, order) => new SnapshotRedPackRecordSendOutDto
|
|
|
{
|
|
|
OrderId = m.OrderId,
|
|
|
- UserType = m.PeopleType
|
|
|
+ UserType = m.PeopleType,
|
|
|
+ IndustryName = snapshot.IndustryName
|
|
|
}, true);
|
|
|
return query;
|
|
|
}
|