wgh/coreshoppro
1
0
Fork 0
mirror of http://git.coreshop.cn/jianweie/coreshoppro.git synced 2025-12-06 20:13:26 +08:00
Code Issues Packages Projects Releases Wiki Activity

【调整】移除后台设置是否会员绑定手机号码的设置。

Browse Source 
【新增】新增商城小程序前端商家管理员功能，商家管理员可以通过商家中心查看所有信息。
【调整】商家中心按门店进行过滤，提货单，服务券，订单等，本门店只能处理本门店业务及查看相应数据。
【调整】后台商城配置移除【会员设置】tab，增加【商家设置】tab，将商家相关设置归集到一起。
This commit is contained in:
大灰灰
2022-12-03 01:44:19 +08:00
parent 201586ab4f
commit 0422df5552
24 changed files with 471 additions and 184 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
CoreCms.Net.Services/Service/CoreCmsUserServicesTicketVerificationLogServices.cs
View File

@@ -17,8 +17,10 @@ using CoreCms.Net.IRepository.UnitOfWork;
using CoreCms.Net.IServices;
using CoreCms.Net.Loging;
using CoreCms.Net.Model.Entities;
using CoreCms.Net.Model.Entities.Expression;
using CoreCms.Net.Model.ViewModels.UI;
using CoreCms.Net.Utility.Helper;
using Microsoft.Extensions.DependencyInjection;
using SqlSugar;
@@ -33,13 +35,19 @@ namespace CoreCms.Net.Services
private readonly ICoreCmsServicesServices _servicesServices;
private readonly ICoreCmsUserServicesTicketServices _userServicesTicketServices;
private readonly ICoreCmsClerkServices _clerkServices;
private readonly ICoreCmsSettingServices _settingServices;
private readonly IServiceProvider _serviceProvider;
private readonly IUnitOfWork _unitOfWork;
public CoreCmsUserServicesTicketVerificationLogServices(IUnitOfWork unitOfWork, ICoreCmsUserServicesTicketVerificationLogRepository dal, ICoreCmsClerkServices clerkServices, ICoreCmsServicesServices servicesServices, ICoreCmsUserServicesTicketServices userServicesTicketServices)
public CoreCmsUserServicesTicketVerificationLogServices(IUnitOfWork unitOfWork, ICoreCmsUserServicesTicketVerificationLogRepository dal, ICoreCmsClerkServices clerkServices, ICoreCmsServicesServices servicesServices, ICoreCmsUserServicesTicketServices userServicesTicketServices, ICoreCmsSettingServices settingServices, IServiceProvider serviceProvider)
{
this._dal = dal;
_clerkServices = clerkServices;
_servicesServices = servicesServices;
_userServicesTicketServices = userServicesTicketServices;
_settingServices = settingServices;
_serviceProvider = serviceProvider;
base.BaseDal = dal;
_unitOfWork = unitOfWork;
}
@@ -48,18 +56,38 @@ namespace CoreCms.Net.Services
/// 店铺核销的服务券列表
/// </summary>
/// <returns></returns>
public async Task<WebApiCallBack> GetVerificationLogs(int userId, int page, int limit)
public async Task<WebApiCallBack> GetVerificationLogs(int userId, int storeId, int page, int limit)
{
var jm = new WebApiCallBack();
using var container = _serviceProvider.CreateScope();
var _userServices = container.ServiceProvider.GetService<ICoreCmsUserServices>();
var clerk = await _clerkServices.QueryByClauseAsync(p => p.userId == userId);
if (clerk == null)
var jm = new WebApiCallBack();
var where = PredicateBuilder.True<CoreCmsUserServicesTicketVerificationLog>();
var allConfigs = await _settingServices.GetConfigDictionaries();
var shopManagerMobile = CommonHelper.GetConfigDictionary(allConfigs, SystemSettingConstVars.ShopManagerMobile);
var user = await _userServices.QueryByClauseAsync(p => p.id == userId);
if (user == null)
{
jm.msg = "未查询到用户门店";
jm.status = false;
jm.msg = "用户获取失败";
return jm;
}
var isManager = !string.IsNullOrEmpty(shopManagerMobile) && shopManagerMobile.Contains(user.mobile);
if (isManager)
{
where = storeId == 0 ? where.And(p => p.isDel == false) : where.And(p => p.isDel == false && p.storeId == storeId);
}
else
{
where = where.And(p => p.isDel == false && p.storeId == storeId);
//var stroes = await _clerkServices.QueryListByClauseAsync(p => p.userId == userId);
//var stroeIds = stroes.Select(p => p.storeId).ToList();
//where = where.And(p => stroeIds.Contains(p.storeId) && p.isDel == false);
}
var logs = await _dal.QueryPageAsync(p => p.storeId == clerk.storeId && p.isDel == false, p => p.verificationTime, OrderByType.Desc, page, limit);
var logs = await _dal.QueryPageAsync(where, p => p.verificationTime, OrderByType.Desc, page, limit);
if (logs != null && logs.Any())
{
@@ -78,6 +106,7 @@ namespace CoreCms.Net.Services
jm.msg = "获取成功";
}
jm.status = true;
jm.data = logs;
jm.otherData = new
{