|
|
@@ -69,6 +69,16 @@ namespace MySystem.Areas.Admin.Controllers
|
|
|
string end = datelist[1];
|
|
|
condition += " and CreateDate>='" + start + " 00:00:00' and CreateDate<='" + end + " 23:59:59'";
|
|
|
}
|
|
|
+ //来源券码
|
|
|
+ if (!string.IsNullOrEmpty(data.SourceCoupons))
|
|
|
+ {
|
|
|
+ condition += " and SourceCoupons like '%" + data.SourceCoupons + "%'";
|
|
|
+ }
|
|
|
+ //兑换券码
|
|
|
+ if (!string.IsNullOrEmpty(data.ToCoupons))
|
|
|
+ {
|
|
|
+ condition += " and ToCoupons like '%" + data.ToCoupons + "%'";
|
|
|
+ }
|
|
|
|
|
|
|
|
|
Dictionary<string, object> obj = new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).IndexData("PosCouponExchangeRecord", Fields, "Id desc", "0", page, limit, condition);
|
|
|
@@ -110,6 +120,16 @@ namespace MySystem.Areas.Admin.Controllers
|
|
|
string end = datelist[1];
|
|
|
condition += " and CreateDate>='" + start + " 00:00:00' and CreateDate<='" + end + " 23:59:59'";
|
|
|
}
|
|
|
+ //来源券码
|
|
|
+ if (!string.IsNullOrEmpty(data.SourceCoupons))
|
|
|
+ {
|
|
|
+ condition += " and SourceCoupons like '%" + data.SourceCoupons + "%'";
|
|
|
+ }
|
|
|
+ //兑换券码
|
|
|
+ if (!string.IsNullOrEmpty(data.ToCoupons))
|
|
|
+ {
|
|
|
+ condition += " and ToCoupons like '%" + data.ToCoupons + "%'";
|
|
|
+ }
|
|
|
|
|
|
|
|
|
Dictionary<string, object> obj = new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).IndexData("PosCouponExchangeRecord", Fields, "Id desc", "0", 1, 20000, condition, "FromUserId,ToUserId,OrderNo,BeforeStock,BeforeTotal,BeforeOut,AfterStock,AfterTotal,AfterOut,ChangeCount,ChangeKind", false);
|