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