|
|
@@ -57,7 +57,7 @@ namespace MySystem.Areas.Admin.Controllers
|
|
|
/// 创客账户变动记录列表
|
|
|
/// </summary>
|
|
|
/// <returns></returns>
|
|
|
- public JsonResult IndexData(UserAccountRecord data, int ChangeType, int ProductType, string TransRecordNo, string MakerCode, string RealName, int TopUserId, string CreateDateData, int UserId = 0, int page = 1, int limit = 30)
|
|
|
+ public JsonResult IndexData(UserAccountRecord data, string ChangeType, int ProductType, string TransRecordNo, string MakerCode, string RealName, int TopUserId, string CreateDateData, int UserId = 0, int page = 1, int limit = 30)
|
|
|
{
|
|
|
|
|
|
Dictionary<string, string> Fields = new Dictionary<string, string>();
|
|
|
@@ -127,23 +127,34 @@ namespace MySystem.Areas.Admin.Controllers
|
|
|
}
|
|
|
|
|
|
}
|
|
|
- if (ChangeType > 0)
|
|
|
+ if (!string.IsNullOrEmpty(ChangeType))
|
|
|
{
|
|
|
- if (ChangeType == 1)
|
|
|
- {
|
|
|
- condition += " and (ChangeType=" + ChangeType + " or (ChangeType in(112,1) and ProductType=101))";
|
|
|
- }
|
|
|
- else if (ChangeType == 30)
|
|
|
+ if (int.Parse(ChangeType) > 0)
|
|
|
{
|
|
|
- condition += " and ChangeType=31 and Remark='开机抢红包活动'";
|
|
|
- }
|
|
|
- else if (ChangeType == 31)
|
|
|
- {
|
|
|
- condition += " and (ChangeType=" + ChangeType + " and (Remark!='开机抢红包活动' or Remark IS NULL))";
|
|
|
+ // if (ChangeType == 0)
|
|
|
+ // {
|
|
|
+ // condition += " and ChangeType in(0,12)";
|
|
|
+ // }
|
|
|
+ if (int.Parse(ChangeType) == 1)
|
|
|
+ {
|
|
|
+ condition += " and (ChangeType=" + int.Parse(ChangeType) + " or (ChangeType in(112,1) and ProductType=101))";
|
|
|
+ }
|
|
|
+ else if (int.Parse(ChangeType) == 30)
|
|
|
+ {
|
|
|
+ condition += " and ChangeType=31 and Remark='开机抢红包活动'";
|
|
|
+ }
|
|
|
+ else if (int.Parse(ChangeType) == 31)
|
|
|
+ {
|
|
|
+ condition += " and (ChangeType=" + int.Parse(ChangeType) + " and (Remark!='开机抢红包活动' or Remark IS NULL))";
|
|
|
+ }
|
|
|
+ else
|
|
|
+ {
|
|
|
+ condition += " and ChangeType=" + int.Parse(ChangeType);
|
|
|
+ }
|
|
|
}
|
|
|
- else
|
|
|
+ if (int.Parse(ChangeType) == 0)
|
|
|
{
|
|
|
- condition += " and ChangeType=" + ChangeType;
|
|
|
+ condition += " and ChangeType in(0,12)";
|
|
|
}
|
|
|
}
|
|
|
if (ProductType > 0)
|
DuGuYang