瀏覽代碼

Merge branch 'feature/snapshot' into test

qinchaoyue 3 月之前
父節點
當前提交
e736b3a9be

+ 2 - 1
src/Hotline.Application.Tests/appsettings.Development.json

@@ -68,7 +68,8 @@
         }
     },
     "ConnectionStrings": {
-        "Hotline": "PORT=5432;DATABASE=hotline_dev;HOST=110.188.24.182;PASSWORD=fengwo11!!;USER ID=dev;",
+         "Hotline": "PORT=5432;DATABASE=hotline_dev;HOST=110.188.24.182;PASSWORD=fengwo11!!;USER ID=dev;",
+        //"Hotline": "PORT=5432;DATABASE=hotline;HOST=110.188.24.182;PASSWORD=fengwo11!!;USER ID=dev;",
         "CAP": "PORT=5432;DATABASE=fwmq;HOST=110.188.24.182;PASSWORD=fengwo11!!;USER ID=dev;Search Path=cap"
         //"Hotline": "PORT=5432;DATABASE=hotline;HOST=110.188.24.182;PASSWORD=fengwo11!!;USER ID=dev;"
     },

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

@@ -481,6 +481,7 @@ public class RedPackApplication : IRedPackApplication, IScopeDependency
             .WhereIF(dto.SendStatus.HasValue, m => m.DistributionState == dto.SendStatus)
             .WhereIF(dto.IsReceive.HasValue && dto.IsReceive == true, m => m.PickupStatus == ERedPackPickupStatus.Received)
             .WhereIF(dto.IsReceive.HasValue && dto.IsReceive == false, m => m.PickupStatus == ERedPackPickupStatus.Unreceived)
+            .WhereIF(dto.BeginCreationTime.HasValue && dto.EndCreationTime.HasValue, m => m.CreationTime >= dto.BeginCreationTime && m.CreationTime <= dto.EndCreationTime)
             .Select(m => new SnapshotRedPackRecordSendOutDto(), true);
         return query;
     }

+ 10 - 0
src/Hotline.Share/Dtos/Snapshot/RedPackRecordDto.cs

@@ -136,6 +136,16 @@ public record SnapshotRedPackRecordSendInDto : PagedRequest
     /// 是否补领
     /// </summary>
     public bool? IsReplace { get; set; }
+
+    /// <summary>
+    /// 发放时间开始
+    /// </summary>
+    public DateTime? BeginCreationTime { get; set; }
+
+    /// <summary>
+    /// 发放时间结束
+    /// </summary>
+    public DateTime? EndCreationTime { get; set; }
 }
 
 public record SnapshotRedPackRecordItemsGuiderInDto : SnapshotRedPackRecordItemsInDto