Pārlūkot izejas kodu

Merge branch 'feature/snapshot' into test

qinchaoyue 3 nedēļas atpakaļ
vecāks
revīzija
adbda28e8d

+ 2 - 1
src/Hotline.Application/Snapshot/RedPackApplication.cs

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