Quellcode durchsuchen

好哒押金队列启动,正常运行

lcl vor 1 Tag
Ursprung
Commit
2e8e973944

+ 7 - 0
Model/Database/HdDepositRecord.cs

@@ -103,6 +103,13 @@ namespace Model
         public int version { get; set; }
 
 
+        /// <summary>
+        /// 商户入网日期
+        /// </summary>
+        [SugarColumn(ColumnDescription = "商户入网日期", ColumnName = "through_date")]
+        public string? throughDate { get; set; }
+
+
 
     }
 }

+ 6 - 0
Model/Vo/Admin/GetHdDepositRecordListVo.cs

@@ -61,6 +61,12 @@ namespace Vo.Admin
         public string mchtNo { get; set; }
 
 
+        /// <summary>
+        /// 商户入网日期
+        /// </summary>
+        public string throughDate { get; set; }
+
+
 
     }
 }

+ 6 - 0
Model/Vo/Admin/GetHdDepositRecordQueryVo.cs

@@ -61,6 +61,12 @@ namespace Vo.Admin
         public string mchtNo { get; set; }
 
 
+        /// <summary>
+        /// 商户入网日期
+        /// </summary>
+        public string throughDate { get; set; }
+
+
 
     }
 }

+ 1 - 1
Services/HdDepositRecordService.cs

@@ -26,7 +26,7 @@ namespace Services
             //拼装查询条件
             var predicate = Expressionable.Create<HdDepositRecord>();
             predicate = predicate.AndIF(!string.IsNullOrEmpty(param.effectiveTime), m => m.effectiveTime.Contains(param.effectiveTime));
-            predicate = predicate.AndIF(!string.IsNullOrEmpty(param.settleType), m => m.settleType.Contains(param.settleType));
+            predicate = predicate.AndIF(!string.IsNullOrEmpty(param.deviceType), m => m.deviceType.Contains(param.deviceType));
             predicate = predicate.AndIF(!string.IsNullOrEmpty(param.channelKind), m => m.channelKind.Contains(param.channelKind));
             predicate = predicate.AndIF(!string.IsNullOrEmpty(param.snNo), m => m.snNo.Contains(param.snNo));
             predicate = predicate.AndIF(!string.IsNullOrEmpty(param.depositAmount), m => m.depositAmount.Contains(param.depositAmount));

+ 2 - 0
Task/HaoDaHelper.cs

@@ -133,6 +133,8 @@ public class HaoDaHelper
                 var depositService = App.GetService<IHdDepositRecordService>();
                 depositService.addHdDepositRecord(item);
                 
+                // sn,商户编号,设备型号,激活时间,押金金额,奖励金额,奖励发放时间,发放人姓名,商户名称,审核通过日期,商户类型,押金活动编号
+                // 00005702380117353402,066510109001394,BOXPOS 808S,20250323,68,50,20250323,蒲晓敏,成都市周成建眼镜店,20250321,0011A4,None
                 string data = item.snNo + "," + item.mchtNo + "," + item.deviceType + "," + item.effectiveTime + "," + item.depositAmount + ",0," + item.effectiveTime + ",蒲晓敏," + item.mchtNm + "," + item.effectiveTime + "," + item.channelKind + "," + item.activityId;
                 RedisServer.Cache.LPush("ListenDepositDataByOneQueue", data);
             }