调整日志展示

奖励发放回调

Controllers/Admin/Pri/PriLogController.cs

@@ -6,6 +6,7 @@ using Model.Base;
 using Vo.Admin;
 using Mapster;
 using Infrastructure;
+using Common;
 
 
 namespace Controllers.Admin
@@ -54,6 +55,7 @@ namespace Controllers.Admin
         public IActionResult getPriLogQuery([FromQuery] PriLog param)
         {
             var response = _PriLogService.GetFirst(m => m.id == param.id).Adapt<GetPriLogQueryVo>();
+            response.stepList = "{" + Function.CheckNull(response.stepList).TrimEnd(',') + "}";
             return SUCCESS(response);
         }
 

Model/Vo/Admin/GetPriLogListVo.cs

@@ -14,21 +14,21 @@ namespace Vo.Admin
 
 
         /// <summary>
-        /// 配置ID
+        /// 状态
         /// </summary>
-        public int listId { get; set; }
+        public int status { get; set; }
 
 
         /// <summary>
-        /// 发放对象
+        /// 配置ID
         /// </summary>
-        public string prizeObjId { get; set; }
+        public int listId { get; set; }
 
 
         /// <summary>
-        /// 日志说明
+        /// 发放对象
         /// </summary>
-        public string logSummary { get; set; }
+        public string prizeObjId { get; set; }
 
 
         /// <summary>
@@ -85,6 +85,12 @@ namespace Vo.Admin
         public string errLog { get; set; }
 
 
+        /// <summary>
+        /// 创建时间
+        /// </summary>
+        public DateTime? createDate { get; set; }
+
+
 
     }
 }

Model/Vo/Admin/GetPriLogQueryVo.cs

@@ -37,6 +37,12 @@ namespace Vo.Admin
         public string batchNo { get; set; }
 
 
+        /// <summary>
+        /// 奖励条件明细
+        /// </summary>
+        public string stepList { get; set; }
+
+
 
     }
 }

Model/Vo/Admin/GetPriRecordListVo.cs

@@ -43,6 +43,12 @@ namespace Vo.Admin
         public string requestParamField { get; set; }
 
 
+        /// <summary>
+        /// 创建时间
+        /// </summary>
+        public DateTime? createDate { get; set; }
+
+
 
     }
 }

Util/PrizeDo.cs

@@ -600,7 +600,7 @@ namespace Util
                     if(recursionFlag)
                     {
                         List<QueryCondition> queryCondiDic = condition(sub.id, projectId, Tools.SpitIntArrary(sub.queryTableIdList, ',').ToList(), content);
-                        setLogStep(sub.id, "查询原始数据", queryCondiDic);                    
+                        setLogStep(sub.id, "查询原始数据", queryCondiDic);
                         var loopSet = loopSetService.GetFirst(m => m.listId == sub.id) ?? new PriLoopSet();
                         var recursionStartTable = recursionStartTableService.GetFirst(m => m.listId == sub.id) ?? new PriRecursionStartTable();
                         var tableEnName = loopSet.tableEnName; //递归查询表
@@ -1425,22 +1425,32 @@ namespace Util
                             listId = sub.id,
                             prizeAmount = prizeAmt,
                             prizeObjId = prizeObjectId,
-                            requestParamField = requestParamField,
+                            requestParamField = content,
                             batchNo = batchNo,
                         };
                         recordService.Add(item);
-                        setLogFieldValue(sub.id, "prizeOutContent", Newtonsoft.Json.JsonConvert.SerializeObject(item));
+                        string prizeOutContent = Newtonsoft.Json.JsonConvert.SerializeObject(item);
+                        setLogFieldValue(sub.id, "prizeOutContent", prizeOutContent);
                         setLogFieldValue(sub.id, "prizeOutUrl", project.noticeUrl);
                         loopAmount = getPrizeAmount;
-                        prizeToDatabase(projectId, sub.id, content, condiDic, prizeAmt); //入库
+                        if(project.requestMode == "http" && !string.IsNullOrEmpty(project.noticeUrl))
+                        {
+                            Function.PostWebRequest(project.noticeUrl, prizeOutContent, "application/json");
+                        }
+                        else if(project.requestMode == "mq")
+                        {}
+                        else
+                        {
+                            prizeToDatabase(projectId, sub.id, content, condiDic, prizeAmt); //入库
+                        }
                     }
                 }
             }
 
-            if(!sub.recursionFlag)
-            {
+            // if(!sub.recursionFlag)
+            // {
                 setLogStatus(sub.id, op ? 1 : 0);
-            }
+            // }
             return prizeAmt;
         }