lcl 2 月之前
父節點
當前提交
53480f9cc6
共有 4 個文件被更改,包括 7 次插入8 次删除
  1. 二進制
      .DS_Store
  2. 1 1
      Model/Database/PriPrizeInField.cs
  3. 4 4
      Program.cs
  4. 2 3
      Util/PrizeDo.cs

二進制
.DS_Store


+ 1 - 1
Model/Database/PriPrizeInField.cs

@@ -76,7 +76,7 @@ namespace Model
         /// <summary>
         /// 匹配值
         /// </summary>
-        [SugarColumn(ColumnDescription = "匹配值", Length = 500, ColumnName = "field_query_value")]
+        [SugarColumn(ColumnDescription = "匹配值", Length = 2000, ColumnName = "field_query_value")]
         public string? fieldQueryValue { get; set; }
 
 

+ 4 - 4
Program.cs

@@ -122,17 +122,17 @@ 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("QUEUE_KXS_MACHINE_PRIZE_CONFIG_DIVISION", "{\"brand_id\":23,\"pos_sn\":\"1453360005\",\"user_id\":264331}");
 // PrizeDo.sendPrize("QUEUE_KXS_WIFI_PRIZE_CONFIG_DIVISION", "{\"brand_id\":24,\"pos_sn\":\"126800303190\",\"user_id\":192332}");
 // PrizeDo.sendPrize(4, "{\"PosSn\":\"CS00000000015859\"}");
 // PrizeDo.sendPrize("QUEUE_KXS_HAODA_PRIZE_CONFIG_DIVISION", "{\"brand_id\":19,\"pos_sn\":\"00000102249QCQF02551\",\"user_id\":192332}");
 // PrizeDo.sendPrize(6, "{\"PosSn\":\"1152131239\"}");
-// PrizeDo.sendPrize("QUEUE_KXS_PRIZE_MALL_CONFIG_DIVISION", "{\"order_id\":602782,\"user_id\":208124}");
+// PrizeDo.sendPrize("QUEUE_KXS_PRIZE_MALL_CONFIG_DIVISION", "{\"order_id\":602804,\"user_id\":264331}");
 // PrizeDo.sendPrize(7, "{\"OrderNo\":\"BM2024090817330511847441249\"}");
 // PrizeDo.sendPrize(7, "{\"OrderNo\":\"BM2024090817360962275551251\"}");
-// PrizeDo.sendPrize("KXS_LEADER_STA_PRIZE", "{\"month\":\"202411\"}");
+PrizeDo.sendPrize("KXS_LEADER_STA_PRIZE", "{\"month\":\"202411\"}");
 
-RabbitMQClient.Instance.Start();
+// RabbitMQClient.Instance.Start();
 
 // CopyProject.Copy(5, 7);
 

+ 2 - 3
Util/PrizeDo.cs

@@ -1114,7 +1114,6 @@ namespace Util
             var recursionFlag = sub.recursionFlag; //是否递归
             setLogStep(sub.id, "是否递归", recursionFlag ? "是" : "否");
             Function.WriteLog(batchNo + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss.fff") + "-s4", "接收mq数据日志");
-            //TODO: 外部查询数据日志重复,需要精简
             bool check = prizeSendDo(projectId, sub, prizeObjectId, content, new PriLoopSet(), startData);
             if(check)
             {
@@ -1511,7 +1510,7 @@ namespace Util
                             loopLog.Add("匹配结果", prizeFlag);
                             if(prizeFlag)
                             {
-                                prizeAck(projectId, sub, prizeObjectId, content, new PriLoopSet(), rootCondiDic, startData);
+                                prizeAck(projectId, sub, objId, content, new PriLoopSet(), rootCondiDic, startData);
                                 op = afterPrizeFlag;
                             }
                             Function.WriteLog(batchNo + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss.fff") + "-loop-in-3", "接收mq数据日志");
@@ -2100,7 +2099,7 @@ namespace Util
                             status = 1;
                         }
                         Function.WriteLog(status.ToString(), "通知返回报文");
-                        var sendItem = recordService.GetFirst(m => m.prizeObjId == prizeObjectId && m.listId == sub.id && m.requestParamField == content);
+                        var sendItem = recordService.GetFirst(m => m.prizeObjId == prizeObjectId && m.listId == sub.id && m.requestParamField == content && m.status == 0);
                         if(sendItem != null)
                         {
                             Function.WriteLog("in", "通知返回报文");