|
@@ -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数据日志");
|
|
|
-
|
|
|
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", "通知返回报文");
|