server/Coreshop
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

321

Browse Source
This commit is contained in:
zpc 2025-12-08 00:57:23 +08:00
parent 31876fa46f
commit 192bc34c1a
6 changed files with 47 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
server/CoreCms.Net.Configuration/SystemSettingConstVars.cs
View File

@ -1,4 +1,4 @@
/***********************************************************************
/***********************************************************************
* Project: CoreCms.Net *
* Web: https://CoreCms.Net *
* ProjectName: 核心内容管理系统 *
@ -31,6 +31,16 @@ namespace CoreCms.Net.Configuration
/// </summary>
public const string HomeAnnouncement = "homeAnnouncement";
/// <summary>
/// 营业公告
/// </summary>
public const string BusinessAnnouncement = "businessAnnouncement";
/// <summary>
/// 收益规则
/// </summary>
public const string EarningsRule = "earningsRule";
/// <summary>
/// 平台地址
/// </summary>

4
server/CoreCms.Net.Configuration/SystemSettingDictionary.cs
View File

@ -1,4 +1,4 @@
/***********************************************************************
/***********************************************************************
* Project: CoreCms.Net *
* Web: https://CoreCms.Net *
* Projectname= 核心内容管理系统 *
@ -31,6 +31,8 @@ namespace CoreCms.Net.Configuration
di.Add(SystemSettingConstVars.ShopName, new DictionaryKeyValues() { sKey = "平台名称", sValue = "核心内容管理系统" });
di.Add(SystemSettingConstVars.ShopDesc, new DictionaryKeyValues() { sKey = "平台描述", sValue = "平台描述会展示在前台及微信分享描述" });
di.Add(SystemSettingConstVars.HomeAnnouncement, new DictionaryKeyValues() { sKey = "首页公告栏", sValue = "" });
di.Add(SystemSettingConstVars.BusinessAnnouncement, new DictionaryKeyValues() { sKey = "营业公告", sValue = "" });
di.Add(SystemSettingConstVars.EarningsRule, new DictionaryKeyValues() { sKey = "收益规则", sValue = "" });
di.Add(SystemSettingConstVars.ShopAddress, new DictionaryKeyValues() { sKey = "平台地址", sValue = "我的平台地址" });
di.Add(SystemSettingConstVars.ShopBeiAn, new DictionaryKeyValues() { sKey = "备案信息", sValue = "网站备案信息" });
di.Add(SystemSettingConstVars.ShopLogo, new DictionaryKeyValues() { sKey = "平台logo", sValue = "" });

14
server/CoreCms.Net.Web.Admin/wwwroot/views/shop/setting/index.html
View File

@ -96,6 +96,20 @@
</div>
<div class="layui-form-mid layui-word-aux">首页公告栏内容，可为空</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label">{{d.data.configs['businessAnnouncement']['sKey']}}：</label>
<div class="layui-input-inline layui-inline-5" style="margin-bottom: 10px">
<textarea name="businessAnnouncement" class="layui-textarea" placeholder="请输入营业公告内容">{{d.data.configs['businessAnnouncement']['sValue']}}</textarea>
</div>
<div class="layui-form-mid layui-word-aux">营业公告内容，可为空</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label">{{d.data.configs['earningsRule']['sKey']}}：</label>
<div class="layui-input-inline layui-inline-5" style="margin-bottom: 10px">
<textarea name="earningsRule" class="layui-textarea" placeholder="请输入收益规则说明">{{d.data.configs['earningsRule']['sValue']}}</textarea>
</div>
<div class="layui-form-mid layui-word-aux">收益规则说明，可为空</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label">{{d.data.configs['shopLogo']['sKey']}}：</label>

6
server/CoreCms.Net.Web.WebApi/Controllers/CommonController.cs
View File

@ -1,4 +1,4 @@
/***********************************************************************
/***********************************************************************
* Project: CoreCms
* ProjectName: 核心内容管理系统
* Web: https://www.corecms.net
@ -134,6 +134,9 @@ namespace CoreCms.Net.Web.WebApi.Controllers
//首页公告栏
var homeAnnouncement = CommonHelper.GetConfigDictionary(allConfigs, SystemSettingConstVars.HomeAnnouncement);
//营业公告
var businessAnnouncement = CommonHelper.GetConfigDictionary(allConfigs, SystemSettingConstVars.BusinessAnnouncement);
//首页弹窗配置
var popupConfig = new
{
@ -191,6 +194,7 @@ namespace CoreCms.Net.Web.WebApi.Controllers
userAgreementId,
privacyPolicyId,
homeAnnouncement,
businessAnnouncement,
popupConfig,
floatConfig,
playingMethodOptions = options,

16
server/CoreCms.Net.Web.WebApi/Controllers/SQController.cs
View File

@ -31,6 +31,7 @@ using NPOI.OpenXmlFormats.Dml;
using Humanizer;
using Newtonsoft.Json;
using CoreCms.Net.Configuration;
using CoreCms.Net.Utility.Helper;
namespace CoreCms.Net.Web.WebApi.Controllers;
/// <summary>
@ -57,6 +58,7 @@ public class SQController : ControllerBase
private readonly ISQRoomPricingServices _sQRoomPricingServices;
private readonly ISQMessageServices _sQMessageServices;
private readonly ISQEarningsServices _sQEarningsServices;
private readonly ICoreCmsSettingServices _settingServices;
// 营业时间常量配置
private const string BUSINESS_OPEN_TIME = "09:00";
@ -82,6 +84,7 @@ public class SQController : ControllerBase
, ISQRoomPricingServices sQRoomPricingServices
, ISQMessageServices sQMessageServices
, ISQEarningsServices sQEarningsServices
, ICoreCmsSettingServices settingServices
)
{
_webHostEnvironment = webHostEnvironment;
@ -101,6 +104,7 @@ public class SQController : ControllerBase
_sQRoomPricingServices = sQRoomPricingServices;
_sQMessageServices = sQMessageServices;
_sQEarningsServices = sQEarningsServices;
_settingServices = settingServices;
}
@ -1930,9 +1934,15 @@ OFFSET {(pageIndex - 1) * pageSize} ROWS FETCH NEXT {pageSize} ROWS ONLY";
try
{
// 从配置中获取收益规则说明，这里暂时返回默认内容
// 后续可以从 CoreCmsSetting 表中读取配置
var content = "收益规则说明：\n1. 收益来源于房间预约成功后的分成\n2. 收益可随时提现\n3. 提现将在3-5个工作日内到账\n4. 最低提现金额为0.01元";
// 从配置中获取收益规则说明
var allConfigs = await _settingServices.GetConfigDictionaries();
var content = CommonHelper.GetConfigDictionary(allConfigs, SystemSettingConstVars.EarningsRule);
// 如果配置为空，返回默认内容
if (string.IsNullOrWhiteSpace(content))
{
content = "收益规则说明：\n1. 收益来源于房间预约成功后的分成\n2. 收益可随时提现\n3. 提现将在3-5个工作日内到账\n4. 最低提现金额为0.01元";
}
jm.code = 0;
jm.msg = "ok";

2
server/CoreCms.Net.Web.WebApi/Doc.xml
View File

@ -771,7 +771,7 @@
预约接口
</summary>
</member>
<member name="M:CoreCms.Net.Web.WebApi.Controllers.SQController.#ctor(Microsoft.AspNetCore.Hosting.IWebHostEnvironment,CoreCms.Net.IServices.ISQReservationsServices,CoreCms.Net.IServices.ISQRoomsServices,CoreCms.Net.IServices.ISysDictionaryServices,CoreCms.Net.IServices.ISysDictionaryDataServices,CoreCms.Net.IServices.ISQReservationParticipantsServices,AutoMapper.IMapper,CoreCms.Net.IServices.ICoreCmsUserServices,CoreCms.Net.Auth.HttpContextUser.IHttpContextUser,CoreCms.Net.IRepository.UnitOfWork.IUnitOfWork,CoreCms.Net.IServices.ICoreCmsUserBlacklistServices,CoreCms.Net.IServices.ISQReservationEvaluateServices,CoreCms.Net.IServices.ISQReservationReputationServices,CoreCms.Net.IServices.ISQRoomUnavailableTimesServices,CoreCms.Net.IServices.ISQRoomPricingServices,CoreCms.Net.IServices.ISQMessageServices,CoreCms.Net.IServices.ISQEarningsServices)">
<member name="M:CoreCms.Net.Web.WebApi.Controllers.SQController.#ctor(Microsoft.AspNetCore.Hosting.IWebHostEnvironment,CoreCms.Net.IServices.ISQReservationsServices,CoreCms.Net.IServices.ISQRoomsServices,CoreCms.Net.IServices.ISysDictionaryServices,CoreCms.Net.IServices.ISysDictionaryDataServices,CoreCms.Net.IServices.ISQReservationParticipantsServices,AutoMapper.IMapper,CoreCms.Net.IServices.ICoreCmsUserServices,CoreCms.Net.Auth.HttpContextUser.IHttpContextUser,CoreCms.Net.IRepository.UnitOfWork.IUnitOfWork,CoreCms.Net.IServices.ICoreCmsUserBlacklistServices,CoreCms.Net.IServices.ISQReservationEvaluateServices,CoreCms.Net.IServices.ISQReservationReputationServices,CoreCms.Net.IServices.ISQRoomUnavailableTimesServices,CoreCms.Net.IServices.ISQRoomPricingServices,CoreCms.Net.IServices.ISQMessageServices,CoreCms.Net.IServices.ISQEarningsServices,CoreCms.Net.IServices.ICoreCmsSettingServices)">
<summary>
构造函数
</summary>