|
@@ -245,12 +245,13 @@ public class RedPackApplication : IRedPackApplication, IScopeDependency
|
|
var outDto = new SnapshotOrderAuditDetailOutDto { Order = order.Adapt<SnapshotOrderAuditOrderDetailOutDto>() };
|
|
var outDto = new SnapshotOrderAuditDetailOutDto { Order = order.Adapt<SnapshotOrderAuditOrderDetailOutDto>() };
|
|
var industry = await _industryRepository.Queryable(includeDeleted: true)
|
|
var industry = await _industryRepository.Queryable(includeDeleted: true)
|
|
.LeftJoin<OrderSnapshot>((i, o) => i.Id == o.IndustryId)
|
|
.LeftJoin<OrderSnapshot>((i, o) => i.Id == o.IndustryId)
|
|
- .Select((i, o) => new { i.Id, i.CitizenReadPackAmount, i.ArgeePoints, i.ExtraDeductedPoints, i.RefusePoints })
|
|
|
|
|
|
+ .Select((i, o) => new { i.Id, i.CitizenReadPackAmount, i.ArgeePoints, i.ExtraDeductedPoints, i.RefusePoints , i.IsPoints})
|
|
.FirstAsync();
|
|
.FirstAsync();
|
|
outDto.Amount = industry.CitizenReadPackAmount;
|
|
outDto.Amount = industry.CitizenReadPackAmount;
|
|
outDto.ArgeePoints = industry.ArgeePoints;
|
|
outDto.ArgeePoints = industry.ArgeePoints;
|
|
outDto.ExtraDeductedPoints = industry.ExtraDeductedPoints;
|
|
outDto.ExtraDeductedPoints = industry.ExtraDeductedPoints;
|
|
outDto.RefusePoints = industry.RefusePoints;
|
|
outDto.RefusePoints = industry.RefusePoints;
|
|
|
|
+ outDto.IsPoints = industry.IsPoints;
|
|
outDto.RedPackTxt = $"{order.FromPhone}【】元; ";
|
|
outDto.RedPackTxt = $"{order.FromPhone}【】元; ";
|
|
var dayStart = DateTime.Now.ToString("yyyy-MM-dd 00:00:00").ObjToDate();
|
|
var dayStart = DateTime.Now.ToString("yyyy-MM-dd 00:00:00").ObjToDate();
|
|
var dayEnd = DateTime.Now.ToString("yyyy-MM-dd 23:59:59").ObjToDate();
|
|
var dayEnd = DateTime.Now.ToString("yyyy-MM-dd 23:59:59").ObjToDate();
|