lcl 3 tháng trước cách đây
mục cha
commit
923f5ebc4f

BIN
.DS_Store


+ 7 - 0
Model/Database/PriList.cs

@@ -150,6 +150,13 @@ namespace Model
         public string? queryTableIdList { get; set; }
 
 
+        /// <summary>
+        /// 重复发放
+        /// </summary>
+        [SugarColumn(ColumnDescription = "重复发放", ColumnName = "repeat_flag")]
+        public bool repeatFlag { get; set; }
+
+
 
     }
 }

+ 7 - 0
Model/Database/PriListAmountSet.cs

@@ -94,6 +94,13 @@ namespace Model
         public string? prizeCode { get; set; }
 
 
+        /// <summary>
+        /// 重复发放
+        /// </summary>
+        [SugarColumn(ColumnDescription = "重复发放", ColumnName = "repeat_flag")]
+        public bool repeatFlag { get; set; }
+
+
 
     }
 }

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

@@ -43,6 +43,12 @@ namespace Vo.Admin
         public string prizeCode { get; set; }
 
 
+        /// <summary>
+        /// 重复发放
+        /// </summary>
+        public bool repeatFlag { get; set; }
+
+
 
     }
 }

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

@@ -97,6 +97,12 @@ namespace Vo.Admin
         public string? queryTableIdList { get; set; }
 
 
+        /// <summary>
+        /// 重复发放
+        /// </summary>
+        public bool repeatFlag { get; set; }
+
+
 
     }
 }

+ 1 - 1
Program.cs

@@ -123,7 +123,7 @@ app.MapControllers();
 app.Urls.Add("http://*:5802");
 
 // PrizeDo.sendPrize("QUEUE_KXS_MACHINE_PRIZE_CONFIG_DIVISION", "{\"brand_id\":12,\"pos_sn\":\"00005702880118407887\",\"user_id\":192332}");
-// PrizeDo.sendPrize(1, "{\"PosSn\":\"00003102722406215502730\"}");
+// PrizeDo.sendPrize("QUEUE_KXS_WIFI_PRIZE_CONFIG_DIVISION", "{\"brand_id\":23,\"pos_sn\":\"1162895007\",\"user_id\":192332}");
 // PrizeDo.sendPrize(4, "{\"PosSn\":\"CS00000000015859\"}");
 // PrizeDo.sendPrize(5, "{\"PosSn\":\"00000302T1NL90664172\"}");
 // PrizeDo.sendPrize(6, "{\"PosSn\":\"1152131239\"}");

+ 6 - 1
Util/PrizeDo.cs

@@ -1799,6 +1799,7 @@ namespace Util
             setLogStep(sub.id, "是否通过", op ? "是" : "否");
             if(op) //满足条件
             {
+                bool repeatFlag = sub.repeatFlag;
                 decimal number = 0;
                 if(prizeSourceField.Contains("/"))
                 {
@@ -1832,6 +1833,7 @@ namespace Util
                     prizePercent = amountSet.prizePercent;
                     prizeAmount = amountSet.prizeAmount;
                     prizeCode = amountSet.prizeCode;
+                    repeatFlag = amountSet.repeatFlag;
                 }
                 if(prizeSourceData.Contains(","))
                 {
@@ -1842,6 +1844,7 @@ namespace Util
                         prizePercent = amountSet.prizePercent;
                         prizeAmount = amountSet.prizeAmount;
                         prizeCode = amountSet.prizeCode;
+                        repeatFlag = amountSet.repeatFlag;
                         prizeSourceData = prizeSourceData.Split(',')[1];
                     }
                 }
@@ -1852,10 +1855,12 @@ namespace Util
                 setLogStep(sub.id, "发放金额", prizeAmt);
                 if(prizeAmt > 0)
                 {
+                    prizeAmt = Util.PublicFunction.NumberFormat(prizeAmt);
                     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.prizeCode == prizeCode && m.requestParamField == content);
+                    var sendFlag = false;
+                    if(!repeatFlag) sendFlag = recordService.Any(m => m.prizeObjId == prizeObjectId && m.listId == sub.id && m.prizeCode == prizeCode && m.requestParamField == content);
                     if(!sendFlag)
                     {
                         PriRecord item = new PriRecord()

+ 19 - 17
Util/PublicFunction.cs

@@ -1,23 +1,25 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Data;
-using System.Text.RegularExpressions;
-using System.IO;
-using System.Web;
-using Microsoft.IdentityModel.Tokens;
-using System.Security.Claims;
-using System.IdentityModel.Tokens.Jwt;
-using System.Text;
-using System.Security.Cryptography;
-using Common;
-
-namespace Util
+namespace Util
 {
     public class PublicFunction
     {
-    
-    
+
+        public static decimal NumberFormat(decimal number, int floatCount = 2)
+        {
+            string str = number.ToString();
+            if (str.Contains("."))
+            {
+                string[] list = str.Split('.');
+                if (list[1].Length > floatCount)
+                {
+                    str = list[0] + "." + list[1].Substring(0, floatCount);
+                }
+            }
+            else
+            {
+                str += ".00";
+            }
+            return decimal.Parse(str);
+        }
     
     }
 }