Procházet zdrojové kódy

审核详情返回统计详情

qinchaoyue před 4 měsíci
rodič
revize
a40edf6109

+ 1 - 1
src/Hotline.Api/Controllers/Snapshot/RedPackController.cs

@@ -40,7 +40,7 @@ public class RedPackController : BaseController
     /// <param name="id">工单Id</param>
     /// <returns></returns>
     [HttpGet("audit/{id}")]
-    public async Task<SnapshotOrderAuditDetailOutDto> GetRedPackAuditDetailAsync([FromQuery]string id)
+    public async Task<SnapshotOrderAuditDetailOutDto> GetRedPackAuditDetailAsync(string id)
         => await _redPackApplication.GetRedPackAuditDetailAsync(id);
 
     /// <summary>

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

@@ -1,11 +1,13 @@
 using Hotline.Orders;
 using Hotline.Share.Dtos.Snapshot;
 using Hotline.Share.Enums.Order;
+using Hotline.Share.Enums.Snapshot;
 using Hotline.Share.Tools;
 using Hotline.Snapshot;
 using Hotline.Snapshot.Interfaces;
 using Mapster;
 using SqlSugar;
+using SqlSugar.Extensions;
 using XF.Domain.Dependency;
 using XF.Domain.Exceptions;
 
@@ -41,8 +43,18 @@ public class RedPackApplication : IRedPackApplication, IScopeDependency
             .Select((i, o) => new { i.Id, i.CitizenReadPackAmount })
             .FirstAsync();
         outDto.Amount = industry.CitizenReadPackAmount;
-        outDto.RedPackTxt = $"15826142797【】元; 今天审批【1】个";
-        //await _redPackAuditRepository.Queryable()
+        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();
+        var query = _redPackAuditRepository.Queryable()
+            .Where(m => m.PhoneNumber == order.FromPhone && m.AuditTime >= dayStart && m.AuditTime <= dayEnd && m.Status == ERedPackAuditStatus.Agree);
+
+        var totalAmount = await query.SumAsync(m => m.ApprovedAmount);
+        if (totalAmount != 0)
+            outDto.RedPackTxt = $"{order.FromPhone}【{totalAmount}】元; ";
+        var count = await query.CountAsync();
+        if (count != 0)
+            outDto.RedPackTxt += $"今天审批【{count}】个";
 
         return outDto;
     }

+ 6 - 0
src/Hotline/Snapshot/RedPackAudit.cs

@@ -25,6 +25,12 @@ public class RedPackAudit : CreationSoftDeleteEntity
     [SugarColumn(ColumnDescription = "关联工单编号")]
     public string OrderId { get; set; }
 
+    /// <summary>
+    /// 领取手机号码
+    /// </summary>
+    [SugarColumn(ColumnDescription = "领取红包手机号码")]
+    public string PhoneNumber { get; set; }
+
     /// <summary>
     /// 审核状态
     /// </summary>