|
|
@@ -68,7 +68,7 @@ namespace MySystem.Areas.Admin.Controllers
|
|
|
//购券创客
|
|
|
if (!string.IsNullOrEmpty(SourceMakerCode))
|
|
|
{
|
|
|
- condition += " and UserId in (select UserId from UserForMakerCode where MakerCode='" + SourceMakerCode + "')";
|
|
|
+ condition += " and SourceUserId in (select UserId from UserForMakerCode where MakerCode='" + SourceMakerCode + "')";
|
|
|
}
|
|
|
//创建时间
|
|
|
if (!string.IsNullOrEmpty(CreateDateData))
|
|
|
@@ -93,7 +93,7 @@ namespace MySystem.Areas.Admin.Controllers
|
|
|
dic["UserIdRealName"] = userid_Users.RealName;
|
|
|
dic.Remove("UserId");
|
|
|
|
|
|
- //购券创客创客
|
|
|
+ //购券创客
|
|
|
int SourceUserId = int.Parse(function.CheckInt(dic["SourceUserId"].ToString()));
|
|
|
if (SourceUserId > 0)
|
|
|
{
|
|
|
@@ -110,6 +110,19 @@ namespace MySystem.Areas.Admin.Controllers
|
|
|
dic.Remove("OrderId");
|
|
|
}
|
|
|
|
|
|
+ // //购券创客
|
|
|
+ // int SourceUserId = int.Parse(function.CheckInt(dic["SourceUserId"].ToString()));
|
|
|
+ // Users sourceUser = db.Users.FirstOrDefault(m => m.Id == SourceUserId) ?? new Users();
|
|
|
+ // dic["SourceMakerCode"] = sourceUser.MakerCode;
|
|
|
+ // dic.Remove("SourceUserId");
|
|
|
+
|
|
|
+ // //来源创客
|
|
|
+ // int OrderId = int.Parse(function.CheckInt(dic["OrderId"].ToString()));
|
|
|
+ // var order = db.Orders.FirstOrDefault(m => m.Id == OrderId) ?? new Orders();
|
|
|
+ // Users sourceOrderUser = db.Users.FirstOrDefault(m => m.Id == order.UserId) ?? new Users();
|
|
|
+ // dic["SourceOrderMakerCode"] = sourceOrderUser.MakerCode;
|
|
|
+ // dic.Remove("OrderId");
|
|
|
+
|
|
|
//订单信息
|
|
|
JsonData ApplyList = JsonMapper.ToObject(dic["SeoTitle"].ToString());//申请数据
|
|
|
dic["dPosCoupons"] = "";
|