From 27b0099074f7d5f592968b381f87f7379f922fbc Mon Sep 17 00:00:00 2001 From: yuyubo <1870149533@qq.com> Date: Wed, 2 Jul 2025 19:31:43 +0800 Subject: [PATCH] 232 --- MyCode.Project.ScheduleTask/App.config | 2 +- MyCode.Project.ScheduleTask/JobConfig.xml | 2 +- .../Jobs/NinePMTimeJob.cs | 12 +- .../MyCode.Project.ScheduleTask.csproj | 1 + .../Common/IBillKeepingService.cs | 172 ------------------ .../Common/ICommonService.cs | 133 -------------- .../Common/ICouponActityDllService.cs | 71 -------- .../Common/IFileManagerService.cs | 109 ----------- .../Common/IOnlinePayService.cs | 27 --- .../Common/IPriceService.cs | 62 ------- .../Common/IRedisService.cs | 21 --- .../IStaffDataEnterpriseWechatService.cs | 2 + .../StaffDataEnterpriseWechatService.cs | 8 + 13 files changed, 18 insertions(+), 604 deletions(-) delete mode 100644 MyCode.Project.Services/Common/IBillKeepingService.cs delete mode 100644 MyCode.Project.Services/Common/ICommonService.cs delete mode 100644 MyCode.Project.Services/Common/ICouponActityDllService.cs delete mode 100644 MyCode.Project.Services/Common/IFileManagerService.cs delete mode 100644 MyCode.Project.Services/Common/IOnlinePayService.cs delete mode 100644 MyCode.Project.Services/Common/IPriceService.cs delete mode 100644 MyCode.Project.Services/Common/IRedisService.cs diff --git a/MyCode.Project.ScheduleTask/App.config b/MyCode.Project.ScheduleTask/App.config index ee733e6..cde1562 100644 --- a/MyCode.Project.ScheduleTask/App.config +++ b/MyCode.Project.ScheduleTask/App.config @@ -16,7 +16,7 @@ - + diff --git a/MyCode.Project.ScheduleTask/JobConfig.xml b/MyCode.Project.ScheduleTask/JobConfig.xml index 1e4c68b..f52986b 100644 --- a/MyCode.Project.ScheduleTask/JobConfig.xml +++ b/MyCode.Project.ScheduleTask/JobConfig.xml @@ -6,7 +6,7 @@ - + diff --git a/MyCode.Project.ScheduleTask/Jobs/NinePMTimeJob.cs b/MyCode.Project.ScheduleTask/Jobs/NinePMTimeJob.cs index 2117d3c..fdd5108 100644 --- a/MyCode.Project.ScheduleTask/Jobs/NinePMTimeJob.cs +++ b/MyCode.Project.ScheduleTask/Jobs/NinePMTimeJob.cs @@ -18,21 +18,19 @@ namespace MyCode.Project.ScheduleTask.Jobs public class NinePMTimeJob : IJob { - private readonly IStorageService _storageService; - private IMillionShopExtensionService _millionShopExtensionService; + private IStaffDataEnterpriseWechatService _staffDataEnterpriseWechatService; - public NinePMTimeJob(IStorageService storageService - , IMillionShopExtensionService millionShopExtensionService) + public NinePMTimeJob(IStaffDataEnterpriseWechatService staffDataEnterpriseWechatService + ) { - _storageService = storageService; - _millionShopExtensionService = millionShopExtensionService; + _staffDataEnterpriseWechatService = staffDataEnterpriseWechatService; } public void Execute(IJobExecutionContext context) { - _storageService.SendManagerAudit();//店长业绩审核提醒 + _staffDataEnterpriseWechatService.AddTask(); } } } diff --git a/MyCode.Project.ScheduleTask/MyCode.Project.ScheduleTask.csproj b/MyCode.Project.ScheduleTask/MyCode.Project.ScheduleTask.csproj index 6ae6a2c..8e7f48d 100644 --- a/MyCode.Project.ScheduleTask/MyCode.Project.ScheduleTask.csproj +++ b/MyCode.Project.ScheduleTask/MyCode.Project.ScheduleTask.csproj @@ -95,6 +95,7 @@ + diff --git a/MyCode.Project.Services/Common/IBillKeepingService.cs b/MyCode.Project.Services/Common/IBillKeepingService.cs deleted file mode 100644 index 959514d..0000000 --- a/MyCode.Project.Services/Common/IBillKeepingService.cs +++ /dev/null @@ -1,172 +0,0 @@ -using MyCode.Project.Domain.Businesses.BillKeeping; -using MyCode.Project.Domain.Message.Act.SalesSheetPay; -using MyCode.Project.Domain.Message.Request.CouponActivity; -using MyCode.Project.Domain.Message.Request.Message; -using MyCode.Project.Domain.Message.Response.CouponActivity; -using MyCode.Project.Domain.Message.Response.SalesSheet; -using MyCode.Project.Domain.Model; -using System; -using System.Collections.Generic; - -namespace MyCode.Project.Services -{ - /// - /// 账单记录模块 相关服务 - /// - public interface IBillKeepingService - { - /// - /// 库存记账 - /// - /// 库存记账 数据传输对象 - void Stock(StockBillKeepingDto dto); - - /// - /// 会员服务数量记账 - /// - /// 会员服务数量记账 数据传输对象 - void MemberServiceBook(MemberServiceBookBillKeepingDto dto,Guid MerchantId); - - /// - /// 会员帐户金额记账 - /// - /// 会员帐户金额记账 数据传输对象 - void MemberAccount(MemberAccountBillKeepingDto dto, Guid MerchantId); - - /// - /// 会员积分记账。应用场景：充值、预售、销售 - /// - /// 会员积分记账 数据传输对象 - /// 是否退货退款，遇到积分不够不拦截报错 - void MemberIntegral(MemberIntegralBillKeepingDto dto, bool ifReturnSheet = false); - - /// - /// 批量库存记账，暂时只允许盘盈盘亏审核使用，其他功能请不要调用 - /// - /// 库存记账 数据传输对象数组 - - void BatchStock(List dtolist, Guid merchantId,string UserName); - - /// - /// 设置会员到店时间信息 - /// - /// - /// - void SetMemberShopTime(Guid memberId, Guid shopId, Guid MerchantId); - - /// - /// 设置会员到店服务时间信息 - /// - /// - /// - void SetMemberServiceTime(Guid memberId, Guid shopId, Guid MerchantId); - - /// - /// 卡券数量登记 - /// - /// - List CardBook(CardBookDto dto); - - - /// - /// 计算一条订单的业绩 - /// - /// - void SetMemberExpenses(Object act1); - - /// - /// 核销门票 - /// - /// - void ChangeActivityStatus(Guid sheetId); - - /// - /// 批量计算时间范围内的所有订单的业绩中间报表数 - /// - /// - /// - void BatchSetMemberExpenses(DateTime begin, DateTime end); - - /// - /// 清零指定加盟商的积分 - /// - /// - /// 截止日期 - /// 指定店铺 - void ClearIntegralByCustomerId(Guid? customerId, DateTime? days = null, Guid? shopId = null); - - /// - /// 修改获奖记录的兑换状态为已兑换 - /// - /// - void ChangeMemberPrizeItem(Guid sheetId); - - /// - /// 计算分销佣金 - /// - /// - void CalculateCommission(string id); - /// - /// 调度计算业绩新老客 - /// - /// - void TaskSetRpShopMemberAnalyzeLog2207(string json); - - /// - ///分析一条订单是首单还是复购或者都不是 - /// - /// - StaMemberExpensesRecord SetShouDanFuGou(StaMemberExpensesRecord staMemberExpensesRecord); - - /// - /// 刷业绩记录是否护肤类服务字段 - /// - /// - /// - void SetHuFu(DateTime begin, DateTime end); - - /// - /// 临时的刷业绩计算结果的支付字段数值,修复BUG记录 - /// - /// - /// - void SaveReturnSheetTemp(DateTime days, DateTime end); - - - /// - /// 恢复指定加盟商的被清零的会员积分 - /// - /// - - void ResumeMemberIntegral(Guid? customerId, DateTime begin, DateTime end ); - - /// - /// 传店铺ID和加盟商ID，获得对应的同规则店铺ID数组 - /// - /// - /// - /// - List GetShopAssetRules(Guid? customerId, Guid shopId); - - /// - /// 获取需要记账的积分数(如果返回0，不需要记账) - /// - /// - int GetIntegralToBook(Guid merchantId, Guid memberGradeId, decimal totalAmount); - - /// - /// 补记录计算一条订单的业绩 - /// - /// - - void BuLuMemberExpenses(MemberExpensesAct act); - - /// - /// 记录服务手工费 - /// - /// - /// - void SetShouGongFeiBooks(Guid headSheetId, Guid? customerId); - - } -} diff --git a/MyCode.Project.Services/Common/ICommonService.cs b/MyCode.Project.Services/Common/ICommonService.cs deleted file mode 100644 index 6a86084..0000000 --- a/MyCode.Project.Services/Common/ICommonService.cs +++ /dev/null @@ -1,133 +0,0 @@ -using IO.Swagger.Model; -using MyCode.Project.Domain.Businesses; -using MyCode.Project.Domain.Dtos.Common; -using MyCode.Project.Domain.Model; -using MyCode.Project.Domain.Procs; -using System; -using System.Collections.Generic; - -namespace MyCode.Project.Services -{ - /// - /// 通用模块 相关服务 - /// - public interface ICommonService - { - /// - /// 获取流水编码，前缀使用常量 - /// - /// 前缀 - /// - string GetSerialCode(string prefix); - - /// - /// 获取流水编码，前缀使用常量 - /// - /// 前缀 - /// 店铺ID - /// - string GetSerialCode(string prefix, Guid shopId); - - /// - /// 获取店员编码 - /// - /// - string GetClerkCode(); - - /// - /// 获取支付流水号 - /// - /// 1 招商银行支付 2 富友支付 - /// - string GetPaySerialCode(int paySupply = 2); - - /// - /// 业务单据从临时表转换到正式表 - /// - /// 临时表转正式表 - void TempTableToOfficialTabel(ProcTemp2Official proc); - - - /// - /// 执行存储过程 - 业务单据从临时表转换到正式表，并标记0表为已删除状态 - /// - /// 临时表转正式表 - void ProcTempTableToOfficialTableForSalesSheet(ProcTemp2Official proc); - - - /// - /// 获取空白国际码列表 - /// - /// 获取数量 - /// 商家ID - /// - List GetBlankBarcodeList(int qty, Guid merchantId); - - /// - /// 获取区域详情地址 - /// - /// 省份 - /// 城市 - /// 区域 - /// 详细地址 - /// - string GetRegionAddress(Guid? state, Guid? city, Guid? district, string address = ""); - - /// - /// 处理区域详细地址 - /// - /// 区域数据传输对象 - void HandlerRegionAddress(List list) where T : IRegionDto; - - /// - /// 获取数据配置 - /// - /// 数据类型 - /// 编码 - /// 商家ID - /// - T GetDataConfig(string code, Guid merchantId); - - /// - /// 创建条码 - /// - /// 内容 - /// - string CreateBarcode(string content); - - /// - /// 创建二维码 - /// - /// 内容 - /// - string CreateQrCode(string content); - - /// - /// 获取当前星期几 返回字符串 - /// - /// - /// - string Getweek(int value); - - /// - /// 计算两点位置的距离，返回两点的距离，单位 米 - /// 该公式为GOOGLE提供，误差小于0.2米 - /// - /// 第一点经度 - /// 第一点纬度 - /// 第二点经度 - /// 第二点纬度 - /// - double GetDistance(double lng1, double lat1, double lng2, double lat2); - - /// - /// 计算订单明细的分摊单价的公共方法 - /// - /// 订单明细 - /// 订单含余额支付的总金额 - /// 订单不含余额支付的总金额 - /// - List GetCalPriceAndRevenuePrice(List sheetItem, decimal totalAmount, decimal? cashAmount); - - } -} diff --git a/MyCode.Project.Services/Common/ICouponActityDllService.cs b/MyCode.Project.Services/Common/ICouponActityDllService.cs deleted file mode 100644 index acdb9a2..0000000 --- a/MyCode.Project.Services/Common/ICouponActityDllService.cs +++ /dev/null @@ -1,71 +0,0 @@ -using MyCode.Project.Domain.Message.Request.CouponActivity; -using MyCode.Project.Domain.Message.Request.Message; -using MyCode.Project.Domain.Message.Response.CouponActivity; -using MyCode.Project.Domain.Message.Response.SalesSheet; -using MyCode.Project.Domain.Model; -using System; -using System.Collections.Generic; - -namespace MyCode.Project.Services -{ - /// - /// 账单记录模块 相关服务 - /// - public interface ICouponActityDllService - { - - /// - /// 需要判断条件的会员领取的活动优惠券的方法 - /// - /// 优惠券活动ID - /// 领取优惠券的店铺ID - /// 优惠券所属加盟商ID - /// 领取优惠券的会员ID - /// 来源加盟商ID - /// 来源店员ID - /// 来源会员ID - /// 分享来源类型 0：加盟商 1：店员 2：会员 3:自主领取 - /// 提前知道的优惠券ID - /// 到账类型 0=直接到账 -1=要点领取按钮 - AddCouponResp MemberGetCouponList(MemberGetCouponListAct act,int AddType=0); - - /// - /// 生日优惠券发放 - /// - /// - - void BirthDayCoupon(string nowstring); - - /// - /// 添加调度任务发放生日优惠券 - /// - void AddBirthDayCouponTask(); - - /// - /// 根据会员已有优惠券和商品ID,返回符合订单条件的优惠券ID - /// - /// - /// - /// - List CanUseCoupon(List couponMemberList, decimal totalAmount, List sheetItemList); - - /// - /// 无需判断直接发放优惠券的方法 - /// - /// - void SendCoupon(SendCouponAct act); - - /// - /// 按门店赠送优惠券直接到账的调度方法 - /// - /// - void AutoSendMemberCouponList(string json); - - /// - /// 判断是否允许领取优惠券 - /// - /// - /// - AddCouponResp CheckIfCanGet(MemberGetCouponListAct act, int AddType = 0); - } -} diff --git a/MyCode.Project.Services/Common/IFileManagerService.cs b/MyCode.Project.Services/Common/IFileManagerService.cs deleted file mode 100644 index f77e6b9..0000000 --- a/MyCode.Project.Services/Common/IFileManagerService.cs +++ /dev/null @@ -1,109 +0,0 @@ -using MyCode.Project.Domain.Businesses.FileManager; -using MyCode.Project.Domain.Dtos.Request.Act; -using MyCode.Project.Domain.Message.Response.Common; -using MyCode.Project.Infrastructure.Common; -using MyCode.Project.Infrastructure.Enumeration; -using System; -using System.Collections.Generic; - -namespace MyCode.Project.Services -{ - /// - /// 文件管理器模块 相关服务 - /// - public interface IFileManagerService - { - /// - /// 获取文件分页列表 - /// - /// 查询条件 - /// 商家ID - /// - PageResult GetPageList(PagedSearch search, Guid merchantId); - - /// - /// 保存文件 - /// k - /// 文件信息 操作 - /// 商家ID - Guid Save(FileInfo act, Guid merchantId); - - /// - /// 获取文件详情 - /// - /// 文件ID - /// - FileInfo GetDetial(Guid id); - - /// - /// 保存文件组 - /// - /// 文件组 操作 - /// 商家ID - void SaveGroup(List act, Guid merchantId); - - /// - /// 获取文件组下拉列表 - /// - /// 商家ID - /// - List GetGroupDropdownList(Guid merchantId); - - /// - /// 获取文件组列表 - /// - /// 商家ID - /// - List GetGroupList(Guid merchantId); - - /// - /// 获取文件组统计列表 - /// - /// 商家ID - /// - List GetGroupCountList(Guid merchantId); - - /// - /// 保存关联文件 - /// - /// 关联文件 - /// 数据ID - /// 文件业务类型 - /// 商家ID - void SaveUse(FileUse fileUse, Guid dataId, FileBusinessType businessType, Guid merchantId); - - /// - /// 保存关联文件 - /// - /// 关联文件集合 - /// 数据ID - /// 文件业务类型 - /// 商家ID - /// 是否主文件,true:是,false:否 - void SaveUse(List fileUses, Guid dataId, FileBusinessType businessType, Guid merchantId, bool isMain); - - /// - /// 获取关联文件 - /// - /// 数据ID - /// 文件业务类型 - /// - FileUse GetUse(Guid dataId, FileBusinessType businessType); - - /// - /// 获取关联文件列表 - /// - /// 数据ID - /// 文件业务类型 - /// - List GetUseList(Guid dataId, FileBusinessType businessType); - - /// - /// 获取关联文件列表 - /// - /// 数据ID - /// 文件业务类型 - /// - List GetUseList(List dataIds, FileBusinessType businessType); - } -} diff --git a/MyCode.Project.Services/Common/IOnlinePayService.cs b/MyCode.Project.Services/Common/IOnlinePayService.cs deleted file mode 100644 index d916350..0000000 --- a/MyCode.Project.Services/Common/IOnlinePayService.cs +++ /dev/null @@ -1,27 +0,0 @@ -using MyCode.Project.Domain.Businesses; -using MyCode.Project.Domain.Dtos.Common; -using MyCode.Project.Domain.Model; -using MyCode.Project.Domain.Procs; -using System; -using System.Collections.Generic; - -namespace MyCode.Project.Services -{ - /// - /// 在线支付 相关服务 - /// - public interface IOnlinePayService - { - /// - /// 单一在线付款方式的退款逻辑 - /// - /// - /// - /// - /// - /// 退款金额 - /// 业务类型。100=充值；8010=销售；8011=预售 - - BusOrderRefundLog RefundMoney(BusOrderPay oriOrderPay, Guid sheetId, Guid shopId, string sheet, decimal payAmount, int SheetType); - } -} diff --git a/MyCode.Project.Services/Common/IPriceService.cs b/MyCode.Project.Services/Common/IPriceService.cs deleted file mode 100644 index aacaaa8..0000000 --- a/MyCode.Project.Services/Common/IPriceService.cs +++ /dev/null @@ -1,62 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace MyCode.Project.Services -{ - - /// - /// 价格模块 相关服务 - /// - public partial interface IPriceService - { - /// - /// 获取客户价格，客户做单时使用 - /// - /// 客户ID/加盟商ID - /// 条码ID（商品ID） - /// - decimal GetCustomerPrice(Guid customerId, Guid barcodeId); - - /// - /// 获取店铺价格，店铺做单时使用 - /// - /// 店铺ID - /// 条码ID（商品ID） - /// - decimal GetShopPrice(Guid shopId, Guid barcodeId); - - /// - /// 获取销售价格，店铺销售时使用 - /// - /// 店铺ID - /// 条码ID（商品ID） - /// 会员ID - /// - decimal GetSellPrice(Guid shopId, Guid barcodeId, Guid? memberId, Guid MerchantId); - - /// - /// 根据barcodeId取商品吊牌价 - /// - /// - /// - decimal GetBasePrice(Guid barcodeId, Guid MerchantId); - - /// - /// 根据barcodeId,memberId获取会员价 - /// - /// - /// - /// - decimal GetMemberPrice(Guid barcodeId, Guid memberId, Guid MerchantId); - - /// - /// 取成商品本价 - /// - /// - /// - decimal? GetCost(Guid barcodeId, Guid MerchantId); - } -} diff --git a/MyCode.Project.Services/Common/IRedisService.cs b/MyCode.Project.Services/Common/IRedisService.cs deleted file mode 100644 index c8e1cf8..0000000 --- a/MyCode.Project.Services/Common/IRedisService.cs +++ /dev/null @@ -1,21 +0,0 @@ -using MyCode.Project.Domain.Businesses; -using MyCode.Project.Domain.Dtos.Common; -using MyCode.Project.Domain.Procs; -using System; -using System.Collections.Generic; - -namespace MyCode.Project.Services -{ - /// - /// 通用模块 相关服务 - /// - public interface IRedisService - { - /// - /// 获取模糊搜索的所有的key - /// - /// - List GetAllKeys(string key = "WebSocket*"); - - } -} diff --git a/MyCode.Project.Services/IServices/IStaffDataEnterpriseWechatService.cs b/MyCode.Project.Services/IServices/IStaffDataEnterpriseWechatService.cs index 05aa3e7..be29830 100644 --- a/MyCode.Project.Services/IServices/IStaffDataEnterpriseWechatService.cs +++ b/MyCode.Project.Services/IServices/IStaffDataEnterpriseWechatService.cs @@ -18,5 +18,7 @@ namespace MyCode.Project.Services /// 调度定时登录账号信息 /// void TaskGetUserByAccount(); + + void AddTask(); } } diff --git a/MyCode.Project.Services/Implementation/StaffData/StaffDataEnterpriseWechatService.cs b/MyCode.Project.Services/Implementation/StaffData/StaffDataEnterpriseWechatService.cs index 78de64c..24e202e 100644 --- a/MyCode.Project.Services/Implementation/StaffData/StaffDataEnterpriseWechatService.cs +++ b/MyCode.Project.Services/Implementation/StaffData/StaffDataEnterpriseWechatService.cs @@ -137,5 +137,13 @@ namespace MyCode.Project.Services.Implementation }); //_workProcessService.Add(this.MerchantId, "InitDepartment", "刷企业微信数据", "", 2); } + + + public void AddTask() + { + _workProcessService.Add(this.MerchantId, "TaskGetPasswordData", "定时获取用户登录参数", "", 2); + _workProcessService.Add(this.MerchantId, "TaskGetUserByAccount", "调度定时登录账号信息", "", 2); + + } } }