Commit 3d1909ce authored by 黄奎's avatar 黄奎

页面修改

parent 271f7b10
...@@ -488,9 +488,8 @@ WHERE u.TenantId={tenantId} and u.MallBaseId={mallBaseId} and u.SuperiorId ={use ...@@ -488,9 +488,8 @@ WHERE u.TenantId={tenantId} and u.MallBaseId={mallBaseId} and u.SuperiorId ={use
//HK06-01新增查询条件 //HK06-01新增查询条件
if (query.OpenId != null && !string.IsNullOrWhiteSpace(query.OpenId)) if (query.OpenId != null && !string.IsNullOrWhiteSpace(query.OpenId))
{ {
where += $@" and {nameof(RB_Member_User.OpenId)} = '%{query.OpenId}%'"; where += $@" and {nameof(RB_Member_User.OpenId)} LIKE '{query.OpenId}%'";
} }
string sql = $@"select * from RB_Member_User where {where} "; string sql = $@"select * from RB_Member_User where {where} ";
return Get<RB_Member_User_Extend>(sql).FirstOrDefault(); return Get<RB_Member_User_Extend>(sql).FirstOrDefault();
} }
......
...@@ -1174,18 +1174,19 @@ namespace Mall.WebApi.Controllers.MallBase ...@@ -1174,18 +1174,19 @@ namespace Mall.WebApi.Controllers.MallBase
//基础配置 Add By:W 2020年6月1号 //基础配置 Add By:W 2020年6月1号
var mallBaseModel = mallBaseModule.GetListRepository(new RB_MallBase_Extend { TenantId = miniProgram.TenantId ?? 0, MallBaseId = miniProgram.MallBaseId}).FirstOrDefault(); var mallBaseModel = mallBaseModule.GetListRepository(new RB_MallBase_Extend { TenantId = miniProgram.TenantId ?? 0, MallBaseId = miniProgram.MallBaseId }).FirstOrDefault();
//获取物流配置 //获取物流配置
var setting = new { var setting = new
contact_tel= mallBaseModel.ContactNumber, {
over_time=mallBaseModel.CancelTime, contact_tel = mallBaseModel.ContactNumber,
delivery_time=mallBaseModel.AutoReceiving, over_time = mallBaseModel.CancelTime,
after_sale_time= mallBaseModel.AfterTime, delivery_time = mallBaseModel.AutoReceiving,
payment_type= "", after_sale_time = mallBaseModel.AfterTime,
send_type="", payment_type = "",
kdniao_mch_id="",//快递鸟配置 send_type = "",
kdniao_api_key="", kdniao_mch_id = "",//快递鸟配置
kdniao_api_key = "",
}; };
} }
...@@ -1645,11 +1646,19 @@ namespace Mall.WebApi.Controllers.MallBase ...@@ -1645,11 +1646,19 @@ namespace Mall.WebApi.Controllers.MallBase
public ApiResult GetUserCenter() public ApiResult GetUserCenter()
{ {
JObject parms = JObject.Parse(RequestParm.msg.ToString()); JObject parms = JObject.Parse(RequestParm.msg.ToString());
//小程序Id string MiniAppId = "";
var MiniAppId = parms.GetStringValue("MiniAppId"); try
{
//小程序Id
MiniAppId = RequestParm.MiniAppId;
}
catch (Exception ex)
{
Common.Plugin.LogHelper.Error("MallController_GetUserCenter", ex);
}
//获取小程序信息 //获取小程序信息
var miniProgram = programModule.GetMiniProgramModule(new Model.Extend.User.RB_MiniProgram_Extend() { MiniAppId = MiniAppId }, isGetUserCenterMenu: true); var miniProgram = programModule.GetMiniProgramModule(new Model.Extend.User.RB_MiniProgram_Extend() { MiniAppId = MiniAppId }, isGetUserCenterMenu: true);
var mall = new object(); var data = new object();
if (miniProgram != null && miniProgram.MallBaseId > 0) if (miniProgram != null && miniProgram.MallBaseId > 0)
{ {
var config = new var config = new
...@@ -1730,15 +1739,35 @@ namespace Mall.WebApi.Controllers.MallBase ...@@ -1730,15 +1739,35 @@ namespace Mall.WebApi.Controllers.MallBase
} }
} }
}; };
mall = new var user_info = new object();
if (RequestParm.OpenId != null && !string.IsNullOrWhiteSpace(RequestParm.OpenId))
{
var memberModel = userModule.GetAppletUserCenterStatistics(RequestParm.OpenId);
user_info = memberModel;
}
data = new
{ {
id = miniProgram.MallBaseId, mall = new
name = miniProgram.MallName, {
//商城编号
id = miniProgram.MallBaseId,
//商城名称
name = miniProgram.MallName,
//是否删除
is_delete = miniProgram.Status,
//是否回收
is_recycle = 0,
//是否禁用
is_disable = miniProgram.Status
},
//配置信息 //配置信息
config config,
//用户信息
user_info,
}; };
} }
return ApiResult.Success(data: mall); return ApiResult.Success(data: data);
} }
/// <summary> /// <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