|
@@ -13,16 +13,16 @@ namespace Util
|
|
|
{
|
|
|
public static string batchNo = "";
|
|
|
//发奖入口
|
|
|
- public static void sendPrize(string content)
|
|
|
+ public static void sendPrize(int prizeObjectTableId, string content)
|
|
|
{
|
|
|
batchNo = DateTime.Now.ToString("yyyyMMddHHmmssfff") + Function.get_Random(3);
|
|
|
- int projectId = 5;
|
|
|
- string priObjString = prizeObject(projectId, content);
|
|
|
+ string priObjString = prizeObject(prizeObjectTableId, content);
|
|
|
if(!string.IsNullOrEmpty(priObjString))
|
|
|
{
|
|
|
string[] priObjData = priObjString.Split('|');
|
|
|
string priObj = priObjData[0];
|
|
|
string priListIds = priObjData[1];
|
|
|
+ int projectId = int.Parse(priObjData[2]);
|
|
|
prizeSend(projectId, priListIds, priObj, content);
|
|
|
}
|
|
|
}
|
|
@@ -325,16 +325,17 @@ namespace Util
|
|
|
return dic;
|
|
|
}
|
|
|
|
|
|
- //奖励发放对象
|
|
|
- public static string prizeObject(int projectId, string content)
|
|
|
+ //奖励发放对象(奖励发放入口)
|
|
|
+ public static string prizeObject(int prizeObjectTableId, string content)
|
|
|
{
|
|
|
Dictionary<string, object> dic = new Dictionary<string, object>();
|
|
|
var prizeObjectTableService = App.GetService<IPriPrizeObjectTableService>();
|
|
|
var prizeObjectFieldService = App.GetService<IPriPrizeObjectFieldService>();
|
|
|
//查询表
|
|
|
- var prizeObjectTable = prizeObjectTableService.GetFirst(m => m.projectId == projectId) ?? new PriPrizeObjectTable();
|
|
|
+ var prizeObjectTable = prizeObjectTableService.GetFirst(m => m.id == prizeObjectTableId) ?? new PriPrizeObjectTable();
|
|
|
//查询返回字段
|
|
|
string field = prizeObjectTable.selectField;
|
|
|
+ int projectId = prizeObjectTable.projectId;
|
|
|
|
|
|
//查询匹配条件
|
|
|
string condi = "";
|
|
@@ -512,7 +513,7 @@ namespace Util
|
|
|
var item = db.Ado.GetScalar("select " + field + " from " + prizeObjectTable.tableEnName + " where 1=1" + condi);
|
|
|
if(item != null)
|
|
|
{
|
|
|
- return item.ToString() + "|" + prizeObjectTable.prizeListIds;
|
|
|
+ return item.ToString() + "|" + prizeObjectTable.prizeListIds + "|" + projectId;
|
|
|
}
|
|
|
return "";
|
|
|
}
|