Merge branch 'feature/snapshot' into dev

src/Hotline.Application/Snapshot/RedPackApplication.cs

@@ -758,6 +758,12 @@ public class RedPackApplication : IRedPackApplication, IScopeDependency
         return outDto;
     }
 
+    /// <summary>
+    /// 获取补充发放记录基础数据
+    /// </summary>
+    /// <param name="v"></param>
+    /// <param name="orderId"></param>
+    /// <returns></returns>
     public async Task<GetRedPackRecordBaseDataOutDto> GetRedPackRecordBaseDataAsync(string orderId)
     {
         var snapshot = await _orderSnapshotRepository.Queryable()
@@ -768,7 +774,6 @@ public class RedPackApplication : IRedPackApplication, IScopeDependency
                 m.AwardBankCardNo,
                 m.AwardOpenBank,
                 m.AwardName,
-                m.AwardAmount
             })
             .FirstAsync();
         var outDto = new GetRedPackRecordBaseDataOutDto();
@@ -777,7 +782,6 @@ public class RedPackApplication : IRedPackApplication, IScopeDependency
             outDto.BankCardNo = snapshot.AwardBankCardNo;
             outDto.OpenBank = snapshot.AwardOpenBank;
             outDto.Name = snapshot.AwardName;
-            outDto.Amount = snapshot.AwardAmount;
         }
         var audit = await _specialRedPackAuditRepository.Queryable().Where(m => m.OrderId == orderId).FirstAsync()
             ?? throw new UserFriendlyException("审核记录不存在");
@@ -786,6 +790,7 @@ public class RedPackApplication : IRedPackApplication, IScopeDependency
             outDto.AuditType = audit.AuditType;
             outDto.AuditTypeCode = audit.AuditTypeCode;
             outDto.RedPackAuditId = audit.Id;
+            outDto.Amount = audit.ApprovedAmount;
         }
         outDto.OrderId = orderId;
         outDto.ReplenishType = _systemDic.SnapshotReplenishType;

test/Hotline.Tests/Application/OrderSnapshotApplicationTest.cs

@@ -191,6 +191,7 @@ public class OrderSnapshotApplicationTest : TestBase
                  var baseData = await _redPackApplication.GetRedPackRecordBaseDataAsync(order.Id);
                 baseData.AuditType.ShouldNotBeNull();
                 baseData.AuditTypeCode.ShouldNotBeNull();
+                baseData.Amount.ShouldBeNull();
             })
             .GetCreateResult();
         order.Id.ShouldNotBeNull();

test/Hotline.Tests/Mock/OrderServiceMock.cs

@@ -496,7 +496,7 @@ public class OrderServiceMock
         var inDto = new UpdateRedPackSpecialAuditInDto
         {
             AuditTypeId = basedata.Id,
-            ApprovedAmount = approvedAmount,
+            ApprovedAmount = double.Parse(basedata.DicDataName.Split('|')[1]),
             RedPackAuditId = item.RedPackAuditId,
             Status = ERedPackAuditStatus.Agree,
             Opinion = "红包审核通过",