Commit 116e2fdd authored by 吴春's avatar 吴春

1

parent 3a2c3dc0
...@@ -783,8 +783,10 @@ namespace Mall.Module.TradePavilion ...@@ -783,8 +783,10 @@ namespace Mall.Module.TradePavilion
public RB_CompanyEnterprise_Extend GetCompanyByUserIdModule(int userId) public RB_CompanyEnterprise_Extend GetCompanyByUserIdModule(int userId)
{ {
var model = companyEnterpriseRepository.GetCompanyRepository(new RB_CompanyEnterprise_Extend() { CreateBy = userId }); var model = companyEnterpriseRepository.GetCompanyRepository(new RB_CompanyEnterprise_Extend() { CreateBy = userId });
if (model != null && model.CompanyId > 0) if (model != null && model.CompanyId > 0)
{ {
model.RejectRemark = model?.RejectRemark ?? "";
model.BrandModel = new RB_BrandEnterpriseApplyFor_Extend(); model.BrandModel = new RB_BrandEnterpriseApplyFor_Extend();
model.CarrierModel = new RB_CarrierEnterpriseApplyFor_Extend(); model.CarrierModel = new RB_CarrierEnterpriseApplyFor_Extend();
model.EnterpriseServicesModel = new RB_EnterpriseServicesApply_Extend(); model.EnterpriseServicesModel = new RB_EnterpriseServicesApply_Extend();
......
...@@ -26,7 +26,7 @@ namespace Mall.Repository.TradePavilion ...@@ -26,7 +26,7 @@ namespace Mall.Repository.TradePavilion
public List<RB_CarrierEnterpriseApplyFor_Extend> GetCarrierEnterpriseList(RB_CarrierEnterpriseApplyFor_Extend query) public List<RB_CarrierEnterpriseApplyFor_Extend> GetCarrierEnterpriseList(RB_CarrierEnterpriseApplyFor_Extend query)
{ {
StringBuilder builder = new StringBuilder(); StringBuilder builder = new StringBuilder();
builder.Append($" SELECT A.*,IFNULL(B.ClassName,'') AS CategoryName FROM {TableName} as A left join rb_brandclass AS B ON A.CategoryId=B.ID WHERE {nameof(RB_CarrierEnterpriseApplyFor_Extend.Status)}=0 "); builder.Append($" SELECT A.*,IFNULL(B.ClassName,'') AS CategoryName FROM {TableName} as A left join rb_brandclass AS B ON A.CategoryId=B.ID WHERE A.{nameof(RB_CarrierEnterpriseApplyFor_Extend.Status)}=0 ");
if (query != null) if (query != null)
{ {
if (query.TenantId > 0) if (query.TenantId > 0)
......
...@@ -4300,6 +4300,10 @@ namespace Mall.WebApi.Controllers.TradePavilion ...@@ -4300,6 +4300,10 @@ namespace Mall.WebApi.Controllers.TradePavilion
/// 获取配置项 /// 获取配置项
/// </summary> /// </summary>
/// <returns></returns> /// <returns></returns>
[HttpGet]
[HttpPost]
[AllowAnonymous]
[RateValve(Policy = Policy.Ip, Limit = 20, Duration = 60)]
public ApiResult GetYBConfig() public ApiResult GetYBConfig()
{ {
var list = carrierModule.GetYBConfigModule(); var list = carrierModule.GetYBConfigModule();
......
...@@ -81,7 +81,7 @@ namespace Mall.WindowsService.Helper ...@@ -81,7 +81,7 @@ namespace Mall.WindowsService.Helper
public void AddWechatStatistics(object sender, System.Timers.ElapsedEventArgs e) public void AddWechatStatistics(object sender, System.Timers.ElapsedEventArgs e)
{ {
DateTime now = DateTime.Now; DateTime now = DateTime.Now;
if (now.Hour <= 4 && now > Convert.ToDateTime("2024-12-06 00:00:00")) if (now.Hour < 2 && now > Convert.ToDateTime("2024-12-06 00:00:00"))
{ {
Thread.Sleep(1000 * 60); Thread.Sleep(1000 * 60);
LogHelper.Write("AddWechatStatistics=====Start"); LogHelper.Write("AddWechatStatistics=====Start");
......
...@@ -9,12 +9,12 @@ namespace Mall.WindowsService ...@@ -9,12 +9,12 @@ namespace Mall.WindowsService
private System.Timers.Timer timer3; //订单自动收货计时器 private System.Timers.Timer timer3; //订单自动收货计时器
private System.Timers.Timer timer4; //七天自动取消下线计时器 private System.Timers.Timer timer4; //七天自动取消下线计时器
private System.Timers.Timer timer5; //定时上架和下架 private System.Timers.Timer timer5; //定时上架和下架
//private System.Timers.Timer timer6; //资讯定时上架和下架 //private System.Timers.Timer timer6; //资讯定时上架和下架
//private System.Timers.Timer timer7; //会员储值卡赠送状态更新 //private System.Timers.Timer timer7; //会员储值卡赠送状态更新
//private System.Timers.Timer timer8;//会员购买储值卡收入 //private System.Timers.Timer timer8;//会员购买储值卡收入
//private System.Timers.Timer timer9;//相亲每日随机查询信息删除 //private System.Timers.Timer timer9;//相亲每日随机查询信息删除
//private System.Timers.Timer timer10; //教育咖啡劵 //private System.Timers.Timer timer10; //教育咖啡劵
private System.Timers.Timer timer11; //定时同步翠屏商务局的小程序统计信息 private System.Timers.Timer timer11; //定时同步翠屏商务局的小程序统计信息
public WindowsService() public WindowsService()
{ {
InitializeComponent(); InitializeComponent();
...@@ -127,7 +127,7 @@ namespace Mall.WindowsService ...@@ -127,7 +127,7 @@ namespace Mall.WindowsService
timer11 = new System.Timers.Timer timer11 = new System.Timers.Timer
{ {
Interval = 1000 * 60 //1分钟检测一次,10分钟执行一次 Interval = 1000 * 60 * 30 //1分钟检测一次,30分钟执行一次
}; };
timer11.Elapsed += new System.Timers.ElapsedEventHandler(helper.AddWechatStatistics); timer11.Elapsed += new System.Timers.ElapsedEventHandler(helper.AddWechatStatistics);
timer11.Enabled = true; timer11.Enabled = true;
......
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