奖励金额配置区分奖励代码

Model/Database/PriListAmountSet.cs

@@ -87,6 +87,13 @@ namespace Model
         public string? prizeSourceField { get; set; }
 
 
+        /// <summary>
+        /// 奖励代码
+        /// </summary>
+        [SugarColumn(ColumnDescription = "奖励代码", Length = 50, ColumnName = "prize_code")]
+        public string? prizeCode { get; set; }
+
+
 
     }
 }

Model/Database/PriRecord.cs

@@ -94,6 +94,13 @@ namespace Model
         public string? requestParamField { get; set; }
 
 
+        /// <summary>
+        /// 奖励代码
+        /// </summary>
+        [SugarColumn(ColumnDescription = "奖励代码", Length = 50, ColumnName = "prize_code")]
+        public string? prizeCode { get; set; }
+
+
 
     }
 }

Model/Vo/Admin/GetPriListAmountSetQueryVo.cs

@@ -37,6 +37,12 @@ namespace Vo.Admin
         public string prizeSourceField { get; set; }
 
 
+        /// <summary>
+        /// 奖励代码
+        /// </summary>
+        public string prizeCode { get; set; }
+
+
 
     }
 }

Model/Vo/Admin/GetPriRecordQueryVo.cs

@@ -43,6 +43,12 @@ namespace Vo.Admin
         public string requestParamField { get; set; }
 
 
+        /// <summary>
+        /// 奖励代码
+        /// </summary>
+        public string prizeCode { get; set; }
+
+
 
     }
 }

Util/PrizeDo.cs

@@ -1443,6 +1443,7 @@ namespace Util
             var prizeContent = sub.prizeContent; //奖励内容
             var conditionMode = sub.conditionMode; //条件模式
             var recursionFlag = sub.recursionFlag; //是否递归
+            var prizeCode = sub.prizeCode; //奖励代码
             
             bool op = false;
             var groupNos = conditionService.GetList(m => m.listId == sub.id).ToList().Select(m => m.groupNo).Distinct().ToList();
@@ -1824,6 +1825,7 @@ namespace Util
                 {
                     prizePercent = amountSet.prizePercent;
                     prizeAmount = amountSet.prizeAmount;
+                    prizeCode = amountSet.prizeCode;
                 }
                 if(prizeSourceData.Contains(","))
                 {
@@ -1833,6 +1835,7 @@ namespace Util
                     {
                         prizePercent = amountSet.prizePercent;
                         prizeAmount = amountSet.prizeAmount;
+                        prizeCode = amountSet.prizeCode;
                         prizeSourceData = prizeSourceData.Split(',')[1];
                     }
                 }
@@ -1846,7 +1849,7 @@ namespace Util
                     setLogPrizeAmount(sub.id, prizeAmt);
                     var req = getRequestParams(projectId, content);
                     var requestParamField = req[sub.requestParamField];
-                    var sendFlag = recordService.Any(m => m.prizeObjId == prizeObjectId && m.listId == sub.id && m.requestParamField == content); //TODO: 增加奖励去重判断字段（奖励类型:prize_code）
+                    var sendFlag = recordService.Any(m => m.prizeObjId == prizeObjectId && m.listId == sub.id && m.prizeCode == prizeCode && m.requestParamField == content);
                     if(!sendFlag)
                     {
                         PriRecord item = new PriRecord()
@@ -1855,6 +1858,7 @@ namespace Util
                             projectId = projectId,
                             listId = sub.id,
                             prizeAmount = prizeAmt,
+                            prizeCode = prizeCode,
                             prizeObjId = prizeObjectId,
                             requestParamField = content,
                             batchNo = batchNo,