diff --git a/MyCode.Project.Domain/Message/Request/Activity/ActivityMemberRequst.cs b/MyCode.Project.Domain/Message/Request/Activity/ActivityMemberRequst.cs deleted file mode 100644 index c710be5..0000000 --- a/MyCode.Project.Domain/Message/Request/Activity/ActivityMemberRequst.cs +++ /dev/null @@ -1,82 +0,0 @@ -using MyCode.Project.Infrastructure.Common; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace MyCode.Project.Domain.Message.Request.Activity -{ - #region 会员本人活动数据 - public class MemberProfitReq - { - /// - /// 总获利 - /// - public decimal TotalProfit { get; set; } - - /// - /// 未结获利 - /// - public decimal NoSettledProfit { get; set; } - - /// - /// 已结获利 - /// - public decimal SettledProfit { get; set; } - - /// - /// 本人获利来源汇总分页列表 - /// - public PageResult MemberProfitPageList { get; set; } - } - - /// - /// 下级的订单中获利情况 - /// - public class NextMemberProfit - { - /// - /// 下级名称 - /// - public string Name { get; set; } - - /// - /// 下级订单总消费金额 - /// - public decimal TotalAmount { get; set; } - - /// - /// 下级订单中本人总获利金额 - /// - public decimal SecondProportion { get; set; } - } - #endregion - - - #region 本人活动数据明细 - public class UserProfitDetailReq - { - /// - /// 操作金额 - /// - public decimal Price { get; set; } - - /// - /// 操作时间 - /// - public DateTime CreateTime { get; set; } - - /// - /// 操作类型 0：结算 1：赚取 - /// - public int OperateType { get; set; } - - /// - /// 操作类型文本值 - /// - public string OperateTypeStr { get; set; } - } - - #endregion -} diff --git a/MyCode.Project.Domain/Message/Request/Activity/ActivityRequst.cs b/MyCode.Project.Domain/Message/Request/Activity/ActivityRequst.cs deleted file mode 100644 index 0ec6ac4..0000000 --- a/MyCode.Project.Domain/Message/Request/Activity/ActivityRequst.cs +++ /dev/null @@ -1,210 +0,0 @@ -using MyCode.Project.Infrastructure.Common; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace MyCode.Project.Domain.Message.Request.Activity -{ - #region - public class DataCenterReq - { - /// - /// 店铺ID(加盟商查看必须传值) - /// - public Guid? ShopID { get; set; } - - /// - /// 活动ID - /// - public Guid ActivityID { get; set; } - - /// - /// 时间范围搜索 - /// - public TimeRange EditTime { get; set; } - } - #endregion - - public class FitShopReq - { - /// - /// 店铺活动记录主键ID - /// - public Guid LogID { get; set; } - - /// - /// 经度 - /// - public double? Longitude { get; set; } - - /// - /// 纬度 - /// - public double? Latitude { get; set; } - } - - #region 活动三-马上参与 - public class ShopJoinReq - { - /// - /// 店铺ID(加盟商角色必须传值) - /// - public Guid? ShopID { get; set; } - - /// - /// 活动ID - /// - public Guid ActivityID { get; set; } - - /// - /// 代金券ID - /// - public Guid VoucherID { get; set; } - - /// - /// 兑换方案 - 主键ID - /// - public Guid CaseID { get; set; } - } - #endregion - - #region 通用活动类型-马上参与 - public class AllShopJoinReq - { - /// - /// 活动ID - /// - public Guid ActivityID { get; set; } - - /// - /// 店铺ID - /// - public Guid ShopID { get; set; } - - /// - /// 奖品设置对应明细列表 - /// - public List PrizeItemList { get; set; } - } - - public class PrizeItemReqList - { - /// - /// 明细ID - /// - public Guid ItemID { get; set; } - } - #endregion - - #region 分销活动类型-马上参与 - public class IsAllShopJoinReq - { - /// - /// 活动ID - /// - public Guid ActivityId { get; set; } - - /// - /// 店铺ID - /// - public Guid ShopId { get; set; } - - /// - /// 是否所有店铺参与该活动 0：否 1：是 - /// - public int IsAll { get; set; } - } - #endregion - - #region 溯源 - public class OriginReq - { - /// - /// 店铺ID(加盟商查看必须传值) - /// - public Guid? ShopID { get; set; } - - /// - /// 活动ID - /// - public Guid ActivityID { get; set; } - - /// - /// 数据中心列表主键ID，店长、店员或加盟商主键 - /// - public Guid Id { get; set; } - - /// - /// 时间范围搜索 - /// - public TimeRange EditTime { get; set; } - - /// - /// 关键字 - /// - public string KeyWord { get; set; } - } - #endregion - - public class CommonActivityReq - { - /// - /// 店铺ID - /// - public Guid? shopId { get; set; } - - /// - /// 活动主键ID - /// - public Guid id { get; set; } - - /// - /// 经度 - /// - public double? Longitude { get; set; } - - /// - /// 纬度 - /// - public double? Latitude { get; set; } - } - - #region 报名活动字段 - public class ApplyRequst - { - /// - /// 店铺活动记录主键ID - /// - public Guid LogID { get; set; } - - /// - /// 小程序进入的参数，小程序码产生传参为scene - /// - public string Scene { get; set; } - - /// - /// 提交报名字段列表 - /// - public List FieldList { get; set; } - } - public class FieldApplyItem - { - /// - /// 字段名 - /// - public string FieldName { get; set; } - - /// - /// 字段内容 - /// - public string FieldContent { get; set; } - - /// - /// 排序 - /// - public int Sort { get; set; } - } - #endregion -} diff --git a/MyCode.Project.Domain/Message/Request/Activity/ActivitySetRequst.cs b/MyCode.Project.Domain/Message/Request/Activity/ActivitySetRequst.cs deleted file mode 100644 index e3c5903..0000000 --- a/MyCode.Project.Domain/Message/Request/Activity/ActivitySetRequst.cs +++ /dev/null @@ -1,146 +0,0 @@ -using MyCode.Project.Infrastructure.Common; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace MyCode.Project.Domain.Message.Request.Activity -{ - #region 获取店铺会员 - public class ShareMemberReq - { - /// - /// 店铺ID(加盟商查看必须传值) - /// - public Guid? ShopId { get; set; } - - /// - /// 活动ID - /// - public Guid ActivityId { get; set; } - - /// - /// 关键字（名称或手机号） - /// - public string KeyWord { get; set; } - } - #endregion - - #region 提交有资格分销的会员信息 - public class IsShareMemberReq - { - /// - /// 店铺ID(加盟商查看必须传值) - /// - public Guid? ShopId { get; set; } - - /// - /// 活动ID - /// - public Guid ActivityId { get; set; } - - /// - /// 会员主键集合 - /// - public List IdActs { get; set; } - } - public class MemberIds - { - /// - /// 会员主键 - /// - public Guid MemberId { get; set; } - } - - #endregion - - #region 获取店铺分佣设置 - public class ActivityProfitReq - { - /// - /// 店铺ID(加盟商查看必须传值) - /// - public Guid? ShopId { get; set; } - - /// - /// 活动ID - /// - public Guid ActivityId { get; set; } - } - #endregion - - #region 提交分佣设置 - public class SetActivityProfitReq - { - - /// - /// 分佣对象主键 - /// - public Guid? ShopId { get; set; } - - /// - /// 活动ID - /// - public Guid ActivityId { get; set; } - - /// - /// 分佣设置列表 - /// - public List ActivityProfitList { get; set; } - - } - public class ActivityProfit - { - /// - /// 分佣数据主键 - /// - public Guid? id { get; set; } - - /// - /// 分佣对象主键 - /// - public Guid? ProfitId { get; set; } - - /// - /// 分佣百分比 - /// - public decimal? ProfitPercent { get; set; } - - /// - /// 分销设置对象 0：店长 1：店员 2：购买者 3：直接推荐人 - /// - public int ProfitType { get; set; } - } - #endregion - - #region 加盟商结款 - - /// - /// 加盟商结款数据 - /// - public class SetSettledReq - { - /// - /// 获利用户主键 - /// - public Guid ProfitId { get; set; } - - /// - /// 已结算对象类型 0 店长 1 店员 2 会员 - /// - public int ProfitType { get; set; } - - /// - /// 当前汇总时间 - /// - public DateTime Time { get; set; } - - /// - /// 店铺主键ID - /// - public Guid ShopId { get; set; } - } - #endregion - -} diff --git a/MyCode.Project.Domain/Message/Request/Activity/GetShopShareCodeRequst.cs b/MyCode.Project.Domain/Message/Request/Activity/GetShopShareCodeRequst.cs deleted file mode 100644 index e4e0311..0000000 --- a/MyCode.Project.Domain/Message/Request/Activity/GetShopShareCodeRequst.cs +++ /dev/null @@ -1,25 +0,0 @@ -using MyCode.Project.Domain.Message.Response.User; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace MyCode.Project.Domain.Message.Request.Activity -{ - /// - /// 调度生成海报的参数 - /// - public class GetShopShareCodeRequst - { - /// - /// 店铺参加活动的主键 - /// - public Guid shopActivityId { get; set; } - - /// - /// 登录信息 - /// - public LoginInfo loginInfo { get; set; } - } -} diff --git a/MyCode.Project.Domain/Message/Request/Activity/MiniCodeScenceAct.cs b/MyCode.Project.Domain/Message/Request/Activity/MiniCodeScenceAct.cs deleted file mode 100644 index 1e7e8cb..0000000 --- a/MyCode.Project.Domain/Message/Request/Activity/MiniCodeScenceAct.cs +++ /dev/null @@ -1,70 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace MyCode.Project.Domain.Message.Request.Activity -{ - public class MiniCodeScenceAct - { - /// - /// Desc:缓存的关键字 - /// Default: - /// Nullable:True - /// - public string Scene { get; set; } - - /// - /// Desc:店铺ID - /// Default: - /// Nullable:True - /// - public Guid? ShopId { get; set; } - - /// - /// Desc:店员ID - /// Default: - /// Nullable:True - /// - public Guid? ClerkId { get; set; } - - /// - /// Desc:店铺参加活动的记录主键ID - /// Default: - /// Nullable:True - /// - public Guid? shopActivityId { get; set; } - - /// - /// Desc:活动ID - /// Default: - /// Nullable:True - /// - public Guid? ActivityId { get; set; } - - /// - /// Desc:数据来源 0=营销活动 1=优惠券活动 2=店员加客户的码,3 商城直播的会员关系链 ,4 商品详情拼接海报 ,5=培训课程 ,6=素材库小程序码 - /// - public int? DataType { get; set; } - - /// - /// Desc:所属的加盟商如果为空，则为公司的 - /// Default: - /// Nullable:True - /// - public Guid? CustomerID { get; set; } - - /// - /// Desc:缓存对应的json数据 - /// Default: - /// Nullable:True - /// - public string DataJson { get; set; } - - /// - /// 有效期设置,仅供参考，实际长期有效 - /// - public TimeSpan? ExpireTime { get; set; } - } -} diff --git a/MyCode.Project.Domain/Message/Request/Clerk/ClerkRequst.cs b/MyCode.Project.Domain/Message/Request/Clerk/ClerkRequst.cs deleted file mode 100644 index 24b7f28..0000000 --- a/MyCode.Project.Domain/Message/Request/Clerk/ClerkRequst.cs +++ /dev/null @@ -1,73 +0,0 @@ -using MyCode.Project.Infrastructure.Common; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace MyCode.Project.Domain.Message.Request.Clerk -{ - public class ClerkRequst - { - /// - /// 店铺ID:选择的店铺ID，或当前登录用户所属店铺ID - /// - public Guid? ShopID { get; set; } - - /// - /// 搜索关键字 - /// - public string KeyWord { get; set; } - - /// - /// Desc:搜索条件 -1:全员 1:店长0:店员 - /// Default: - /// Nullable:False - /// - public int ShopFlag { get; set; } - } - - public class EditClerkRequst - { - /// - /// 主键ID 新增店员，不需要该字段 - /// - public Guid? ID { get; set; } - - /// - /// 工号 - /// - public string Code { get; set; } - - /// - /// 姓名 - /// - public string Name { get; set; } - - /// - /// 手机号码 - /// - public string Mobile { get; set; } - - /// - /// 归属店铺ID - /// - public Guid? ShopID { get; set; } - - /// - /// 是否店长。1=是；0=否。 - /// - public int? ShopFlag { get; set; } - - /// - /// 状态 1：在职 0：离职 - /// - public int? Status { get; set; } - - /// - /// 备注 - /// - public string Note { get; set; } - } - -} diff --git a/MyCode.Project.Domain/Message/Request/CouponActivity/GetCouponActivityDetail.cs b/MyCode.Project.Domain/Message/Request/CouponActivity/GetCouponActivityDetail.cs deleted file mode 100644 index da90e49..0000000 --- a/MyCode.Project.Domain/Message/Request/CouponActivity/GetCouponActivityDetail.cs +++ /dev/null @@ -1,104 +0,0 @@ -using MyCode.Project.Domain.Message.Response.CouponActivity; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace MyCode.Project.Domain.Message.Request.CouponActivity -{ - public class GetCouponActivityDetail - { - /// - /// 店铺ID - /// - public Guid shopId { get; set; } - - /// - /// 活动主键ID - /// - public Guid id { get; set; } - } - - public class CouponActivityJoinAct - { - /// - /// 活动ID - /// - public Guid CouponActivityID { get; set; } - - /// - /// 店铺ID - /// - public Guid ShopID { get; set; } - - ///// - ///// 优惠券列表 - ///// - //public List CouponLists { get; set; } - } - - public class MemberGetCouponListAct - { - - /// - /// 事件类型 1=登录事件、2=评价、3=生日、4=到店任意消费、5=累计消费、6=一次性消费 7=注册 ,8=扫码领取 9=会员升级 11=优惠券活动自动发放 21=需要点击才能领取的的扫码领取 - /// - public int? TriggerEvent { get; set; } - - /// - /// 优惠券活动ID - /// - public Guid CouponActivityId { get; set; } - - /// - /// 领取优惠券的店铺ID - /// - public Guid ShopId { get; set; } - - /// - /// 优惠券所属加盟商ID - /// - public Guid? CustomerId { get; set; } - - /// - /// 领取优惠券的会员ID - /// - public Guid MemberId { get; set; } - - /// - /// 来源加盟商ID - /// - public Guid? FromCustomerId { get; set; } - - /// - /// 来源店员ID - /// - public Guid? FromClerkId { get; set; } - - /// - /// 来源会员ID - /// - public Guid? FromMemberId { get; set; } - - /// - /// 分享来源类型 0：加盟商 1：店员 2：会员 3:自主领取 - /// - public int? SourceType { get; set; } - - /// - /// 提前知道的优惠券ID - /// - public List CouponIds { get; set; } - - /// - /// 到账类型 0=直接到账 -1=要点领取按钮 - /// - - public int AddType { get; set; } - - - } - - -} diff --git a/MyCode.Project.Domain/Message/Request/Course/CourseItemReq.cs b/MyCode.Project.Domain/Message/Request/Course/CourseItemReq.cs deleted file mode 100644 index 4ced1c4..0000000 --- a/MyCode.Project.Domain/Message/Request/Course/CourseItemReq.cs +++ /dev/null @@ -1,16 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace MyCode.Project.Domain.Message.Request.Course -{ - public class CourseItemReq - { - /// - /// 课程系列ID - /// - public Guid MainId { get; set; } - } -} diff --git a/MyCode.Project.Domain/Message/Request/CustomServiceSet/ServiceaRequst.cs b/MyCode.Project.Domain/Message/Request/CustomServiceSet/ServiceaRequst.cs deleted file mode 100644 index b1d1261..0000000 --- a/MyCode.Project.Domain/Message/Request/CustomServiceSet/ServiceaRequst.cs +++ /dev/null @@ -1,82 +0,0 @@ -using MyCode.Project.Infrastructure.Common; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace MyCode.Project.Domain.Message.Request.CustomServiceSet -{ - - #region 自定义套餐详情信息 - public class ServiceSetDetailReq - { - /// - /// 套餐主键ID 可为空 - /// - public Guid? ID { get; set; } - - /// - /// 套餐名称 - /// - public string Name { get; set; } - - /// - /// 套餐价格 - /// - public decimal? Price { get; set; } - - /// - /// 状态。1=上架；0=保存不上架。 - /// - public int? Status { get; set; } - - /// - /// 商品类别 0 服务 1 商品 - /// - public int? GoodsType { get; set; } - - /// - /// 服务类型的自定义套餐的服务次数 - /// - public int Qty { get; set; } - - /// - /// 服务分类ID - /// - public Guid? DeptId { get; set; } - - /// - /// 套餐内服务列表 - /// - public List ServiceList { get; set; } - - } - - public class ServiceDetailReq - { - /// - /// 服务主键ID - /// - public Guid ServiceID { get; set; } - - /// - /// 服务次数 - /// - public int Qty { get; set; } - - } - - #endregion - - public class KeyWordsSearch - { - /// - /// 关键字 - /// - public string KeyWord { get; set; } - } - - - -} diff --git a/MyCode.Project.Domain/Message/Request/DouYin/DouYinCommonParam.cs b/MyCode.Project.Domain/Message/Request/DouYin/DouYinCommonParam.cs deleted file mode 100644 index 2669070..0000000 --- a/MyCode.Project.Domain/Message/Request/DouYin/DouYinCommonParam.cs +++ /dev/null @@ -1,108 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace MyCode.Project.Domain.Message.Request.DouYin -{ - public class DouYinCommonParam - { - /// - /// (必填)调用的API接口名称 示例值 token.create - /// - public string Method { get; set; } - - - } - - - public class DouYinVerify - { - /// - /// 一次验券的标识 (用于短时间内的幂等) - /// - public string verify_token { get; set; } - - /// - /// 验券准备接口返回的加密抖音券码 - /// - - public List Encrypted_data { get; set; } - } - - - public class DouYinCancelVerifyQuery - { - /// - /// 代表券码一次核销的唯一标识（验券时返回） - /// - public string verify_id { get; set; } - - /// - /// 代表一张券码的标识（验券时返回） - /// - public string certificate_id { get; set; } - - ///// - ///// 取消核销总次数（多次卡商品可传，优先级低于verify_id）注意：如果是分门店结算，此字段不要传！！！ - ///// - //public int? times_card_cancel_count { get; set; } - - ///// - ///// 撤销核销幂等操作，主要针对次卡，避免因超时等原因在短时间内重复请求导致撤销多次（幂等有效期1小时）注意：如果是分门店结算，此字段不要传！！！ - ///// - //public string cancel_token { get; set; } - } - - public class DouYinVerifyQuery - { - /// - ///必填: 一次验券的标识 (用于短时间内的幂等) - /// - public string verify_token { get; set; } - - /// - ///必填: 核销的抖音门店id - /// - public string poi_id { get; set; } - - /// - /// 验券准备接口返回的加密抖音券码(多次卡商品，如果需要一次核销多份，list中传多个相同encrypted_code) - /// - public List encrypted_codes { get; set; } - - /// - ///三方原始券码值列表 (encrypted_codes/codes/code_with_time_list必须三选一) 多次卡商品，如果需要一次核销多份，list中传多个 - /// - public List codes { get; set; } - - /// - /// 抖音侧的订单号 (非预导码模式的三方券码必需) - /// - public string order_id { get; set; } - - /// - /// 带有核销时间的三方码列表（如果code_with_time_list 和 codes 同时传， 本字段优先级更高） - /// - public List code_with_time_list { get; set; } - - /// - /// 三方码 - /// - public string code { get; set; } - - /// - /// 核销时间戳（秒） - /// - public long? verify_time { get; set; } - - /// - /// 验签 - /// - public List verify_sign_list { get; set; } - - - - } -} diff --git a/MyCode.Project.Domain/Message/Request/Goods/GetGoodsStockRequest.cs b/MyCode.Project.Domain/Message/Request/Goods/GetGoodsStockRequest.cs deleted file mode 100644 index f839940..0000000 --- a/MyCode.Project.Domain/Message/Request/Goods/GetGoodsStockRequest.cs +++ /dev/null @@ -1,21 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace MyCode.Project.Domain.Message.Request.Goods -{ - public class GetGoodsStockRequest - { - /// - /// 店铺id - /// - public Guid ShopId { get; set; } - - /// - /// 搜索关键字 - /// - public string Key { get; set; } - } -} diff --git a/MyCode.Project.Domain/Message/Request/Goods/GoodsStockPageListQuery.cs b/MyCode.Project.Domain/Message/Request/Goods/GoodsStockPageListQuery.cs deleted file mode 100644 index 4ee479b..0000000 --- a/MyCode.Project.Domain/Message/Request/Goods/GoodsStockPageListQuery.cs +++ /dev/null @@ -1,31 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace MyCode.Project.Domain.Message.Request.Goods -{ - /// - /// 进销存模块的商品的列表查询Query - /// - public class GoodsStockPageListQuery - { - - /// - /// 搜索关键字 - /// - public string KeyWord { get; set; } - - /// - /// 店铺ID - /// - public Guid ShopID { get; set; } - - /// - /// 分类或者品牌ID，只有普通商品才存在分类和品牌 - /// - public Guid? DeptID { get; set; } - - } -} diff --git a/MyCode.Project.Domain/Message/Request/LiveVideo/LiveInfoRequest.cs b/MyCode.Project.Domain/Message/Request/LiveVideo/LiveInfoRequest.cs deleted file mode 100644 index 421df51..0000000 --- a/MyCode.Project.Domain/Message/Request/LiveVideo/LiveInfoRequest.cs +++ /dev/null @@ -1,21 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace MyCode.Project.Domain.Message.Request.LiveVideo -{ - public class LiveInfoRequest - { - /// - /// 起始拉取房间，start = 0 表示从第 1 个房间开始拉取 - /// - public int start { get; set; } - - /// - /// 每次拉取的个数上限，不要设置过大，建议 100 以内 - /// - public int limit { get; set; } - } -} diff --git a/MyCode.Project.Domain/Message/Request/MaterialWarehouse/MaterialWarehousePageQuery.cs b/MyCode.Project.Domain/Message/Request/MaterialWarehouse/MaterialWarehousePageQuery.cs deleted file mode 100644 index 34a7623..0000000 --- a/MyCode.Project.Domain/Message/Request/MaterialWarehouse/MaterialWarehousePageQuery.cs +++ /dev/null @@ -1,50 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace MyCode.Project.Domain.Message.Request.MaterialWarehouse -{ - public class MaterialWarehousePageQuery - { - - /// - /// 搜索关键字 - /// - public string KeyWords { get; set; } - - /// - /// 主题ID - /// - public Guid? MaterialThemeID { get; set; } - - /// - /// 素材主键ID - /// - public string MaterialId { get; set; } - - - } - - public class CoursePageQuery - { - - /// - /// 搜索关键字 - /// - public string KeyWords { get; set; } - - } - - public class CoursePageQuery2 - { - - /// - /// 1=已收藏课程 2=已学习课程 - /// - public int SearchType { get; set; } - - - } -} diff --git a/MyCode.Project.Domain/Message/Request/MeiTuan/GetConsumedReq.cs b/MyCode.Project.Domain/Message/Request/MeiTuan/GetConsumedReq.cs deleted file mode 100644 index 552e275..0000000 --- a/MyCode.Project.Domain/Message/Request/MeiTuan/GetConsumedReq.cs +++ /dev/null @@ -1,80 +0,0 @@ -namespace MyCode.Project.Domain.Message.Request.MeiTuan -{ - public class GetConsumedReq - { - - /// - /// 团购券码 - /// - public string receiptCode{ get; set; } - - } - - public class GetConsumeReq - { - - /// - /// 团购券码，必须未验证 - /// - public string receiptCode{ get; set; } - - /// - /// 验券数量, 不可多于100个 - /// - public int count{ get; set; } - - /// - /// 请求ID，用于幂等 - /// - public string requestId{ get; set; } - - /// - /// 商家在自研系统或第三方服务商系统内登陆的用户名，仅用于记录验券者的信息，该字段不参与任何验券校验逻辑 - /// - public string appShopAccountName{ get; set; } - - /// - /// 商家在自研系统或第三方服务商系统内登录的帐号，仅用于记录验券者的信息，该字段不参与任何验券校验逻辑 - /// - public string appShopAccount{ get; set; } - - } - - public class MeituanPrepareReq - { - - /// - /// 团购券码，必须未验证 - /// - public string receiptCode{ get; set; } - - } - - - public class MeituanReverseConsumeReq - { - - /// - /// 商家在自研系统或第三方服务商系统内登录的帐号，仅用于记录验券者的信息，该字段不参与任何验券校验逻辑 - /// - public string appShopAccount{ get; set; } - - /// - /// 商家在自研系统或第三方服务商系统内登陆的用户名，仅用于记录验券者的信息，该字段不参与任何验券校验逻辑 - /// - public string appShopAccountName{ get; set; } - - /// - /// 团购券码，注：撤销核销只能撤销当前核销且核销未超过10分钟的券 - /// - public string receiptCode{ get; set; } - - /// - /// 套餐ID，注意：对应dealId，非dealgroupId - /// - public string dealId{ get; set; } - - } - - -} diff --git a/MyCode.Project.Domain/Message/Request/Member/GetWxPhoneRequest.cs b/MyCode.Project.Domain/Message/Request/Member/GetWxPhoneRequest.cs deleted file mode 100644 index 616090a..0000000 --- a/MyCode.Project.Domain/Message/Request/Member/GetWxPhoneRequest.cs +++ /dev/null @@ -1,26 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace MyCode.Project.Domain.Message.Request.Member -{ - public class GetWxPhoneRequest - { - public string JsCode { get; set; } - - public string EncryptedData { get; set; } - - public string Iv { get; set; } - } - - public class GetWxTokenRequest - { - public string JsCode { get; set; } - - public string EncryptedData { get; set; } - - public string Iv { get; set; } - } -} diff --git a/MyCode.Project.Domain/Message/Request/Member/MemberRequst.cs b/MyCode.Project.Domain/Message/Request/Member/MemberRequst.cs deleted file mode 100644 index 851e4ed..0000000 --- a/MyCode.Project.Domain/Message/Request/Member/MemberRequst.cs +++ /dev/null @@ -1,99 +0,0 @@ -using MyCode.Project.Domain.Message.Response.User; -using MyCode.Project.Infrastructure.Common; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace MyCode.Project.Domain.Message.Request.Member -{ - #region 获取会员信息 - public class MemberReq - { - /// - /// 当前选择的店铺主键ID - /// - public Guid ShopID { get; set; } - - /// - /// (均可不传)当前选择的店铺所属加盟商ID - /// - public Guid? CustomerID { get; set; } - } - #endregion - - #region 获取优惠券列表 - public class CouponMemberPageQuery - { - /// - /// 状态 -1全部 1已使用 2未使用 3已过期 - /// - public int Flag { get; set; } - - /// - /// 店铺ID - /// - public Guid? ShopId { get; set; } - } - #endregion - - public class SetMemberAddFrom - { - - /// - /// Desc:会员资料增加来源 0= 其他; 1= 抖音; 2= 美团; 3=自来客; 4=老客转介绍 - /// - public int? AddFromType { get; set; } - - /// - /// 详情ID - /// - public Guid Id { get; set; } - } - - - - public class MemberAccountBookLogRequst - { - /// - /// 店铺ID - /// - public Guid? ShopId { get; set; } - - /// - /// 后端使用的字段 - /// - public Guid? MemberId { get; set; } - - } - - public class AddMemberConsultantAct - { - /// - /// 店铺ID - /// - public Guid? ShopId { get; set; } - - /// - /// 后端使用的字段 - /// - public Guid? MemberId { get; set; } - - /// - /// 店员ID - /// - public Guid? ClerkId { get; set; } - - /// - /// 加盟商ID,null为公司 - /// - public Guid? CustomerId { get; set; } - - /// - /// 名称 - /// - public string Name { get; set; } - - } -} diff --git a/MyCode.Project.Domain/Message/Request/MemberFunnel/MemberFunnelQuest.cs b/MyCode.Project.Domain/Message/Request/MemberFunnel/MemberFunnelQuest.cs deleted file mode 100644 index 3dc8b01..0000000 --- a/MyCode.Project.Domain/Message/Request/MemberFunnel/MemberFunnelQuest.cs +++ /dev/null @@ -1,40 +0,0 @@ -using MyCode.Project.Infrastructure.Common; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace MyCode.Project.Domain.Message.Request.MemberFunnel -{ - public class MemberFunnelQuest - { - /// - /// 选择的月份。传空时是全部的数据，选月的时候是单月的新增数据 - /// - public DateTime? SelectMonth { get; set; } - - /// - /// 店铺ID - /// - public Guid? ShopId { get; set; } - } - - public class MemberFunnelQuest2 - { - /// - /// 选择的具体时间段,当SearchType=1时生效 - /// - public TimeRange TimeRange { get; set; } - - /// - /// 店铺ID - /// - public Guid? ShopId { get; set; } - - /// - /// 查询类型 1=具体时间 0=全部 - /// - public int? SearchType { get; set; } - } -} diff --git a/MyCode.Project.Domain/Message/Request/Message/ActivityPeopleFullMessageReq.cs b/MyCode.Project.Domain/Message/Request/Message/ActivityPeopleFullMessageReq.cs deleted file mode 100644 index b9dce83..0000000 --- a/MyCode.Project.Domain/Message/Request/Message/ActivityPeopleFullMessageReq.cs +++ /dev/null @@ -1,55 +0,0 @@ -using MyCode.Project.Infrastructure.Common; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace MyCode.Project.Domain.Message.Request.Message -{ - public class ActivityPeopleFullMessageReq - { - - /// - /// 标题 - /// - public string TitleTxt { get; set; } - - - /// - /// 原有数量 - /// - public string FirstTxt { get; set; } - - /// - /// 变更结果 - /// - public string SecondTxt { get; set; } - - /// - /// 变更日期 - /// - public string Time { get; set; } - - - /// - /// 温馨提示 - /// - public string Remarks { get; set; } - - - /// - /// 消息接收角色 - /// - public int RoleType { get; set; } - - - /// - /// OpenId - /// - public string OpenId { get; set; } - - } - - -} diff --git a/MyCode.Project.Domain/Message/Request/Message/BaseSendWxMsgAct.cs b/MyCode.Project.Domain/Message/Request/Message/BaseSendWxMsgAct.cs deleted file mode 100644 index 496966f..0000000 --- a/MyCode.Project.Domain/Message/Request/Message/BaseSendWxMsgAct.cs +++ /dev/null @@ -1,75 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace MyCode.Project.Domain.Message.Request.Message -{ - public class BaseSendWxMsgAct - { - /// - /// unionid - /// - public string UnionId - { - get; - set; - } - - /// - /// 消息ID，为调用方自己的ID，该ID用于微信判断重复性发送消息，可以用调度表中的id - /// - public string MsgId - { - get; - set; - } - - /// - /// 要跳转的url ,非必须 - /// - public string Url - { - get; - set; - } - - /// - /// 要跳转的小程序appid，与上面的URL必传一个 - /// - public string MiniAppId - { - get; - set; - } - - /// - /// 要跳转的小程序路径 - /// - public string MiniPagePath - { - get; - set; - } - - /// - /// 模板的头标题， - /// - public string Title - { - get; - set; - } - - - /// - /// 备注 - /// - public string Remark - { - get; - set; - } - } -} diff --git a/MyCode.Project.Domain/Message/Request/Message/BirthdayMemberSearchReq.cs b/MyCode.Project.Domain/Message/Request/Message/BirthdayMemberSearchReq.cs deleted file mode 100644 index 5245d58..0000000 --- a/MyCode.Project.Domain/Message/Request/Message/BirthdayMemberSearchReq.cs +++ /dev/null @@ -1,31 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace MyCode.Project.Domain.Message.Request.Message -{ - public class BirthdayMemberSearchReq - { - /// - /// 生日日期搜索开始 月-日 - /// - public string BirthStart { get; set; } - - /// - /// 生日日期搜索结束 月-日 - /// - public string BirthEnd { get; set; } - - /// - /// 查询类型 0=近7天生日会员,1=近15天 2=近30天 3=自定义时间生日会员 - /// - public int SearchType { get; set; } - - /// - /// 门店ID,必须传值 - /// - public Guid ShopId { get; set; } - } -} diff --git a/MyCode.Project.Domain/Message/Request/Message/InvitationSuccessNotificationReq.cs b/MyCode.Project.Domain/Message/Request/Message/InvitationSuccessNotificationReq.cs deleted file mode 100644 index 913c1cb..0000000 --- a/MyCode.Project.Domain/Message/Request/Message/InvitationSuccessNotificationReq.cs +++ /dev/null @@ -1,108 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace MyCode.Project.Domain.Message.Request.Message -{ - /// - /// 邀请成功通知（接收对象是分享者） - /// - public class InvitationSuccessNotificationReq - { - /// - /// 受邀人 - /// - public string Name { get; set; } - - /// - /// 邀请奖励: 【优惠券金额】元权益金 （【店铺名称（分享哪家店铺显示哪家）】 - /// - public string MsgString { get; set; } - - /// - /// 邀请时间: 2019年12月29日11:07 - /// - public string InvitationTime { get; set; } - - /// - /// 温馨提示: 您的好友成功领取【活动名称】，使用后您可获得【优惠券金额】元【优惠券使用条件】代金券。 - /// - public string Tips { get; set; } - - /// - /// 发送对象的OPENID - /// - public string OpenId { get; set; } - - } - - /// - /// 优惠券领取成功通知（接收对象是受赠人） - /// - - public class CouponClaimSuccessNotificationReq - { - - /// - /// 优惠券名称：【活动名称】 - /// - public string Name { get; set; } - - /// - /// 有效期： 2019.12.1 - 2019.12.31 - /// - public string InvitationTime { get; set; } - - /// - /// 使用方式：至【门店名称（分享哪家显示哪家）】出示二维码核销使用 - /// - public string MsgString { get; set; } - - /// - /// 温馨提示: 请在有效期内到所属门店使用，小程序BINF流行美活动页查看详情 - /// - public string Tips { get; set; } - - /// - /// 发送对象的OPENID - /// - public string OpenId { get; set; } - - } - - /// - /// 商品兑换成功通知（接收对象是分享者） - /// - - public class ProductExchangeSuccessNotificationReq - { - - /// - /// 商品名称：【活动名称】 - /// - public string Name { get; set; } - - /// - /// 成功兑换时间：2019年12月30日 12:22:22 - /// - public string InvitationTime { get; set; } - - /// - /// 兑换门店：【门店名称】 - /// - public string ShopName { get; set; } - - /// - /// 备注：您的好友成功使用【活动名称】，【优惠券金额】元【优惠券使用条件】代金券。已经到账 - /// - public string Note { get; set; } - - /// - /// 发送对象的OPENID - /// - public string OpenId { get; set; } - - } -} diff --git a/MyCode.Project.Domain/Message/Request/Message/MemberPrizeReq.cs b/MyCode.Project.Domain/Message/Request/Message/MemberPrizeReq.cs deleted file mode 100644 index 1a47965..0000000 --- a/MyCode.Project.Domain/Message/Request/Message/MemberPrizeReq.cs +++ /dev/null @@ -1,150 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace MyCode.Project.Domain.Message.Request.Message -{ - public class MemberPrizeReq - { - /// - /// Desc:使用状态 0 未使用 1 已使用 2 已过期 - /// Default: - /// Nullable:True - /// - public int? IsUsed { get; set; } - - /// - /// 店铺ID - /// - public Guid? ShopId { get; set; } - } - - - public class MemberPrizeAct - { - /// - /// 活动ID - /// - public Guid ActivityID { get; set; } - - /// - /// 奖励记录ID - /// - public Guid Id { get; set; } - - /// - /// 奖品明细ID - /// - public Guid PrizeID { get; set; } - - /// - /// 奖品数量 - /// - public int Qty { get; set; } - - /// - /// 奖品类型(这里是创建订单所需要的)0：商品 1：服务 6：代金券 7=优惠券 - /// - public int ItemType { get; set; } - } - - - public class SendCouponAct - { - /// - /// Desc:普通活动ID - /// Default: - /// Nullable:False - /// - public Guid? ActivityId { get; set; } - - /// - /// 店铺ID - /// - public Guid ShopId { get; set; } - - /// - /// 会员ID - /// - public Guid MemberId { get; set; } - - /// - /// 优惠券发放配置数组 - /// - public List CouponSetActs { get; set; } - - /// - /// 加盟商ID - /// - public Guid? CustomerId { get; set; } - - /// - /// 事件类型 1=登录事件、2=评价、3=生日、4=到店任意消费、5=累计消费、6=一次性消费 7=注册 ,8=扫码领取 9=通用活动的扫码兑换 10=通用活动的分享奖励 11=优惠券活动自动发放 12 大转盘中奖发放 - /// - public int? TriggerEvent { get; set; } - - } - - - public class CouponSetAct - { - /// - /// 发放数量 - /// - public int? Qty { get; set; } - - /// - /// 优惠券ID - /// - public Guid CouponId { get; set; } - - } - - - public class AutoSendMemberCouponAct - { - /// - /// Desc:普通活动ID - /// Default: - /// Nullable:False - /// - public Guid ActivityId { get; set; } - - /// - /// 店铺ID - /// - public Guid ShopId { get; set; } - - /// - /// 会员ID - /// - public List MemberIdList { get; set; } - - /// - /// 优惠券发放配置数组 - /// - public List CouponSetActs { get; set; } - - /// - /// 加盟商ID - /// - public Guid? CustomerId { get; set; } - - /// - /// 事件类型 1=登录事件、2=评价、3=生日、4=到店任意消费、5=累计消费、6=一次性消费 7=注册 ,8=扫码领取 9=会员升级 11=优惠券活动自动发放 21=需要点击才能领取的的扫码领取 - /// - public int? TriggerEvent { get; set; } - - } - - public class ShopInfo - { - public Guid ShopId { get; set; } - - public Guid? CustomerId { get; set; } - - } - -} diff --git a/MyCode.Project.Domain/Message/Request/Message/ProcessMessageReq.cs b/MyCode.Project.Domain/Message/Request/Message/ProcessMessageReq.cs deleted file mode 100644 index efd7930..0000000 --- a/MyCode.Project.Domain/Message/Request/Message/ProcessMessageReq.cs +++ /dev/null @@ -1,33 +0,0 @@ -using MyCode.Project.Infrastructure.Common; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace MyCode.Project.Domain.Message.Request.Message -{ - public class ProcessMessageReq - { - /// - /// Desc:店铺ID 加盟商选择查看的店铺ID(店员不用传) - /// - public Guid? ShopID { get; set; } - } - - /// - /// 管理层-店长的一天 - /// - public class CusMessageReq - { - /// - /// 店铺ID - /// - public Guid ShopID { get; set; } - - /// - /// 时间范围搜索 - /// - public TimeRange SendTime { get; set; } - } -} diff --git a/MyCode.Project.Domain/Message/Request/Message/SendMemberConsumeMsgAct.cs b/MyCode.Project.Domain/Message/Request/Message/SendMemberConsumeMsgAct.cs deleted file mode 100644 index 338e304..0000000 --- a/MyCode.Project.Domain/Message/Request/Message/SendMemberConsumeMsgAct.cs +++ /dev/null @@ -1,59 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace MyCode.Project.Domain.Message.Request.Message -{ - /// - /// 发送会员消费提醒 - /// - public class SendMemberConsumeMsgAct : BaseSendWxMsgAct - { - /// - /// 店铺名 - /// - public string ShopName - { - get; - set; - } - - /// - /// 金额 - /// - public decimal Amount - { - get; - set; - } - - /// - /// 支付方式 - /// - public string PayMethod - { - get; - set; - } - - /// - /// 赠送积分 - /// - public int Point - { - get; - set; - } - - /// - /// 消费时间 - /// - public DateTime Time - { - get; - set; - } - } -} diff --git a/MyCode.Project.Domain/Message/Request/Message/SendVeriSuccessMsgAct.cs b/MyCode.Project.Domain/Message/Request/Message/SendVeriSuccessMsgAct.cs deleted file mode 100644 index 9836b16..0000000 --- a/MyCode.Project.Domain/Message/Request/Message/SendVeriSuccessMsgAct.cs +++ /dev/null @@ -1,41 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace MyCode.Project.Domain.Message.Request.Message -{ - /// - /// 核销成功通知 - /// - public class SendVeriSuccessMsgAct : BaseSendWxMsgAct - { - /// - /// 项目名 - /// - public string ProjectName - { - get; - set; - } - - /// - /// 核销时间 - /// - public DateTime Time - { - get; - set; - } - - /// - /// 核销门店 - /// - public string ShopName - { - get; - set; - } - } -} diff --git a/MyCode.Project.Domain/Message/Request/Message/SendWeMsgRechargeSuccessAct.cs b/MyCode.Project.Domain/Message/Request/Message/SendWeMsgRechargeSuccessAct.cs deleted file mode 100644 index 18aa32b..0000000 --- a/MyCode.Project.Domain/Message/Request/Message/SendWeMsgRechargeSuccessAct.cs +++ /dev/null @@ -1,43 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace MyCode.Project.Domain.Message.Request.Message -{ - /// - /// 充值成功 - /// - public class SendWeMsgRechargeSuccessAct : BaseSendWxMsgAct - { - /// - /// 充值门店名 - /// - public string ShopName - { - get; - set; - } - - /// - /// 充值金额 - /// - public decimal RechargeAmount - { - get; - set; - } - - /// - /// 余额 - /// - public decimal BalanceMoney - { - get; - set; - } - - - } -} diff --git a/MyCode.Project.Domain/Message/Request/Million/ExecutionProgressAct.cs b/MyCode.Project.Domain/Message/Request/Million/ExecutionProgressAct.cs deleted file mode 100644 index 1c84429..0000000 --- a/MyCode.Project.Domain/Message/Request/Million/ExecutionProgressAct.cs +++ /dev/null @@ -1,66 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace MyCode.Project.Domain.Message.Request.Million -{ - public class ExecutionProgressAct - { - - /// - /// 店铺ID - /// - public Guid? ShopId { get; set; } - - /// - ///状态 0 初始化 10 店长中午审核 20 店长晚上审核 100 加盟商审核 - /// - public int Flag { get; set; } - - /// - /// 状态描述，前端不用传 - /// - public string FlagStr { get; set; } - /// - ///纳新工作 0 未完成 1 已完成 2 不需要 - /// - public int NewMember { get; set; } - - /// - /// Desc:促销方案 0 未完成 1 已完成 2 不需要 - /// Default: - /// Nullable:True - /// - public int PromotionalPrograms { get; set; } - - /// - /// Desc:朋友圈 0 未完成 1 已完成 2 不需要 - /// Default: - /// Nullable:True - /// - public int CircleOfFriends { get; set; } - - /// - /// Desc:邀约工作 0 未完成 1 已完成 2 不需要 - /// Default: - /// Nullable:True - /// - public int Invite { get; set; } - - /// - /// Desc:陈列及清洁 0 未完成 1 已完成 2 不需要 - /// Default: - /// Nullable:True - /// - public int DisplayClean { get; set; } - - /// - /// Desc:补货及安排 0 未完成 1 已完成 2 不需要 - /// Default: - /// Nullable:True - /// - public int Replenishment { get; set; } - } -} diff --git a/MyCode.Project.Domain/Message/Request/Million/JsonStringReq.cs b/MyCode.Project.Domain/Message/Request/Million/JsonStringReq.cs deleted file mode 100644 index 5b2b5a8..0000000 --- a/MyCode.Project.Domain/Message/Request/Million/JsonStringReq.cs +++ /dev/null @@ -1,43 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace MyCode.Project.Domain.Message.Request.Million -{ - public class JsonStringReq - { - public string jsonstring { get; set; } - } - - public class RequestModel - { - /// - /// 请求URL - /// - public string Url - { - get; - set; - } - - /// - /// 请求的token - /// - public object Token - { - get; - set; - } - - /// - /// 请求的参数 - /// - public string Param - { - get; - set; - } - } -} diff --git a/MyCode.Project.Domain/Message/Request/Million/MillionBaseInfoReq.cs b/MyCode.Project.Domain/Message/Request/Million/MillionBaseInfoReq.cs deleted file mode 100644 index ff8bc95..0000000 --- a/MyCode.Project.Domain/Message/Request/Million/MillionBaseInfoReq.cs +++ /dev/null @@ -1,47 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace MyCode.Project.Domain.Message.Request.Million -{ - public class MillionBaseInfoReq - { - /// - /// 主键ID - /// - public Guid? ID { get; set; } - - /// - /// Desc:店铺ID 编辑时不可修改店铺 - /// - public Guid? ShopID { get; set; } - - /// - /// Desc:店铺类型ID - /// - public Guid? TradingAreaID { get; set; } - - /// - /// Desc:T100老师ID - /// - public Guid? TeacherID { get; set; } - - /// - /// Desc:百万店经理ID - /// - public Guid? ManagerID { get; set; } - - /// - /// Desc:店铺面积(m2) - /// - public decimal Area { get; set; } - - /// - /// Desc:前3个月均单 - /// - public decimal BothSingle { get; set; } - - } -} diff --git a/MyCode.Project.Domain/Message/Request/Million/MillionSchemeReq.cs b/MyCode.Project.Domain/Message/Request/Million/MillionSchemeReq.cs deleted file mode 100644 index 0cec46f..0000000 --- a/MyCode.Project.Domain/Message/Request/Million/MillionSchemeReq.cs +++ /dev/null @@ -1,197 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace MyCode.Project.Domain.Message.Response.MillionPolicy -{ - public class MillionSchemeReq - { - /// - /// Desc:主键ID，新增不需传 - /// - public Guid? ID { get; set; } - - /// - /// Desc:店铺ID - /// - public Guid ShopID { get; set; } - - /// - /// Desc:团队奖-业绩指标(万) - - /// - public decimal? TeamPerformance { get; set; } - - /// - /// Desc:团队奖-业绩指标奖励金额 - /// - public decimal? TeamReward1 { get; set; } - - /// - /// Desc:团队奖-冲刺指标(万) - /// - public decimal? TeamSprint { get; set; } - - /// - /// Desc:团队奖-冲刺指标奖励金额 - /// - public decimal? TeamReward2 { get; set; } - - /// - /// Desc:团队奖-挑战指标(万) - /// - public decimal? TeamChallenge { get; set; } - - /// - /// Desc:团队奖-挑战指标奖励金额 - /// - public decimal? TeamReward3 { get; set; } - - /// - /// Desc:成长奖-个人业绩(元) - /// - public decimal? GrowPerformance1 { get; set; } - - /// - /// Desc:成长奖-个人业绩奖励金额(元) - /// - public decimal? GrowReward1 { get; set; } - - /// - /// Desc:成长奖-个人业绩1(元) - /// - public decimal? GrowPerformance2 { get; set; } - - /// - /// Desc:成长奖-个人业绩奖励金额1(元) - /// - public decimal? GrowReward2 { get; set; } - - /// - /// Desc:周奖励-个人业绩(元) - /// - public decimal? WeekPerformance { get; set; } - - /// - /// Desc:周奖励-个人业绩奖励金额(元) - /// - public decimal? WeekReward { get; set; } - - /// - /// Desc:日激励-总套餐金额1(元) - /// - public decimal? DaySetPrice1 { get; set; } - - /// - /// Desc:日激励-总套餐金额奖励1(元) - /// - public decimal? DaySetReward1 { get; set; } - - /// - /// Desc:日激励-总套餐金额2(元) - /// - public decimal? DaySetPrice2 { get; set; } - - /// - /// Desc:日激励-总套餐金额奖励2(元) - /// - public decimal? DaySetReward2 { get; set; } - - /// - /// Desc:日激励-总套餐金额3(元) - /// - public decimal? DaySetPrice3 { get; set; } - - /// - /// Desc:日激励-总套餐金额奖励3(元) - /// - public decimal? DaySetReward3 { get; set; } - - /// - /// Desc:日激励-总套餐金额4(元) - /// - public decimal? DaySetPrice4 { get; set; } - - /// - /// Desc:日激励-总套餐金额奖励4(元) - /// - public decimal? DaySetReward4 { get; set; } - - /// - /// Desc:首单奖-时间 - /// - public string TimeAM { get; set; } - - /// - /// Desc:首单奖-金额(元) - /// - public decimal? AMPrice { get; set; } - - /// - /// Desc:首单奖-奖励金额(元) - /// - public decimal? AMReward { get; set; } - - /// - /// Desc:末单奖-时间 - /// - public string TimePM { get; set; } - - /// - /// Desc:末单奖-金额(元) - /// - public decimal? PMPrice { get; set; } - - /// - /// Desc:末单奖-奖励金额(元) - /// - public decimal? PMReward { get; set; } - - /// - /// Desc:大单奖-单日业绩1(元) - /// - public decimal? BigPerformance1 { get; set; } - - /// - /// Desc:大单奖-奖励金额1(元) - /// - public decimal? BigReward1 { get; set; } - - /// - /// Desc:大单奖-单日业绩2(元) - /// - public decimal? BigPerformance2 { get; set; } - - /// - /// Desc:大单奖-奖励金额2(元) - /// - public decimal? BigReward2 { get; set; } - - /// - /// Desc:大单奖-单日业绩3(元) - /// - public decimal? BigPerformance3 { get; set; } - - /// - /// Desc:大单奖-奖励金额3(元) - /// - public decimal? BigReward3 { get; set; } - - /// - /// Desc:护肤奖-每日护肤保底人数 - /// - public int Qty { get; set; } - - /// - /// Desc:护肤奖-水果金(元) - /// - public decimal? FruitReward { get; set; } - - /// - /// Desc:大单奖-负激励(元) - /// - public decimal? MinusReward { get; set; } - } -} diff --git a/MyCode.Project.Domain/Message/Request/Million/MillionShopAduitReq.cs b/MyCode.Project.Domain/Message/Request/Million/MillionShopAduitReq.cs deleted file mode 100644 index 58cfab2..0000000 --- a/MyCode.Project.Domain/Message/Request/Million/MillionShopAduitReq.cs +++ /dev/null @@ -1,214 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace MyCode.Project.Domain.Message.Request.Million -{ - #region 业绩审核 - public class KPIAduitReq - { - /// - /// Desc:主键ID - /// - public Guid? ID { get; set; } - - /// - /// Desc:当前选择日期 - /// - public DateTime Time { get; set; } - - /// - /// Desc:店员ID - /// - public Guid? ClerkID { get; set; } - - /// - /// Desc:实际KPI(元) - /// - public decimal? RealQty { get; set; } - - /// - /// Desc:日业绩指标(元) - /// - public decimal? Qty { get; set; } - - /// - /// Desc:是否达标 0=未达标 1=达标 - /// - public int? IsReach { get; set; } - } - #endregion - - #region 纳新 - public class ExAduitReq - { - /// - /// Desc:主键ID - /// - public Guid? ID { get; set; } - - /// - /// Desc:当前选择日期 - /// - public DateTime Time { get; set; } - - /// - /// Desc:店员ID - /// - public Guid ClerkID { get; set; } - - ///// - ///// Desc:实际老顾客数量 - ///// Default: - ///// Nullable:True - ///// - //public int? RealRegularQty { get; set; } - - /// - /// Desc:实际新顾客数量 - /// Default: - /// Nullable:True - /// - public int? RealQty { get; set; } - - ///// - ///// Desc:老顾客人数 - ///// Default: - ///// Nullable:True - ///// - //public int? RegularQty { get; set; } - - /// - /// Desc:新顾客人数 - /// Default: - /// Nullable:True - /// - public int? Qty { get; set; } - - ///// - ///// Desc:是否达标 0=未达标 1=达标 - ///// - //public int? IsReach { get; set; } - } - #endregion - - #region 纳新 - public class InviteAduitReq - { - /// - /// Desc:主键ID - /// - public Guid? ID { get; set; } - - /// - /// Desc:当前选择日期 - /// - public DateTime Time { get; set; } - - /// - /// Desc:店员ID - /// - public Guid ClerkID { get; set; } - - /// - /// Desc:实际邀约数量 - /// - public int? RealQty { get; set; } - - /// - /// Desc:邀约指标人数 - /// - public int? Qty { get; set; } - - ///// - ///// Desc:是否达标 0=未达标 1=达标 - ///// - //public int? IsReach { get; set; } - } - #endregion - - #region 护理 - public class NurseAduitReq - { - /// - /// Desc:主键ID - /// - public Guid? ID { get; set; } - - /// - /// Desc:当前选择日期 - /// - public DateTime Time { get; set; } - - /// - /// Desc:店员ID - /// - public Guid ClerkID { get; set; } - - /// - /// Desc:实际护理数量 - /// - public int? RealQty { get; set; } - - /// - /// Desc:护理指标人数 - /// - public int? Qty { get; set; } - - ///// - ///// Desc:是否达标 0=未达标 1=达标 - ///// - //public int? IsReach { get; set; } - } - #endregion - - #region 体验 - public class ExperienceAduitReq - { - /// - /// Desc:主键ID - /// - public Guid? ID { get; set; } - - /// - /// Desc:当前选择日期 - /// - public DateTime Time { get; set; } - - /// - /// Desc:店员ID - /// - public Guid ClerkID { get; set; } - - /// - /// Desc:实际体验数量 - /// - public int? RealQty { get; set; } - - /// - /// Desc:体验指标人数 - /// - public int? Qty { get; set; } - - ///// - ///// Desc:是否达标 0=未达标 1=达标 - ///// - //public int? IsReach { get; set; } - } - #endregion - - public class AuditRequest - { - /// - /// 店员ID - /// - public Guid ClerkID { get; set; } - - /// - /// 店铺ID - /// - public Guid ShopID { get; set; } - } -} diff --git a/MyCode.Project.Domain/Message/Request/Million/MillionStrategyReq.cs b/MyCode.Project.Domain/Message/Request/Million/MillionStrategyReq.cs deleted file mode 100644 index 2b3ce17..0000000 --- a/MyCode.Project.Domain/Message/Request/Million/MillionStrategyReq.cs +++ /dev/null @@ -1,71 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace MyCode.Project.Domain.Message.Request.Million -{ - public class MillionStrategyReq - { - /// - /// Desc:主键ID - /// - public Guid? ID { get; set; } - - /// - /// Desc:基础信息ID - /// - public Guid BaseID { get; set; } - - /// - /// Desc:评估分析 - /// - public string EvaluationAnalysis { get; set; } - - /// - /// Desc:评估分数 - /// - public decimal? EvaluationScore { get; set; } - - /// - /// Desc:保底 - /// - public decimal? Guaranteed { get; set; } - - /// - /// Desc:挑战 - /// - public decimal? Challenge { get; set; } - - /// - /// Desc:冲刺 - /// - public decimal? Sprint { get; set; } - - /// - /// Desc:开始时间 - /// - public DateTime? BeginTime { get; set; } - - /// - /// 结束时间（必填） - /// - public DateTime EndTime { get; set; } - - /// - /// Desc:核心策略1 - /// - public string Strategy1 { get; set; } - - /// - /// Desc:核心策略2 - /// - public string Strategy2 { get; set; } - - /// - /// Desc:核心策略3 - /// - public string Strategy3 { get; set; } - } -} diff --git a/MyCode.Project.Domain/Message/Request/Million/SalesPerformancReq.cs b/MyCode.Project.Domain/Message/Request/Million/SalesPerformancReq.cs deleted file mode 100644 index 55a67b0..0000000 --- a/MyCode.Project.Domain/Message/Request/Million/SalesPerformancReq.cs +++ /dev/null @@ -1,106 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace MyCode.Project.Domain.Message.Request.Million -{ - public class ShopSalesPerformancReq - { - /// - /// 查询日期 - /// - public DateTime Date { get; set; } - - /// - /// 查询店铺 - /// - public Guid ShopId { get; set; } - - } - - - public class ClerkSalesPerformancReq - { - /// - /// 查询日期 - /// - public DateTime Date { get; set; } - - /// - /// 店员ID - /// - public Guid ClerkId { get; set; } - - } - - public class ShopOnlineDataEntryReq - { - /// - /// 店铺ID - /// - public Guid? ShopId { get; set; } - - /// - /// 日期 - /// - public DateTime? Days { get; set; } - - } - - public class SomeShopsSalesPerformancReq - { - /// - /// 开始日期 - /// - public DateTime Begin { get; set; } - - /// - /// 结束日期 - /// - public DateTime End { get; set; } - - /// - /// 报表类型 0=合计; 1=平均 - /// - public int ReportType { get; set; } - - /// - /// 是否全选店铺 0=否; 1=是 - /// - public int IfAllShop { get; set; } - - /// - /// 查询店铺数组 - /// - public List ShopIds { get; set; } - - } - - public class ClerkOrCusSalesPerformancReq - { - /// - /// 查询日期 - /// - public DateTime Date { get; set; } - - /// - /// 店员ID或加盟商ID - /// - public Guid? ClerkId { get; set; } - - /// - /// 店铺主键ID - /// - public Guid ShopId { get; set; } - - /// - /// 是否为加盟商 0=否 1=是 - /// - public int IsCustomer { get; set; } - - } - - -} diff --git a/MyCode.Project.Domain/Message/Request/Million/ShopAnalyzeReq.cs b/MyCode.Project.Domain/Message/Request/Million/ShopAnalyzeReq.cs deleted file mode 100644 index c1d39d0..0000000 --- a/MyCode.Project.Domain/Message/Request/Million/ShopAnalyzeReq.cs +++ /dev/null @@ -1,127 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace MyCode.Project.Domain.Message.Request.Million -{ - #region 店铺周围环境分析 - public class EnvironmentReq - { - /// - /// Desc:主键ID - /// - public Guid? ID { get; set; } - - /// - /// Desc:基础情况ID - /// - public Guid BaseID { get; set; } - - /// - /// Desc:文本框 - /// - public List shoptextList { get; set; } - } - #endregion - - #region 店员分析 - public class MillionClerkReq - { - /// - /// Desc:主键ID - /// - public Guid? ID { get; set; } - - /// - /// Desc:基础信息ID - /// - public Guid BaseID { get; set; } - - /// - /// Desc:文本框 - /// - public List shoptextList { get; set; } - - } - #endregion - - #region 老顾客分析 - public class RegularCustomerReq - { - /// - /// Desc:主键ID - /// - public Guid? ID { get; set; } - - /// - /// Desc:基础信息ID - /// - public Guid BaseID { get; set; } - - /// - /// Desc:文本框 - /// - public List shoptextList { get; set; } - } - #endregion - - #region 业绩趋势分析 - public class MillionTrendsReq - { - /// - /// Desc:主键ID - /// - public Guid? ID { get; set; } - - /// - /// Desc:基础信息ID - /// - public Guid BaseID { get; set; } - - /// - /// Desc:文本框 - /// - public List shoptextList { get; set; } - } - #endregion - - #region 经营能力分析 - public class MillionManageReq - { - /// - /// Desc:主键ID - /// - public Guid? ID { get; set; } - - /// - /// Desc:基础信息ID - /// - public Guid BaseID { get; set; } - - /// - /// Desc:文本框 - /// - public List shoptextList { get; set; } - } - - public class ShopTextReq - { - /// - /// Desc:字段名 - /// - public string Field { get; set; } - - /// - /// Desc:文本描述 - /// - public string text { get; set; } - - /// - /// Desc:文本内容 - /// - public string value { get; set; } - } - #endregion -} diff --git a/MyCode.Project.Domain/Message/Request/Million/ShopKPIReq.cs b/MyCode.Project.Domain/Message/Request/Million/ShopKPIReq.cs deleted file mode 100644 index b66f358..0000000 --- a/MyCode.Project.Domain/Message/Request/Million/ShopKPIReq.cs +++ /dev/null @@ -1,394 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace MyCode.Project.Domain.Message.Request.Million -{ - #region 设置店铺业绩计算方式 - public class KPIModelReq - { - /// - /// 店铺ID；加盟商选中时需传 - /// - public Guid? ShopID { get; set; } - - /// - /// 方式对应值 - /// - public int Model { get; set; } - } - #endregion - - #region 店员指标设置 - public class MonthKPIReq - { - /// - /// 指标类型 0：月度 1：日指标 - /// - public int TargetType { get; set; } - - /// - /// 店铺ID；加盟商保存时需传 - /// - public Guid? ShopID { get; set; } - - /// - /// 各个店员指标设置明细 - /// - public List ClerkDetail { get; set; } - } - public class KPIDetailReq - { - /// - /// Desc:店员ID - /// Default: - /// Nullable:False - /// - public Guid ClerkID { get; set; } - - /// - /// 店员名称 - /// - public string Name { get; set; } - - /// - /// Desc:业绩指标(元) - /// Default: - /// Nullable:False - /// - public decimal? Qty { get; set; } - } - #endregion - - #region 店员拓客指标设置 - public class ExtensionReq - { - /// - /// 指标类型 0：月度 1：日指标 - /// - public int TargetType { get; set; } - - /// - /// 店铺ID；加盟商保存时需传 - /// - public Guid? ShopID { get; set; } - - /// - /// 各个店员指标设置明细 - /// - public List ClerkDetail { get; set; } - } - public class ExtensionDetailReq - { - /// - /// Desc:店员ID - /// - public Guid ClerkID { get; set; } - - /// - /// 店员名称 - /// - public string Name { get; set; } - - ///// - ///// 老顾客人数 - ///// - //public int? RegularQty { get; set; } - - /// - /// 新顾客人数 - /// - public int? Qty { get; set; } - } - #endregion - - #region 店员邀约指标设置 - public class InviteReq - { - /// - /// 指标类型 0：月度 1：日指标 - /// - public int TargetType { get; set; } - - /// - /// 店铺ID；加盟商保存时需传 - /// - public Guid? ShopID { get; set; } - - /// - /// 各个店员指标设置明细 - /// - public List ClerkDetail { get; set; } - } - public class InviteDetailReq - { - /// - /// Desc:店员ID - /// - public Guid ClerkID { get; set; } - - /// - /// 店员名称 - /// - public string Name { get; set; } - - /// - /// 邀约人数 - /// - public int? Qty { get; set; } - } - #endregion - - #region 店员护理指标设置 - public class NurseReq - { - /// - /// 指标类型 0：月度 1：日指标 - /// - public int TargetType { get; set; } - - /// - /// 店铺ID；加盟商保存时需传 - /// - public Guid? ShopID { get; set; } - - /// - /// 各个店员指标设置明细 - /// - public List ClerkDetail { get; set; } - } - public class NurseDetailReq - { - /// - /// Desc:店员ID - /// - public Guid ClerkID { get; set; } - - /// - /// 店员名称 - /// - public string Name { get; set; } - - /// - /// 护理人数 - /// - public int? Qty { get; set; } - } - #endregion - - #region 店员体验指标设置 - public class ExperienceReq - { - /// - /// 指标类型 0：月度 1：日指标 - /// - public int TargetType { get; set; } - - /// - /// 店铺ID；加盟商保存时需传 - /// - public Guid? ShopID { get; set; } - - /// - /// 各个店员指标设置明细 - /// - public List ClerkDetail { get; set; } - } - public class ExperienceDetailReq - { - /// - /// Desc:店员ID - /// - public Guid ClerkID { get; set; } - - /// - /// 店员名称 - /// - public string Name { get; set; } - - /// - /// 体验人数 - /// - public int? Qty { get; set; } - } - #endregion - - #region 店员裂变指标设置 - public class FissionReq - { - /// - /// 指标类型 0：月度 1：日指标 - /// - public int TargetType { get; set; } - - /// - /// 店铺ID；加盟商保存时需传 - /// - public Guid? ShopID { get; set; } - - /// - /// 各个店员指标设置明细 - /// - public List ClerkDetail { get; set; } - } - public class FissionDetailReq - { - /// - /// 店员ID - /// - public Guid ClerkID { get; set; } - - /// - /// 店员名称 - /// - public string Name { get; set; } - - /// - /// 人数 - /// - public int? Qty { get; set; } - } - #endregion - - #region 早会旺场指标设置 - public class ZHWCReq - { - /// - /// 店铺ID；加盟商保存时需传 - /// - public Guid? ShopID { get; set; } - - /// - /// 当前操作类型 0：店长分配任务 1：店员提交数据 2：店长审核 - /// - public int Flag { get; set; } - - /// - /// 各个店员指标设置明细 - /// - public List ClerkDetail { get; set; } - } - public class ZHWCDetailReq - { - /// - /// Desc:店员ID - /// - public Guid ClerkID { get; set; } - - /// - /// 店员名称 - /// - public string Name { get; set; } - - /// - /// 实际数量 - /// - public int? Qty { get; set; } - - /// - /// 目标数量 - /// - public int? TargetQty { get; set; } - } - #endregion - - #region 店员提交自己的五项指标数据给店长 - public class ZHResultReq - { - /// - /// 消息公告主键ID - /// - public Guid ID { get; set; } - - /// - /// 业绩指标数据 - /// - public ZHKPIAuditDetailReq KPIResult { get; set; } - - /// - /// 纳新指标数据 - /// - public ZHAuditDetailReq NewResult { get; set; } - - /// - /// 邀约指标数据 - /// - public ZHAuditDetailReq InviteResult { get; set; } - - /// - /// 护理指标数据 - /// - public ZHAuditDetailReq NurseResult { get; set; } - - /// - /// 体验指标数据 - /// - public ZHAuditDetailReq ExperienceResult { get; set; } - } - public class ZHKPIAuditDetailReq - { - /// - /// 实际业绩 - /// - public decimal Qty { get; set; } - - /// - /// 目标业绩 - /// - public decimal TargetQty { get; set; } - } - - public class ZHAuditDetailReq - { - /// - /// 实际数量 - /// - public int Qty { get; set; } - - /// - /// 目标数量 - /// - public int TargetQty { get; set; } - } - #endregion - - #region 店员查看自己早旺场指标任务和查看本人早旺场数据 - public class ZHWCResultReq - { - /// - /// 消息-任务公告主键ID - /// - public Guid ID { get; set; } - - /// - /// 提交的数据 - /// - public List List { get; set; } - } - - public class ZHWCResultList - { - /// - /// 主键ID - /// - public Guid Id { get; set; } - - /// - /// 是否可以修改 0：不可以 1：可以修改 (店长已审核此项指标，不能修改) - /// - public int IsModify { get; set; } - - /// - /// 实际数量 - /// - public int Qty { get; set; } - - /// - /// 目标数量 - /// - public int TargetQty { get; set; } - } - #endregion -} diff --git a/MyCode.Project.Domain/Message/Request/Million/TemplateRequst.cs b/MyCode.Project.Domain/Message/Request/Million/TemplateRequst.cs deleted file mode 100644 index 0fe1379..0000000 --- a/MyCode.Project.Domain/Message/Request/Million/TemplateRequst.cs +++ /dev/null @@ -1,45 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace MyCode.Project.Domain.Message.Request.Million -{ - public class TemplateTxtRequest - { - /// - /// 选中的标题ID , - /// - public Guid? Id { get; set; } - /// - /// 店铺ID - /// - public Guid? ShopId { get; set; } - - } - - public class ConfirmNameRequest - { - /// - /// 选中的节点ID , - /// - public int Id { get; set; } - /// - /// 店铺ID - /// - public Guid ShopId { get; set; } - - /// - /// 第一个文本框，或者选中的值 从左到右 0,1,2 赋值 - /// - public string WriteContent1 { get; set; } - - - /// - /// 第二个文本框，或者选中的值 从左到右 0,1,2 赋值 - /// - public string WriteContent2 { get; set; } - - } -} diff --git a/MyCode.Project.Domain/Message/Request/OnlineGoods/OnlineGoodsItem.cs b/MyCode.Project.Domain/Message/Request/OnlineGoods/OnlineGoodsItem.cs deleted file mode 100644 index d1a9707..0000000 --- a/MyCode.Project.Domain/Message/Request/OnlineGoods/OnlineGoodsItem.cs +++ /dev/null @@ -1,88 +0,0 @@ -using MyCode.Project.Domain.Message.Response.User; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace MyCode.Project.Domain.Message.Request.OnlineGoods -{ - public class OnlineGoodsItemAct - { - /// - /// 项目类型，0=商品；1=服务；2=组合商品；3=卡券 4=自定义套餐 - /// - public int ItemType { get; set; } - - /// - /// 项目ID - /// - public Guid ItemID { get; set; } - - /// - /// 吊牌价,前端可以不用传 - /// - public decimal SalesPrice { get; set; } - - /// - /// 实际销售价,前端可以不用传 - /// - public decimal Price { get; set; } - - /// - /// 数量 - /// - public int? Qty { get; set; } - - /// - /// 备注 - /// - public string Note { get; set; } - } - - public class OnlineGoodsItem - { - /// - /// 项目类型，0=商品；1=服务；2=组合商品；3=卡券 4=自定义套餐 - /// - public int SuitFlag { get; set; } - /// - /// 列表数据的ID - /// - public Guid Id { get; set; } - - /// - /// 店铺ID - /// - public Guid ShopId { get; set; } - } - - public class ShopOnlineGoodsItem: OnlineGoodsItem - { - - /// - /// 店铺ID - /// - public Guid ShopId { get; set; } - } - - public class OnlineGoodsScene: ShopOnlineGoodsItem - { - /// - /// 小程序图片路径地址 - /// - public string MiniCodeUrl { get; set; } - - /// - /// 海报背景图路径地址 - /// - public string PosterUrl { get; set; } - - /// - /// 无视它 - /// - public MemberLoginInfo loginInfo { get; set; } - } - - -} diff --git a/MyCode.Project.Domain/Message/Request/OnlineGoods/OnlineGoodsStockPageListQuery.cs b/MyCode.Project.Domain/Message/Request/OnlineGoods/OnlineGoodsStockPageListQuery.cs deleted file mode 100644 index 33d313b..0000000 --- a/MyCode.Project.Domain/Message/Request/OnlineGoods/OnlineGoodsStockPageListQuery.cs +++ /dev/null @@ -1,49 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace MyCode.Project.Domain.Message.Request.Goods -{ - /// - /// 进销存模块的商品的列表查询Query - /// - public class OnlineGoodsStockPageListQuery - { - - /// - /// 搜索关键字 - /// - public string KeyWord { get; set; } - - /// - /// 店铺ID - /// - public Guid ShopID { get; set; } - - /// - /// 分类ID - /// - public Guid? OnlineDeptId { get; set; } - - /// - /// 商品编号 精确搜索,POS机专用字段 - /// - public string CustomBC { get; set; } - - } - - public class DouYinUrlAct - { - /// - /// 扫描得到的内容 - /// - public string Code { get; set; } - - /// - /// 店铺ID - /// - public Guid ShopId { get; set; } - } -} diff --git a/MyCode.Project.Domain/Message/Request/PayConfig/PayConfigPageListQuery.cs b/MyCode.Project.Domain/Message/Request/PayConfig/PayConfigPageListQuery.cs deleted file mode 100644 index 70f15ea..0000000 --- a/MyCode.Project.Domain/Message/Request/PayConfig/PayConfigPageListQuery.cs +++ /dev/null @@ -1,50 +0,0 @@ -using MyCode.Project.Infrastructure.Common; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace MyCode.Project.Domain.Message.Request.PayConfig -{ - /// - /// 支付配置分页列表 查询 - /// - public class PayConfigPageListQuery - { - /// - /// 店铺编码 - /// - public string ShopCode { get; set; } - - /// - /// 店铺名称 - /// - public string ShopName { get; set; } - - /// - /// 商户名称 - /// - public string Name { get; set; } - - /// - /// 商户号 - /// - public string MchId { get; set; } - - /// - /// 状态。-1:全部,0:禁用,1:启用 - /// - public int Status { get; set; } - - /// - /// 修改人 - /// - public string Editor { get; set; } - - /// - /// 修改时间 - /// - public TimeRange EditTime { get; set; } - } -} diff --git a/MyCode.Project.Domain/Message/Request/PerformanceRecord/PerformanceRecordQuery.cs b/MyCode.Project.Domain/Message/Request/PerformanceRecord/PerformanceRecordQuery.cs deleted file mode 100644 index 26c6eb1..0000000 --- a/MyCode.Project.Domain/Message/Request/PerformanceRecord/PerformanceRecordQuery.cs +++ /dev/null @@ -1,46 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace MyCode.Project.Domain.Message.Request.PerformanceRecord -{ - public class PerformanceRecordQuery - { - /// - /// 主键ID - /// - public Guid Id { get; set; } - - /// - /// 业务类型。3030 =进货入库；3110=销售出库 - /// - public int DataType { get; set; } - - public DateTime? CreateTime { get; set; } - } - - public class PerformanceReportQuery - { - /// - /// 对象类型 0 不指定内容,根据账号角色判断 ;1 店铺 ; 2 加盟商; 3 区域经理 ;4 大区; - /// - public int DataType { get; set; } - /// - /// DataType 不为0 时传 主键对象ID - /// - public Guid? Id { get; set; } - - /// - /// DataType不为0传值 - /// - public string CodePath { get; set; } - - /// - /// 日期 - /// - public string Days { get; set; } - } - -} diff --git a/MyCode.Project.Domain/Message/Request/Ranking/RankingReq.cs b/MyCode.Project.Domain/Message/Request/Ranking/RankingReq.cs deleted file mode 100644 index 8e6b152..0000000 --- a/MyCode.Project.Domain/Message/Request/Ranking/RankingReq.cs +++ /dev/null @@ -1,88 +0,0 @@ -using MyCode.Project.Infrastructure.Common; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace MyCode.Project.Domain.Message.Request.Ranking -{ - public class RankingReq - { - /// - /// 时间范围搜索 - /// - public TimeRange Time { get; set; } - - /// - /// 店铺名称模糊搜索 - /// - public string KeyWord { get; set; } - - /// - /// 区域主键ID数组(有区域查询时可传) - /// - public List ZoneId { get; set; } - } - - public class RankingExReq - { - /// - /// 时间范围搜索 - /// - public TimeRange Time { get; set; } - - /// - /// 店铺名称模糊搜索 - /// - public string KeyWord { get; set; } - - /// - /// 活动主键ID - /// - public Guid? ActivityId { get; set; } - - /// - /// 区域主键ID数组(有区域查询时可传) - /// - public List ZoneId { get; set; } - - } - - /// - /// 活动统计 - /// - public class RankingActivityReportReq - { - /// - /// 时间范围搜索 - /// - public TimeRange Time { get; set; } - - /// - /// 活动主键ID - /// - public Guid? ActivityId { get; set; } - - /// - /// 区域主键ID - /// - public List ZoneId { get; set; } - - /// - /// 未使用智慧门店 1 选中 0 未选中 - /// - public int AppletsNo { get; set; } - - /// - /// 使用智慧门店 1 选中 0 未选中 - /// - public int AppletsYes { get; set; } - - /// - /// 搜索店铺 - /// - public string ShopName { get; set; } - - } -} diff --git a/MyCode.Project.Domain/Message/Request/Report/ShopsSearchQuery.cs b/MyCode.Project.Domain/Message/Request/Report/ShopsSearchQuery.cs deleted file mode 100644 index abca7fd..0000000 --- a/MyCode.Project.Domain/Message/Request/Report/ShopsSearchQuery.cs +++ /dev/null @@ -1,78 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace MyCode.Project.Domain.Message.Request.Report -{ - public class ShopsSearchQuery - { - /// - /// 开始日期 - /// - public DateTime? Begin { get; set; } - - /// - /// 结束日期 - /// - public DateTime? End { get; set; } - - /// - /// 未使用智慧门店 1 选中 0 未选中 - /// - public int AppletsNo { get; set; } - - /// - /// 未开通智慧门店 1 选中 0 未选中 - /// - public int? AppletsFlag { get; set; } - - /// - /// 店铺名称 - /// - public string ShopName { get; set; } - /// - /// 使用智慧门店 1 选中 0 未选中 - /// - public int? AppletsYes { get; set; } - } - - public class ShopsSearchForGeneralManagerQuery - { - /// - /// 开始日期 - /// - public DateTime? Begin { get; set; } - - /// - /// 结束日期 - /// - public DateTime? End { get; set; } - - /// - /// 未使用智慧门店 1 选中 0 未选中 - /// - public int AppletsNo { get; set; } - - /// - /// 使用智慧门店 1 选中 0 未选中 - /// - public int? AppletsYes { get; set; } - - /// - /// 选中的大区ID数组 - /// - public List ZoneList { get; set; } - - /// - /// 未开通智慧门店 1 选中 0 未选中 - /// - public int? AppletsFlag { get; set; } - - /// - /// 店铺名称 - /// - public string ShopName { get; set; } - } -} diff --git a/MyCode.Project.Domain/Message/Request/Report2301/GetCustmoerServiceInvAct.cs b/MyCode.Project.Domain/Message/Request/Report2301/GetCustmoerServiceInvAct.cs deleted file mode 100644 index 3eaee04..0000000 --- a/MyCode.Project.Domain/Message/Request/Report2301/GetCustmoerServiceInvAct.cs +++ /dev/null @@ -1,22 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace MyCode.Project.Domain.Message.Request.Report2301 -{ - public class GetCustmoerServiceInvAct - { - /// - /// 加盟商ID - /// - public string CustomerId { get; set; } - - /// - /// 查询具体某一天的日期 - /// - public DateTime Days { get; set; } - } - -} diff --git a/MyCode.Project.Domain/Message/Request/Report2301/MonthOperationReportReq.cs b/MyCode.Project.Domain/Message/Request/Report2301/MonthOperationReportReq.cs deleted file mode 100644 index b6350f7..0000000 --- a/MyCode.Project.Domain/Message/Request/Report2301/MonthOperationReportReq.cs +++ /dev/null @@ -1,78 +0,0 @@ -using MyCode.Project.Infrastructure.Common; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace MyCode.Project.Domain.Message.Request.Report2301 -{ - public class MonthOperationReportReq - { - /// - /// 月报的年月字符串 例如 2023-01 - /// - public string Days { get; set; } - - /// - /// 店铺id - /// - public Guid? ShopId { get; set; } - } - - - public class MonthOperationReportApiReq - { - /// - /// 查询key - /// - public string LxmZHMDReportKey { get; set; } - - /// - /// 年 - /// - public int Year { get; set; } - - /// - /// 月 - /// - public int Month { get; set; } - - /// - /// 店铺id - /// - public Guid? ShopId { get; set; } - } - - public class RpShopZhenduansibiaoYejiDataReq - { - /// - /// 查询key - /// - public string LxmZHMDReportKey { get; set; } - - /// - /// 店铺id列表 - /// - public List ShopIdList { get; set; } - - /// - /// 时间 - /// - public TimeRange TimeRange { get; set; } - } - - public class ShopLabelSearch - { - //2024-01-24 此标签条件只影响区域内容的 指定店铺 板块，不影响其他地方包括店铺列表显示的数量 - /// - /// 查询类型 0=没选此条件 1= 或关系 2= 且关系 - /// - public int SearchType { get; set; } - - /// - /// 选中的标签ID数组 - /// - public List LabelIds { get; set; } - } -} diff --git a/MyCode.Project.Domain/Message/Request/Report40/EmployeePerformanceRankingQuery.cs b/MyCode.Project.Domain/Message/Request/Report40/EmployeePerformanceRankingQuery.cs deleted file mode 100644 index 88bc3bd..0000000 --- a/MyCode.Project.Domain/Message/Request/Report40/EmployeePerformanceRankingQuery.cs +++ /dev/null @@ -1,90 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace MyCode.Project.Domain.Message.Request.Report40 -{ - - public class EmployeePerformanceRankingQuery - { - /// - /// 开始日期 - /// - public DateTime BeginTime { get; set; } - - /// - /// 结束日期 - /// - public DateTime EndTime { get; set; } - - - /// - /// 查询店铺ID - /// - public Guid ShopId { get; set; } - - } - - public class ReportDetail40Query - { - /// - /// 查询日期 - /// - public DateTime Date { get; set; } - - /// - /// 店员ID - /// - public Guid? Clerkid { get; set; } - - /// - /// 店铺主键ID - /// - public Guid Shopid { get; set; } - - } - - - public class ReportShouGongFeiQuery - { - /// - /// 开始日期 - /// - public DateTime BeginTime { get; set; } - - /// - /// 结束日期 - /// - public DateTime EndTime { get; set; } - - /// - /// 店员ID - /// - public Guid? ClerkId { get; set; } - - /// - /// 店铺主键ID - /// - public Guid Shopid { get; set; } - - } - - - public class MemberConsumptionRankingsHomePageRespQuery - { - - /// - /// 查询类型 0=全部 1=最近30天 - /// - public int SearchType { get; set; } - - /// - /// 查询店铺ID - /// - public Guid ShopId { get; set; } - - } - -} diff --git a/MyCode.Project.Domain/Message/Request/Report40/ManagerHeXin2207Query.cs b/MyCode.Project.Domain/Message/Request/Report40/ManagerHeXin2207Query.cs deleted file mode 100644 index 61a826c..0000000 --- a/MyCode.Project.Domain/Message/Request/Report40/ManagerHeXin2207Query.cs +++ /dev/null @@ -1,122 +0,0 @@ -using MyCode.Project.Infrastructure.Common; -using System; -using System.Collections.Generic; - -namespace MyCode.Project.Domain.Message.Request.Report40 -{ - public class ManagerHeXin2207Query - { - /// - /// 选择年月的时间，传 "2021-08" 这样的字符串 - /// - public string SearchTime { get; set; } - - /// - /// 是否全选店铺 0=否; 1=是 - /// - public int IfAllShop { get; set; } - - /// - /// 查询店铺数组 - /// - public List ShopIds { get; set; } - - } - - - public class ManagerFenXiReport2207Query - { - /// - /// 选择对比的时间，传 "2021-08" 这样的字符串 - /// - public string DuiBi { get; set; } - - /// - /// 店铺ID数组 - /// - public List ShopIds { get; set; } - - /// - /// 是否全选店铺 0=否; 1=是 - /// - public int IfAllShop { get; set; } - - /// - /// 自定义时间的查询时间段 - /// - public TimeRange TimeSearch { get; set; } - } - - public class ManagerYeJi2207Query - { - /// - /// 查询时间类型 0=昨天 1=今天 2=自然月 3=自定义时间 - /// - public int SearchType { get; set; } - - /// - /// 自定义时间的查询时间段 - /// - public TimeRange TimeSearch { get; set; } - - /// - /// 是否全选店铺 0=否; 1=是 - /// - public int IfAllShop { get; set; } - - /// - /// 查询店铺数组 - /// - public List ShopIds { get; set; } - - /// - /// 自然月选择的年-月 2022-08 - /// - public string YearMonth { get; set; } - - /// - /// 督导ID， -1=全部 - /// - public Guid? DuDaoId { get; set; } - - } - - public class ManagerHuiYuan2207Query - { - - /// - /// 是否全选店铺 0=否; 1=是 - /// - public int IfAllShop { get; set; } - - /// - /// 查询店铺数组 - /// - public List ShopIds { get; set; } - } - - public class ShopYeJiPangHang2207Query : ManagerYeJi2207Query - { - - ///// - ///// 排序字段 0=日期 1=总业绩 - ///// - //public int SortField { get; set; } - - /// - /// 排序类型 0=倒序 1=顺序 - /// - public int SortType { get; set; } - - } - - - public class GetShopFenXiReport2207 - { - public Guid UserId { get; set; } - - public string DuiBi { get; set; } - } - - -} diff --git a/MyCode.Project.Domain/Message/Request/Report40/ManagerReport2308Query.cs b/MyCode.Project.Domain/Message/Request/Report40/ManagerReport2308Query.cs deleted file mode 100644 index eab091f..0000000 --- a/MyCode.Project.Domain/Message/Request/Report40/ManagerReport2308Query.cs +++ /dev/null @@ -1,117 +0,0 @@ -using MyCode.Project.Domain.Message.Request.Report2301; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace MyCode.Project.Domain.Message.Request.Report40 -{ - public class ManagerReport2308Query - { - /// - /// 是否全选店铺 0=否; 1=是 - /// - public int IfAllShop { get; set; } - - /// - /// 查询店铺数组 - /// - public List ShopIds { get; set; } - - /// - /// 查询时间类型 1=今天 2=自然月 - /// - public int SearchType { get; set; } - - /// - /// 自然月选择的年-月 2022-08 - /// - public string YearMonth { get; set; } - - /// - /// 组织ID 非区域人员跳转页面传 -1 - /// - public Guid? OrganizationId { get; set; } - - /// - /// 查询类型 0=区域总览 1=主要店铺 2=指定店铺 - /// - public int QuYu { get; set; } - - /// - /// 用户ID，如果不传就是登录ID - /// - public Guid? UserId { get; set; } - - } - - - public class ChiXuShiYongTianShuQuery: ManagerReport2308Query - { - /// - /// 使用天数 - /// - public int? Days { get; set; } - - /// - /// 收款金额 起 - /// - public decimal? MoneyBegin { get; set; } - - /// - /// 收款金额 止 - /// - public decimal? MoneyEnd { get; set; } - - - /// - /// 标签数组 ,NULL 是没有选择该条件 - /// - public ShopLabelSearch LabelQuery { get; set; } - - } - - public class QuYu2308Query : ManagerReport2308Query - { - /// - /// 查询类型 0=区域总览 1=主要店铺 2=指定店铺 - /// - public int QuYu { get; set; } - - /// - /// 使用天数 - /// - public int? Days { get; set; } - - /// - /// 收款金额 起 - /// - public decimal? MoneyBegin { get; set; } - - /// - /// 收款金额 止 - /// - public decimal? MoneyEnd { get; set; } - - /// - /// 标签数组 ,NULL 是没有选择该条件 - /// - public ShopLabelSearch LabelQuery { get; set; } - - } - - public class GetUserOrganizationTrees - { - /// - /// 组织ID，初始本人传"-1" - /// - public string OrganizationId { get; set; } - - /// - /// 用户ID，如果不传就是登录ID - /// - public Guid? UserId { get; set; } - - } -} diff --git a/MyCode.Project.Domain/Message/Request/Report40/ShopHeXin2207Query.cs b/MyCode.Project.Domain/Message/Request/Report40/ShopHeXin2207Query.cs deleted file mode 100644 index b640d8f..0000000 --- a/MyCode.Project.Domain/Message/Request/Report40/ShopHeXin2207Query.cs +++ /dev/null @@ -1,322 +0,0 @@ -using MyCode.Project.Infrastructure.Common; -using System; -using System.Collections.Generic; - -namespace MyCode.Project.Domain.Message.Request.Report40 -{ - public class ShopHeXin2207Query - { - /// - /// 选择的年份 - /// - public int? YearSearch { get; set; } - - /// - /// 店员ID,不传为全部 - /// - public Guid? ClerkId { get; set; } - - /// - /// 店铺ID - /// - public Guid ShopId { get; set; } - - /// - /// 前端无视它， API内部使用，指定月份 - /// - public int? Month { get; set; } - } - - - public class ShopYeJi2207Query - { - /// - /// 查询时间类型 0=昨天 1=今天 2=自然月 3=自定义时间 - /// - public int SearchType { get; set; } - - /// - /// 自定义时间的查询时间段 - /// - public TimeRange TimeSearch{ get; set; } - - /// - /// 店铺ID - /// - public Guid ShopId { get; set; } - - /// - /// 店员ID,不传值为全部店员 - /// - public Guid? ClerkId { get; set; } - - /// - /// 自然月选择的年-月 2022-08 - /// - public string YearMonth { get; set; } - - } - - - public class ShopZiChanGaiKuang2207Query - { - /// - /// 店铺ID - /// - public Guid ShopId { get; set; } - - /// - /// 店员ID,不传值为全部店员 - /// - public Guid? ClerkId { get; set; } - - /// - /// 排序字段 0=最近一次购买时间 1=累计消费单数 2=累计消费金额 - /// - public int SortField { get; set; } - - /// - /// 排序类型 0=倒序 1=顺序 - /// - public int SortType { get; set; } - } - - public class ShopHuiYuanTypeTaoCan2207Query - { - /// - /// 店铺ID - /// - public Guid ShopId { get; set; } - - /// - /// 店员ID,不传值为全部店员 - /// - public Guid? ClerkId { get; set; } - - /// - /// 会员状态类型 0=流失 1=沉睡 2=活跃 - /// - public int StatusType { get; set; } - - /// - /// 排序类型 0=倒序 1=顺序 - /// - public int SortType { get; set; } - - } - - - - public class ShopDaKaDetail2207Query - { - /// - /// 展开明细时传这个数组请求 - /// - public List OrderIds { get; set; } - } - - - public class ShopXiaoFeiPaiHangBang2207Query : ShopYeJi2207Query - { - /// - /// 排序字段 0=消费金额 1=消费次数 2=累计消费金额 3=累计消费次数 - /// - public int SortField { get; set; } - - /// - /// 排序类型 0=倒序 1=顺序 - /// - public int SortType { get; set; } - } - - - public class ShopHuiYuanTypeJiFen2207Query - { - /// - /// 店铺ID - /// - public Guid ShopId { get; set; } - - /// - /// 店员ID,不传值为全部店员 - /// - public Guid? ClerkId { get; set; } - - /// - /// 会员状态类型 0=流失 1=沉睡 2=活跃 - /// - public int StatusType { get; set; } - - /// - /// 排序字段 0=余额 1=积分 - /// - public int SortField { get; set; } - - /// - /// 排序类型 0=倒序 1=顺序 - /// - public int SortType { get; set; } - - } - - public class ShopHuiYuanDengJi2207Query - { - /// - /// 店铺ID - /// - public Guid ShopId { get; set; } - - /// - /// 店员ID,不传值为全部店员 - /// - public Guid? ClerkId { get; set; } - - /// - /// 等级ID，不传则是全部 - /// - public Guid? GradeId { get; set; } - - /// - /// 排序字段 0=会员等级 1= 累计消费金额 2=余额 3=剩余次数 4=最近一次到店时间 - /// - public int SortField { get; set; } - - /// - /// 排序类型 0=倒序 1=顺序 - /// - public int SortType { get; set; } - - } - - public class ShopZiChanMingXi2207Query - { - /// - /// 店铺ID - /// - public Guid ShopId { get; set; } - - /// - /// 店员ID,不传值为全部店员 - /// - public Guid? ClerkId { get; set; } - - /// - /// 排序字段 -1不选中 0=余额 1= 剩余服务次数 2=剩余积分 3=最近一次到店时间 - /// - public int SortField { get; set; } - - /// - /// 排序类型 0=倒序 1=顺序 - /// - public int SortType { get; set; } - - } - - - - public class ShopHuiYuanLeiMu2207Query - { - /// - /// 店铺ID - /// - public Guid ShopId { get; set; } - - /// - /// 店员ID,不传值为全部店员 - /// - public Guid? ClerkId { get; set; } - - /// - /// 类目的查询字段 -1=全部; 1=护肤类会员; 2=发饰类会员;3=彩妆类会员 4=其他类会员 5=体验套会员 - /// - public int LeiMuType { get; set; } - - } - - - public class ShopHuiGoodsPangHangJi2207Query : ShopYeJi2207Query - { - - /// - /// 排序字段 0=金额 1=数量 - /// - public int SortField { get; set; } - - /// - /// 排序类型 0=倒序 1=顺序 - /// - public int SortType { get; set; } - - /// - /// 查询类型 0=销售排行榜 1=护肤类 2=彩妆类 3=发饰类 4=其他类 5=服务类 - /// - public int LeiMuType { get; set; } - - - - } - - public class ShopFenXiReport2207Query - { - /// - /// 选择对比的时间，传 "2021-08" 这样的字符串 - /// - public string DuiBi { get; set; } - - /// - /// 自定义时间的查询时间段 - /// - public TimeRange TimeSearch { get; set; } - - /// - /// 店铺ID数组 - /// - public List ShopIds { get; set; } - } - - public class RpShopUseAppletDataAct - { - public string Token { get; set; } - - public string ApiUrl { get; set; } - - public string RequestDataStr { get; set; } - } - - public class ShopRiYeJi2207Query : ShopYeJi2207Query - { - - /// - /// 排序字段 0=日期 1=总业绩 - /// - public int SortField { get; set; } - - /// - /// 排序类型 0=倒序 1=顺序 - /// - public int SortType { get; set; } - - } - - public class ShopRiYeJiDetail2207Query - { - /// - /// 日期 - /// - public string Days { get; set; } - - /// - /// 店铺ID - /// - public Guid ShopId { get; set; } - - /// - /// 店员ID,不传值为全部店员 - /// - public Guid? ClerkId { get; set; } - } - - - - -} diff --git a/MyCode.Project.Domain/Message/Request/Report40/TimeSearchAct2308.cs b/MyCode.Project.Domain/Message/Request/Report40/TimeSearchAct2308.cs deleted file mode 100644 index 76862ae..0000000 --- a/MyCode.Project.Domain/Message/Request/Report40/TimeSearchAct2308.cs +++ /dev/null @@ -1,26 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace MyCode.Project.Domain.Message.Request.Report40 -{ - public class TimeSearchAct2308 - { - /// - /// 年月--开始 例如"2023-08" - /// - public string BeginYearMonth { get; set; } - - /// - /// 年月--结束 例如"2023-08" - /// - public string EndYearMonth { get; set; } - - /// - /// 固定传值: - /// - public string Key { get; set; } - } -} diff --git a/MyCode.Project.Domain/Message/Request/ReturnVisitLog/GetReturnVisitLogDetail.cs b/MyCode.Project.Domain/Message/Request/ReturnVisitLog/GetReturnVisitLogDetail.cs deleted file mode 100644 index dd09f07..0000000 --- a/MyCode.Project.Domain/Message/Request/ReturnVisitLog/GetReturnVisitLogDetail.cs +++ /dev/null @@ -1,44 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace MyCode.Project.Domain.Message.Request.ReturnVisitLog -{ - public class GetReturnVisitLogDetail - { - /// - /// 营销顾问ID - /// - public Guid Id { get; set; } - - /// - /// 菜单类型 0=首单会员列表 10=复购会员列表 21=近7天到店新客列表 22=近7天到店老客列表 30=活跃会员列表 40=沉睡会员列表 50=流失会员列表 - /// - public int MenuType { get; set; } - - - } - - - public class GetMenuMemberListReq - { - /// - /// 店铺ID - /// - public Guid? ShopId { get; set; } - - /// - /// 菜单类型 0=首单会员列表 10=复购会员列表 21=近7天到店新客列表 22=近7天到店老客列表 30=活跃会员列表 40=沉睡会员列表 50=流失会员列表 - /// - public int MenuType { get; set; } - - /// - /// 后端使用的字段 - /// - public Guid? MemberId { get; set; } - - - } -} diff --git a/MyCode.Project.Domain/Message/Request/SalesSheet/PresalesSheetPageListQuery.cs b/MyCode.Project.Domain/Message/Request/SalesSheet/PresalesSheetPageListQuery.cs deleted file mode 100644 index 724b980..0000000 --- a/MyCode.Project.Domain/Message/Request/SalesSheet/PresalesSheetPageListQuery.cs +++ /dev/null @@ -1,30 +0,0 @@ -using MyCode.Project.Infrastructure.Common; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace MyCode.Project.Domain.Message.Request.SalesSheet -{ - /// - /// - /// - public class PresalesSheetPageListQuery - { - /// - /// 时间范围 - /// - public TimeRange Time { get; set; } - - /// - /// 是否已到货，1是，0不是,-1全部 - /// - public int IsArrival { get; set; } - - /// - /// 会员姓名/手机号 - /// - public string MemberInfo { get; set; } - } -} diff --git a/MyCode.Project.Domain/Message/Request/SalesSheet/SalesSheetPageListQuery.cs b/MyCode.Project.Domain/Message/Request/SalesSheet/SalesSheetPageListQuery.cs deleted file mode 100644 index 004fb94..0000000 --- a/MyCode.Project.Domain/Message/Request/SalesSheet/SalesSheetPageListQuery.cs +++ /dev/null @@ -1,40 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace MyCode.Project.Domain.Message.Request.SalesSheet -{ - /// - /// - /// - public class SalesSheetPageListQuery - { - /// - /// 开始时间 - /// - public DateTime? Begin { get; set; } - - /// - /// 截止时间 - /// - public DateTime? End { get; set; } - - /// - /// 会员姓名/手机号 - /// - public string MemberInfo { get; set; } - - /// - /// 根据时间排序。-1默认排序，1根据时间正序，2根据时间倒序 - /// - public int? OrderByTime { get; set; } - - /// - /// 根据状态排序。-1默认排序，1根据状态正序，2根据状态倒序 - /// - public int? OrderByFlag { get; set; } - - } -} diff --git a/MyCode.Project.Domain/Message/Request/Service/AppGetShopPageListQuery.cs b/MyCode.Project.Domain/Message/Request/Service/AppGetShopPageListQuery.cs deleted file mode 100644 index ac179a2..0000000 --- a/MyCode.Project.Domain/Message/Request/Service/AppGetShopPageListQuery.cs +++ /dev/null @@ -1,21 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace MyCode.Project.Domain.Message.Request.Service -{ - /// - /// 小程序查询服务的适用门店列表 - /// - public class AppGetShopPageListQuery - { - - /// - /// 所属的加盟商ID 如果为空，则为公司的 - /// - public Guid? CustomerID { get; set; } - - } -} diff --git a/MyCode.Project.Domain/Message/Request/ServiceOrder/GetReserveServiceListQuery.cs b/MyCode.Project.Domain/Message/Request/ServiceOrder/GetReserveServiceListQuery.cs deleted file mode 100644 index 29b6f62..0000000 --- a/MyCode.Project.Domain/Message/Request/ServiceOrder/GetReserveServiceListQuery.cs +++ /dev/null @@ -1,148 +0,0 @@ -using MyCode.Project.Domain.Message.Response.ServiceOrder; -using MyCode.Project.Infrastructure.Common; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace MyCode.Project.Domain.Message.Request.ServiceOrder -{ - /// - /// 查询服务列表的条件 - /// - public class GetReserveServiceListQuery - { - /// - /// 服务类型。 0=免费服务，2=已购服务， 3=体验服务 - /// - public int? ServiceType { get; set; } - - /// - /// 会员ID - /// - public Guid? MemberID { get; set; } - - /// - /// 店铺ID，前端不用传 - /// - public Guid? ShopId { get; set; } - } - - #region 核销数据 - public class ServiceOrderRequst - { - /// - /// 会员ID - /// - public Guid MemberID { get; set; } - - /// - /// 店铺ID - /// - public Guid? ShopId { get; set; } - - /// - /// 核销选中的套餐服务ID - /// - public Guid? ServiceSetID { get; set; } - - /// - /// 前端不用对接这个字段 - /// - public List ServiceItem { get; set; } - } - - public class ServiceOrderItem - { - /// - /// 服务主键ID - /// - public Guid ServiceID { get; set; } - - /// - /// 服务次数 - /// - public int Qty { get; set; } - - /// - /// 服务类型。新定义： 护理类型 1=护理(非盘发) 0=盘发服务 3 体验服务 旧定义：1=收费；0=免费, 3 体验服务,4=固定的护理服务 - /// - public int ServiceType { get; set; } - - //项目类型。0=商品；1=服务；2=套餐,3=卡券 , 4=自定义套餐 - public int? ItemType { get; set; } -} - #endregion - - #region - public class ServiceOrderListReq - { - /// - /// 店铺ID:详细档案接口中返回的店铺ID - /// - public Guid ShopID { get; set; } - - /// - /// 会员ID - /// - public Guid MemberID { get; set; } - - /// - /// 时间范围搜索 - /// - public TimeRange EditTime { get; set; } - - } - - public class MemberServiceListReq - { - /// - /// 店铺ID:详细档案接口中返回的店铺ID - /// - public Guid ShopID { get; set; } - - /// - /// 会员ID - /// - public Guid MemberID { get; set; } - - /// - /// 服务次数范围类型：0=全部的共享店铺 1=单店 - /// - public int ShopType { get; set; } - - } - - - public class ServiceOrder2Requst - { - /// - /// 会员ID - /// - public Guid MemberID { get; set; } - - /// - /// 店铺ID - /// - public Guid? ShopId { get; set; } - - /// - /// 核销选中的套餐服务数据 - /// - public List ServiceList { get; set; } - - /// - /// 备注 - /// - public string Note { get; set; } - - ///// - ///// 前端不用对接这个字段 - ///// - //public List ServiceItem { get; set; } - } - - #endregion - -} diff --git a/MyCode.Project.Domain/Message/Request/ServiceOrderComment/GetServiceCommentDetail.cs b/MyCode.Project.Domain/Message/Request/ServiceOrderComment/GetServiceCommentDetail.cs deleted file mode 100644 index c0e54a7..0000000 --- a/MyCode.Project.Domain/Message/Request/ServiceOrderComment/GetServiceCommentDetail.cs +++ /dev/null @@ -1,34 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace MyCode.Project.Domain.Message.Request.ServiceOrderComment -{ - public class GetServiceCommentDetailQuest - { - /// - /// 店员ID - /// - public Guid? ClerkId { get; set; } - - /// - /// 店铺ID - /// - public Guid ShopId { get; set; } - - /// - /// 店员类型,0 店员 1 加盟商 - /// - public int ClerkType { get; set; } - - /// - /// 订单ID - /// - public Guid? OrderId { get; set; } - - - - } -} diff --git a/MyCode.Project.Domain/Message/Request/Shop/KeyWordsQuest.cs b/MyCode.Project.Domain/Message/Request/Shop/KeyWordsQuest.cs deleted file mode 100644 index 9f8f10b..0000000 --- a/MyCode.Project.Domain/Message/Request/Shop/KeyWordsQuest.cs +++ /dev/null @@ -1,93 +0,0 @@ -using MyCode.Project.Domain.Message.Request.Report2301; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace MyCode.Project.Domain.Message.Request.Shop -{ - public class KeyWordsQuest - { - /// - /// 关键字 - /// - public string KeyWords { get; set; } - - /// - /// 经度 - /// - public double Longitude { get; set; } - - /// - /// 纬度 - /// - public double Latitude { get; set; } - - /// - /// 是否使用智慧门店 -1=全部 ;1=是 ;0=否; - /// - public int? AppletsFlag { get; set; } - - /// - /// 组织ID 非区域人员跳转页面传 -1 - /// - public Guid? OrganizationId { get; set; } - - } - - - public class KeyWords2308Quest: KeyWordsQuest - { - /// - /// 标签数组 ,NULL 是没有选择该条件 - /// - public ShopLabelSearch LabelQuery { get; set; } - - /// - /// 202308月报表的查询类型 0=区域总览 1=主要店铺 2=指定店铺 - /// - public int? QuYu { get; set; } - - /// - /// 查询时间类型 1=今天 2=自然月 - /// - public int SearchType { get; set; } - - /// - /// 自然月选择的年-月 2022-08 - /// - public string YearMonth { get; set; } - - - /// - /// 使用天数 - /// - public int? Days { get; set; } - - /// - /// 收款金额 起 - /// - public decimal? MoneyBegin { get; set; } - - /// - /// 收款金额 止 - /// - public decimal? MoneyEnd { get; set; } - - /// - /// 用户ID，如果不传就是登录ID - /// - public Guid? UserId { get; set; } - } - - //public class KeyWords2401Quest : KeyWords2308Quest - //{ - // /// - // /// 标签数组 ,NULL 是没有选择该条件 - // /// - // public ShopLabelSearch LabelQuery { get; set; } - - - //} -} diff --git a/MyCode.Project.Domain/Message/Request/ShopData/ShopDataIndicatorsDetailsReq.cs b/MyCode.Project.Domain/Message/Request/ShopData/ShopDataIndicatorsDetailsReq.cs deleted file mode 100644 index 9dfc112..0000000 --- a/MyCode.Project.Domain/Message/Request/ShopData/ShopDataIndicatorsDetailsReq.cs +++ /dev/null @@ -1,21 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace MyCode.Project.Domain.Message.Request.ShopData -{ - public class ShopDataIndicatorsDetailsReq - { - /// - /// 店铺id - /// - public Guid ShopId { get; set; } - - /// - /// 日期 - /// - public DateTime BelongingTime { get; set; } - } -} diff --git a/MyCode.Project.Domain/Message/Request/ShopInventoryAmount/ShopInventoryAmount.cs b/MyCode.Project.Domain/Message/Request/ShopInventoryAmount/ShopInventoryAmount.cs deleted file mode 100644 index c4719b9..0000000 --- a/MyCode.Project.Domain/Message/Request/ShopInventoryAmount/ShopInventoryAmount.cs +++ /dev/null @@ -1,48 +0,0 @@ -using MyCode.Project.Infrastructure.Enumeration; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace MyCode.Project.Domain.Message.Request.ShopInventoryAmount -{ - public class ShopInventoryAmount - { - /// - /// 店铺主键 - /// - public Guid ShopId { get; set; } - - /// - /// 操作订单主键 - /// - public Guid SheetId { get; set; } - - /// - /// 操作类型 0=销售 10=导入 20=补货 - /// - public int OperateType { get; set; } - - /// - /// 变动品类 0=发饰品 10=首饰品 20=彩妆 30=护肤品 - /// - public int? DeptType { get; set; } - - /// - /// 操作金额 - /// - public decimal Amount { get; set; } - - /// - /// 发生操作方向 - /// - public DirectFlag DirectFlag { get; set; } - - /// - /// 操作人 - /// - public string Creater { get; set; } - - } -} diff --git a/MyCode.Project.Domain/Message/Request/Target/TargetRequst.cs b/MyCode.Project.Domain/Message/Request/Target/TargetRequst.cs deleted file mode 100644 index b54735a..0000000 --- a/MyCode.Project.Domain/Message/Request/Target/TargetRequst.cs +++ /dev/null @@ -1,37 +0,0 @@ -using MyCode.Project.Infrastructure.Common; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace MyCode.Project.Domain.Message.Request.Target -{ - public class TargetRequst - { - /// - /// 主键ID（编辑保存时传值） - /// - public Guid? ID { get; set; } - - /// - /// 店员ID - /// - public Guid ClerkID { get; set; } - - /// - /// 加盟商选择店铺ID - /// - public Guid? ShopID { get; set; } - - /// - ///分类ID - /// - public Guid SuitFlag { get; set; } - - /// - /// 指标金额 - /// - public decimal TargetPrice { get; set; } - } -} diff --git a/MyCode.Project.Domain/Message/Request/User/FirstGetTokenRequest.cs b/MyCode.Project.Domain/Message/Request/User/FirstGetTokenRequest.cs deleted file mode 100644 index acae8a6..0000000 --- a/MyCode.Project.Domain/Message/Request/User/FirstGetTokenRequest.cs +++ /dev/null @@ -1,27 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace MyCode.Project.Domain.Message.Request.User -{ - /// - /// 最全注册的页面 - /// - public class FirstGetTokenRequest - { - public string JsCode { get; set; } - - /// - /// 小程序进入的参数，比如id,小程序码产生传参为scene - /// - public string Scene { get; set; } - - public string EncryptedData { get; set; } - - public string Iv { get; set; } - - - } -} diff --git a/MyCode.Project.Domain/Message/Request/User/GetTokenRequest.cs b/MyCode.Project.Domain/Message/Request/User/GetTokenRequest.cs deleted file mode 100644 index a6525bd..0000000 --- a/MyCode.Project.Domain/Message/Request/User/GetTokenRequest.cs +++ /dev/null @@ -1,138 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace MyCode.Project.Domain.Message.Request.User -{ - public class GetTokenRequest - { - public string JsCode { get; set; } - - public string EncryptedData { get; set; } - - public string Iv { get; set; } - - /// - /// 小程序进入的参数，比如id,小程序码产生传参为scene - /// - public string Scene { get; set; } - - /// - /// 账号 - /// - public string UserName { get; set; } - - /// - /// 密码 - /// - public string PassWord { get; set; } - - /// - /// 11=总部管理者; 12=盟商 ; 13 =店员 - /// - public int? RoleType { get; set; } - - /// - /// 登录方式 0=微信捆绑手机号登录 1=手动输入账号密码登录 - /// - public int LoginType { get; set; } - } - - - public class SaveCodeRequest - { - public string JsCode { get; set; } - - } - - public class GetTokenByWxPhoneRequest - { - public string JsCode { get; set; } - - public string EncryptedData { get; set; } - - public string Iv { get; set; } - - /// - /// 11=总部管理者; 12=加盟商 ; 13 =店员 , 14=测试店员; 15 测试店长 16 测试加盟商 - /// - public int? RoleType { get; set; } - } - - - - - public class SaveWxInfoRequest - { - public string JsCode { get; set; } - - public string EncryptedData { get; set; } - - public string Iv { get; set; } - - } - - public class GetLoginInfo - { - /// - /// 识别合法的请求Key - /// - public string Key { get; set; } - - /// - /// 账号 - /// - public string UserName { get; set; } - - /// - /// 密码 - /// - public string PassWord { get; set; } - - } - - - public class GetShopClerk - { - /// - /// 识别合法的请求Key - /// - public string Key { get; set; } - - /// - /// 店铺编码数组 - /// - public List ShopCode { get; set; } - - } - - public class GetUserId - { - /// - /// 识别合法的请求Key - /// - public string Key { get; set; } - - /// - /// 用户ID - /// - public Guid UserId { get; set; } - - } - - public class GetOrganizationUser - { - /// - /// 识别合法的请求Key - /// - public string Key { get; set; } - - /// - /// 组织ID - /// - public Guid OrganizationId { get; set; } - - } -} diff --git a/MyCode.Project.Domain/Message/Request/User/MemberGetTokenRequest.cs b/MyCode.Project.Domain/Message/Request/User/MemberGetTokenRequest.cs deleted file mode 100644 index fdceb17..0000000 --- a/MyCode.Project.Domain/Message/Request/User/MemberGetTokenRequest.cs +++ /dev/null @@ -1,159 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace MyCode.Project.Domain.Message.Request.User -{ - /// - /// 最全注册的页面 - /// - public class MemberGetTokenRequest - { - - public string EncryptedData { get; set; } - - public string Iv { get; set; } - - /// - /// 小程序进入的参数，比如id,小程序码产生传参为scene - /// - public string Scene { get; set; } - - - /// - /// 生日日期 - /// - public string Birthday { get; set; } - - /// - /// 手机号码 - /// - public string Mobile { get; set; } - - /// - /// 发卡店铺ID,前端不用传 - /// - public Guid? ShopId { get; set; } - - /// - /// 营销顾问ID,前端不用传 - /// - public Guid? ClerkId { get; set; } - - /// - /// 缓存索引字符串 - /// - public Guid? CacheString { get; set; } - - - } - - /// - /// 小程序码参数缓存的对象 - /// - public class ActivityScene - { - /// - ///会员门票来源类型 0：加盟商 1：店员 2：会员 3:自主领取 4 直播分享 - /// - public int? SourceType { get; set; } - - /// - ///分享人ID( 加盟商:传加盟商ID 店员:传店员ID 会员:传会员ID) - /// - public Guid? ShareId { get; set; } - - /// - /// 活动ID - /// - public Guid? ActivityId { get; set; } - - /// - ///分享店铺ID - /// - public Guid? ShopId { get; set; } - - /// - /// 店铺参加活动主键ID - /// - public Guid? Id { get; set; } - - /// - /// 小程序图片路径地址 - /// - public string MiniCodeUrl { get; set; } - - /// - /// 海报背景图路径地址 - /// - public string PosterUrl { get; set; } - - /// - /// 活动类型 -1 : 什么活动都没有，纯扫码注册 0=裂变门票活动 1=新店活动 2=99女神卡活动 3=通用类型 4=分销关系链活动 5 直播 - /// 6= 优惠券活动 - /// - public int ActivityType { get; set; } - - /// - /// 直播时的OPENID - /// - public string OpenId { get; set; } - - /// - /// 脸部识别主键 - /// - public string FaceId { get; set; } - - /// - /// 脸部图片Url - /// - - public string FaceImgUrl { get; set; } - - - } - /// - /// 会员主动绑定营销顾问 - /// - public class SetMemberConsultant - { - /// - /// 发卡店铺ID - /// - public Guid? ShopId { get; set; } - - /// - /// 营销顾问ID - /// - public Guid? ClerkId { get; set; } - - /// - /// 缓存索引字符串 - /// - public Guid? CacheString { get; set; } - } - - public class JsCodeToken - { - /// - /// JsCode - /// - public string JsCode { get; set; } - - /// - /// Token - /// - public string Token { get; set; } - } - - //会员手动新增营销顾问关系 - public class AddMemberConsultant - { - /// - /// 店铺ID - /// - public Guid? ShopId { get; set; } - } -} diff --git a/MyCode.Project.Domain/Message/Request/User/MemberOrderRequst.cs b/MyCode.Project.Domain/Message/Request/User/MemberOrderRequst.cs deleted file mode 100644 index fccedd4..0000000 --- a/MyCode.Project.Domain/Message/Request/User/MemberOrderRequst.cs +++ /dev/null @@ -1,56 +0,0 @@ -using MyCode.Project.Infrastructure.Common; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace MyCode.Project.Domain.Message.Request.User -{ - public class MemberOrderRequst - { - /// - /// 店铺ID:详细档案接口中返回的店铺ID - /// - public Guid ShopID { get; set; } - - /// - /// 会员ID(消费者端，该参数可不传) - /// - public Guid MemberID { get; set; } - - /// - /// 消费类型 -1:全部 0：销售 1：退换货 20：预售 30：充值 - /// - public int SalesType { get; set; } - - /// - /// 时间范围搜索 - /// - public TimeRange EditTime { get; set; } - } - - public class OrderRequst - { - /// - /// 店铺ID - /// - public Guid? ShopID { get; set; } - - /// - /// 时间范围搜索 - /// - public TimeRange EditTime { get; set; } - - /// - /// 搜索关键字 - /// - public string KeyWord { get; set; } - - /// - /// 消费类型 -1:全部 0：销售 1：退换货 20：预售 30：充值 40:服务 - /// - public int SalesType { get; set; } - } - -} diff --git a/MyCode.Project.Domain/Message/Request/User/MemberRequst.cs b/MyCode.Project.Domain/Message/Request/User/MemberRequst.cs deleted file mode 100644 index 28c97e9..0000000 --- a/MyCode.Project.Domain/Message/Request/User/MemberRequst.cs +++ /dev/null @@ -1,373 +0,0 @@ -using MyCode.Project.Infrastructure.Common; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace MyCode.Project.Domain.Message.Request.User -{ - public class MemberRequst - { - /// - /// 店铺ID:选择的店铺ID，或当前登录用户所属店铺ID - /// - public Guid? ShopID { get; set; } - - /// - /// 搜索关键字 - /// - public string KeyWord { get; set; } - - /// - /// 卡券ID集合 - /// - public List CardIDList { get; set; } - - /// - /// 等级ID集合 - /// - public List GradeIDList { get; set; } - - /// - /// 标签ID集合 - /// - public List TagIDList { get; set; } - - /// - /// 时间类型 0：不限 2：三天前 3：一周前 4：一个月前 - /// - public int TimeType { get; set; } - - /// - /// 上次到店时间范围搜索 - /// - public TimeRange EditTime { get; set; } - - /// - /// 生日日期搜索开始 月-日 - /// - public string BirthStart { get; set; } - - /// - /// 生日日期搜索结束 月-日 - /// - public string BirthEnd { get; set; } - - /// - /// 营销顾问ID - /// - public Guid? ClerkId { get; set; } - - /// - /// 是否已添加微信 -1全部; 0=否;1=是 - /// - public int? IfAddWx { get; set; } - - /// - /// 是否已添加社区 -1全部; 0=否;1=是 - /// - public int? IfAddCommunity { get; set; } - - /// - /// 转营销顾问时取消选中的会员ID - /// - public List NotSelectedIds { get; set; } - - /// - /// 转营销顾问时前端页面选中的会员ID数组 - /// - public List HadSelectedIds { get; set; } - - /// - /// 转营销顾问时总共选中的会员人数 - /// - public int? HadSelectedCount { get; set; } - - /// - /// 批量修改营销顾问时的顾问ID - /// - public Guid? ConsultantId { get; set; } - - /// - /// 最小会员余额 - /// - public decimal? MinAccount { get; set; } - - /// - /// 最大会员余额 - /// - public decimal? MaxAccount { get; set; } - - /// - /// 最小剩余服务次数 - /// - public int? MinServiceQty { get; set; } - - /// - /// 最大剩余服务次数 - /// - public int? MaxServiceQty { get; set; } - - /// - /// 排序 1=升序 0=倒序 - /// - public int? SortType { get; set; } - - /// - /// 排序字段 - /// - public string SortString { get; set; } - - /// - /// 后端使用的字段 - /// - public Guid? Id { get; set; } - - /// - /// 会员资料增加来源 未选=NULL 0= 其他; 1= 抖音; 2= 美团; 3=自然流量; 4=老顾客裂变 5=1元公益、派单 6=第三方合作 - /// - public List AddFromType { get; set; } - - ///// - ///// 会员状态 -1=全部; 1=拓客 2=留客 3=锁客 - ///// - //public int? TuoKeType { get; set; } - - ///// - ///// 会员类型 -1=全部 1=新会员 2=老会员 - ///// - //public int? NewOrOld { get; set; } - - ///// - ///// 拓客标签 -1=全部 0=未体验 1=体验一次 2=体验2次 3=体验3次以上 - ///// - //public int? TuoKeLabel { get; set; } - - - ///// - ///// 留客标签 -1=全部 0="服务次数0-4" 1="服务次数5-6" 2="服务次数7-8" 3="服务次数9-10" - ///// - //public int? LiuKeLabel { get; set; } - - ///// - ///// 锁客标签 -1=全部 0="剩余服务20次以上" 1="剩余服务10-19次" 2=剩余服务5-9次" 3="剩余服务≤5次" - ///// - //public int? SuoKeLabel { get; set; } - - } - - #region 需要修改的会员信息 - /// - /// 需要修改的会员信息 - /// - public class SetMemberRequst - { - /// - /// 会员营销顾问关系主键ID - /// - public Guid ID { get; set; } - - /// - /// 会员主键ID - /// - public Guid MemberID { get; set; } - - /// - /// 会员名称 - /// - public string Name { get; set; } - - /// - /// 电话 - /// - public string Mobile { get; set; } - - /// - /// 生日 "月-日" - /// - public string BirthDay { get; set; } - - - /// - /// 生日 "年-月-日" - /// - public DateTime? BirthDay2 { get; set; } - - /// - /// 会员备注 - /// - public string Note { get; set; } - - /// - /// 是否已添加微信 0=否;1=是 - /// - public int? IfAddWx { get; set; } - - /// - /// 是否已添加社区 0=否;1=是 - /// - public int? IfAddCommunity { get; set; } - - /// - /// Desc:年龄，店员手填 - /// Default:0 - /// - public int? Age { get; set; } - - } - #endregion - - #region 拟邀名称 - public class InviteMemberReq - { - /// - /// 模糊搜索关键字 - /// - public string KeyWord { get; set; } - - /// - /// 搜索时间（邀约列表可用） - /// - public DateTime CheckTime { get; set; } - } - #endregion - - - public class MemberOfInviteRequst - { - /// - /// 店铺ID:选择的店铺ID，或当前登录用户所属店铺ID - /// - public Guid? ShopID { get; set; } - - /// - /// 搜索关键字 - /// - public string KeyWord { get; set; } - - /// - /// 只看套餐客户 0=不勾选;1=勾选 - /// - public int IfTaoCan { get; set; } - - /// - /// 排除已邀约客户 0=不勾选;1=勾选 - /// - public int IfInvite { get; set; } - - } - - - /// - /// 快速添加的会员信息 - /// - public class QuicklyAddMemberInformationAct - { - - /// - /// 店铺ID:选择的店铺ID - /// - public Guid? ShopId { get; set; } - - /// - /// 会员名称 - /// - public string Name { get; set; } - - /// - /// 电话 - /// - public string Mobile { get; set; } - - /// - /// 会员资料增加来源 未选=NULL 0= 其他; 1= 抖音; 2= 美团; 3=自然流量; 4=老顾客裂变 5=1元公益、派单 - /// - public int? AddFromType { get; set; } - - - } - - - public class TuoKeMemberRequst - { - /// - /// 店铺ID:选择的店铺ID，或当前登录用户所属店铺ID - /// - public Guid? ShopID { get; set; } - - /// - /// 搜索关键字 - /// - public string KeyWord { get; set; } - - - /// - /// 转营销顾问时取消选中的会员ID - /// - public List NotSelectedIds { get; set; } - - /// - /// 转营销顾问时前端页面选中的会员ID数组 - /// - public List HadSelectedIds { get; set; } - - /// - /// 转营销顾问时总共选中的会员人数 - /// - public int? HadSelectedCount { get; set; } - - /// - /// 批量修改营销顾问时的顾问ID - /// - public Guid? ConsultantId { get; set; } - - - /// - /// 排序 1=升序 0=倒序 - /// - public int? SortType { get; set; } - - /// - /// 排序字段 - /// - public string SortString { get; set; } - - /// - /// 后端使用的字段 - /// - public Guid? Id { get; set; } - - - - /// - /// 会员状态 -1=全部; 1=拓客 2=留客 3=锁客 - /// - public int? TuoKeType { get; set; } - - /// - /// 会员类型 -1=全部 1=新会员 2=老会员 - /// - public int? NewOrOld { get; set; } - - /// - /// 拓客标签 -1=全部 0=未体验 1=体验一次 2=体验2次 3=体验3次以上 - /// - public int? TuoKeLabel { get; set; } - - - /// - /// 留客标签 -1=全部 0="服务次数0-4" 1="服务次数5-6" 2="服务次数7-8" 3="服务次数9-10" - /// - public int? LiuKeLabel { get; set; } - - /// - /// 锁客标签 -1=全部 0="剩余服务20次以上" 1="剩余服务10-19次" 2=剩余服务5-9次" 3="剩余服务≤5次" - /// - public int? SuoKeLabel { get; set; } - - } - - - -} diff --git a/MyCode.Project.Domain/Message/Request/User/MemberTagRequest.cs b/MyCode.Project.Domain/Message/Request/User/MemberTagRequest.cs deleted file mode 100644 index 31af5f4..0000000 --- a/MyCode.Project.Domain/Message/Request/User/MemberTagRequest.cs +++ /dev/null @@ -1,49 +0,0 @@ -using MyCode.Project.Domain.Message.Response.User; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace MyCode.Project.Domain.Message.Request.User -{ - public class MemberTagRequest - { - /// - /// 会员ID - /// - public Guid MemberID { get; set; } - - /// - /// 店铺ID 详细档案明细接口中返回的店铺ID - /// - public Guid? ShopID { get; set; } - - /// - /// 标签ID集合 - /// - public List Ids { get; set; } - } - - public class MemberTagNewAct - { - /// - /// 会员ID - /// - public Guid MemberId { get; set; } - - /// - /// 店铺ID - /// - public Guid? ShopId { get; set; } - - /// - /// 标签ID集合 - /// - public List List { get; set; } - /// - /// 自定义标签数组 - /// - public List PrivateTagList { get; set; } - } -} diff --git a/MyCode.Project.Domain/Message/Request/User/MiniMessageRequst.cs b/MyCode.Project.Domain/Message/Request/User/MiniMessageRequst.cs deleted file mode 100644 index 39277d1..0000000 --- a/MyCode.Project.Domain/Message/Request/User/MiniMessageRequst.cs +++ /dev/null @@ -1,305 +0,0 @@ -using MyCode.Project.Infrastructure.Common; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace MyCode.Project.Domain.Message.Request.User -{ - public class MiniMessageRequst - { - /// - /// 会员ID集合 - /// - public List MemberIDs { get; set; } - - /// - /// 店员ID - /// - public Guid ClerkID { get; set; } - } - - public class InStorageRequst - { - /// - /// 店铺ID - /// - public Guid ShopID { get; set; } - - /// - /// 入库数量 - /// - public string InStorageItem { get; set; } - - /// - /// 出库总数 - /// - public string InStorageQty { get; set; } - - /// - /// 入库日期 - /// - public string Time { get; set; } - - /// - /// 店铺名称 - /// - public string ShopName { get; set; } - - /// - /// OpenId - /// - public string OpenId { get; set; } - - /// - /// LoginID - /// - public Guid LoginID { get; set; } - - /// - /// 消息接收角色 - /// - public int RoleType { get; set; } - } - - public class OutStorageRequst - { - /// - /// 店铺ID - /// - public Guid ShopID { get; set; } - - /// - /// 数量 - /// - public string OutStorageItem { get; set; } - - /// - /// 出库总数 - /// - public string OutStorageQty { get; set; } - - /// - /// 出库日期 - /// - public string Time { get; set; } - - /// - /// 店铺名称 - /// - public string ShopName { get; set; } - - /// - /// OpenId - /// - public string OpenId { get; set; } - - /// - /// LoginID - /// - public Guid LoginID { get; set; } - - /// - /// 消息接收角色 - /// - public int RoleType { get; set; } - } - - /// - /// 发送服务测试提醒的请求 - /// - public class SendServiceRequest - { - /// - /// 店铺名称 - /// - public string ShopName { get; set; } - - /// - /// 会员名称 - /// - public string MemberName { get; set; } - - /// - /// 会员电话 - /// - public string MemberMobile { get; set; } - - /// - /// 店员名称 - /// - public string ClerkName { get; set; } - - /// - /// 划卡日期 - /// - public string DateTime { get; set; } - - /// - /// 套餐名称 - /// - public string ServiceName { get; set; } - - /// - /// 服务次数 - /// - public string Qty { get; set; } - - /// - /// 剩余服务次数 - /// - public string InvServiceName { get; set; } - - /// - /// 店铺ID - /// - public Guid ShopId { get; set; } - - /// - /// 店员ID - /// - public Guid? clerkId { get; set; } - - /// - /// 单号 - /// - public string Sheet { get; set; } - - /// - /// openid - /// - public string OpenId { get; set; } - - /// - /// LoginID - /// - public Guid LoginID { get; set; } - - } - - public class KPISendInfo - { - - /// - /// 店铺名称 - /// - public string Name { get; set; } - - /// - /// 店员名称 - /// - public string ClerkName { get; set; } - - /// - /// 日期 - /// - public string Date { get; set; } - - /// - /// OpenId - /// - public string OpenId { get; set; } - - /// - /// 店长LoginID - /// - public Guid LoginID { get; set; } - } - - public class KPIInfo - { - /// - /// OpenId - /// - public string OpenId { get; set; } - - /// - /// ShopID - /// - public Guid ShopID { get; set; } - - /// - /// LoginID - /// - public Guid LoginID { get; set; } - - /// - /// 统计时间 - /// - public DateTime Time { get; set; } - } - public class CusKPIInfo - { - /// - /// OpenId - /// - public string OpenId { get; set; } - - /// - /// LoginID - /// - public Guid LoginID { get; set; } - - /// - /// ShopID - /// - public Guid ShopID { get; set; } - - /// - /// 统计时间 - /// - public DateTime Time { get; set; } - } - public class ClerkKPIInfo - { - /// - /// OpenId - /// - public string OpenId { get; set; } - - /// - /// ClerkID店员ID - /// - public Guid ClerkID { get; set; } - - /// - /// 统计时间 - /// - public DateTime Time { get; set; } - } - public class InviteInfo - { - - /// - /// OpenId - /// - public string OpenId { get; set; } - - /// - /// LoginID - /// - public Guid LoginID { get; set; } - - /// - /// 会员手机号 - /// - public string Mobile { get; set; } - - /// - /// 会员名称 - /// - public string Name { get; set; } - - /// - /// 店员名称 - /// - public string ClerkName { get; set; } - - /// - /// 邀约日期 - /// - public string date { get; set; } - } - -} diff --git a/MyCode.Project.Domain/Message/Request/User/ServiceItems.cs b/MyCode.Project.Domain/Message/Request/User/PostModel.cs similarity index 50% rename from MyCode.Project.Domain/Message/Request/User/ServiceItems.cs rename to MyCode.Project.Domain/Message/Request/User/PostModel.cs index 8f70ec6..80b44c7 100644 --- a/MyCode.Project.Domain/Message/Request/User/ServiceItems.cs +++ b/MyCode.Project.Domain/Message/Request/User/PostModel.cs @@ -6,22 +6,26 @@ using System.Threading.Tasks; namespace MyCode.Project.Domain.Message.Request.User { - public class ServiceItems + public class PostModel1 { /// - /// 服务ID + /// 账套ID /// - public Guid Id { get; set; } + public string DBID { get; set; } + /// - /// 服务名称 + /// 验证KEY /// - public string Name { get; set; } + public string KEY { get; set; } /// - /// 数量 + /// 加密后的密码 /// - public int Qty { get; set; } + public string HashPassword { get; set; } + + //是否调度在登录 1=是 0=否 + public int IFTaskLogin { get; set; } } } diff --git a/MyCode.Project.Domain/Message/Response/User/MemberOrderListResp.cs b/MyCode.Project.Domain/Message/Response/User/MemberOrderListResp.cs deleted file mode 100644 index eacc823..0000000 --- a/MyCode.Project.Domain/Message/Response/User/MemberOrderListResp.cs +++ /dev/null @@ -1,374 +0,0 @@ -using MyCode.Project.Domain.Businesses.FileManager; -using MyCode.Project.Domain.Message.Response.ServiceOrder; -using MyCode.Project.Domain.Message.Response.Shop; -using MyCode.Project.Domain.Model; -using MyCode.Project.Infrastructure.Common; -using MyCode.Project.Infrastructure.Enumeration; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace MyCode.Project.Domain.Message.Response.User -{ - #region 会员消费订单记录 - public class MemberOrderListResp - { - /// - /// 总额 - /// - public decimal TotalAmount { get; set; } - - /// - /// 服务总数 - /// - public int ServiceAmount { get; set; } - - /// - /// 订单明细列表 - /// - public PageResult OrderList { get; set; } - } - - public class MemberOrderList - { - /// - /// 消费主键ID(后台逻辑需要) - /// - public Guid ID { get; set; } - - /// - /// 退换货主键ID(后台逻辑需要) - /// - public Guid? RefSalesSheetID { get; set; } - - /// - /// 消费类型 0：销售 1：退换货 20：预售 30：充值 40：服务单 - /// - public int SalesType { get; set; } - - /// - /// 消费类型文本 - /// - public string SalesTypeStr { get; set; } - - /// - /// 退款状态 0：显示退款按钮 1：不显示退款按钮 - /// - public int HasReturn { get; set; } - - /// - /// 退款状态文本 - /// - public string HasReturnStr { get; set; } - - /// - /// 业务单号 - /// - public string Sheet { get; set; } - - /// - /// 会员id - /// - public Guid MemberId { get; set; } - - /// - /// 会员名称 - /// - public string MemberName { get; set; } - - /// - /// 加盟商id - /// - public Guid CustomerId { get; set; } - - /// - /// 店铺名称 - /// - public string ShopName { get; set; } - - /// - /// 接待人 - /// - public string ClerkName { get; set; } - - /// - /// 操作数量 - /// - public int TotalQty { get; set; } - - /// - /// 支付方式文本 - /// - public string PayTypeStr { get; set; } - - /// - /// 实际支付金额 - /// - public decimal Amount { get; set; } - - /// - /// 创建时间 - /// - public DateTime CreateTime { get; set; } - - - /// - /// 备注 - /// - public string Note { get; set; } - - /// - /// 订单明细列表 - /// - public List DetailList { get; set; } - - /// - /// 赠送的服务列表 - /// - public List GiveAwayList { get; set; } - - } - #endregion - - #region 会员消费订单记录明细 - public class MemberOrderDetail - { - /// - /// 明细主键ID - /// - public Guid? Id { get; set; } - /// - /// 明细商品ID - /// - public Guid? ItemId { get; set; } - - /// - /// 消费类型 0：销售 1：退换货 20：预售 30：充值 40：服务单 - /// - public int SalesType { get; set; } - - /// - /// 商品类型 (2,3,4 需要有展开明细) 0：商品 1：服务 2：套餐 3：卡套 4：自定义套餐 - /// - public int ItemType { get; set; } - - /// - /// 剩余服务次数 - /// - public int LeftServiceQty { get; set; } - - /// - /// 是否显示核销 - /// - public bool ShowVerification { get; set; } - - /// - /// 主图文件 - /// - public FileUse Img { get; set; } - - /// - /// 商品名称 - /// - public string GoodsName { get; set; } - - /// - /// 购买数量 - /// - public int Qty { get; set; } - - /// - /// 商品价格（分摊价）或 充值类型(实付金额) - /// - public decimal Price { get; set; } - - /// - /// (充值金额) - /// - public decimal AccPrice { get; set; } - - /// - /// 商品编码 - /// - public string CustomBC { get; set; } - } - - public class MemberOrderItem - { - /// - /// 订单明细 - /// - public Guid ID { get; set; } - - /// - /// 订单明细主键ID - /// - public Guid DetailID { get; set; } - - /// - /// 商品名称 - /// - public string GoodsName { get; set; } - - /// - /// 购买数量 - /// - public int Qty { get; set; } - - /// - /// 商品价格（分摊价）或 充值类型(实付金额) - /// - public decimal Price { get; set; } - - /// - /// (充值金额) - /// - public decimal AccPrice { get; set; } - - /// - /// 订单类型 - /// - public int SalesType { get; set; } - - /// - /// 商品ID - /// - public Guid GoodsID { get; set; } - - /// - /// 商品类型 0：商品 1：服务 2：套餐 3：卡套 4：自定义套餐 20：预售 30：充值 40：服务 - /// - public int ItemType{ get; set; } - - /// - /// 商品编码 - /// - public string CustomBC { get; set; } - } - - public class ItemDetailOfDetail - { - - /// - /// 主键ID - /// - public Guid? Id { get; set; } - - /// - /// 订单ID - /// - public Guid? SheetId { get; set; } - - /// - /// 明细商品ID - /// - public Guid? ItemId { get; set; } - - /// - /// 购买数量 - /// - public int Qty { get; set; } - - /// - /// 主图文件 - /// - public FileUse Img { get; set; } - - - /// - /// 商品编码 - /// - public string CustomBC { get; set; } - - /// - /// 商品名称 - /// - public string GoodsName { get; set; } - - /// - /// 商品类型 0：商品 1：服务 2：套餐 3：卡套 4：自定义套餐 20：预售 30：充值 40：服务 - /// - public int ItemType { get; set; } - - - } - - - public class GiveAwayDetail - { - /// - /// 主键ID - /// - public Guid? Id { get; set; } - - /// - /// 订单ID - /// - public Guid? SheetId { get; set; } - - /// - /// 明细商品ID - /// - public Guid? ItemId { get; set; } - - /// - /// 购买数量 - /// - public int Qty { get; set; } - - /// - /// 商品名称 - /// - public string GoodsName { get; set; } - - /// - /// 项目类型。0=商品；1=服务；2=套餐,3=卡券 , 4=自定义套餐 - /// - public int ItemType { get; set; } - - /// - /// 主图文件 - /// - public FileUse Img { get; set; } - - - /// - /// 剩余服务次数 - /// - public int LeftServiceQty { get; set; } - - /// - /// 是否显示核销 - /// - public bool ShowVerification { get; set; } - } - - public class ServiceNameDetail - { - /// - /// 主键ID - /// - public Guid? Id { get; set; } - - /// - /// 明细商品ID - /// - public Guid? ItemId { get; set; } - - /// - /// 商品名称 - /// - public string Name { get; set; } - - /// - /// 项目类型。0=商品；1=服务；2=套餐,3=卡券 , 4=自定义套餐 - /// - public int ItemType { get; set; } - - } - - - #endregion -} diff --git a/MyCode.Project.Domain/Message/Response/User/MemberResp.cs b/MyCode.Project.Domain/Message/Response/User/MemberResp.cs deleted file mode 100644 index c905d67..0000000 --- a/MyCode.Project.Domain/Message/Response/User/MemberResp.cs +++ /dev/null @@ -1,458 +0,0 @@ -using MyCode.Project.Domain.Message.Response.ServiceOrder; -using MyCode.Project.Domain.Model; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace MyCode.Project.Domain.Message.Response.User -{ - #region 会员信息 - /// - /// 会员Resp - /// - public class MemberResp - { - /// - /// 会员营销顾问关系主键ID - /// - public Guid ID { get; set; } - - /// - /// 会员名称 - /// - public string Name { get; set; } - - /// - /// 电话 - /// - public string Mobile { get; set; } - - /// - /// 人脸识别主键 - /// - public string FaceId { get; set; } - - /// - /// 人脸识别图片集合数量 - /// - public int FaceCount { get; set; } - - /// - /// 会员余额 - /// - public decimal? Account { get; set; } - - /// - /// 会员主键ID - /// - public Guid? MemberId { get; set; } - } - #endregion - - #region 会员管理-会员信息列表 - /// - /// 会员Resp - /// - public class MemberCusResp - { - /// - /// 会员营销顾问关系主键ID - /// - public Guid ID { get; set; } - - /// - /// 会员ID - /// - public Guid MemberID { get; set; } - - /// - /// 会员名称 - /// - public string Name { get; set; } - - /// - /// 销售顾问名称 - /// - public string ClerkName { get; set; } - - /// - /// Desc:头像地址 - /// Default: - /// Nullable:True - /// - public string HeadImgUrl { get; set; } - - /// - /// 电话 - /// - public string Mobile { get; set; } - - /// - /// 等级 - /// - public string GradeName { get; set; } - - - /// - /// 等级图标对应字段 - /// - public int GradeNum { get; set; } - - /// - /// 会员等级ICON地址 - /// - public string GradeIconUrl { get; set; } - - - /// - /// 余额 - /// - public decimal? Account { get; set; } - - /// - /// 生日 - /// - public string BirthDay { get; set; } - - /// - /// 上次到店时间 - /// - public string LastShopTime { get; set; } - - /// - /// 回店提醒时间 - /// - public string RecentRemindersTime { get; set; } - - /// - /// 店员ID - /// - public Guid ClerkID { get; set; } - - /// - /// 剩余服务次数 - /// - public int? ServiceQty { get; set; } - - /// - /// 1=已绑定营销关系的会员 0=未绑定营销关系的会员 - /// - public int IfNormal { get; set; } - } - #endregion - - public class MemberStatistics - { - /// - /// 门店会员人数统计 - /// - public int ShopMemberSta { get; set; } - - /// - /// 我的会员人数统计 - /// - public int MemberSta { get; set; } - - /// - /// 我的会员余额 - /// - public decimal MyBalance { get; set; } - - /// - /// 门店会员余额 - /// - public decimal ShopBalance { get; set; } - } - - #region 会员详细档案 - /// - /// 会员详细档案Resp - /// - public class MemberDetailResp - { - - /// - /// 等级图标对应字段 - /// - public int GradeNum { get; set; } - - /// - /// 会员等级ICON地址 - /// - public string GradeIconUrl { get; set; } - - /// - /// 会员营销顾问关系主键ID - /// - public Guid ID { get; set; } - - /// - /// 会员ID - /// - public Guid MemberID { get; set; } - - /// - /// 关联店铺ID - /// - public Guid ShopID { get; set; } - - /// - /// 人脸识别id - /// - public string FaceId { get; set; } - - /// - /// 人脸识别图片集合数量 - /// - public int FaceCount { get; set; } - - /// - /// 会员名称 - /// - public string Name { get; set; } - - /// - /// 销售顾问名称 - /// - public string ClerkName { get; set; } - - /// - /// 店铺名称 - /// - public string ShopName { get; set; } - - /// - /// Desc:头像地址 - /// Default: - /// Nullable:True - /// - public string HeadImgUrl { get; set; } - - /// - /// 电话 - /// - public string Mobile { get; set; } - - /// - /// 等级 - /// - public string GradeName { get; set; } - - /// - /// 余额 - /// - public decimal Account { get; set; } - - /// - /// 积分 - /// - public decimal? Integral { get; set; } - - /// - /// 已打标签数 - /// - public int TagAmount { get; set; } - - /// - /// 生日 "月-日" - /// - public string BirthDay { get; set; } - - /// - /// 生日 "年-月-日" - /// - public DateTime? BirthDay2 { get; set; } - - /// - /// 上次到店时间 - /// - public string LastShopTime { get; set; } - - /// - /// 注册时间 - /// - public string CreateTime { get; set; } - - /// - /// 备注 - /// - public string Note { get; set; } - - /// - /// 是否已添加微信 0=否;1=是 - /// - public int? IfAddWx { get; set; } - - /// - /// 是否已添加社区 0=否;1=是 - /// - public int? IfAddCommunity { get; set; } - - - ///// - ///// 会员已绑定的标签 - ///// - //public List tagLogList { get; set; } - - /// - /// 会员卡券信息 - /// - public List cardList { get; set; } - - /// - /// 剩余服务列表 - /// - public List serviceInvList { get; set; } - - /// - /// 剩余服务次数 - /// - public int ServiceQty { get; set; } - - /// - /// 店铺的加盟商ID - /// - public Guid? CustomerID { get; set; } - - /// - /// 会员资料增加来源 0= 其他; 1= 抖音; 2= 美团; 3=自来客; 4=老客转介绍 - /// - public int? AddFromType { get; set; } - /// - /// 会员资料增加来源文本显示 - /// - public string AddFromTypeName { get; set; } - - /// - /// Desc:年龄，店员手填 - /// - public int? Age { get; set; } - - } - - public class MemberCardListResp - { - /// - /// 主键ID - /// - public Guid Id { get; set; } - - /// - /// 名称 - /// - public string Name { get; set; } - - /// - /// 留店设置 1 留店 0 提走 - /// - public int IfStaystore { get; set; } - - /// - /// 卡套数量 - /// - public int Qty { get; set; } - } - #endregion - - #region 拟邀名单列表 - /// - /// 会员Resp - /// - public class InviteMemberResp - { - /// - /// 会员营销顾问关系主键ID(拟邀名单列表使用) - /// - public Guid ID { get; set; } - - /// - /// 会员ID - /// - public Guid MemberID { get; set; } - - /// - /// 会员名称 - /// - public string Name { get; set; } - - /// - /// Desc:头像地址 - /// Default: - /// Nullable:True - /// - public string HeadImgUrl { get; set; } - - /// - /// 电话 - /// - public string Mobile { get; set; } - - /// - /// 上次到店时间 - /// - public string LastShopTime { get; set; } - } - #endregion - - - #region 邀约管理-4.0版本根据条件获取会员邀约列表 - /// - /// 邀约管理-4.0版本根据条件获取会员邀约列表 - /// - public class MemberOfInvite40Resp - { - /// - /// 会员营销顾问关系主键ID - /// - public Guid ID { get; set; } - - /// - /// 会员ID - /// - public Guid MemberID { get; set; } - - /// - /// 会员名称 - /// - public string Name { get; set; } - - /// - /// 销售顾问名称 - /// - public string ClerkName { get; set; } - - /// - /// Desc:头像地址 - /// Default: - /// Nullable:True - /// - public string HeadImgUrl { get; set; } - - /// - /// 电话 - /// - public string Mobile { get; set; } - - /// - /// 上次到店时间 - /// - public string LastShopTime { get; set; } - - /// - /// 回店提醒时间 - /// - public string RecentRemindersTime { get; set; } - - /// - /// 1=修改邀约; 0=马上邀约 - /// - public int HadInvite { get; set; } - /// - /// 获取邀约详情的ID - /// - public Guid? InviteId { get; set; } - } - #endregion -} diff --git a/MyCode.Project.Domain/Message/Response/User/MemberTagResp.cs b/MyCode.Project.Domain/Message/Response/User/MemberTagResp.cs deleted file mode 100644 index bc14ac7..0000000 --- a/MyCode.Project.Domain/Message/Response/User/MemberTagResp.cs +++ /dev/null @@ -1,85 +0,0 @@ -using MyCode.Project.Infrastructure.Enumeration; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace MyCode.Project.Domain.Message.Response.User -{ - public class MemberTagResp - { - /// - /// 会员标签记录ID - /// - public Guid ID { get; set; } - - /// - /// 标签名称 - /// - public string Name { get; set; } - } - - public class MemberTagClassifyResp - { - /// - /// 标签分类ID - /// - public Guid ClassifyId { get; set; } - - /// - /// 标签分类名称 - /// - public string Name { get; set; } - - /// - /// 标签分类排序 - /// - public int Sort { get; set; } - - } - - - public class NewMemberTagResp - { - /// - /// 是否已使用 0=未使用 1=已使用 - /// - public int IsUse { get; set; } - - /// - /// 标签id - /// - public Guid Id { get; set; } - - /// - /// 标签名称 - /// - public string Name { get; set; } - } - - public class NewMemberTagClassifyResp : MemberTagClassifyResp - { - /// - /// 该类型下的标签内容 - /// - public List MemberTags { get; set; } - - - } - - public class MemberTagsList40 - { - /// - /// 公共的会员标签数组 - /// - public List MemberTags { get; set; } - - /// - /// 自定义标签数组 - /// - public List PrivateTagList { get; set; } - } - - -} diff --git a/MyCode.Project.Domain/Message/Response/User/MemberUpgradeInfoDto.cs b/MyCode.Project.Domain/Message/Response/User/MemberUpgradeInfoDto.cs deleted file mode 100644 index 547b3b7..0000000 --- a/MyCode.Project.Domain/Message/Response/User/MemberUpgradeInfoDto.cs +++ /dev/null @@ -1,68 +0,0 @@ -using MyCode.Project.Infrastructure.Enumeration; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace MyCode.Project.Domain.Message.Response.User -{ - /// - /// 会员升级信息 数据传输对象 - /// - public class MemberUpgradeInfoDto - { - - - /// - /// 会员ID - /// - public Guid MemberId { get; set; } - - /// - /// 消费金额 - /// - public decimal Amount { get; set; } - - /// - /// 业务单号 - /// - public string Sheet { get; set; } - - /// - /// 业务ID - /// - public Guid? SheetId { get; set; } - - /// - /// 业务类型 - /// - public ConsumptionSheetType SheetType { get; set; } - - /// - /// 业务方向 - /// - public DirectFlag DirectFlag { get; set; } = DirectFlag.Plus; - - /// - /// 审核人 - /// - public string Checker { get; set; } - - /// - /// 店铺ID - /// - public Guid? ShopId { get; set; } - - /// - /// 加盟商ID - /// - public Guid? CustomerId { get; set; } - - /// - /// 店员ID - /// - - public Guid? ClerkId { get; set; } - } -} diff --git a/MyCode.Project.Domain/Message/Response/User/MiniUserInfoResp.cs b/MyCode.Project.Domain/Message/Response/User/MiniUserInfoResp.cs deleted file mode 100644 index efdd82e..0000000 --- a/MyCode.Project.Domain/Message/Response/User/MiniUserInfoResp.cs +++ /dev/null @@ -1,58 +0,0 @@ -using MyCode.Project.Infrastructure.Enumeration; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace MyCode.Project.Domain.Message.Response.User -{ - public class MiniUserInfoResp - { - /// - /// openId - /// - public string openId { get; set; } - - /// - /// nickName - /// - public string nickName { get; set; } - - - /// - /// gender - /// - public int gender { get; set; } - - /// - /// language - /// - public string language { get; set; } - - /// - /// city - /// - public string city { get; set; } - - /// - /// province - /// - public string province { get; set; } - - /// - /// country - /// - public string country { get; set; } - - /// - /// avatarUrl - /// - public string avatarUrl { get; set; } - - /// - /// UnionId联合主键ID - /// - public string unionId { get; set; } - } -} diff --git a/MyCode.Project.Domain/Message/Response/User/RoleMenuPower.cs b/MyCode.Project.Domain/Message/Response/User/RoleMenuPower.cs deleted file mode 100644 index a21da6d..0000000 --- a/MyCode.Project.Domain/Message/Response/User/RoleMenuPower.cs +++ /dev/null @@ -1,63 +0,0 @@ -using Newtonsoft.Json; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace MyCode.Project.Domain.Message.Response.User -{ - /// - /// 角色菜单权限 - /// - public class RoleMenuPower - { - /// - /// 路径 - /// - public string Path { get; set; } - - /// - /// 名称 - /// - public string Name { get; set; } - - /// - /// 图标 - /// - [JsonProperty("iconCls")] - public string Icon { get; set; } - - /// - /// 子菜单 - /// - public List Children { get; set; } - - /// - /// 菜单按钮 - /// - public MenuButtonView MenuPower { get; set; } - } - - - /// - /// 菜单按钮 显示视图 - /// - public class MenuButtonView - { - /// - /// 页面按钮权限 - /// - public List Page { get; set; } = new List(); - - /// - /// 分页列表按钮权限 - /// - public List PageList { get; set; } = new List(); - - /// - /// 分页子列表按钮权限 - /// - public List ChildrenList { get; set; } = new List(); - } -} diff --git a/MyCode.Project.Domain/Message/Response/User/SapLoginInfo.cs b/MyCode.Project.Domain/Message/Response/User/SapLoginInfo.cs deleted file mode 100644 index a5a7cb4..0000000 --- a/MyCode.Project.Domain/Message/Response/User/SapLoginInfo.cs +++ /dev/null @@ -1,13 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace MyCode.Project.Domain.Message.Response.User -{ - public class SAPLoginInfo : LoginInfo - { - - } -} diff --git a/MyCode.Project.Domain/Message/Response/User/ShopMemberResp.cs b/MyCode.Project.Domain/Message/Response/User/ShopMemberResp.cs deleted file mode 100644 index 6782b12..0000000 --- a/MyCode.Project.Domain/Message/Response/User/ShopMemberResp.cs +++ /dev/null @@ -1,59 +0,0 @@ -using MyCode.Project.Domain.Businesses.FileManager; -using MyCode.Project.Domain.Message.Response.Shop; -using MyCode.Project.Domain.Model; -using MyCode.Project.Infrastructure.Enumeration; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace MyCode.Project.Domain.Message.Response.User -{ - public class ShopMemberResp - { - /// - /// 名称 - /// - public string NickName { get; set; } - - /// - /// 头像 - /// - public string HeadImgUrl { get; set; } - - /// - /// 登录角色类型 1 顾客 11 观察者 12 加盟商 13 店员 14 店长 - /// - public LoginRoleType RoleType { get; set; } - - /// - /// 店铺权限数组，管理人员调另外一个接口，管理人员无数据 - /// - public List shopList { get; set; } - - - /// - /// 管理人员的组织架构名称数组 - /// - public List OrganizationChartName { get; set; } - /// - /// 是否(事业部总经理角色、销售总监角色) 1 是 0 否 - /// - public int IfGeneralManagerRole { get; set; } - - /// - /// 是否显示补货情况报表 1 显示 0 不显示 - /// - public int IfShowBuHuoReport { get; set; } - - /// - /// 店员ID或者加盟商ID - /// - - public Guid? ClerkId { get; set; } - - public Guid UserId { get; set; } - - } -} diff --git a/MyCode.Project.Domain/Message/Response/User/WechatMiniSessionKey.cs b/MyCode.Project.Domain/Message/Response/User/WechatMiniSessionKey.cs deleted file mode 100644 index 28d9dc2..0000000 --- a/MyCode.Project.Domain/Message/Response/User/WechatMiniSessionKey.cs +++ /dev/null @@ -1,26 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace MyCode.Project.Domain.Message.Response.User -{ - public class WechatMiniSessionKey - { - /// - /// 用户唯一标识 - /// - public string Openid { get; set; } - - /// - /// 会话密钥 - /// - public string SessionKey { get; set; } - - /// - /// 用户在开放平台的唯一标识符。本字段在满足一定条件的情况下才返回。具体参看：https://mp.weixin.qq.com/debug/wxadoc/dev/api/uinionID.html - /// - public string UnionId { get; set; } - } -} diff --git a/MyCode.Project.Domain/Message/Response/User/WechatMiniUserInfo.cs b/MyCode.Project.Domain/Message/Response/User/WechatMiniUserInfo.cs deleted file mode 100644 index 620a40d..0000000 --- a/MyCode.Project.Domain/Message/Response/User/WechatMiniUserInfo.cs +++ /dev/null @@ -1,58 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace MyCode.Project.Domain.Message.Response.User -{ - public class WechatMiniUserInfo - { - - ///// - ///// 用户的标识，对当前公众号唯一 - ///// - //public string Openid { get; set; } - - /// - /// 用户的昵称 - /// - public string NickName { get; set; } - - /// - /// 用户的性别，值为1时是男性，值为2时是女性，值为0时是未知 - /// - public int Sex { get; set; } - - /// - /// 用户所在城市 - /// - public string City { get; set; } - - /// - /// 用户所在国家 - /// - public string Country { get; set; } - - /// - /// 用户所在省份 - /// - public string Province { get; set; } - - /// - /// 用户头像，最后一个数值代表正方形头像大小（有0、46、64、96、132数值可选，0代表640*640正方形头像），用户没有头像时该项为空。若用户更换头像，原有头像URL将失效。 - /// - public string HeadImgUrl { get; set; } - - /// - /// 用户关注时间，为时间戳。如果用户曾多次关注，则取最后关注时间 - /// - public long SubscribeTime { get; set; } - - ///// - ///// 只有在用户将公众号绑定到微信开放平台帐号后，才会出现该字段。 - ///// - //public string Unionid { get; set; } - - } -} diff --git a/MyCode.Project.Domain/Message/Response/Wechat/GetMemberTokenResp.cs b/MyCode.Project.Domain/Message/Response/Wechat/GetMemberTokenResp.cs index 91e282b..a68f733 100644 --- a/MyCode.Project.Domain/Message/Response/Wechat/GetMemberTokenResp.cs +++ b/MyCode.Project.Domain/Message/Response/Wechat/GetMemberTokenResp.cs @@ -34,4 +34,62 @@ namespace MyCode.Project.Domain.Message.Response.Wechat /// public string NickName { get; set; } } + + //如果好用，请收藏地址，帮忙分享。 + public class ItemItem + { + /// + /// + /// + public string FPHONE { get; set; } + /// + /// + /// + public string FPASSWORD { get; set; } + /// + /// + /// + public string DBID { get; set; } + /// + /// + /// + public string KEY { get; set; } + } + + public class Data + { + /// + /// + /// + public List Item { get; set; } + } + + public class Result + { + /// + /// + /// + public string IsSuccess { get; set; } + /// + /// + /// + public string ErrorMessage { get; set; } + /// + /// + /// + public Data Data { get; set; } + /// + /// + /// + public int Count { get; set; } + } + + public class DeMiResp + { + /// + /// + /// + public Result Result { get; set; } + } + } diff --git a/MyCode.Project.Domain/Message/Response/Wechat/OpenIdResp.cs b/MyCode.Project.Domain/Message/Response/Wechat/OpenIdResp.cs deleted file mode 100644 index 40b48a8..0000000 --- a/MyCode.Project.Domain/Message/Response/Wechat/OpenIdResp.cs +++ /dev/null @@ -1,17 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace MyCode.Project.Domain.Message.Response.Wechat -{ - public class OpenIdResp - { - /// - /// 授权成功后，跳转的地址 - /// - public string RedirectUrl { get; set; } - - } -} diff --git a/MyCode.Project.Domain/Message/Response/Wechat/TemplateItem.cs b/MyCode.Project.Domain/Message/Response/Wechat/TemplateItem.cs deleted file mode 100644 index d9e13b4..0000000 --- a/MyCode.Project.Domain/Message/Response/Wechat/TemplateItem.cs +++ /dev/null @@ -1,39 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace MyCode.Project.Domain.Message.Response.Wechat -{ - public class TemplateItem - { - /// - /// keyword1,keyword2 - /// - public string Code { get; set; } - - /// - /// 模板值 - /// - public string Value { get; set; } - - /// - /// 字体颜色 - /// - public string Color { get; set; } - - /// - /// 初始化一个类型的实例 - /// - /// 模板编码 - /// 模板值 - /// 字体颜色，默认#173177 - public TemplateItem(string code, string value, string color = "#173177") - { - this.Code = code; - this.Value = value; - this.Color = color; - } - } -} diff --git a/MyCode.Project.Domain/Message/Response/Wechat/TemplateModel.cs b/MyCode.Project.Domain/Message/Response/Wechat/TemplateModel.cs deleted file mode 100644 index fa001e0..0000000 --- a/MyCode.Project.Domain/Message/Response/Wechat/TemplateModel.cs +++ /dev/null @@ -1,81 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace MyCode.Project.Domain.Message.Response.Wechat -{ - /// - /// 模板实体 - /// - public class TemplateModel - { - /// - /// 用户ID - /// - public Guid UserID { get; set; } - - /// - /// 模板ID - /// - public string TemplateId { get; set; } - - /// - /// 模板跳转链接 - /// - public string Url { get; set; } - - /// - /// 模板项数据 - /// - public List Data { get; set; } - - /// - /// 关键字索引 - /// - private int _keywordIndex; - - /// - /// 初始化一个 - /// - /// 用户Id - /// 模板ID - /// 模板跳转链 - public TemplateModel(Guid UserID, string templateId, string url = "") - { - this.TemplateId = templateId; - this.Url = url; - this.Data = new List(); - this.UserID = UserID; - this._keywordIndex = 0; - - } - - - /// - /// 添加模板关键字 - /// - /// 值 - /// - public TemplateModel Keyword(string value) - { - this._keywordIndex++; - this.AddData("keyword" + _keywordIndex, value); - return this; - } - - - - /// - /// 添加模板项数据 - /// - /// 键 - /// 值 - /// - private void AddData(string key, string value) - { - this.Data.Add(new TemplateItem(key, value)); - } - } -} diff --git a/MyCode.Project.Domain/Message/Response/Wechat/TokenAndTicket.cs b/MyCode.Project.Domain/Message/Response/Wechat/TokenAndTicket.cs deleted file mode 100644 index e51e0df..0000000 --- a/MyCode.Project.Domain/Message/Response/Wechat/TokenAndTicket.cs +++ /dev/null @@ -1,15 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace MyCode.Project.Domain.Message.Response.Wechat -{ - public class TokenAndTicket - { - public string Token { get; set; } - - public string Ticket { get; set; } - } -} diff --git a/MyCode.Project.Domain/Message/Response/Wechat/TradeType.cs b/MyCode.Project.Domain/Message/Response/Wechat/TradeType.cs deleted file mode 100644 index 8b71d3f..0000000 --- a/MyCode.Project.Domain/Message/Response/Wechat/TradeType.cs +++ /dev/null @@ -1,31 +0,0 @@ -using System; -using System.Collections.Generic; -using System.ComponentModel; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace MyCode.Project.Domain.Message.Response.Wechat -{ - /// - /// 交易类型 - /// - public enum TradeType - { - /// - /// 公众号支付 - /// - [Description("JSAPI")] - JsApi = 0, - /// - /// 原生扫码支付 - /// - [Description("NATIVE")] - Native = 1, - /// - /// App支付 - /// - [Description("APP")] - App = 2 - } -} diff --git a/MyCode.Project.Domain/Message/Response/Wechat/WXAccessTokenResp.cs b/MyCode.Project.Domain/Message/Response/Wechat/WXAccessTokenResp.cs deleted file mode 100644 index cf89644..0000000 --- a/MyCode.Project.Domain/Message/Response/Wechat/WXAccessTokenResp.cs +++ /dev/null @@ -1,15 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace MyCode.Project.Domain.Message.Response.Wechat -{ - public class WXAccessTokenResp - { - public string AccessToken { get; set; } - - public string OpenId { get; set; } - } -} diff --git a/MyCode.Project.Domain/Message/Response/Wechat/WXUserInfoResp.cs b/MyCode.Project.Domain/Message/Response/Wechat/WXUserInfoResp.cs deleted file mode 100644 index 0986342..0000000 --- a/MyCode.Project.Domain/Message/Response/Wechat/WXUserInfoResp.cs +++ /dev/null @@ -1,49 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace MyCode.Project.Domain.Message.Response.Wechat -{ - public class WXUserInfoResp - { - /// 用户的唯一标识 - public string OpenId { get; set; } - - /// - /// UnionId - /// - public string UnionId { get; set; } - - /// 用户昵称 - public string NickName { get; set; } - - /// 用户的性别，值为1时是男性，值为2时是女性，值为0时是未知 - public int Sex { get; set; } - - /// 用户个人资料填写的省份 - public string Province { get; set; } - - /// 普通用户个人资料填写的城市 - public string City { get; set; } - - /// 国家，如中国为CN - public string Country { get; set; } - - /// - /// 用户头像，最后一个数值代表正方形头像大小（有0、46、64、96、132数值可选，0代表640*640正方形头像），用户没有头像时该项为空 - /// - public string HeadImgUrl { get; set; } - - /// - /// 1:关注 0：没有关注 - /// - public int Subscribe { get; set; } - - /// - /// 关注时间 - /// - public DateTime? SubscribeTime { get; set; } - } -} diff --git a/MyCode.Project.Domain/Message/Response/Wechat/WxPayParam.cs b/MyCode.Project.Domain/Message/Response/Wechat/WxPayParam.cs deleted file mode 100644 index e14742c..0000000 --- a/MyCode.Project.Domain/Message/Response/Wechat/WxPayParam.cs +++ /dev/null @@ -1,89 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace MyCode.Project.Domain.Message.Response.Wechat -{ - /// - /// 微信支付参数 - /// - public class WxPayParam - { - /// - /// 微信应用ID - /// - public string AppId { get; set; } - - /// - /// 微信支付——商户ID - /// - public string MchId { get; set; } - - /// - /// 微信支付——设备号 - /// - public string DeviceInfo { get; set; } - - /// - /// 微信支付——服务端IP地址 - /// - public string ServiceIpAddress { get; set; } - - /// - /// 微信支付——商户支付密匙 - /// - public string Key { get; set; } - - /// - /// 交易类型 - /// - public TradeType TradeType { get; set; } - - /// - /// 域名 - /// - public string Domain { get; set; } - - /// - /// 商品描述 - /// - public string Body { get; set; } - - /// - /// 商品名称明细列表 - /// - public string Detail { get; set; } - /// - /// 附加参数。 - /// 在查询API和支付通知中原样返回，该字段主要用于商户携带订单的自定义数据 - /// - public string Attach { get; set; } - - /// - /// 商品单ID - /// - public string OutTradeNo { get; set; } - - /// - /// 结算货币，默认人民币：CNY - /// - public string FeeType { get; set; } - - /// - /// 支付金额 - /// - public decimal TotalFee { get; set; } - - /// - /// 回调Url，支付成功或失败回调的Url - /// - public string NotifyUrl { get; set; } - - /// - /// 微信用户标识，trade_type=JSAPI，此参数必传，用户在商户appid下的唯一标识。 - /// - public string Openid { get; set; } - } -} diff --git a/MyCode.Project.Domain/Message/Response/Wechat/WxPayReturn.cs b/MyCode.Project.Domain/Message/Response/Wechat/WxPayReturn.cs deleted file mode 100644 index b6f59bb..0000000 --- a/MyCode.Project.Domain/Message/Response/Wechat/WxPayReturn.cs +++ /dev/null @@ -1,34 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace MyCode.Project.Domain.Message.Response.Wechat -{ - /// - /// 微信下单支付返回值 - /// - public class WxPayReturn - { - /// - /// 返回状态码 - /// - public WxPayState ReturnCode { get; set; } - - /// - /// 微信生成的预支付ID，用于后续接口调用中使用 - /// - public string PrepayId { get; set; } - - /// - /// 微信支付分配的终端设备号 - /// - public string DeviceInfo { get; set; } - - /// - /// trade_type为NATIVE时有返回，此参数可直接生成二维码展示出来进行扫码支付 - /// - public string CodeUrl { get; set; } - } -} diff --git a/MyCode.Project.Domain/Message/Response/Wechat/WxPaySign.cs b/MyCode.Project.Domain/Message/Response/Wechat/WxPaySign.cs deleted file mode 100644 index b218729..0000000 --- a/MyCode.Project.Domain/Message/Response/Wechat/WxPaySign.cs +++ /dev/null @@ -1,44 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace MyCode.Project.Domain.Message.Response.Wechat -{ - /// - /// 小程序支付参数 - /// - public class WxPaySign - { - /// - /// 签名类型，默认MD5，支持HMAC-SHA256和MD5 - /// - public string SignType { get; set; } - - /// - /// 随机字符串 - /// - public string NonceStr { get; set; } - - /// - /// 预支付ID - /// - public string Package { get; set; } - - /// - /// 时间戳 - /// - public string TimeStamp { get; set; } - - /// - /// 支付签名 - /// - public string PaySign { get; set; } - - /// - /// AppId - /// - public string AppId { get; set; } - } -} diff --git a/MyCode.Project.Domain/Message/Response/Wechat/WxPayState.cs b/MyCode.Project.Domain/Message/Response/Wechat/WxPayState.cs deleted file mode 100644 index 2ecabb3..0000000 --- a/MyCode.Project.Domain/Message/Response/Wechat/WxPayState.cs +++ /dev/null @@ -1,31 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace MyCode.Project.Domain.Message.Response.Wechat -{ - /// - /// 微信支付返回状态 - /// - public enum WxPayState - { - /// - /// 成功生成Prepay_id - /// - Success, - /// - /// 已支付 - /// - OrderPayid, - /// - /// out_trade_no已使用， 返回 prepay_id， 继续完成支付 - /// - OutTradeNoUsed, - /// - /// 支付失败 - /// - Fail - } -} diff --git a/MyCode.Project.Domain/Message/Response/Wechat/WxTemplateModel.cs b/MyCode.Project.Domain/Message/Response/Wechat/WxTemplateModel.cs deleted file mode 100644 index e97d105..0000000 --- a/MyCode.Project.Domain/Message/Response/Wechat/WxTemplateModel.cs +++ /dev/null @@ -1,99 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace MyCode.Project.Domain.Message.Response.Wechat -{ - /// - /// 模板实体 - /// - public class WxTemplateModel - { - /// - /// 接受者openid - /// - public string Openid { get; set; } - - /// - /// 模板ID - /// - public string TemplateId { get; set; } - - /// - /// 模板跳转链接 - /// - public string Url { get; set; } - - /// - /// 模板项数据 - /// - public List Data { get; set; } - - /// - /// 关键字索引 - /// - private int _keywordIndex; - - /// - /// 初始化一个 - /// - /// 接受者openid - /// 模板ID - /// 模板跳转链 - public WxTemplateModel(string openid, string templateId, string url = "") - { - this.Openid = openid; - this.TemplateId = templateId; - this.Url = url; - this.Data = new List(); - this._keywordIndex = 0; - } - - /// - /// 添加模板前置语 - /// - /// 值 - /// - public WxTemplateModel First(string value) - { - this.AddData("first", value); - return this; - } - - /// - /// 添加模板关键字 - /// - /// 值 - /// - public WxTemplateModel Keyword(string value) - { - this._keywordIndex++; - this.AddData("keyword" + _keywordIndex, value); - return this; - } - - /// - /// 添加模板后置语 - /// - /// 值 - /// - public WxTemplateModel Remark(string value) - { - this.AddData("remark", value); - return this; - } - - /// - /// 添加模板项数据 - /// - /// 键 - /// 值 - /// - private void AddData(string key, string value) - { - this.Data.Add(new TemplateItem(key, value)); - } - } -} diff --git a/MyCode.Project.Domain/Message/Response/Wechat/WxTokenTicket.cs b/MyCode.Project.Domain/Message/Response/Wechat/WxTokenTicket.cs deleted file mode 100644 index 3c6cfda..0000000 --- a/MyCode.Project.Domain/Message/Response/Wechat/WxTokenTicket.cs +++ /dev/null @@ -1,21 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace MyCode.Project.Domain.Message.Response.Wechat -{ - public class WxTokenTicket - { - /// - /// 7200秒有效期的token - /// - public string AccessToken { get; set; } - - /// - /// 7200秒有效期的Ticket - /// - public string Ticket { get; set; } - } -} diff --git a/MyCode.Project.Domain/Message/Response/Wechat/WxUserInfoJson.cs b/MyCode.Project.Domain/Message/Response/Wechat/WxUserInfoJson.cs deleted file mode 100644 index 70dd5ed..0000000 --- a/MyCode.Project.Domain/Message/Response/Wechat/WxUserInfoJson.cs +++ /dev/null @@ -1,76 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace MyCode.Project.Domain.Message.Response.Wechat -{ - public class WxUserInfoJson - { - - // - // 摘要: - // 返回用户关注的渠道来源，ADD_SCENE_SEARCH 公众号搜索，ADD_SCENE_ACCOUNT_MIGRATION 公众号迁移，ADD_SCENE_PROFILE_CARD - // 名片分享，ADD_SCENE_QR_CODE 扫描二维码，ADD_SCENEPROFILE LINK 图文页内名称点击，ADD_SCENE_PROFILE_ITEM - // 图文页右上角菜单，ADD_SCENE_PAID 支付后关注，ADD_SCENE_OTHERS 其他 - public string subscribe_scene { get; set; } - // - // 摘要: - // 用户标签 - public int[] tagid_list { get; set; } - // - // 摘要: - // 用户所在的分组ID（兼容旧的用户分组接口） - public int groupid { get; set; } - // - // 摘要: - // 公众号运营者对粉丝的备注，公众号运营者可在微信公众平台用户管理界面对粉丝添加备注 - public string remark { get; set; } - // - // 摘要: - // 只有在用户将公众号绑定到微信开放平台帐号后，才会出现该字段。 - public string unionid { get; set; } - // - // 摘要: - // 用户关注时间，为时间戳。如果用户曾多次关注，则取最后关注时间 - public long subscribe_time { get; set; } - // - // 摘要: - // 用户头像，最后一个数值代表正方形头像大小（有0、46、64、96、132数值可选，0代表640*640正方形头像），用户没有头像时该项为空。若用户更换头像，原有头像URL将失效。 - public string headimgurl { get; set; } - // - // 摘要: - // 用户所在国家 - public string country { get; set; } - // - // 摘要: - // 用户所在省份 - public string province { get; set; } - // - // 摘要: - // 用户所在城市 - public string city { get; set; } - // - // 摘要: - // 用户的语言，简体中文为zh_CN - public string language { get; set; } - // - // 摘要: - // 用户的性别，值为1时是男性，值为2时是女性，值为0时是未知 - public int sex { get; set; } - // - // 摘要: - // 用户的昵称 - public string nickname { get; set; } - // - // 摘要: - // 用户的标识，对当前公众号唯一 - public string openid { get; set; } - // - // 摘要: - // 用户是否订阅该公众号标识，值为0时，代表此用户没有关注该公众号，拉取不到其余信息。 - public int subscribe { get; set; } - - } -} diff --git a/MyCode.Project.Domain/Model/T_BD_AttendanceEntryTemp.cs b/MyCode.Project.Domain/Model/T_BD_AttendanceEntryTemp.cs index f26a9b7..f47cf53 100644 --- a/MyCode.Project.Domain/Model/T_BD_AttendanceEntryTemp.cs +++ b/MyCode.Project.Domain/Model/T_BD_AttendanceEntryTemp.cs @@ -27,7 +27,7 @@ namespace MyCode.Project.Domain.Model /// Default: /// Nullable:False /// - [SugarColumn(IsPrimaryKey=true)] + [SugarColumn(IsPrimaryKey=true,IsIdentity=true)] public long FEntryID {get;set;} /// diff --git a/MyCode.Project.Domain/Model/T_BD_AttendanceTemp.cs b/MyCode.Project.Domain/Model/T_BD_AttendanceTemp.cs index d949d28..d48214e 100644 --- a/MyCode.Project.Domain/Model/T_BD_AttendanceTemp.cs +++ b/MyCode.Project.Domain/Model/T_BD_AttendanceTemp.cs @@ -20,7 +20,7 @@ namespace MyCode.Project.Domain.Model /// Default: /// Nullable:False /// - [SugarColumn(IsPrimaryKey=true)] + [SugarColumn(IsPrimaryKey=true,IsIdentity=true)] public long FID {get;set;} /// diff --git a/MyCode.Project.Domain/Model/T_UserLogin_Parameter.cs b/MyCode.Project.Domain/Model/T_UserLogin_Parameter.cs new file mode 100644 index 0000000..ee4e453 --- /dev/null +++ b/MyCode.Project.Domain/Model/T_UserLogin_Parameter.cs @@ -0,0 +1,90 @@ +using System; +using System.Linq; +using System.Text; +using SqlSugar; + +namespace MyCode.Project.Domain.Model +{ + /// + /// + /// + [SugarTable("T_UserLogin_Parameter")] + public partial class T_UserLogin_Parameter + { + public T_UserLogin_Parameter(){ + + + } + /// + /// Desc: + /// Default: + /// Nullable:False + /// + [SugarColumn(IsPrimaryKey=true,IsIdentity=true)] + public int Id {get;set;} + + /// + /// Desc: + /// Default: + /// Nullable:True + /// + public string FPHONE {get;set;} + + /// + /// Desc: + /// Default: + /// Nullable:True + /// + public string FPASSWORD {get;set;} + + /// + /// Desc: + /// Default: + /// Nullable:True + /// + public string DBID {get;set;} + + /// + /// Desc: + /// Default: + /// Nullable:True + /// + public string KEY1 {get;set;} + + /// + /// Desc:0=账号密码未更新 1=账号密码更新成功 + /// Default: + /// Nullable:True + /// + public int? Status {get;set;} + + /// + /// Desc:刷新登录参数的时间 + /// Default: + /// Nullable:True + /// + public DateTime? EditTime {get;set;} + + /// + /// Desc: + /// Default: + /// Nullable:True + /// + public string Response {get;set;} + + /// + /// Desc:0=登录未成功 1=登录成功 + /// Default: + /// Nullable:True + /// + public int? LoginStatus {get;set;} + + /// + /// Desc:刷新登录状态的时间 + /// Default: + /// Nullable:True + /// + public DateTime? LoginEditTime {get;set;} + + } +} diff --git a/MyCode.Project.Domain/MyCode.Project.Domain.csproj b/MyCode.Project.Domain/MyCode.Project.Domain.csproj index d7c0bbb..5858532 100644 --- a/MyCode.Project.Domain/MyCode.Project.Domain.csproj +++ b/MyCode.Project.Domain/MyCode.Project.Domain.csproj @@ -114,6 +114,7 @@ + @@ -129,6 +130,7 @@ + @@ -137,6 +139,7 @@ + @@ -147,6 +150,7 @@ + diff --git a/MyCode.Project.Domain/Repositories/ITUserLoginParameterRepository.cs b/MyCode.Project.Domain/Repositories/ITUserLoginParameterRepository.cs new file mode 100644 index 0000000..102912e --- /dev/null +++ b/MyCode.Project.Domain/Repositories/ITUserLoginParameterRepository.cs @@ -0,0 +1,18 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using MyCode.Project.Infrastructure; +using MyCode.Project.Domain; +using MyCode.Project.Domain.Model; +using MyCode.Project.Infrastructure.Common; +using MyCode.Project.Domain.Message; + +namespace MyCode.Project.Domain.Repositories +{ + public interface ITUserLoginParameterRepository : IRepository + { + + } +} diff --git a/MyCode.Project.Repositories/MyCode.Project.Repositories.csproj b/MyCode.Project.Repositories/MyCode.Project.Repositories.csproj index 7de6712..17d7ffd 100644 --- a/MyCode.Project.Repositories/MyCode.Project.Repositories.csproj +++ b/MyCode.Project.Repositories/MyCode.Project.Repositories.csproj @@ -91,6 +91,7 @@ + diff --git a/MyCode.Project.Repositories/TUserLoginParameterRepository.cs b/MyCode.Project.Repositories/TUserLoginParameterRepository.cs new file mode 100644 index 0000000..fcdb80c --- /dev/null +++ b/MyCode.Project.Repositories/TUserLoginParameterRepository.cs @@ -0,0 +1,26 @@ +using MyCode.Project.Repositories.Common; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using MyCode.Project.Domain.Message; +using MyCode.Project.Domain.Model; +using MyCode.Project.Domain.Repositories; +using MyCode.Project.Infrastructure.Common; +using MyCode.Project.Infrastructure.Search; + +namespace MyCode.Project.Repositories +{ + public class TUserLoginParameterRepository: Repository, ITUserLoginParameterRepository + { + public TUserLoginParameterRepository(MyCodeSqlSugarClient context) : base(context) + { } + + + + + + + } +} \ No newline at end of file diff --git a/MyCode.Project.Services/IServices/IStaffDataEnterpriseWechatService.cs b/MyCode.Project.Services/IServices/IStaffDataEnterpriseWechatService.cs index a6def25..05aa3e7 100644 --- a/MyCode.Project.Services/IServices/IStaffDataEnterpriseWechatService.cs +++ b/MyCode.Project.Services/IServices/IStaffDataEnterpriseWechatService.cs @@ -9,22 +9,14 @@ namespace MyCode.Project.Services { public interface IStaffDataEnterpriseWechatService { - void InitDepartment(); - + /// + /// 定时获取用户登录参数 + /// + void TaskGetPasswordData(); /// - /// 执行需要比对的数据任务 + /// 调度定时登录账号信息 /// - void RunWechatVSKingDee(); - - /// - /// 创建需要比对的数据任务 - /// - void AddWechatVSKingDeeJob(); - - /// - /// 定时任务刷微信OPENID - /// - void TaskAddOpenIdJob(); + void TaskGetUserByAccount(); } } diff --git a/MyCode.Project.Services/Implementation/StaffData/StaffDataEnterpriseWechatService.cs b/MyCode.Project.Services/Implementation/StaffData/StaffDataEnterpriseWechatService.cs index 5e50ab6..78de64c 100644 --- a/MyCode.Project.Services/Implementation/StaffData/StaffDataEnterpriseWechatService.cs +++ b/MyCode.Project.Services/Implementation/StaffData/StaffDataEnterpriseWechatService.cs @@ -1,13 +1,19 @@ -using MyCode.Project.Domain.Message.Response.EnterpriseWechat; +using MyCode.Project.Domain.Message.Request.User; +using MyCode.Project.Domain.Message.Response.EnterpriseWechat; +using MyCode.Project.Domain.Message.Response.Wechat; using MyCode.Project.Domain.Model; using MyCode.Project.Domain.Repositories; using MyCode.Project.Infrastructure.Common; +using MyCode.Project.Infrastructure.WebPost; using MyCode.Project.OutSideService; using MyCode.Project.Repositories; using Senparc.CO2NET.Exceptions; using System; using System.Collections.Generic; using System.Linq; +using System.Net; +using System.Security.Policy; +using System.Threading; using System.Xml.Linq; namespace MyCode.Project.Services.Implementation @@ -18,555 +24,118 @@ namespace MyCode.Project.Services.Implementation public class StaffDataEnterpriseWechatService : ServiceBase , IStaffDataEnterpriseWechatService { private IWorkProcessService _workProcessService; - private ITBASSYSPARAMETERRepository _tBASSYSPARAMETERRepository; - private readonly IEnterpriseWechatService _enterpriseWechatService; - private IBasDepartmentRepository _basDepartmentRepository; - private IBasEmployeeRepository _basEmployeeRepository; - private IBasEmployeeDepartRepository _basEmployeeDepartRepository; - private ITBDDEPARTMENTLRepository _tBDDEPARTMENTLRepository; - private IRpEmployeeDepartLogRepository _rpEmployeeDepartLogRepository; + private ITBDStaffDataLRepository _tBDStaffDataLRepository; private ITBDStaffDataRepository _tBDStaffDataRepository; + private ITUserLoginParameterRepository _tUserLoginParameterRepository; private static object locker = new object(); //创建锁 public StaffDataEnterpriseWechatService(IWorkProcessService workProcessService - , ITBASSYSPARAMETERRepository tBASSYSPARAMETERRepository - ,IBasDepartmentRepository basDepartmentRepository - , IBasEmployeeRepository basEmployeeRepository - , IBasEmployeeDepartRepository basEmployeeDepartRepository - , ITBDDEPARTMENTLRepository tBDDEPARTMENTLRepository - , IRpEmployeeDepartLogRepository rpEmployeeDepartLogRepository + , ITBDStaffDataLRepository tBDStaffDataLRepository , ITBDStaffDataRepository tBDStaffDataRepository + , ITUserLoginParameterRepository tUserLoginParameterRepository , IEnterpriseWechatService enterpriseWechatService) { _workProcessService = workProcessService; - _tBASSYSPARAMETERRepository = tBASSYSPARAMETERRepository; - _basEmployeeRepository = basEmployeeRepository; - _basDepartmentRepository = basDepartmentRepository; - _basEmployeeDepartRepository = basEmployeeDepartRepository; - _enterpriseWechatService = enterpriseWechatService; - _tBDDEPARTMENTLRepository = tBDDEPARTMENTLRepository; - _rpEmployeeDepartLogRepository = rpEmployeeDepartLogRepository; - _tBDStaffDataLRepository = tBDStaffDataLRepository; + _tUserLoginParameterRepository = tUserLoginParameterRepository; + _tBDStaffDataLRepository = tBDStaffDataLRepository; _tBDStaffDataRepository = tBDStaffDataRepository; } DateTime now = DateTime.Now; - #region 初始化 公司-部门列表 + /// - /// 初始化 公司-部门列表【后端测试用】 + /// 定时获取用户登录参数 /// - /// - public void InitDepartment() + public void TaskGetPasswordData() { - //var config = _companyConfigService.GetCompanyConfig(login.CompanyId); - var configList = _tBASSYSPARAMETERRepository.Queryable().Where(t=>t.FPARAMETEROBJID== "GAT_HR_AbutmentParameter").ToList(); - - configList.ForEach(SysParameter => - { - WechatSysParameter config = new WechatSysParameter(); - if (!string.IsNullOrWhiteSpace(SysParameter.FPARAMETERS)) - { - try - { - - XDocument xdoc = XDocument.Parse(SysParameter.FPARAMETERS); - - // 使用 LINQ to XML 查询所有的 元素 - var FCorpid = xdoc.Descendants("FCorpid").FirstOrDefault(); - var FCorpsecret = xdoc.Descendants("FCorpsecret").FirstOrDefault(); - - config.FAppid = FCorpid.Value; - config.FSecret = FCorpsecret.Value; - } - catch - { - return; - } - var infoList = _enterpriseWechatService.GetDepartmentList("", config.FAppid, config.FSecret); - var ids = infoList.Select(x => long.Parse(x.Id.ToString())).ToList(); - var existsDepartList = _basDepartmentRepository.Queryable().Where(x => 1 == 1).ToList(); - //_repository.UpdateQueue(x=>new BasDepartment { IsDelete=1},x=> x.IsDelete == 0 && x.CompanyId == login.CompanyId && !ids.Contains(x.Id)); - List addList = new List(); - infoList.ForEach(x => - { - var info = existsDepartList.Where(p => p.WeChatId == x.Id).FirstOrDefault(); - if (info == null) - { - BasDepartment depart = new BasDepartment(); - depart.Id = Guid.NewGuid(); - depart.WeChatId = x.Id; - depart.Name = x.Name; - depart.OrderNum = x.Order; - depart.WeChatIdParentId = x.Parentid; - addList.Add(depart); - } - else - { - now = now.AddSeconds(1); - _basDepartmentRepository.Update(p => new BasDepartment { Name = x.Name, OrderNum = x.Order, WeChatIdParentId = long.Parse(x.Parentid.ToString()), EditTime = now }, p => p.WeChatId == x.Id); - - } - - InitEmployee(config, x.Id);//员工列表 - - - if (x.ListChild.Count() > 0) - { - addList.AddRange(SetChild(x.ListChild, existsDepartList, config)); - } - }); - if (addList.Count() > 0) - _basDepartmentRepository.Add(addList); - - - InitEmployeeInfo(config);//完善员工详情 - - //部门与员工的关系 - SetEmployeeDepart(config); - _workProcessService.Add(this.MerchantId, "AddWechatVSKingDeeJob", "创建需要比对的数据任务", "", 2); - } - }); - } - - public List SetChild(List listChild, List existsDepartList, WechatSysParameter config) - { - List addList = new List(); - List dropList = new List(); - var childids = listChild.Select(x => long.Parse(x.Id.ToString())).ToList(); - listChild.ForEach(t => { - var info = existsDepartList.Where(p => p.WeChatId == t.Id).FirstOrDefault(); - var drop = existsDepartList.Where(x => x.WeChatIdParentId == t.Parentid && !childids.Contains(x.WeChatId.Value)).Select(x => x.WeChatId.Value).FirstOrDefault(); - if (drop > 0) - dropList.Add(drop); - if (info == null) - { - BasDepartment depart = new BasDepartment(); - depart.Id = Guid.NewGuid(); - depart.WeChatId = t.Id; - depart.Name = t.Name; - depart.OrderNum = t.Order; - depart.WeChatIdParentId = t.Parentid; - depart.EditTime = DateTime.Now; - addList.Add(depart); - } - else - { - now = now.AddSeconds(1); - _basDepartmentRepository.Update(p => new BasDepartment { Name = t.Name, OrderNum = t.Order, WeChatIdParentId =long.Parse( t.Parentid.ToString()), EditTime = now }, p => p.WeChatId == t.Id); - } - if (t.ListChild.Count() > 0) - { - addList.AddRange(SetChild(t.ListChild, existsDepartList, config)); - } - }); - //已删掉的部门 - _basDepartmentRepository.Delete( x => dropList.Contains(x.WeChatId.Value)); - return addList; - } - #endregion - - #region 初始化 公司-公司-员工列表【后端测试用】 - /// - /// 初始化 公司-公司-员工列表【后端测试用】 - /// - /// - public void InitEmployee(WechatSysParameter config ,int departid) - { - - var infoList = _enterpriseWechatService.GetDepartmentMemberList("", departid, config.FAppid, config.FSecret, 1); - var existsempIds = _basEmployeeRepository.Queryable().Where(x => 1==1).Select(x => x.UserId).ToList(); - List addList = new List(); - infoList.Where(x => !existsempIds.Contains(x.Userid)).ToList().ForEach(x => - { - BasEmployee employee = new BasEmployee(); - employee.ID = Guid.NewGuid(); - employee.UserId = x.Userid; - employee.Name = EncryptHelper.Base64Encrypt(x.Name); - - employee.EditTime = DateTime.Now; - - addList.Add(employee); - }); - if (addList.Count() > 0) - _basEmployeeRepository.Add(addList); - - } - #endregion - - #region 初始化 完善员工详情 - /// - /// 初始化 完善员工详情【后端测试用】 - /// - public void InitEmployeeInfo(WechatSysParameter config) - { - - var empList = _basEmployeeRepository.Queryable().Where(x => 1==1).Select(x => x.UserId).ToList(); - empList.ForEach(x => - { - var info = _enterpriseWechatService.GetEmployeeInfo(x, config.FAppid, config.FSecret); - if (info.Errcode == 60111) - { - now = now.AddSeconds(1); - _basEmployeeRepository.Update(t => new BasEmployee - { - IsDelete = 1, - - EditTime = now - }, t => t.UserId == x ); - } - else - { - now = now.AddSeconds(1); - var openid = _enterpriseWechatService.GetOpenidByUserid(x, config.FAppid, config.FSecret); - _basEmployeeRepository.Update(t => new BasEmployee - { - Name = EncryptHelper.Base64Encrypt(info.name), - Nick = info.name, - Alias = info.alias, - Gender = info.gender, - Mobile = info.mobile, - Position = info.position, - Avatar = info.avatar, - ThumbAvatar = info.thumb_avatar, - Email = info.email, - Status = info.status, - OpenUserid = openid.openid, - EditTime = now - }, t => t.UserId == x); - } - }); + string url = $@"http://14.21.32.187:9090/K3Cloud/G_HRApi.Staff.StaffData.GetPasswordData.ExecuteService,G-HRApi.common.kdsvc"; + PostModel1 postModel1 = new PostModel1(); + postModel1.DBID = "5dc0f25110f625"; + postModel1.KEY = "95F80245-F905-4472-A319-008682087E02"; + WebUtils webUtility = new WebUtils(); + string json = JsonHelper.ToJson(postModel1); + Dictionary keyValuePairs = new Dictionary(); + keyValuePairs.Add("Data", json); + json = JsonHelper.ToJson(keyValuePairs); + LogHelper.Info(json); + var re=webUtility.DoPostJson(url, json); - } - #endregion - - - #region 初始化 部门与员工的关系 - /// - /// 初始化 部门与员工的关系 - /// - /// - public void SetEmployeeDepart(WechatSysParameter config) - { - - var departList = _basDepartmentRepository.Queryable().Where(x => 1 == 1).ToList(); - var employeeList = _basEmployeeRepository.Queryable().Where(x => 1 == 1).Select(x => new { x.ID, x.UserId ,x.Nick,x.OpenUserid}).ToList(); - var empShipList = _basEmployeeDepartRepository.Queryable().Where(x => 1==1).ToList(); - List emdepartList = new List(); - departList.ForEach(x => + LogHelper.Info(re); + var result = JsonHelper.ToObject(re); + if (result.Result.IsSuccess == "true") { - //获取目前部门的员工数据 - var empShip = empShipList.Where(p => p.DepartmentId == x.Id).ToList(); - //与同步过来后部门的员工数据对比 - var infoList = _enterpriseWechatService.GetDepartmentMemberList("", x.WeChatId.Value, config.FAppid, config.FSecret); - var userids = empShip.Select(p => p.EmployeeUserId.Trim()).ToList(); - //新的关系则新增 - infoList.ForEach(t => - { - var em = employeeList.Where(f => f.UserId.Trim() == t.Userid.Trim()).FirstOrDefault(); - if (em != null) - { - BasEmployeeDepart item = new BasEmployeeDepart(); - item.Id =Guid.NewGuid(); - item.DepartmentId = x.Id; - item.EmployeeId = em.ID; - item.EmployeeUserId = t.Userid; - item.KDepartementId = -1; - item.WechatDepartName = x.Name; - item.Nick = em.Nick; - item.OpenId = em.OpenUserid; - if (x.WeChatIdParentId > 1) - { - var pDept = departList.Where(s => s.WeChatId == x.WeChatIdParentId).FirstOrDefault(); - if (pDept != null) - { - item.WechatDepartName = pDept.Name + "-" + item.WechatDepartName; - if (pDept.WeChatIdParentId > 1) - { - pDept = departList.Where(s => s.WeChatId == pDept.WeChatIdParentId).FirstOrDefault(); - if (pDept != null) - { - item.WechatDepartName = pDept.Name + "-" + item.WechatDepartName; - if (pDept.WeChatIdParentId > 1) - { - pDept = departList.Where(s => s.WeChatId == pDept.WeChatIdParentId).FirstOrDefault(); - if (pDept != null) - { - item.WechatDepartName = pDept.Name + "-" + item.WechatDepartName; - if (pDept.WeChatIdParentId > 0) - { - - } - } - } - } - } - } - } - emdepartList.Add(item); - } - }); - ////已更换部门的员工则修改为删除状态 - //var infoUserIds = infoList.Select(p => p.Userid).ToList(); - //var upUserids = empShip.Where(p => !infoUserIds.Contains(p.EmployeeUserId)).Select(p => p.EmployeeUserId).ToList(); - //if (upUserids.Count() > 0) - // _basEmployeeDepartRepository.Delete( p => p.DepartmentId == x.Id && upUserids.Contains(p.EmployeeUserId)); - }); - if (emdepartList.Count() > 0) - { - _basEmployeeDepartRepository.Delete(t=>1==1); - _basEmployeeDepartRepository.Add(emdepartList); - } - - } - #endregion - - #region AddWechatVSKingDeeJob(创建需要比对的数据任务) - /// - /// 创建需要比对的数据任务 - /// - public void AddWechatVSKingDeeJob() - { - var list = _basEmployeeDepartRepository.Queryable().Where(t => 1 == 1).ToList(); - List addList = new List(); - list.ForEach(t => - { - t.Status = 0; - t.OpenIdStatus = 0; - t.DepartStatus = 0; - RpEmployeeDepartLog temp = new RpEmployeeDepartLog(); - temp.Id = Guid.NewGuid(); - temp.Nick = t.Nick; - temp.CreateTime = DateTime.Now; - temp.WechatDepartmentId = t.WechatDepartmentId; - temp.WechatDepartName = t.WechatDepartName; - temp.EmployeeId = t.EmployeeId; - temp.EmployeeUserId = t.EmployeeUserId; - temp.OpenId = t.OpenId; - temp.Status = 0; - temp.OpenIdStatus = 0; - temp.DepartStatus = 0; - addList.Add(temp); - }); - _basEmployeeDepartRepository.Update(list); - if (addList.Count > 0) - _rpEmployeeDepartLogRepository.Add(addList); - string now = DateTime.Now.ToString("yyyyMMdd"); - string lastMonth = DateTime.Now.AddMonths(-1).ToString("yyyyMMdd"); - string sql = $@" -IF EXISTS ( - SELECT 1 - FROM INFORMATION_SCHEMA.TABLES - WHERE TABLE_SCHEMA = 'dbo' - AND TABLE_NAME = 'T_BD_StaffData{now}' -) -BEGIN - PRINT '表 T_BD_StaffData{now} 存在'; -END -ELSE -BEGIN - select * into T_BD_StaffData{now} from T_BD_StaffData -END; - -IF EXISTS ( - SELECT 1 - FROM INFORMATION_SCHEMA.TABLES - WHERE TABLE_SCHEMA = 'dbo' - AND TABLE_NAME = 'T_BD_StaffData{lastMonth}' -) -BEGIN - drop table T_BD_StaffData{lastMonth}; -END; -"; - _rpEmployeeDepartLogRepository.ExecuteSqlCommand(sql); - _workProcessService.Add(this.MerchantId, "RunWechatVSKingDee", "执行需要比对的数据任务", "", 2); - } - - #endregion - - - #region RunWechatVSKingDee(执行需要比对的数据任务) - /// - /// 执行需要比对的数据任务 - /// - public void RunWechatVSKingDee() - { - try - { - var allKingDepet = _tBDDEPARTMENTLRepository.Queryable().Where(t => 1 == 1).ToList(); - var allKingEmployeeL = _tBDStaffDataLRepository.Queryable().Where(t => 1 == 1).ToList(); - var allKingEmployee = _tBDStaffDataRepository.Queryable().Where(t => 1 == 1).ToList(); - var list = _rpEmployeeDepartLogRepository.Queryable().Where(t => t.Status == 0).OrderBy(t => t.SortNum).Take(1000).ToList(); - List addList = new List(); + var list = result.Result.Data.Item; + var oldList = _tUserLoginParameterRepository.Queryable().Where(t => 1 == 1).ToList(); list.ForEach(t => { - //执行结果 -1=金蝶未找到员工 0=未开始 3=名字重复且部门无法匹配 100=更新完毕 - int status = 0; - var KingEmployeeL = allKingEmployeeL.Where(h => h.FNAME.Trim() == t.Nick.Trim()).ToList(); - if (KingEmployeeL.Count == 0) + int add = 0; + var one = oldList.Where(h => h.FPHONE == t.FPHONE).FirstOrDefault(); + if (one == null) { - status = -1; + add = 1; + one = new T_UserLogin_Parameter(); + one.FPHONE = t.FPHONE; } + one.DBID = postModel1.DBID; + one.FPASSWORD = t.FPASSWORD; + one.Status = 1; + one.EditTime = DateTime.Now; + one.KEY1= "95F80245-F905-4472-A319-008682087E02"; + if (add == 0) + _tUserLoginParameterRepository.Update(one); else - { - //1 先找同名的人 - //2 如果有超过1个同名人,则找相同部门 - if (KingEmployeeL.Count == 1) - { - var tempOne = KingEmployeeL.FirstOrDefault(); - var KingEmployee = allKingEmployee.FirstOrDefault(h => h.FID == tempOne.FID); - t.FID = KingEmployee.FID; - - if (KingEmployee.FWECOMID != t.OpenId) - { - - t.FWECOMID = KingEmployee.FWECOMID; - t.OpenIdStatus = 1; - KingEmployee.FWECOMID = t.OpenId; - _tBDStaffDataRepository.Update(KingEmployee); - } - else - { - t.OpenIdStatus = 100; - } - var KingDepart = allKingDepet.FirstOrDefault(h => h.FDEPTID == KingEmployee.FDEPARTMENTID); - if (KingDepart != null) - { - t.KDName = KingDepart.FNAME; - t.KDepartementId = KingDepart.FDEPTID; - if (KingDepart.FNAME != t.WechatDepartName) - { - - t.DepartStatus = 1; - } - else - t.DepartStatus = 100; - } - else - { - t.KDName = "无部门"; - t.DepartStatus = 1; - } - - status = 100; - } - else if (KingEmployeeL.Count > 1) - { - var FIDList = KingEmployeeL.Select(h => h.FID).ToList(); - var tempKingEmployee = allKingEmployee.Where(h => FIDList.Contains(h.FID)).ToList(); - var tempDepartIdList = tempKingEmployee.Select(h => h.FDEPARTMENTID).ToList(); - var tempKingDepet = allKingDepet.Where(h => tempDepartIdList.Contains(h.FDEPTID)).ToList(); - var rightKingDepet = tempKingDepet.Where(h => h.FNAME == t.WechatDepartName).FirstOrDefault(); - if (rightKingDepet == null) //多人同名但是部门无法匹配 - { - t.KDName = string.Join(",", tempKingDepet.Select(h => h.FNAME).ToList()); - var zaiZhiEmployeel = tempKingEmployee.Where(h => h.FEMPLOYEESTATUSID !=null &&h.FEMPLOYEESTATUSID.ToLower() != ("646b0211707080").ToLower() - && FIDList.Contains(h.FID)).ToList(); - if (zaiZhiEmployeel.Count == 1) - { - t.DepartStatus = 1; - var tempOne = zaiZhiEmployeel.FirstOrDefault(); - var KingEmployee = allKingEmployee.FirstOrDefault(h => h.FID == tempOne.FID); - t.FID = KingEmployee.FID; - - if (KingEmployee.FWECOMID != t.OpenId) - { - t.FWECOMID = KingEmployee.FWECOMID; - t.OpenIdStatus = 1; - KingEmployee.FWECOMID = t.OpenId; - _tBDStaffDataRepository.Update(KingEmployee); - } - else - { - t.OpenIdStatus = 100; - } - var KingDepart = allKingDepet.FirstOrDefault(h => h.FDEPTID == KingEmployee.FDEPARTMENTID); - if (KingDepart != null) - { - t.KDName = KingDepart.FNAME; - t.KDepartementId = KingDepart.FDEPTID; - if (KingDepart.FNAME != t.WechatDepartName) - { - - t.DepartStatus = 1; - } - else - t.DepartStatus = 100; - } - else - { - t.KDName = "无部门"; - t.DepartStatus = 1; - } - - status = 100; - } - else - { - t.DepartStatus = 1; - status = 3; - } - } - else - { - t.KDName = rightKingDepet.FNAME; - t.KDepartementId = rightKingDepet.FDEPTID; - t.DepartStatus = 100; - var rightKingEmployee = tempKingEmployee.FirstOrDefault(h => h.FDEPARTMENTID == rightKingDepet.FDEPTID); - if (rightKingEmployee.FWECOMID != t.OpenId) - { - t.FWECOMID = rightKingEmployee.FWECOMID; - t.OpenIdStatus = 1; - rightKingEmployee.FWECOMID = t.OpenId; - _tBDStaffDataRepository.Update(rightKingEmployee); - } - else - { - t.OpenIdStatus = 100; - } - status = 100; - } - } - - } - - t.Status = status; - var employeeDepart = _basEmployeeDepartRepository.Queryable().Where(h => h.EmployeeUserId == t.EmployeeUserId).First(); - employeeDepart.Status = t.Status; - employeeDepart.OpenIdStatus = t.OpenIdStatus; - employeeDepart.DepartStatus = t.DepartStatus; - t.EditTime = DateTime.Now; - _basEmployeeDepartRepository.Update(employeeDepart); - _rpEmployeeDepartLogRepository.Update(t); - + _tUserLoginParameterRepository.Add(one); }); - } - catch (Exception ex) - { - throw new BaseException(ex.Message); - } - finally - { - if (_rpEmployeeDepartLogRepository.IsExist(t => t.Status == 0)) - { - _workProcessService.Add(this.MerchantId, "RunWechatVSKingDee", "执行需要比对的数据任务", "", 2); - } - - } - + //_workProcessService.Add(this.MerchantId, "InitDepartment", "刷企业微信数据", "", 2); } - #endregion - /// - /// 定时任务刷微信OPENID + /// 调度定时登录账号信息 /// - public void TaskAddOpenIdJob() + public void TaskGetUserByAccount() { - _workProcessService.Add(this.MerchantId, "InitDepartment", "刷企业微信数据", "", 2); + string url = $@"http://14.21.32.187:9090/K3Cloud/G_HRApi.GetUserByAccount.ExecuteService,G-HRApi.common.kdsvc"; + PostModel1 postModel1 = new PostModel1(); + postModel1.DBID = "5dc0f25110f625"; + postModel1.KEY = "95F80245-F905-4472-A319-008682087E02"; + + WebUtils webUtility = new WebUtils(); + string json = JsonHelper.ToJson(postModel1); + var list = _tUserLoginParameterRepository.Queryable().Where(t => t.FPHONE != "").ToList(); + list.ForEach(t => + { + var JsonString = new + { + Data = new + { + DBID = postModel1.DBID, + userName = t.FPHONE, + HashPassword = t.FPASSWORD, + IFTaskLogin=1 + } + }; + json = JsonHelper.ToJson(JsonString); + LogHelper.Info(json); + var re = webUtility.DoPostJson(url, json); + LogHelper.Info(re); + var result = JsonHelper.ToObject(re); + t.Response = re; + if (result.Result.IsSuccess == "true") + { + t.LoginStatus = 1; + } + else + { + t.LoginStatus = 0; + } + t.LoginEditTime = DateTime.Now; + _tUserLoginParameterRepository.Update(t); + Thread.Sleep(300); + }); + //_workProcessService.Add(this.MerchantId, "InitDepartment", "刷企业微信数据", "", 2); } - } } diff --git a/MyCode.Project.Services/MyCode.Project.Services.csproj b/MyCode.Project.Services/MyCode.Project.Services.csproj index ac0d89a..8c7cc91 100644 --- a/MyCode.Project.Services/MyCode.Project.Services.csproj +++ b/MyCode.Project.Services/MyCode.Project.Services.csproj @@ -162,8 +162,10 @@ + + diff --git a/MyCode.Project.WebApi/Areas/Admin/Controllers/StaffDataEnterpriseWechatController.cs b/MyCode.Project.WebApi/Areas/Admin/Controllers/StaffDataEnterpriseWechatController.cs index 3d61535..216c3be 100644 --- a/MyCode.Project.WebApi/Areas/Admin/Controllers/StaffDataEnterpriseWechatController.cs +++ b/MyCode.Project.WebApi/Areas/Admin/Controllers/StaffDataEnterpriseWechatController.cs @@ -20,57 +20,32 @@ namespace MyCode.Project.WebApi.Areas.Admin.Controllers _staffDataEnterpriseWechatService = staffDataEnterpriseWechatService; } - #region InitDepartment(刷公司微信的部门和员工资料) + + + #region TaskGetPasswordData(定时获取用户登录参数) /// - /// 刷公司微信的部门和员工资料 + /// 定时获取用户登录参数 /// /// [HttpGet] [AllowAnonymous] - public void InitDepartment() + public void TaskGetPasswordData() { - _staffDataEnterpriseWechatService.InitDepartment(); + _staffDataEnterpriseWechatService.TaskGetPasswordData(); } #endregion - #region RunWechatVSKingDee(执行需要比对的数据任务) + #region TaskGetUserByAccount(调度定时登录账号信息) /// - /// 执行需要比对的数据任务 + /// 调度定时登录账号信息 /// /// [HttpGet] [AllowAnonymous] - public void RunWechatVSKingDee() + public void TaskGetUserByAccount() { - _staffDataEnterpriseWechatService.RunWechatVSKingDee(); - } - #endregion - - - #region InitDepartment(创建需要比对的数据任务) - /// - /// 创建需要比对的数据任务 - /// - /// - [HttpGet] - [AllowAnonymous] - public void AddWechatVSKingDeeJob() - { - _staffDataEnterpriseWechatService.AddWechatVSKingDeeJob(); - } - #endregion - - #region InitDepartment(定时任务刷微信OPENID) - /// - /// 定时任务刷微信OPENID - /// - /// - [HttpGet] - [AllowAnonymous] - public void TaskAddOpenIdJob() - { - _staffDataEnterpriseWechatService.TaskAddOpenIdJob(); + _staffDataEnterpriseWechatService.TaskGetUserByAccount(); } #endregion diff --git a/MyCode.Project.WebApi/MyCode.Project.WebApi.csproj b/MyCode.Project.WebApi/MyCode.Project.WebApi.csproj index d82c553..eecc4c4 100644 --- a/MyCode.Project.WebApi/MyCode.Project.WebApi.csproj +++ b/MyCode.Project.WebApi/MyCode.Project.WebApi.csproj @@ -231,6 +231,7 @@ +