Commit a2d80ca9 authored by 黄奎's avatar 黄奎

页面修改

parent 37e8ef1c
using Mall.Common.Plugin;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace Mall.CacheManager.DataStatistic.Enum
{
/// <summary>
/// 发布信息类型枚举
/// </summary>
public enum PublishB2BMsgEnum
{
/// <summary>
/// 城市登录信息
/// </summary>
[EnumField("城市登录信息")]
CityLogin = 1,
/// <summary>
/// 同行数量、激活总数、沉睡客户数量、app下载数量
/// </summary>
[EnumField("同行数量、激活总数、沉睡客户数量、app下载数量")]
ClientNum = 2,
/// <summary>
/// 今日/年度交易信息
/// </summary>
[EnumField("今日/年度交易信息、平台数据信息、返佣红包")]
TradeInfo = 3,
/// <summary>
/// 其他信息
/// </summary>
[EnumField("其他信息")]
OtherInfo = 4
}
}
using Mall.CacheManager.DataStatistic.Enum;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace Mall.CacheManager.DataStatistic.Model
{
/// <summary>
/// 发布消息载体
/// </summary>
public class DataPublishB2BMsg
{
/// <summary>
/// 消息类型
/// </summary>
public PublishB2BMsgEnum type { get; set; }
/// <summary>
/// 消息内容
/// </summary>
public object data { get; set; }
}
}
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace Mall.CacheManager.DataStatistic.Model
{
public class DataTask
{
/// <summary>
/// 任务全路径
/// </summary>
public string FullName { get; set; }
/// <summary>
/// 任务执行方法
/// </summary>
public string Method { get; set; }
/// <summary>
/// 任务执行参数
/// </summary>
public List<object> Parms { get; set; }
}
}
...@@ -27,11 +27,6 @@ namespace Mall.CacheManager.User ...@@ -27,11 +27,6 @@ namespace Mall.CacheManager.User
return ts; return ts;
} }
/// <summary> /// <summary>
/// 判断key是否存在 /// 判断key是否存在
/// </summary> /// </summary>
......
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace Mall.CacheKey
{
/// <summary>
/// 公用模块缓存Key配置
/// </summary>
public class UserCacheKeyConfig
{
/// <summary>
/// User库集团列表缓存
/// </summary>
public static string USER_GROUP_LIST
{
get { return "USER_GROUP_LIST"; }
}
/// <summary>
/// User库分公司列表缓存
/// </summary>
public static string USER_BRANCH_LIST
{
get { return "USER_BRANCH_LIST"; }
}
/// <summary>
/// USER库员工列表缓存
/// </summary>
public static string USER_EMPLOYEE
{
get { return "USER_EMPLOYEE_"; }
}
/// <summary>
/// DMC库供应商列表缓存
/// </summary>
public static string DMC_SUPPLIER
{
get { return "DMC_SUPPLIER_"; }
}
/// <summary>
/// IP白名单缓存Key
/// </summary>
public static string IP_Manager_Key
{
get { return "IP_Manager_List"; }
}
}
}
...@@ -12,93 +12,11 @@ namespace Mall.CacheKey ...@@ -12,93 +12,11 @@ namespace Mall.CacheKey
public class UserModuleCacheKeyConfig public class UserModuleCacheKeyConfig
{ {
/// <summary> /// <summary>
/// USER_Login_Info_123(用户ID) /// Mall_Login_Info_123(商户Id)
/// </summary> /// </summary>
public static string USER_Login_Info public static string Mall_Login_Info
{ {
get { return "USER_Login_Info_"; } get { return "Mall_Login_Info_"; }
}
/// <summary>
/// B2B_USER_Login_Info_123(用户ID)
/// </summary>
public static string B2B_USER_Login_Info
{
get { return "B2B_USER_Login_Info_"; }
}
/// <summary>
/// //USER_SysMenu_StrInfo_123
/// </summary>
public static string USER_SysMenu_StrInfo
{
get { return "USER_SysMenu_StrInfo_"; }
}
/// <summary>
/// User_Code
/// </summary>
public static string User_Code
{
get { return "User_Code_"; }
}
/// <summary>
/// User_Send_Code_List
/// </summary>
public static string User_Send_Code_List
{
get { return "User_Send_Code_List_"; }
}
/// <summary>
/// User_New_Share_Cloud_Message
/// </summary>
public static string User_New_Share_Cloud_Message
{
get { return "User_New_Share_Cloud_Message"; }
}
/// <summary>
/// 机票订单待付款信息
/// </summary>
public static string Air_WaitOrderPay_Info
{
get { return "Air_WaitOrderPay_Info"; }
}
/// <summary>
/// 机票订单正在付款信息
/// </summary>
public static string Air_JustOrderPay_Info
{
get { return "Air_JustOrderPay_Info"; }
}
/// <summary>
/// //USER_SysMenu_StrInfo_123
/// </summary>
public static string Access_Token
{
get { return "Access_Token"; }
}
public static string MiniProgramFormId
{
get { return "MiniProgram_FormId_"; }
}
public static string KKDayAPIKey
{
get { return "KKDayAPIKey"; }
}
public static string CounponOrder
{
get { return "CounponOrder_"; }
}
/// <summary>
/// 公司部门员工组织架构Key
/// </summary>
public static string CompanyDepartMentEmployeeForChar
{
get {
return "CompanyDepartMentEmployeeForChar";
}
} }
} }
} }
...@@ -21,6 +21,13 @@ namespace Mall.Repository.User ...@@ -21,6 +21,13 @@ namespace Mall.Repository.User
{ {
StringBuilder builder = new StringBuilder(); StringBuilder builder = new StringBuilder();
builder.Append(" SELECT * FROM RB_Tenant WHERE 1=1 "); builder.Append(" SELECT * FROM RB_Tenant WHERE 1=1 ");
if (query != null)
{
if (query.Account != null && !string.IsNullOrEmpty(query.Account.Trim()))
{
builder.AppendFormat(" AND Account='{0}' ", query.Account.Trim());
}
}
return Get<RB_Tenant_Extend>(builder.ToString()).ToList(); return Get<RB_Tenant_Extend>(builder.ToString()).ToList();
} }
......
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