Skip to content

M
mall.oytour.com
Commit 759298d3 authored by 黄奎's avatar 黄奎
Browse files
Options

页面修改

parent bb43df16
Hide whitespace changes
Inline Side-by-side
Showing with 106 additions and 34 deletions
Mall.Repository/User/RB_Member_UserRepository.cs
View file @ 759298d3
......@@ -868,6 +868,7 @@ WHERE u.TenantId={tenantId} and u.MallBaseId={mallBaseId} and u.SuperiorId ={use
/// <returns></returns>
public RB_Member_User_Extend GetMemberUserEntityRepository(RB_Member_User_Extend query)
{
var parameters = new DynamicParameters();
StringBuilder builder = new StringBuilder();
builder.AppendFormat(@"
SELECT A.*,IFNULL(B.UserId,0) AS AdminId
......@@ -888,11 +889,13 @@ WHERE 1=1
}
if (!string.IsNullOrEmpty(query.Name))
{
builder.AppendFormat($@" and A.{nameof(RB_Member_User.Name)} like '%{query.Name}%' ");
builder.AppendFormat($@" and A.{nameof(RB_Member_User.Name)} like @Name ");
parameters.Add("Name", "%" + query.Name.Trim() + "%");
}
if (!string.IsNullOrEmpty(query.AliasName))
{
builder.AppendFormat($@" and A.{nameof(RB_Member_User.AliasName)} like '%{query.AliasName}%'");
builder.AppendFormat($@" and A.{nameof(RB_Member_User.AliasName)} like @AliasName ");
parameters.Add("AliasName", "%" + query.AliasName.Trim() + "%");
}
if (query.Source > 0)
{
......@@ -900,7 +903,8 @@ WHERE 1=1
}
if (!string.IsNullOrEmpty(query.Moblie))
{
builder.AppendFormat($@" and A.{nameof(RB_Member_User.Moblie)} like '%{query.Moblie}%'");
builder.AppendFormat($@" and A.{nameof(RB_Member_User.Moblie)} like @Moblie ");
parameters.Add("Moblie", "%" + query.Moblie.Trim() + "%");
}
if (query.MemberGrade > 0)
{
......@@ -917,10 +921,10 @@ WHERE 1=1
//HK06-01新增查询条件
if (query.OpenId != null && !string.IsNullOrWhiteSpace(query.OpenId))
{
builder.AppendFormat($@" and A.{nameof(RB_Member_User.OpenId)} LIKE '{query.OpenId}%'");
builder.AppendFormat($@" and A.{nameof(RB_Member_User.OpenId)} LIKE @OpenId ");
parameters.Add("OpenId", "%" + query.OpenId.Trim() + "%");
}
return Get<RB_Member_User_Extend>(builder.ToString()).FirstOrDefault();
return Get<RB_Member_User_Extend>(builder.ToString(), parameters).FirstOrDefault();
}
#endregion
......
Mall.Repository/User/RB_MiniProgramRepository.cs
View file @ 759298d3
......@@ -4,7 +4,7 @@ using System.Text;
using Mall.Model.Entity.User;
using Mall.Model.Extend.User;
using System.Linq;
using VT.FW.DB.Dapper;
namespace Mall.Repository.User
{
......@@ -61,6 +61,7 @@ namespace Mall.Repository.User
/// <returns></returns>
public RB_MiniProgram_Extend GetMiniProgramRepository(RB_MiniProgram_Extend query)
{
var parameters = new DynamicParameters();
StringBuilder builder = new StringBuilder();
builder.Append(" SELECT * FROM RB_MiniProgram WHERE 1=1 ");
if (query != null)
......@@ -75,10 +76,11 @@ namespace Mall.Repository.User
}
if (query.MiniAppId != null && !string.IsNullOrEmpty(query.MiniAppId))
{
builder.AppendFormat(" AND MiniAppId='{0}' ", query.MiniAppId);
builder.AppendFormat(" AND MiniAppId=@MiniAppId ");
parameters.Add("MiniAppId", query.MiniAppId.Trim());
}
}
return Get<RB_MiniProgram_Extend>(builder.ToString()).FirstOrDefault();
return Get<RB_MiniProgram_Extend>(builder.ToString(),parameters).FirstOrDefault();
}
/// <summary>
......
Mall.WebApi/Controllers/Education/AppletSchoolController.cs
View file @ 759298d3
......@@ -569,17 +569,28 @@ namespace Mall.WebApi.Controllers.Education
[RateValve(Policy = Policy.Ip, Limit = 10, Duration = 60)]
public ApiResult GetEducationStartUpModel(object requestMsg)
{
var parms = JsonConvert.DeserializeObject<RequestParm>(requestMsg.ToString());
//var parms = RequestParm;
var query = JsonConvert.DeserializeObject<RB_Education_StartUp>(parms.msg.ToString());
query.TenantId = parms.TenantId;
query.MallBaseId = parms.MallBaseId;
var oldLogisticsModel = educationModule.GetEducationStartUpListRepository(query).FirstOrDefault();
if (oldLogisticsModel == null)
JObject jobj = JObject.Parse(requestMsg.ToString());
var parms = new RequestParm()
{
MallBaseId=jobj.GetInt("MallBaseId"),
TenantId=jobj.GetInt("TenantId"),
};
if (parms != null)
{
oldLogisticsModel = new RB_Education_StartUp();
var query = new RB_Education_StartUp()
{
};
query.TenantId = parms.TenantId;
query.MallBaseId = parms.MallBaseId;
var oldLogisticsModel = educationModule.GetEducationStartUpListRepository(query).FirstOrDefault();
if (oldLogisticsModel == null)
{
oldLogisticsModel = new RB_Education_StartUp();
}
return ApiResult.Success("", oldLogisticsModel);
}
return ApiResult.Success("", oldLogisticsModel);
return ApiResult.Success("", new RB_Education_StartUp());
}
#endregion
......
Mall.WebApi/Controllers/Product/AppletGoodsController.cs
View file @ 759298d3
......@@ -17,6 +17,7 @@ using Mall.Common;
using Mall.Module.Product;
using Mall.Model.Extend.User;
using Google.Protobuf.WellKnownTypes;
using Mall.Common.Enum.Goods;
namespace Mall.WebApi.Controllers.MallBase
{
......@@ -84,12 +85,28 @@ namespace Mall.WebApi.Controllers.MallBase
[HttpPost]
public ApiResult GetProductCategoryTreeList(object requestMsg)
{
var parms = JsonConvert.DeserializeObject<RequestParm>(requestMsg.ToString());
JObject rootObj = JObject.Parse(requestMsg.ToString());
var parms = new RequestParm()
{
TenantId = rootObj.GetInt("TenantId"),
MallBaseId = rootObj.GetInt("MallBaseId"),
};
if (parms.MallBaseId <= 0)
{
return ApiResult.ParamIsNull();
}
RB_Product_Category_Extend demodel = JsonConvert.DeserializeObject<RB_Product_Category_Extend>(parms.msg.ToString());
JObject jObj = JObject.Parse(rootObj.GetStringValue("msg"));
RB_Product_Category_Extend demodel = new RB_Product_Category_Extend()
{
Id = jObj.GetInt("Id"),
CategoryIds=jObj.GetStringValue("CategoryIds"),
Name=jObj.GetStringValue("Name"),
Tier=jObj.GetInt("Tier"),
ParentId=jObj.GetInt("ParentId"),
RootId=jObj.GetInt("RootId"),
CategoryPageType=(Common.Enum.Goods.GoodsPageTypeEnum)jObj.GetInt("CategoryPageType"),
};
demodel.TenantId = parms.TenantId;
demodel.MallBaseId = parms.MallBaseId;
......@@ -128,7 +145,13 @@ namespace Mall.WebApi.Controllers.MallBase
[HttpPost]
public ApiResult GetProductCategoryStyleInfo(object requestMsg)
{
var parms = JsonConvert.DeserializeObject<RequestParm>(requestMsg.ToString());
JObject jobj = JObject.Parse(requestMsg.ToString());
var parms = new RequestParm()
{
MallBaseId = jobj.GetInt("MallBaseId"),
TenantId = jobj.GetInt("TenantId"),
UserId=jobj.GetInt("UserId"),
};
if (parms.MallBaseId <= 0)
{
return ApiResult.ParamIsNull();
......@@ -191,20 +214,43 @@ namespace Mall.WebApi.Controllers.MallBase
[HttpPost]
public ApiResult GetAppletGoodsPageListForZY(object requestMsg)
{
var parms = JsonConvert.DeserializeObject<RequestParm>(requestMsg.ToString());
JObject rootObj = JObject.Parse(requestMsg.ToString());
var parms = new RequestParm()
{
TenantId=rootObj.GetInt("TenantId"),
MallBaseId=rootObj.GetInt("MallBaseId"),
SmallShopsId=rootObj.GetInt("SmallShopsId"),
UserId=rootObj.GetInt("UserId"),
msg=rootObj.GetStringValue("msg")
};
if (parms.MallBaseId <= 0)
{
return ApiResult.ParamIsNull();
}
ResultPageModel pagelist = JsonConvert.DeserializeObject<ResultPageModel>(parms.msg.ToString());
RB_Goods_Extend demodel = JsonConvert.DeserializeObject<RB_Goods_Extend>(parms.msg.ToString());
JObject sObj = JObject.Parse(rootObj.GetStringValue("msg"));
ResultPageModel pagelist = new ResultPageModel()
{
pageIndex=sObj.GetInt("pageIndex"),
pageSize=sObj.GetInt("pageSize"),
};
RB_Goods_Extend demodel = new RB_Goods_Extend()
{
Name=sObj.GetStringValue("Name"),
GoodsType=(OrderTypeEnum)sObj.GetInt ("GoodsType"),
CategoryIds=sObj.GetStringValue("CategoryIds"),
OrderBy=sObj.GetInt("OrderBy"),
UserId=sObj.GetInt("UserId"),
GoodsPageType=(GoodsPageTypeEnum)sObj.GetInt("GoodsPageType"),
IsVideo=sObj.GetInt("IsVideo")
};
demodel.TenantId = parms.TenantId;
demodel.MallBaseId = parms.MallBaseId;
demodel.GoodsStatus = 1;//只查询销售中的
demodel.SmallShopsId = parms.SmallShopsId;
JObject newParms = JObject.Parse(parms.msg.ToString());
int UserId = parms.UserId;
if (newParms.GetInt("ERPUserId") > 0)
if (sObj.GetInt("ERPUserId") > 0)
{
UserId = newParms.GetInt("ERPUserId");
}
......@@ -1140,17 +1186,22 @@ namespace Mall.WebApi.Controllers.MallBase
[HttpPost]
public ApiResult GetAppletGoodsRecommendListForZY(object requestMsg)
{
var parms = JsonConvert.DeserializeObject<RequestParm>(requestMsg.ToString());
JObject rootObj = JObject.Parse(requestMsg.ToString());
var parms = new RequestParm()
{
TenantId=rootObj.GetInt("TenantId"),
MallBaseId= rootObj.GetInt("MallBaseId"),
SmallShopsId=rootObj.GetInt("SmallShopsId"),
};
if (parms.MallBaseId <= 0)
{
return ApiResult.ParamIsNull();
}
RB_Goods_Extend demodel = JsonConvert.DeserializeObject<RB_Goods_Extend>(parms.msg.ToString());
RB_Goods_Extend demodel = JsonConvert.DeserializeObject<RB_Goods_Extend>(rootObj.GetStringValue("msg"));
if (!demodel.RecommendType.HasValue && demodel.RecommendType <= 0)
{
return ApiResult.ParamIsNull("请传递推荐类型");
}
demodel.TenantId = parms.TenantId;
demodel.MallBaseId = parms.MallBaseId;
demodel.GoodsStatus = 1;//只查询销售中的
......
Mall.WebApi/Controllers/User/MemberUserController.cs
View file @ 759298d3
......@@ -25,17 +25,22 @@ namespace Mall.WebApi.Controllers.User
{
private MemberUserModule MemberUserModule = new MemberUserModule();
[AllowAnonymous] [RateValve(Policy = Policy.Ip, Limit = 10, Duration = 60)]
/// <summary>
/// 用户登录
/// 根据用户Id更新用户头像和名称
/// </summary>
/// <returns></returns>
[RateValve(Policy = Policy.Ip, Limit = 10, Duration = 60)]
[AllowAnonymous]
public ApiResult SetMemberPhoto()
{
var extModel = JsonConvert.DeserializeObject<RB_Member_User_Extend>(RequestParm.msg.ToString());
if (extModel.Name != "微信用户")
JObject jobj = JObject.Parse(RequestParm.msg.ToString());
var extModel = new RB_Member_User_Extend()
{
Id=jobj.GetInt("Id"),
AliasName=jobj.GetStringValue("AliasName"),
Photo=jobj.GetStringValue("Photo"),
};
if (extModel.Name != "微信用户" && extModel.Id>0)
{
var flag = MemberUserModule.SetMemberUserNameAndPhoto(extModel);
return flag ? ApiResult.Success() : ApiResult.Failed();
......@@ -44,7 +49,6 @@ namespace Mall.WebApi.Controllers.User
{
return ApiResult.Failed("获取用户信息失败");
}
}
/// <summary>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment