调整

Program.cs

@@ -122,14 +122,14 @@ app.MapControllers();
 
 // PrizeDo.sendPrize(1, "{\"PosSn\":\"00005702880118401003\"}");
 // PrizeDo.sendPrize(1, "{\"PosSn\":\"00003102722406215502730\"}");
-// PrizeDo.sendPrize(4, "{\"PosSn\":\"89861500232320207957\"}");
+// PrizeDo.sendPrize(4, "{\"PosSn\":\"CS00000000015859\"}");
 // PrizeDo.sendPrize(5, "{\"PosSn\":\"00000302T1NL90664172\"}");
 // PrizeDo.sendPrize(6, "{\"PosSn\":\"1152131239\"}");
-// PrizeDo.sendPrize(3, "{\"OrderNo\":\"BM2024090922074280346374786\"}");
+// PrizeDo.sendPrize(3, "{\"OrderNo\":\"BM2024092716134457308682404\"}");
 // PrizeDo.sendPrize(7, "{\"OrderNo\":\"BM2024090817330511847441249\"}");
 // PrizeDo.sendPrize(7, "{\"OrderNo\":\"BM2024090817360962275551251\"}");
 
-RabbitMQClient.Instance.Start();
+// RabbitMQClient.Instance.Start();
 
 // PrizeDo.sendPrize("{\"prize_tag\":\"1\",\"content\":\"{\\\"PosSn\\\":\\\"00002402045980195457\\\"}\"}");
 

Util/PrizeDo.cs

@@ -590,7 +590,6 @@ namespace Util
                             var conditions = recursionStartConditionService.GetList(m => m.loopSetId == loopSet.id);
                             if(conditions.Count > 0)
                             {
-                                MergeCondiDic(condiDic, queryCondiDic);
                                 int allCount = conditions.Count; //所有奖励条件数
                                 int passCount = 0; //通过条件数
                                 foreach(var condition in conditions)
@@ -798,8 +797,8 @@ namespace Util
                                             }
                                             else if(fieldQueryModel == "query_field")
                                             {                                                
-                                                valLeft = GetComputeVal(condiDic, valLeft);
-                                                valRight = GetComputeVal(condiDic, valRight);
+                                                valLeft = GetComputeVal(queryCondiDic, valLeft);
+                                                valRight = GetComputeVal(queryCondiDic, valRight);
                                                 if(fieldQueryValueType == "number")
                                                 {
                                                     if(!string.IsNullOrEmpty(valLeft) && !string.IsNullOrEmpty(valRight) && decimal.Parse(checkObj) >= decimal.Parse(Function.CheckNum(valLeft)) && decimal.Parse(Function.CheckNum(checkObj.ToString())) <= decimal.Parse(Function.CheckNum(valRight))) 
@@ -1692,6 +1691,10 @@ namespace Util
                         {
                             condi += "'%" + fieldQueryValue + "%'";
                         }
+                        else if(fieldQueryModel == "query_field")
+                        {
+                            condi += "'%" + GetQueryTableData(condiDic, fieldQueryValue) + "%'";
+                        }
                     }
                     else if(fieldQueryKind == "2") //精确匹配
                     {
@@ -1706,6 +1709,10 @@ namespace Util
                         {
                             val = fieldQueryValue;
                         }
+                        else if(fieldQueryModel == "query_field")
+                        {
+                            val = GetQueryTableData(condiDic, fieldQueryValue);
+                        }
                         if(fieldQueryValueType == "text")
                         {
                             val = "'" + val + "'";
@@ -1747,6 +1754,20 @@ namespace Util
                                 }
                             }
                         }
+                        else if(fieldQueryModel == "query_field")
+                        {
+                            foreach(string sub in valList)
+                            {
+                                if(fieldQueryValueType == "text")
+                                {
+                                    val += "'" + GetQueryTableData(condiDic, sub) + "',";
+                                }
+                                else
+                                {
+                                    val += GetQueryTableData(condiDic, sub) + ",";
+                                }
+                            }
+                        }
                         else if(fieldQueryModel == "db_field")
                         {
                             foreach(string sub in valList)