Parcourir la source

Merge branch 'feature/snapshot' into dev

qinchaoyue il y a 3 mois
Parent
commit
1208656fa6

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

@@ -822,7 +822,7 @@ public abstract class SnapshotApplicationBase
     /// <summary>
     /// 生成用户红包审核数据
     /// </summary>
-    /// <param name="id"></param>
+    /// <param name="orderId">工单Id</param>
     /// <param name="cancellationToken"></param>
     /// <returns></returns>
     public async Task<string> AddRedPardAsync(string orderId, CancellationToken cancellationToken)
@@ -851,6 +851,7 @@ public abstract class SnapshotApplicationBase
         guiderAudit.ShouldAmount = industry.GuiderReadPackAmount;
         guiderAudit.PhoneNumber = snapshot.MemberMobile;
         guiderAudit.LevelTwoStatus = ERedPackAuditStatus.Pending;
+        guiderAudit.ApprovedAmount = industry.GuiderReadPackAmount;
         await _redPackGuiderAuditRepository.AddAsync(guiderAudit, cancellationToken);
         return "ok";
     }

+ 7 - 0
test/Hotline.Tests/Application/OrderSnapshotApplicationTest.cs

@@ -118,6 +118,13 @@ public class OrderSnapshotApplicationTest : TestBase
             .发布工单(SetZuoXi, inputLable.Select(m => new Kv(m.DicDataName, m.DicDataName)).ToList())
             .部门审核网格员红包(Set政法委)
             .部门审核网格员红包(Set应急管理局)
+            .StepHandle(async order => 
+            {
+                var redPackRecord = _redPackRecordRepository.Queryable()
+                .Where(m => m.OrderId == order.Id && m.PeopleType == EReadPackUserType.Guider)
+                .First();
+                redPackRecord.Amount.ShouldNotBe(0);
+            })
             .部门审核市民红包(Set应急管理局)
             .StepHandle(async order => {
                 var redPackAudit = _redPackAuditRepository.Queryable().Where(m => m.OrderId == order.Id).First();