Эх сурвалжийг харах

Merge branch 'test' of http://110.188.24.182:10023/Fengwo/hotline into test

tangjiang 4 долоо хоног өмнө
parent
commit
968ae02b71

+ 4 - 0
src/Hotline.Application/Snapshot/RedPackApplication.cs

@@ -341,6 +341,7 @@ public class RedPackApplication : IRedPackApplication, IScopeDependency
                             AuditRemark = special.AuditRemark,
                             BankCardNo = supplement.BankCardNo,
                             OpenBank = supplement.OpenBank,
+                            AwardName = supplement.Name,
                             AuditStatus = special.Status,
                         });
 #if DEBUG
@@ -618,6 +619,7 @@ public class RedPackApplication : IRedPackApplication, IScopeDependency
             .Then(async audit =>
             {
                 var orderNo = await _orderRepository.Queryable().Where(m => m.Id == audit.OrderId).Select(m => m.No).FirstAsync();
+                var auditTypeId = _systemDic.SnapshotRedPackSpecialType.FirstOrDefault(m => m.DicDataName.StartsWith(dto.AuditType))?.DicDataValue;
 
                 var entity = dto.Adapt<SupplementRecord>();
                 var industryName = await _orderSnapshotRepository.Queryable()
@@ -630,6 +632,8 @@ public class RedPackApplication : IRedPackApplication, IScopeDependency
                 entity.IndustryName = industryName.IndustryName;
                 entity.IndustryId = industryName.IndustryId;
                 entity.ReplenishRemark = dto.ReplenishRemark;
+                entity.AuditType = dto.AuditType;
+                entity.AuditTypeCode = auditTypeId;
                 await _supplementRecordRepository.AddAsync(entity);
 
                 if (dto.IsSendSMS)

+ 2 - 0
src/Hotline.Share/Dtos/Snapshot/RedPackDto.cs

@@ -151,6 +151,8 @@ public class UpdateRedPackRecordInDto
     /// 补充发放类型Id
     /// </summary>
     public string ReplenishTypeId { get; set; }
+
+    public string AuditType { get; set; }
 }