diff --git a/netcore/src/Application/NCC.API.Core/NCC.API.Core.csproj b/netcore/src/Application/NCC.API.Core/NCC.API.Core.csproj index 2ba1be7..a9b4698 100644 --- a/netcore/src/Application/NCC.API.Core/NCC.API.Core.csproj +++ b/netcore/src/Application/NCC.API.Core/NCC.API.Core.csproj @@ -9,7 +9,6 @@ - diff --git a/netcore/src/Modularity/Order/.DS_Store b/netcore/src/Modularity/Order/.DS_Store deleted file mode 100644 index fcdfb55..0000000 --- a/netcore/src/Modularity/Order/.DS_Store +++ /dev/null diff --git a/netcore/src/Modularity/Order/NCC.Order.Entitys/.DS_Store b/netcore/src/Modularity/Order/NCC.Order.Entitys/.DS_Store deleted file mode 100644 index 79f5271..0000000 --- a/netcore/src/Modularity/Order/NCC.Order.Entitys/.DS_Store +++ /dev/null diff --git a/netcore/src/Modularity/Order/NCC.Order.Entitys/Dto/Balance/BaseUserBalanceCrInput.cs b/netcore/src/Modularity/Order/NCC.Order.Entitys/Dto/Balance/BaseUserBalanceCrInput.cs deleted file mode 100644 index 4088a36..0000000 --- a/netcore/src/Modularity/Order/NCC.Order.Entitys/Dto/Balance/BaseUserBalanceCrInput.cs +++ /dev/null @@ -1,37 +0,0 @@ -using System; -using System.Collections.Generic; - -namespace NCC.Order.Entitys.Dto.BaseUserBalance -{ - /// - /// 用户余额变动修改输入参数 - /// - public class BaseUserBalanceCrInput - { - /// - /// 用户ID - /// - public string userId { get; set; } - - /// - /// 余额变动类型 - /// - public string type { get; set; } - - /// - /// 订单号或其他来源 - /// - public string sourceId { get; set; } - - /// - /// 余额变动描述 - /// - public string mark { get; set; } - - /// - /// 变动时间 - /// - public DateTime? addTime { get; set; } - - } -} diff --git a/netcore/src/Modularity/Order/NCC.Order.Entitys/Dto/Balance/BaseUserBalanceInfoOutput.cs b/netcore/src/Modularity/Order/NCC.Order.Entitys/Dto/Balance/BaseUserBalanceInfoOutput.cs deleted file mode 100644 index e1a4660..0000000 --- a/netcore/src/Modularity/Order/NCC.Order.Entitys/Dto/Balance/BaseUserBalanceInfoOutput.cs +++ /dev/null @@ -1,42 +0,0 @@ -using System; -using System.Collections.Generic; - -namespace NCC.Order.Entitys.Dto.BaseUserBalance -{ - /// - /// 用户余额变动输出参数 - /// - public class BaseUserBalanceInfoOutput - { - /// - /// 主键 - /// - public string id { get; set; } - - /// - /// 用户ID - /// - public string userId { get; set; } - - /// - /// 余额变动类型 - /// - public string type { get; set; } - - /// - /// 订单号或其他来源 - /// - public string sourceId { get; set; } - - /// - /// 余额变动描述 - /// - public string mark { get; set; } - - /// - /// 变动时间 - /// - public DateTime? addTime { get; set; } - - } -} diff --git a/netcore/src/Modularity/Order/NCC.Order.Entitys/Dto/Balance/BaseUserBalanceListOutput.cs b/netcore/src/Modularity/Order/NCC.Order.Entitys/Dto/Balance/BaseUserBalanceListOutput.cs deleted file mode 100644 index 8336aa3..0000000 --- a/netcore/src/Modularity/Order/NCC.Order.Entitys/Dto/Balance/BaseUserBalanceListOutput.cs +++ /dev/null @@ -1,41 +0,0 @@ -using System; - -namespace NCC.Order.Entitys.Dto.BaseUserBalance -{ - /// - /// 用户余额变动输入参数 - /// - public class BaseUserBalanceListOutput - { - /// - /// 主键 - /// - public string id { get; set; } - - /// - /// 用户ID - /// - public string userId { get; set; } - - /// - /// 余额变动类型 - /// - public string type { get; set; } - - /// - /// 订单号或其他来源 - /// - public string sourceId { get; set; } - - /// - /// 余额变动描述 - /// - public string mark { get; set; } - - /// - /// 变动时间 - /// - public DateTime? addTime { get; set; } - - } -} diff --git a/netcore/src/Modularity/Order/NCC.Order.Entitys/Dto/Balance/BaseUserBalanceListQueryInput.cs b/netcore/src/Modularity/Order/NCC.Order.Entitys/Dto/Balance/BaseUserBalanceListQueryInput.cs deleted file mode 100644 index 9e578a5..0000000 --- a/netcore/src/Modularity/Order/NCC.Order.Entitys/Dto/Balance/BaseUserBalanceListQueryInput.cs +++ /dev/null @@ -1,43 +0,0 @@ -using NCC.Common.Filter; -using System.Collections.Generic; - -namespace NCC.Order.Entitys.Dto.BaseUserBalance -{ - /// - /// 用户余额变动列表查询输入 - /// - public class BaseUserBalanceListQueryInput : PageInputBase - { - /// - /// 选择导出数据key - /// - public string selectKey { get; set; } - - /// - /// - /// - public int dataType { get; set; } - - - /// - /// 用户ID - /// - public string userId { get; set; } - - /// - /// 余额变动类型 - /// - public string type { get; set; } - - /// - /// 订单号或其他来源 - /// - public string sourceId { get; set; } - - /// - /// 变动时间 - /// - public string addTime { get; set; } - - } -} diff --git a/netcore/src/Modularity/Order/NCC.Order.Entitys/Dto/Balance/BaseUserBalanceUpInput.cs b/netcore/src/Modularity/Order/NCC.Order.Entitys/Dto/Balance/BaseUserBalanceUpInput.cs deleted file mode 100644 index b1d140b..0000000 --- a/netcore/src/Modularity/Order/NCC.Order.Entitys/Dto/Balance/BaseUserBalanceUpInput.cs +++ /dev/null @@ -1,17 +0,0 @@ -using System; -using System.Collections.Generic; - -namespace NCC.Order.Entitys.Dto.BaseUserBalance -{ - /// - /// 用户余额变动更新输入参数 - /// - public class BaseUserBalanceUpInput : BaseUserBalanceCrInput - { - /// - /// 主键 - /// - public string id { get; set; } - - } -} diff --git a/netcore/src/Modularity/Order/NCC.Order.Entitys/Dto/BaseAmountHistoryCrInput.cs b/netcore/src/Modularity/Order/NCC.Order.Entitys/Dto/BaseAmountHistoryCrInput.cs deleted file mode 100644 index a3d0949..0000000 --- a/netcore/src/Modularity/Order/NCC.Order.Entitys/Dto/BaseAmountHistoryCrInput.cs +++ /dev/null @@ -1,46 +0,0 @@ -using System; -using System.Collections.Generic; - -namespace NCC.Order.Entitys.Dto.BaseAmountHistory -{ - /// - /// 金额流水记录修改输入参数 - /// - public class BaseAmountHistoryCrInput - { - /// - /// 容量 - /// - public decimal money { get; set; } - - /// - /// 产品/套餐编号 - /// - public string productId { get; set; } - - /// - /// 用户编号 - /// - public string userId { get; set; } - - /// - /// 消费用户编号 - /// - public string payUserId { get; set; } - /// - /// 来源 - /// - public string source { get; set; } - - /// - /// 状态 - /// - public int? status { get; set; } - - /// - /// 创建时间 - /// - public DateTime? creatorTime { get; set; } - - } -} diff --git a/netcore/src/Modularity/Order/NCC.Order.Entitys/Dto/BaseAmountHistoryInfoOutput.cs b/netcore/src/Modularity/Order/NCC.Order.Entitys/Dto/BaseAmountHistoryInfoOutput.cs deleted file mode 100644 index 063b33b..0000000 --- a/netcore/src/Modularity/Order/NCC.Order.Entitys/Dto/BaseAmountHistoryInfoOutput.cs +++ /dev/null @@ -1,76 +0,0 @@ -using System; -using System.Collections.Generic; - -namespace NCC.Order.Entitys.Dto.BaseAmountHistory -{ - /// - /// 金额流水记录输出参数 - /// - public class BaseAmountHistoryInfoOutput - { - /// - /// 主键 - /// - public string id { get; set; } - - /// - /// 容量 - /// - public decimal money { get; set; } - - /// - /// 产品/套餐编号 - /// - public string productId { get; set; } - - /// - /// 关联订单编号 - /// - public string orderId { get; set; } - - /// - /// 用户编号 - /// - public string userId { get; set; } - /// - /// 消费用户编号 - /// - public string payUserId { get; set; } - - /// - /// 用户 - /// - public string userName { get; set; } - /// - /// 消费用户 - /// - public string payUserName { get; set; } - - /// - /// 来源 - /// - public string source { get; set; } - - /// - /// 状态 - /// - public int? status { get; set; } - - /// - /// 创建时间 - /// - public DateTime? creatorTime { get; set; } - - /// - /// 删除用户 - /// - public string deleteUserId { get; set; } - - /// - /// 删除时间 - /// - public DateTime? deleteTime { get; set; } - - - } -} diff --git a/netcore/src/Modularity/Order/NCC.Order.Entitys/Dto/BaseAmountHistoryListOutput.cs b/netcore/src/Modularity/Order/NCC.Order.Entitys/Dto/BaseAmountHistoryListOutput.cs deleted file mode 100644 index 88c6f12..0000000 --- a/netcore/src/Modularity/Order/NCC.Order.Entitys/Dto/BaseAmountHistoryListOutput.cs +++ /dev/null @@ -1,66 +0,0 @@ -using System; - -namespace NCC.Order.Entitys.Dto.BaseAmountHistory -{ - /// - /// 金额流水记录输入参数 - /// - public class BaseAmountHistoryListOutput - { - /// - /// 主键 - /// - public string id { get; set; } - - /// - /// 容量 - /// - public decimal money { get; set; } - - /// - /// 产品/套餐编号 - /// - public string productId { get; set; } - - /// - /// 用户编号 - /// - public string userId { get; set; } - /// - /// 消费用户编号 - /// - public string payUserId { get; set; } - - /// - /// 用户 - /// - public string userName { get; set; } - /// - /// 消费用户 - /// - public string payUserName { get; set; } - /// - /// 订单金额 - /// - public decimal orderMoney { get; set; } - /// - /// 订单编号 - /// - public string orderId { get; set; } - /// - /// 来源 - /// - public string source { get; set; } - - /// - /// 状态 - /// - public int? status { get; set; } - - /// - /// 创建时间 - /// - public DateTime? creatorTime { get; set; } - - } -} diff --git a/netcore/src/Modularity/Order/NCC.Order.Entitys/Dto/BaseAmountHistoryListQueryInput.cs b/netcore/src/Modularity/Order/NCC.Order.Entitys/Dto/BaseAmountHistoryListQueryInput.cs deleted file mode 100644 index dc5f917..0000000 --- a/netcore/src/Modularity/Order/NCC.Order.Entitys/Dto/BaseAmountHistoryListQueryInput.cs +++ /dev/null @@ -1,57 +0,0 @@ -using NCC.Common.Filter; -using System.Collections.Generic; - -namespace NCC.Order.Entitys.Dto.BaseAmountHistory -{ - /// - /// 金额流水记录列表查询输入 - /// - public class BaseAmountHistoryListQueryInput : PageInputBase - { - /// - /// 选择导出数据key - /// - public string selectKey { get; set; } - - /// - /// - /// - public int dataType { get; set; } - - - /// - /// 容量 - /// - public string money { get; set; } - - /// - /// 产品/套餐编号 - /// - public string productId { get; set; } - - /// - /// 用户编号 - /// - public string userId { get; set; } - - /// - /// 来源 - /// - public string source { get; set; } - - /// - /// 状态 - /// - public string status { get; set; } - - /// - /// 创建时间 - /// - public string creatorTime { get; set; } - /// - /// 我的下级分销记录 - /// - public bool? myChildren { get; set; } - - } -} diff --git a/netcore/src/Modularity/Order/NCC.Order.Entitys/Dto/BaseAmountHistoryUpInput.cs b/netcore/src/Modularity/Order/NCC.Order.Entitys/Dto/BaseAmountHistoryUpInput.cs deleted file mode 100644 index d4b0510..0000000 --- a/netcore/src/Modularity/Order/NCC.Order.Entitys/Dto/BaseAmountHistoryUpInput.cs +++ /dev/null @@ -1,17 +0,0 @@ -using System; -using System.Collections.Generic; - -namespace NCC.Order.Entitys.Dto.BaseAmountHistory -{ - /// - /// 金额流水记录更新输入参数 - /// - public class BaseAmountHistoryUpInput : BaseAmountHistoryCrInput - { - /// - /// 主键 - /// - public string id { get; set; } - - } -} diff --git a/netcore/src/Modularity/Order/NCC.Order.Entitys/Dto/MarketingRulesCrInput.cs b/netcore/src/Modularity/Order/NCC.Order.Entitys/Dto/MarketingRulesCrInput.cs deleted file mode 100644 index 372a769..0000000 --- a/netcore/src/Modularity/Order/NCC.Order.Entitys/Dto/MarketingRulesCrInput.cs +++ /dev/null @@ -1,82 +0,0 @@ -using System; -using System.Collections.Generic; - -namespace NCC.Order.Entitys.Dto.MarketingRules -{ - /// - /// 分销规则设置修改输入参数 - /// - public class MarketingRulesCrInput - { - /// - /// 规则名称 - /// - public string title { get; set; } - - /// - /// 提成比例 - /// - public string proportion { get; set; } - - /// - /// 满多少能提现 - /// - public string withdrawalMoney { get; set; } - - /// - /// 单次最大提现金额 - /// - public string singleMaxWithdrawalAmount { get; set; } - - /// - /// 每个月能提现的数量 - /// - public string monthWithdrawalCount { get; set; } - - /// - /// 规则描述 - /// - public string description { get; set; } - - /// - /// 备注 - /// - public string remark { get; set; } - - /// - /// 是否有效 - /// - public int? enabledMark { get; set; } - - /// - /// 排序码 - /// - public long sortCode { get; set; } - - /// - /// 创建时间 - /// - public DateTime? creatorTime { get; set; } - - /// - /// 创建用户 - /// - public string creatorUserId { get; set; } - - /// - /// 修改时间 - /// - public DateTime? lastModifyTime { get; set; } - - /// - /// 修改用户 - /// - public string lastModifyUserId { get; set; } - - /// - /// 营销规则-等级规则 - /// - public List marketingRulesDetailList { get; set; } - - } -} diff --git a/netcore/src/Modularity/Order/NCC.Order.Entitys/Dto/MarketingRulesDetailCrInput.cs b/netcore/src/Modularity/Order/NCC.Order.Entitys/Dto/MarketingRulesDetailCrInput.cs deleted file mode 100644 index 6f9cb5e..0000000 --- a/netcore/src/Modularity/Order/NCC.Order.Entitys/Dto/MarketingRulesDetailCrInput.cs +++ /dev/null @@ -1,57 +0,0 @@ -using System; -using System.Collections.Generic; - -namespace NCC.Order.Entitys.Dto.MarketingRules -{ - /// - /// 分销规则设置修改输入参数 - /// - public class MarketingRulesDetailCrInput - { - /// - /// 主键 - /// - public string id { get; set; } - - /// - /// 等级名称 - /// - public string name { get; set; } - - /// - /// 提成比例 - /// - public decimal proportion { get; set; } - - /// - /// 满多少能提现 - /// - public decimal withdrawalMoney { get; set; } - - /// - /// 粉丝量范围-开始 - /// - public string numberStart { get; set; } - - /// - /// 单次最大提现金额 - /// - public decimal singleMaxWithdrawalAmount { get; set; } - - /// - /// 每个月能提现的数量 - /// - public int? monthWithdrawalCount { get; set; } - - /// - /// 排序码 - /// - public long sortCode { get; set; } - - /// - /// 描述 - /// - public string description { get; set; } - - } -} diff --git a/netcore/src/Modularity/Order/NCC.Order.Entitys/Dto/MarketingRulesDetailInfoOutput.cs b/netcore/src/Modularity/Order/NCC.Order.Entitys/Dto/MarketingRulesDetailInfoOutput.cs deleted file mode 100644 index 5c9fdca..0000000 --- a/netcore/src/Modularity/Order/NCC.Order.Entitys/Dto/MarketingRulesDetailInfoOutput.cs +++ /dev/null @@ -1,71 +0,0 @@ -using System; -using System.Collections.Generic; - -namespace NCC.Order.Entitys.Dto.MarketingRules -{ - /// - /// 分销规则设置输出参数 - /// - public class MarketingRulesDetailInfoOutput - { - /// - /// 主键 - /// - public string id { get; set; } - - /// - /// 规则ID - /// - public string ruleId { get; set; } - - /// - /// 等级名称 - /// - public string name { get; set; } - - /// - /// 提成比例 - /// - public decimal proportion { get; set; } - - /// - /// 满多少能提现 - /// - public decimal withdrawalMoney { get; set; } - - /// - /// 粉丝量范围-开始 - /// - public string numberStart { get; set; } - - /// - /// 粉丝量范围-结束（备用） - /// - public string numberEnd { get; set; } - - /// - /// 单次最大提现金额 - /// - public decimal singleMaxWithdrawalAmount { get; set; } - - /// - /// 每个月能提现的数量 - /// - public int? monthWithdrawalCount { get; set; } - - /// - /// 排序码 - /// - public long sortCode { get; set; } - - /// - /// 描述 - /// - public string description { get; set; } - /// - /// 粉丝数 - /// - public int fansCount { get; set; } - - } -} diff --git a/netcore/src/Modularity/Order/NCC.Order.Entitys/Dto/MarketingRulesDetailUpInput.cs b/netcore/src/Modularity/Order/NCC.Order.Entitys/Dto/MarketingRulesDetailUpInput.cs deleted file mode 100644 index 6a53e94..0000000 --- a/netcore/src/Modularity/Order/NCC.Order.Entitys/Dto/MarketingRulesDetailUpInput.cs +++ /dev/null @@ -1,17 +0,0 @@ -using System; -using System.Collections.Generic; - -namespace NCC.Order.Entitys.Dto.MarketingRules -{ - /// - /// 分销规则设置更新输入参数 - /// - public class MarketingRulesDetailUpInput : MarketingRulesCrInput - { - /// - /// 主键 - /// - public string id { get; set; } - - } -} diff --git a/netcore/src/Modularity/Order/NCC.Order.Entitys/Dto/MarketingRulesInfoOutput.cs b/netcore/src/Modularity/Order/NCC.Order.Entitys/Dto/MarketingRulesInfoOutput.cs deleted file mode 100644 index 4b3b572..0000000 --- a/netcore/src/Modularity/Order/NCC.Order.Entitys/Dto/MarketingRulesInfoOutput.cs +++ /dev/null @@ -1,97 +0,0 @@ -using System; -using System.Collections.Generic; - -namespace NCC.Order.Entitys.Dto.MarketingRules -{ - /// - /// 分销规则设置输出参数 - /// - public class MarketingRulesInfoOutput - { - /// - /// 主键 - /// - public string id { get; set; } - - /// - /// 规则名称 - /// - public string title { get; set; } - - /// - /// 提成比例 - /// - public string proportion { get; set; } - - /// - /// 满多少能提现 - /// - public string withdrawalMoney { get; set; } - - /// - /// 粉丝量范围-开始 - /// - public string numberStart { get; set; } - - /// - /// 粉丝量范围-结束（备用） - /// - public string numberEnd { get; set; } - - /// - /// 单次最大提现金额 - /// - public string singleMaxWithdrawalAmount { get; set; } - - /// - /// 每个月能提现的数量 - /// - public string monthWithdrawalCount { get; set; } - - /// - /// 规则描述 - /// - public string description { get; set; } - - /// - /// 备注 - /// - public string remark { get; set; } - - /// - /// 是否有效 - /// - public int? enabledMark { get; set; } - - /// - /// 排序码 - /// - public long sortCode { get; set; } - - /// - /// 创建时间 - /// - public DateTime? creatorTime { get; set; } - - /// - /// 创建用户 - /// - public string creatorUserId { get; set; } - - /// - /// 修改时间 - /// - public DateTime? lastModifyTime { get; set; } - - /// - /// 修改用户 - /// - public string lastModifyUserId { get; set; } - - /// - /// 营销规则-等级规则 - /// - public List marketingRulesDetailList { get; set; } - - } -} diff --git a/netcore/src/Modularity/Order/NCC.Order.Entitys/Dto/MarketingRulesListOutput.cs b/netcore/src/Modularity/Order/NCC.Order.Entitys/Dto/MarketingRulesListOutput.cs deleted file mode 100644 index 6d45fa1..0000000 --- a/netcore/src/Modularity/Order/NCC.Order.Entitys/Dto/MarketingRulesListOutput.cs +++ /dev/null @@ -1,83 +0,0 @@ -using System; -using System.Collections.Generic; - -namespace NCC.Order.Entitys.Dto.MarketingRules -{ - /// - /// 分销规则设置输入参数 - /// - public class MarketingRulesListOutput - { - /// - /// 主键 - /// - public string id { get; set; } - - /// - /// 规则名称 - /// - public string title { get; set; } - - /// - /// 提成比例 - /// - public string proportion { get; set; } - - /// - /// 满多少能提现 - /// - public string withdrawalMoney { get; set; } - - /// - /// 单次最大提现金额 - /// - public string singleMaxWithdrawalAmount { get; set; } - - /// - /// 每个月能提现的数量 - /// - public string monthWithdrawalCount { get; set; } - - /// - /// 备注 - /// - public string remark { get; set; } - - /// - /// 是否有效 - /// - public int? enabledMark { get; set; } - - /// - /// 排序码 - /// - public long sortCode { get; set; } - - /// - /// 创建时间 - /// - public DateTime? creatorTime { get; set; } - - /// - /// 创建用户 - /// - public string creatorUserId { get; set; } - - /// - /// 修改时间 - /// - public DateTime? lastModifyTime { get; set; } - - /// - /// 修改用户 - /// - public string lastModifyUserId { get; set; } - - - /// - /// 营销规则-等级规则 - /// - public List details { get; set; } - - } -} diff --git a/netcore/src/Modularity/Order/NCC.Order.Entitys/Dto/MarketingRulesListQueryInput.cs b/netcore/src/Modularity/Order/NCC.Order.Entitys/Dto/MarketingRulesListQueryInput.cs deleted file mode 100644 index d10b5b0..0000000 --- a/netcore/src/Modularity/Order/NCC.Order.Entitys/Dto/MarketingRulesListQueryInput.cs +++ /dev/null @@ -1,72 +0,0 @@ -using NCC.Common.Filter; -using System.Collections.Generic; - -namespace NCC.Order.Entitys.Dto.MarketingRules -{ - /// - /// 分销规则设置列表查询输入 - /// - public class MarketingRulesListQueryInput : PageInputBase - { - /// - /// 选择导出数据key - /// - public string selectKey { get; set; } - - /// - /// - /// - public int dataType { get; set; } - - - /// - /// 规则名称 - /// - public string title { get; set; } - - /// - /// 提成比例 - /// - public string proportion { get; set; } - - /// - /// 满多少能提现 - /// - public string withdrawalMoney { get; set; } - - /// - /// 单次最大提现金额 - /// - public string singleMaxWithdrawalAmount { get; set; } - - /// - /// 每个月能提现的数量 - /// - public string monthWithdrawalCount { get; set; } - - /// - /// 创建时间 - /// - public string creatorTime { get; set; } - - /// - /// 创建用户 - /// - public string creatorUserId { get; set; } - - /// - /// 修改时间 - /// - public string lastModifyTime { get; set; } - - /// - /// 修改用户 - /// - public string lastModifyUserId { get; set; } - /// - /// 是否有效 - /// - public int? enabledMark { get; set; } - - } -} diff --git a/netcore/src/Modularity/Order/NCC.Order.Entitys/Dto/MarketingRulesUpInput.cs b/netcore/src/Modularity/Order/NCC.Order.Entitys/Dto/MarketingRulesUpInput.cs deleted file mode 100644 index 462e92c..0000000 --- a/netcore/src/Modularity/Order/NCC.Order.Entitys/Dto/MarketingRulesUpInput.cs +++ /dev/null @@ -1,17 +0,0 @@ -using System; -using System.Collections.Generic; - -namespace NCC.Order.Entitys.Dto.MarketingRules -{ - /// - /// 分销规则设置更新输入参数 - /// - public class MarketingRulesUpInput : MarketingRulesCrInput - { - /// - /// 主键 - /// - public string id { get; set; } - - } -} diff --git a/netcore/src/Modularity/Order/NCC.Order.Entitys/Dto/Order/BaseOrderCrInput.cs b/netcore/src/Modularity/Order/NCC.Order.Entitys/Dto/Order/BaseOrderCrInput.cs deleted file mode 100644 index 7c4048e..0000000 --- a/netcore/src/Modularity/Order/NCC.Order.Entitys/Dto/Order/BaseOrderCrInput.cs +++ /dev/null @@ -1,106 +0,0 @@ -using NCC.Code.JsonSerialization; -using Newtonsoft.Json; -using System; -using System.Collections.Generic; - -namespace NCC.Order.Entitys.Dto.BaseOrder -{ - /// - /// 订单模块V1修改输入参数 - /// - public class BaseOrderCrInput - { - ///// - ///// 订单标题 - ///// - //public string title { get; set; } - - ///// - ///// 系统订单编号 - ///// - //public string orderNumber { get; set; } - - ///// - ///// 下单时间 - ///// - //public DateTime? orderTime { get; set; } - - /// - /// 订单金额 - /// - public decimal money { get; set; } - - /// - /// 产品ID - /// - public string productId { get; set; } - - ///// - ///// 订单状态 关联枚举值/数据字典 - ///// - //public Entitys.Enum.OrderStatus? status { get; set; } - - ///// - ///// 下单IP - ///// - //public string ip { get; set; } - - ///// - ///// 卖家备注 - ///// - //public string mark { get; set; } - - /// - /// 订单来源 - /// - public string source { get; set; } - - /// - /// 支付方式 h5 native = 扫码支付 - /// - public string payType { get; set; } - - ///// - ///// 三方订单号 - ///// - //public string thirdPartyOrderNo { get; set; } - - ///// - ///// 创建时间 - ///// - //public DateTime? creatorTime { get; set; } - - ///// - ///// 创建用户 - ///// - //public string creatorUserId { get; set; } - - ///// - ///// 修改用户 - ///// - //public string lastModifyUserId { get; set; } - - ///// - ///// 修改时间 - ///// - //public DateTime? lastModifyTime { get; set; } - - /// - /// 描述 - /// - public string description { get; set; } - ///// - ///// openid - ///// - //public string openId { get; set; } - - - /// - /// 数量 - /// - public int amount { get; set; } - - - - } -} diff --git a/netcore/src/Modularity/Order/NCC.Order.Entitys/Dto/Order/BaseOrderInfoOutput.cs b/netcore/src/Modularity/Order/NCC.Order.Entitys/Dto/Order/BaseOrderInfoOutput.cs deleted file mode 100644 index 2c5b8bb..0000000 --- a/netcore/src/Modularity/Order/NCC.Order.Entitys/Dto/Order/BaseOrderInfoOutput.cs +++ /dev/null @@ -1,171 +0,0 @@ -using NCC.Code.JsonSerialization; -using NCC.Order.Entitys.Dto.BaseProduct; -using Newtonsoft.Json; -using System; -using System.Collections.Generic; - -namespace NCC.Order.Entitys.Dto.BaseOrder -{ - /// - /// 订单模块V1输出参数 - /// - public class BaseOrderInfoOutput - { - /// - /// 主键 - /// - public string id { get; set; } - - /// - /// 订单标题 - /// - public string title { get; set; } - - /// - /// 系统订单编号 - /// - public string orderNumber { get; set; } - - /// - /// 下单时间 - /// - public DateTime? orderTime { get; set; } - - /// - /// 订单金额 - /// - public decimal money { get; set; } - - /// - /// 产品ID - /// - public string productId { get; set; } - - /// - /// 订单状态 关联枚举值/数据字典 - /// - [JsonConverter(typeof(JsonEnumDisplayConverter))] - public Entitys.Enum.OrderStatus? status { get; set; } - - /// - /// 发货状态 - /// - public int? shipStatus { get; set; } - - /// - /// 支付状态 - /// - public int? payStatus { get; set; } - - /// - /// 商户/店铺/门店ID - /// - public string sellerId { get; set; } - - /// - /// 售后状态 - /// - public string confirmStatus { get; set; } - - /// - /// 确认收货时间 - /// - public DateTime? confirmTime { get; set; } - - /// - /// 使用积分 - /// - public string point { get; set; } - - /// - /// 下单IP - /// - public string ip { get; set; } - - /// - /// 卖家备注 - /// - public string mark { get; set; } - - /// - /// 订单来源 - /// - public string source { get; set; } - - /// - /// 支付方式 - /// - public string payType { get; set; } - - /// - /// 收货电话 - /// - public string shipMobile { get; set; } - - /// - /// 收货人姓名 - /// - public string shipName { get; set; } - - /// - /// 收货详细地址 - /// - public string shipAddress { get; set; } - - /// - /// 收货地区 - /// - public string shipArea { get; set; } - - /// - /// 三方订单号 - /// - public string thirdPartyOrderNo { get; set; } - - /// - /// 创建时间 - /// - public DateTime? creatorTime { get; set; } - - /// - /// 创建用户 - /// - public string creatorUserId { get; set; } - - /// - /// 修改用户 - /// - public string lastModifyUserId { get; set; } - - /// - /// 修改时间 - /// - public DateTime? lastModifyTime { get; set; } - - /// - /// 删除用户 - /// - public string deleteUserId { get; set; } - - /// - /// 删除时间 - /// - public DateTime? deleteTime { get; set; } - - /// - /// 描述 - /// - public string description { get; set; } - /// - /// 产品信息 - /// - public BaseProductInfoOutput product { get; set; } - - public decimal year { get; set; } - ///// - ///// 卷码信息 - ///// - //public BaseMyCouponInfoOutput coupon { get; set; } - - } -} diff --git a/netcore/src/Modularity/Order/NCC.Order.Entitys/Dto/Order/BaseOrderListOutput.cs b/netcore/src/Modularity/Order/NCC.Order.Entitys/Dto/Order/BaseOrderListOutput.cs deleted file mode 100644 index 5ddcc29..0000000 --- a/netcore/src/Modularity/Order/NCC.Order.Entitys/Dto/Order/BaseOrderListOutput.cs +++ /dev/null @@ -1,169 +0,0 @@ -using NCC.Code; -using NCC.Code.JsonSerialization; -using NCC.Common.Helper; -using NCC.Common.Model; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text.Json.Serialization; - -namespace NCC.Order.Entitys.Dto.BaseOrder -{ - /// - /// 订单模块V1输入参数 - /// - public class BaseOrderListOutput - { - /// - /// 主键 - /// - public string id { get; set; } - - /// - /// 订单标题 - /// - public string title { get; set; } - - /// - /// 系统订单编号 - /// - public string orderNumber { get; set; } - - /// - /// 下单时间 - /// - public DateTime? orderTime { get; set; } - /// - /// 数量 - /// - public int amount { get; set; } - - /// - /// 订单金额 - /// - public decimal money { get; set; } - - /// - /// 产品ID - /// - public string productId { get; set; } - /// - /// 产品名字 - /// - public string productName { get; set; } - - /// - /// 订单状态 关联枚举值/数据字典 - /// - [JsonConverter(typeof(JsonEnumDisplayConverter))] - public Entitys.Enum.OrderStatus? status { get; set; } - /// - /// 状态说明 - /// - public string statusName - { - get - { - try - { - var list = EnumHelper.EnumToList(false); - return list.First(o => o.Key == status.GetHashCode()).Desc; - } - catch (Exception) - { - return "未知"; - } - } - } - - /// - /// 下单IP - /// - public string ip { get; set; } - - /// - /// 卖家备注 - /// - public string mark { get; set; } - - /// - /// 订单来源 - /// - public string source { get; set; } - - /// - /// 支付方式 - /// - public string payType { get; set; } - - /// - /// 三方订单号 - /// - public string thirdPartyOrderNo { get; set; } - - /// - /// 创建时间 - /// - public DateTime? creatorTime { get; set; } - - /// - /// 创建用户 - /// - public string creatorUserId { get; set; } - - /// - /// 修改用户 - /// - public string lastModifyUserId { get; set; } - - /// - /// 修改时间 - /// - public DateTime? lastModifyTime { get; set; } - - /// - /// 描述 - /// - public string description { get; set; } - /// - /// 商品标题 - /// - public string productTitle { get; set; } - - /// - /// 下单用户 - /// - public string userFullName { get; set; } - /// - /// 商家名 - /// - public string businessName { get; set; } - - /// - /// 商品图片集合 - /// - public string images { get; set; } - /// - /// 手机号 - /// - public string phone { get; set; } - /// - /// 商品图片集合 - /// - public List imagelist - { - get - { - try - { - return images.ToObject>(); - } - catch (Exception) - { - return new List(); - } - } - } - - } -} diff --git a/netcore/src/Modularity/Order/NCC.Order.Entitys/Dto/Order/BaseOrderListQueryInput.cs b/netcore/src/Modularity/Order/NCC.Order.Entitys/Dto/Order/BaseOrderListQueryInput.cs deleted file mode 100644 index 49518e3..0000000 --- a/netcore/src/Modularity/Order/NCC.Order.Entitys/Dto/Order/BaseOrderListQueryInput.cs +++ /dev/null @@ -1,63 +0,0 @@ -using NCC.Common.Filter; -using System.Collections.Generic; - -namespace NCC.Order.Entitys.Dto.BaseOrder -{ - /// - /// 订单模块V1列表查询输入 - /// - public class BaseOrderListQueryInput : PageInputBase - { - /// - /// 选择导出数据key - /// - public string selectKey { get; set; } - - /// - /// - /// - public int dataType { get; set; } - - - /// - /// 订单标题 - /// - public string title { get; set; } - - /// - /// 系统订单编号 - /// - public string orderNumber { get; set; } - - /// - /// 下单时间 - /// - public string orderTime { get; set; } - - /// - /// 订单金额 - /// - public string money { get; set; } - - /// - /// 订单状态 关联枚举值/数据字典 - /// - public Entitys.Enum.OrderStatus? status { get; set; } - - /// - /// 卖家备注 - /// - public string mark { get; set; } - - /// - /// 支付方式 - /// - public string payType { get; set; } - - /// - /// 创建用户 - /// - public string creatorUserId { get; set; } - - } -} diff --git a/netcore/src/Modularity/Order/NCC.Order.Entitys/Dto/Order/BaseOrderUnOrderResult.cs b/netcore/src/Modularity/Order/NCC.Order.Entitys/Dto/Order/BaseOrderUnOrderResult.cs deleted file mode 100644 index dbb2b06..0000000 --- a/netcore/src/Modularity/Order/NCC.Order.Entitys/Dto/Order/BaseOrderUnOrderResult.cs +++ /dev/null @@ -1,51 +0,0 @@ -using NCC.Code.JsonSerialization; -using Newtonsoft.Json; -using System; -using System.Collections.Generic; - -namespace NCC.Order.Entitys.Dto.BaseOrder -{ - /// - /// 下单返回 - /// - public class BaseOrderUnOrderResult - { - - public string Id { get; set; } - /// - /// 订单标题 - /// - public string title { get; set; } - - /// - /// 系统订单编号 - /// - public string orderNumber { get; set; } - - /// - /// 下单时间 - /// - public DateTime? orderTime { get; set; } - - /// - /// 订单金额 - /// - public decimal money { get; set; } - - /// - /// 产品ID - /// - public string productId { get; set; } - - /// - /// openid - /// - public string openId { get; set; } - - public dynamic data { get; set; } - /// - /// 二维码 base64 - /// - public string qrCode { get; set; } - } -} diff --git a/netcore/src/Modularity/Order/NCC.Order.Entitys/Dto/Order/BaseOrderUpInput.cs b/netcore/src/Modularity/Order/NCC.Order.Entitys/Dto/Order/BaseOrderUpInput.cs deleted file mode 100644 index a662628..0000000 --- a/netcore/src/Modularity/Order/NCC.Order.Entitys/Dto/Order/BaseOrderUpInput.cs +++ /dev/null @@ -1,17 +0,0 @@ -using System; -using System.Collections.Generic; - -namespace NCC.Order.Entitys.Dto.BaseOrder -{ - /// - /// 订单模块V1更新输入参数 - /// - public class BaseOrderUpInput : BaseOrderCrInput - { - /// - /// 主键 - /// - public string id { get; set; } - - } -} diff --git a/netcore/src/Modularity/Order/NCC.Order.Entitys/Dto/Product/BaseProductCrInput.cs b/netcore/src/Modularity/Order/NCC.Order.Entitys/Dto/Product/BaseProductCrInput.cs deleted file mode 100644 index 96e5108..0000000 --- a/netcore/src/Modularity/Order/NCC.Order.Entitys/Dto/Product/BaseProductCrInput.cs +++ /dev/null @@ -1,105 +0,0 @@ -using System; -using System.Collections.Generic; -using NCC.Common.Model; -using SqlSugar; - -namespace NCC.Order.Entitys.Dto.BaseProduct -{ - /// - /// 产品信息V1修改输入参数 - /// - public class BaseProductCrInput - { - /// - /// 产品名称 - /// - public string title { get; set; } - - /// - /// 有效期开始时间 - /// - public DateTime? validStart { get; set; } - - /// - /// 有效期结束时间 - /// - public DateTime? validEnd { get; set; } - - /// - /// 金额/单价 - /// - public decimal price { get; set; } - - /// - /// 原价 - /// - public decimal originalPrice { get; set; } - - /// - /// 折扣 - /// - public double discount { get; set; } - - /// - /// 图片集合 - /// - public List images { get; set; } - - /// - /// 描述 - /// - public string description { get; set; } - - /// - /// 创建时间 - /// - public DateTime? creatorTime { get; set; } - - /// - /// 修改时间 - /// - public DateTime? lastModifyTime { get; set; } - - /// - /// 修改用户 - /// - public string lastModifyUserId { get; set; } - - /// - /// 标签 - /// - public string tags { get; set; } - - /// - /// 创建用户 - /// - public string creatorUserId { get; set; } - - /// - /// 商品详情 - /// - public List baseProductDetailsList { get; set; } - /// - /// 商家ID - /// - public string BusinessId { get; set; } - /// - /// 年 - /// - public double year { get; set; } - /// - /// 容量 - /// - public long volume { get; set; } - /// - /// 产品类型 - /// - - public string type { get; set; } - - /// - /// 商品描述 - /// - public string remark { get; set; } - } -} diff --git a/netcore/src/Modularity/Order/NCC.Order.Entitys/Dto/Product/BaseProductDetailsCrInput.cs b/netcore/src/Modularity/Order/NCC.Order.Entitys/Dto/Product/BaseProductDetailsCrInput.cs deleted file mode 100644 index a148abc..0000000 --- a/netcore/src/Modularity/Order/NCC.Order.Entitys/Dto/Product/BaseProductDetailsCrInput.cs +++ /dev/null @@ -1,37 +0,0 @@ -using System; -using System.Collections.Generic; - -namespace NCC.Order.Entitys.Dto.BaseProduct -{ - /// - /// 产品信息V1修改输入参数 - /// - public class BaseProductDetailsCrInput - { - /// - /// 主键 - /// - public string id { get; set; } - - /// - /// 标题 - /// - public string title { get; set; } - - /// - /// 是否能使用优惠券 - /// - public bool isUseCoupo { get; set; } - - /// - /// 价格 - /// - public decimal price { get; set; } - - /// - /// 原价 - /// - public decimal orgPrice { get; set; } - - } -} diff --git a/netcore/src/Modularity/Order/NCC.Order.Entitys/Dto/Product/BaseProductDetailsInfoOutput.cs b/netcore/src/Modularity/Order/NCC.Order.Entitys/Dto/Product/BaseProductDetailsInfoOutput.cs deleted file mode 100644 index f911946..0000000 --- a/netcore/src/Modularity/Order/NCC.Order.Entitys/Dto/Product/BaseProductDetailsInfoOutput.cs +++ /dev/null @@ -1,67 +0,0 @@ -using System; -using System.Collections.Generic; - -namespace NCC.Order.Entitys.Dto.BaseProduct -{ - /// - /// 产品信息V1输出参数 - /// - public class BaseProductDetailsInfoOutput - { - /// - /// 主键 - /// - public string id { get; set; } - - /// - /// 关联商品 - /// - public string productId { get; set; } - - /// - /// 标题 - /// - public string title { get; set; } - - /// - /// 类型 - /// - public string type { get; set; } - - /// - /// 是否能使用优惠券 - /// - public bool? isUseCoupo { get; set; } - - /// - /// 价格 - /// - public decimal price { get; set; } - - /// - /// 原价 - /// - public decimal orgPrice { get; set; } - - /// - /// 备注 - /// - public string remark { get; set; } - - /// - /// 排序 - /// - public long sortCode { get; set; } - - /// - /// 创建用户 - /// - public string creatorUserId { get; set; } - - /// - /// 创建时间 - /// - public DateTime? creatorTime { get; set; } - - } -} diff --git a/netcore/src/Modularity/Order/NCC.Order.Entitys/Dto/Product/BaseProductDetailsUpInput.cs b/netcore/src/Modularity/Order/NCC.Order.Entitys/Dto/Product/BaseProductDetailsUpInput.cs deleted file mode 100644 index db9bb94..0000000 --- a/netcore/src/Modularity/Order/NCC.Order.Entitys/Dto/Product/BaseProductDetailsUpInput.cs +++ /dev/null @@ -1,17 +0,0 @@ -using System; -using System.Collections.Generic; - -namespace NCC.Order.Entitys.Dto.BaseProduct -{ - /// - /// 产品信息V1更新输入参数 - /// - public class BaseProductDetailsUpInput : BaseProductCrInput - { - /// - /// 主键 - /// - public string id { get; set; } - - } -} diff --git a/netcore/src/Modularity/Order/NCC.Order.Entitys/Dto/Product/BaseProductInfoOutput.cs b/netcore/src/Modularity/Order/NCC.Order.Entitys/Dto/Product/BaseProductInfoOutput.cs deleted file mode 100644 index 240183c..0000000 --- a/netcore/src/Modularity/Order/NCC.Order.Entitys/Dto/Product/BaseProductInfoOutput.cs +++ /dev/null @@ -1,168 +0,0 @@ -using System; -using System.Collections.Generic; -using NCC.Common.Model; - -namespace NCC.Order.Entitys.Dto.BaseProduct -{ - /// - /// 产品信息V1输出参数 - /// - public class BaseProductInfoOutput - { - /// - /// 主键 - /// - public string id { get; set; } - - /// - /// 产品名称 - /// - public string title { get; set; } - - /// - /// 有效期开始时间 - /// - public DateTime? validStart { get; set; } - - /// - /// 有效期结束时间 - /// - public DateTime? validEnd { get; set; } - - /// - /// 金额/单价 - /// - public decimal price { get; set; } - - /// - /// 原价 - /// - public decimal originalPrice { get; set; } - - /// - /// 折扣 - /// - public decimal discount { get; set; } - - /// - /// 折后价 - /// - public decimal discountPrice { get; set; } - - /// - /// 门店 - /// - public string store { get; set; } - - /// - /// 经度 - /// - public string longitude { get; set; } - - /// - /// 纬度 - /// - public string latitude { get; set; } - - /// - /// 缩略图 - /// - public string thumbnail { get; set; } - - /// - /// 图片集合 - /// - public List images { get; set; } - - /// - /// 主图 - /// - public string manImage { get; set; } - - /// - /// 产品类型 - /// - public string type { get; set; } - - /// - /// 描述 - /// - public string description { get; set; } - - /// - /// 创建时间 - /// - public DateTime? creatorTime { get; set; } - - /// - /// 删除用户 - /// - public string deleteUserId { get; set; } - - /// - /// 修改时间 - /// - public DateTime? lastModifyTime { get; set; } - - /// - /// 修改用户 - /// - public string lastModifyUserId { get; set; } - - /// - /// 删除时间 - /// - public DateTime? deleteTime { get; set; } - - /// - /// 排序码 - /// - public long sortCode { get; set; } - - /// - /// 标签 - /// - public string tags { get; set; } - - /// - /// 商品描述 - /// - public string remark { get; set; } - - /// - /// 产品状态 - /// - public int? status { get; set; } - - /// - /// 创建用户 - /// - public string creatorUserId { get; set; } - - /// - /// 商品详情 - /// - public List baseProductDetailsList { get; set; } - - /// - /// 商家ID - /// - public string F_BusinessId { get; set; } - ///// - ///// 商家信息 - ///// - //public BaseBusinessInfoOutput BusinessInfo { get; set; } - - public int Visit { get; set; } - - - /// - /// 年 - /// - public decimal year { get; set; } - /// - /// 容量 - /// - public long volume { get; set; } - } -} diff --git a/netcore/src/Modularity/Order/NCC.Order.Entitys/Dto/Product/BaseProductListOutput.cs b/netcore/src/Modularity/Order/NCC.Order.Entitys/Dto/Product/BaseProductListOutput.cs deleted file mode 100644 index e09f644..0000000 --- a/netcore/src/Modularity/Order/NCC.Order.Entitys/Dto/Product/BaseProductListOutput.cs +++ /dev/null @@ -1,127 +0,0 @@ -using NCC.Common.Helper; -using NCC.Common.Model; -using System; -using System.Collections.Generic; - -namespace NCC.Order.Entitys.Dto.BaseProduct -{ - /// - /// 产品信息V1输入参数 - /// - public class BaseProductListOutput - { - /// - /// 主键 - /// - public string id { get; set; } - - /// - /// 产品名称 - /// - public string title { get; set; } - - /// - /// 有效期开始时间 - /// - public DateTime? validStart { get; set; } - - /// - /// 有效期结束时间 - /// - public DateTime? validEnd { get; set; } - - /// - /// 金额/单价 - /// - public decimal price { get; set; } - - /// - /// 原价 - /// - public decimal originalPrice { get; set; } - - /// - /// 折扣 - /// - public decimal discount { get; set; } - - /// - /// 创建时间 - /// - public DateTime? creatorTime { get; set; } - - /// - /// 修改时间 - /// - public DateTime? lastModifyTime { get; set; } - - /// - /// 修改用户 - /// - public string lastModifyUserId { get; set; } - - /// - /// 标签 - /// - public string tags { get; set; } - - /// - /// 创建用户 - /// - public string creatorUserId { get; set; } - - /// - /// 图片集合 - /// - public string images { get; set; } - /// - /// 图片集合 - /// - public List imagelist - { - get - { - - try - { - return images.ToObject>(); - } - catch (Exception) - { - return new List(); - } - } - } - - /// - /// 商家ID - /// - public string F_BusinessId { get; set; } - ///// - ///// 商家信息 - ///// - //public BaseBusinessInfoOutput BusinessInfo { get; set; } - - public int Visit { get; set; } - - /// - /// 年 - /// - public decimal year { get; set; } - /// - /// 容量 - /// - public long volume { get; set; } - /// - /// 产品类型 - /// - - public string type { get; set; } - - /// - /// 商品描述 - /// - public string remark { get; set; } - - } -} diff --git a/netcore/src/Modularity/Order/NCC.Order.Entitys/Dto/Product/BaseProductListQueryInput.cs b/netcore/src/Modularity/Order/NCC.Order.Entitys/Dto/Product/BaseProductListQueryInput.cs deleted file mode 100644 index b598a93..0000000 --- a/netcore/src/Modularity/Order/NCC.Order.Entitys/Dto/Product/BaseProductListQueryInput.cs +++ /dev/null @@ -1,62 +0,0 @@ -using NCC.Common.Filter; -using System.Collections.Generic; - -namespace NCC.Order.Entitys.Dto.BaseProduct -{ - /// - /// 产品信息V1列表查询输入 - /// - public class BaseProductListQueryInput : PageInputBase - { - /// - /// 选择导出数据key - /// - public string selectKey { get; set; } - - /// - /// - /// - public int dataType { get; set; } - - - /// - /// 产品名称 - /// - public string title { get; set; } - - /// - /// 有效期开始时间 - /// - public string validStart { get; set; } - - /// - /// 有效期结束时间 - /// - public string validEnd { get; set; } - - /// - /// 金额/单价 - /// - public string price { get; set; } - - /// - /// 原价 - /// - public string originalPrice { get; set; } - - /// - /// 标签 - /// - public string tags { get; set; } - /// - /// 商家ID - /// - - public string BusinessId { get; set; } - /// - /// 类型 - /// - public string type { get; set; } - - } -} diff --git a/netcore/src/Modularity/Order/NCC.Order.Entitys/Dto/Product/BaseProductUpInput.cs b/netcore/src/Modularity/Order/NCC.Order.Entitys/Dto/Product/BaseProductUpInput.cs deleted file mode 100644 index 2279896..0000000 --- a/netcore/src/Modularity/Order/NCC.Order.Entitys/Dto/Product/BaseProductUpInput.cs +++ /dev/null @@ -1,17 +0,0 @@ -using System; -using System.Collections.Generic; - -namespace NCC.Order.Entitys.Dto.BaseProduct -{ - /// - /// 产品信息V1更新输入参数 - /// - public class BaseProductUpInput : BaseProductCrInput - { - /// - /// 主键 - /// - public string id { get; set; } - - } -} diff --git a/netcore/src/Modularity/Order/NCC.Order.Entitys/Entity/BaseAmountHistoryEntity.cs b/netcore/src/Modularity/Order/NCC.Order.Entitys/Entity/BaseAmountHistoryEntity.cs deleted file mode 100644 index 0537275..0000000 --- a/netcore/src/Modularity/Order/NCC.Order.Entitys/Entity/BaseAmountHistoryEntity.cs +++ /dev/null @@ -1,93 +0,0 @@ -using NCC.Common.Const; -using SqlSugar; -using System; - -namespace NCC.Order.Entitys -{ - /// - /// 金额流水记录 - /// - [SugarTable("base_amount_history")] - [Tenant(ClaimConst.TENANT_ID)] - public class BaseAmountHistoryEntity - { - /// - /// 主键 - /// - [SugarColumn(ColumnName = "F_Id", IsPrimaryKey = true)] - public string Id { get; set; } - - /// - /// 容量 - /// - [SugarColumn(ColumnName = "F_Money")] - public decimal Money { get; set; } - - /// - /// 产品/套餐编号 - /// - [SugarColumn(ColumnName = "F_ProductId")] - public string ProductId { get; set; } - - /// - /// 关联订单编号 - /// - [SugarColumn(ColumnName = "F_Order_id")] - public string OrderId { get; set; } - - /// - /// 用户编号 - /// - [SugarColumn(ColumnName = "F_UserId")] - public string UserId { get; set; } - - /// - /// 消费用户编号 - /// - [SugarColumn(ColumnName = "F_PayUserId")] - public string PayUserId { get; set; } - - - /// - /// 来源 - /// - [SugarColumn(ColumnName = "F_Source")] - public string Source { get; set; } - - /// - /// 状态 - /// - [SugarColumn(ColumnName = "F_status")] - public int? Status { get; set; } - - /// - /// 创建时间 - /// - [SugarColumn(ColumnName = "F_CreatorTime")] - public DateTime? CreatorTime { get; set; } - - /// - /// 删除用户 - /// - [SugarColumn(ColumnName = "F_DeleteUserId")] - public string DeleteUserId { get; set; } - - /// - /// 删除时间 - /// - [SugarColumn(ColumnName = "F_DeleteTime")] - public DateTime? DeleteTime { get; set; } - - /// - /// 有效期开始时间 - /// - [SugarColumn(ColumnName = "F_ValidStart")] - public DateTime? ValidStart { get; set; } - - /// - /// 有效期结束时间 - /// - [SugarColumn(ColumnName = "F_ValidEnd")] - public DateTime? ValidEnd { get; set; } - } -} \ No newline at end of file diff --git a/netcore/src/Modularity/Order/NCC.Order.Entitys/Entity/BaseBusinessEntity.cs b/netcore/src/Modularity/Order/NCC.Order.Entitys/Entity/BaseBusinessEntity.cs deleted file mode 100644 index 4e4afd1..0000000 --- a/netcore/src/Modularity/Order/NCC.Order.Entitys/Entity/BaseBusinessEntity.cs +++ /dev/null @@ -1,160 +0,0 @@ -using NCC.Common.Const; -using SqlSugar; -using System; - -namespace NCC.Order.Entitys -{ - /// - /// 商家信息 - /// - [SugarTable("base_business")] - [Tenant(ClaimConst.TENANT_ID)] - public class BaseBusinessEntity - { - /// - /// 主键 - /// - [SugarColumn(ColumnName = "F_Id", IsPrimaryKey = true)] - public string Id { get; set; } - - /// - /// 排序码 - /// - [SugarColumn(ColumnName = "F_SortCode")] - public long SortCode { get; set; } - - /// - /// 描述 - /// - [SugarColumn(ColumnName = "F_Description")] - public string Description { get; set; } - - /// - /// 创建用户 - /// - [SugarColumn(ColumnName = "F_CreatorUserId")] - public string CreatorUserId { get; set; } - - /// - /// 创建时间 - /// - [SugarColumn(ColumnName = "F_CreatorTime")] - public DateTime? CreatorTime { get; set; } - - /// - /// 删除用户 - /// - [SugarColumn(ColumnName = "F_DeleteUserId")] - public string DeleteUserId { get; set; } - - /// - /// 删除时间 - /// - [SugarColumn(ColumnName = "F_DeleteTime")] - public DateTime? DeleteTime { get; set; } - - /// - /// 有效标志 - /// - [SugarColumn(ColumnName = "F_EnabledMark")] - public int? EnabledMark { get; set; } - - /// - /// 修改用户 - /// - [SugarColumn(ColumnName = "F_LastModifyUserId")] - public string LastModifyUserId { get; set; } - - /// - /// 修改时间 - /// - [SugarColumn(ColumnName = "F_LastModifyTime")] - public DateTime? LastModifyTime { get; set; } - - /// - /// 商家名称 - /// - [SugarColumn(ColumnName = "F_Name")] - public string Name { get; set; } - - /// - /// 联系电话 - /// - [SugarColumn(ColumnName = "F_Phone")] - public string Phone { get; set; } - - /// - /// 标签 - /// - [SugarColumn(ColumnName = "F_Tags")] - public string Tags { get; set; } - - /// - /// 图片 - /// - [SugarColumn(ColumnName = "F_Images")] - public string Images { get; set; } - - /// - /// 地址 - /// - [SugarColumn(ColumnName = "F_Adress")] - public string Adress { get; set; } - - /// - /// 经度 - /// - [SugarColumn(ColumnName = "F_Longitude")] - public string Longitude { get; set; } - - /// - /// 维度 - /// - [SugarColumn(ColumnName = "F_Latitude")] - public string Latitude { get; set; } - - /// - /// 区域，省市 - /// - [SugarColumn(ColumnName = "F_Area")] - public string Area { get; set; } - - /// - /// 商家Logo - /// - [SugarColumn(ColumnName = "F_Logo")] - public string Logo { get; set; } - - /// - /// 均价/人 - /// - [SugarColumn(ColumnName = "F_AvgPrice")] - public string AvgPrice { get; set; } - - /// - /// 营业时间 - /// - [SugarColumn(ColumnName = "F_BusinessHours")] - public string BusinessHours { get; set; } - - /// - /// 关联用户 - /// - [SugarColumn(ColumnName = "F_ReUserId")] - public string ReUserId { get; set; } - - - /// - /// 商家分类 - /// - [SugarColumn(ColumnName = "F_Category")] - public string Category { get; set; } - - /// - /// 是否首页置顶 - /// - [SugarColumn(ColumnName = "F_HomeTop")] - public bool HomeTop { get; set; } - - } -} \ No newline at end of file diff --git a/netcore/src/Modularity/Order/NCC.Order.Entitys/Entity/BaseMyCouponEntity.cs b/netcore/src/Modularity/Order/NCC.Order.Entitys/Entity/BaseMyCouponEntity.cs deleted file mode 100644 index ce16783..0000000 --- a/netcore/src/Modularity/Order/NCC.Order.Entitys/Entity/BaseMyCouponEntity.cs +++ /dev/null @@ -1,105 +0,0 @@ -using NCC.Common.Const; -using SqlSugar; -using System; - -namespace NCC.Order.Entitys -{ - /// - /// 优惠券记录 - /// - [SugarTable("base_my_coupon")] - [Tenant(ClaimConst.TENANT_ID)] - public class BaseMyCouponEntity - { - /// - /// 主键 - /// - [SugarColumn(ColumnName = "F_Id", IsPrimaryKey = true)] - public string Id { get; set; } - - /// - /// 我的优惠券 - /// - [SugarColumn(ColumnName = "F_ProductId")] - public string ProductId { get; set; } - - /// - /// 订单ID - /// - [SugarColumn(ColumnName = "F_OrderId")] - public string OrderId { get; set; } - - /// - /// 券码 - /// - [SugarColumn(ColumnName = "F_CoupnCode")] - public string CoupnCode { get; set; } - - /// - /// 二维码 - /// - [SugarColumn(ColumnName = "F_QrCode")] - public string QrCode { get; set; } - - /// - /// 用户ID - /// - [SugarColumn(ColumnName = "F_UserId")] - public string UserId { get; set; } - - /// - /// 是否使用 - /// - [SugarColumn(ColumnName = "F_IsUsed")] - public bool? IsUsed { get; set; } - - /// - /// 使用商品ID - /// - [SugarColumn(ColumnName = "F_UsedId")] - public string UsedId { get; set; } - - /// - /// 有效开始时间 - /// - [SugarColumn(ColumnName = "F_StartTime")] - public DateTime? StartTime { get; set; } - - /// - /// 有效结束时间 - /// - [SugarColumn(ColumnName = "F_EndTime")] - public DateTime? EndTime { get; set; } - - /// - /// 备注 - /// - [SugarColumn(ColumnName = "F_Remark")] - public string Remark { get; set; } - - /// - /// 创建时间 - /// - [SugarColumn(ColumnName = "F_CreatorTime")] - public DateTime? CreatorTime { get; set; } - - /// - /// 总金额 - /// - [SugarColumn(ColumnName = "F_TotalMoney")] - public decimal TotalMoney { get; set; } - - /// - /// 使用金额 - /// - [SugarColumn(ColumnName = "F_UsedMoney")] - public decimal UsedMoney { get; set; } - - /// - /// 剩余金额 - /// - [SugarColumn(ColumnName = "F_OverMoney")] - public decimal OverMoney { get; set; } - - } -} \ No newline at end of file diff --git a/netcore/src/Modularity/Order/NCC.Order.Entitys/Entity/BaseOrderEntity.cs b/netcore/src/Modularity/Order/NCC.Order.Entitys/Entity/BaseOrderEntity.cs deleted file mode 100644 index 3849f7c..0000000 --- a/netcore/src/Modularity/Order/NCC.Order.Entitys/Entity/BaseOrderEntity.cs +++ /dev/null @@ -1,211 +0,0 @@ -using NCC.Common.Const; -using SqlSugar; -using System; - -namespace NCC.Order.Entitys -{ - /// - /// 订单模块V1 - /// - [SugarTable("base_order")] - [Tenant(ClaimConst.TENANT_ID)] - public class BaseOrderEntity - { - /// - /// 主键 - /// - [SugarColumn(ColumnName = "F_Id", IsPrimaryKey = true)] - public string Id { get; set; } - - /// - /// 订单标题 - /// - [SugarColumn(ColumnName = "F_Title")] - public string Title { get; set; } - - /// - /// 系统订单编号 - /// - [SugarColumn(ColumnName = "F_OrderNumber")] - public string OrderNumber { get; set; } - - /// - /// 下单时间 - /// - [SugarColumn(ColumnName = "F_OrderTime")] - public DateTime? OrderTime { get; set; } - - /// - /// 订单金额 - /// - [SugarColumn(ColumnName = "F_Money")] - public decimal Money { get; set; } - - /// - /// 产品ID - /// - [SugarColumn(ColumnName = "F_ProductId")] - public string ProductId { get; set; } - - /// - /// 订单状态 关联枚举值/数据字典 - /// - [SugarColumn(ColumnName = "F_Status")] - public Entitys.Enum.OrderStatus? Status { get; set; } - - /// - /// 发货状态 - /// - [SugarColumn(ColumnName = "F_ShipStatus")] - public int? ShipStatus { get; set; } - - /// - /// 支付状态 - /// - [SugarColumn(ColumnName = "F_PayStatus")] - public int? PayStatus { get; set; } - - /// - /// 商户/店铺/门店ID - /// - [SugarColumn(ColumnName = "F_SellerId")] - public string SellerId { get; set; } - - /// - /// 售后状态 - /// - [SugarColumn(ColumnName = "F_ConfirmStatus")] - public string ConfirmStatus { get; set; } - - /// - /// 确认收货时间 - /// - [SugarColumn(ColumnName = "F_ConfirmTime")] - public DateTime? ConfirmTime { get; set; } - - /// - /// 使用积分 - /// - [SugarColumn(ColumnName = "F_Point")] - public string Point { get; set; } - - /// - /// 下单IP - /// - [SugarColumn(ColumnName = "F_IP")] - public string Ip { get; set; } - - /// - /// 卖家备注 - /// - [SugarColumn(ColumnName = "F_Mark")] - public string Mark { get; set; } - - /// - /// 订单来源 - /// - [SugarColumn(ColumnName = "F_Source")] - public string Source { get; set; } - - /// - /// 支付方式 - /// - [SugarColumn(ColumnName = "F_PayType")] - public string PayType { get; set; } - - /// - /// 收货电话 - /// - [SugarColumn(ColumnName = "F_ShipMobile")] - public string ShipMobile { get; set; } - - /// - /// 收货人姓名 - /// - [SugarColumn(ColumnName = "F_ShipName")] - public string ShipName { get; set; } - - /// - /// 收货详细地址 - /// - [SugarColumn(ColumnName = "F_ShipAddress")] - public string ShipAddress { get; set; } - - /// - /// 收货地区 - /// - [SugarColumn(ColumnName = "F_ShipArea")] - public string ShipArea { get; set; } - - /// - /// 三方订单号 - /// - [SugarColumn(ColumnName = "F_ThirdPartyOrderNo")] - public string ThirdPartyOrderNo { get; set; } - - /// - /// 创建时间 - /// - [SugarColumn(ColumnName = "F_CreatorTime")] - public DateTime? CreatorTime { get; set; } - - /// - /// 创建用户 - /// - [SugarColumn(ColumnName = "F_CreatorUserId")] - public string CreatorUserId { get; set; } - - /// - /// 修改用户 - /// - [SugarColumn(ColumnName = "F_LastModifyUserId")] - public string LastModifyUserId { get; set; } - - /// - /// 修改时间 - /// - [SugarColumn(ColumnName = "F_LastModifyTime")] - public DateTime? LastModifyTime { get; set; } - - /// - /// 删除用户 - /// - [SugarColumn(ColumnName = "F_DeleteUserId")] - public string DeleteUserId { get; set; } - - /// - /// 删除时间 - /// - [SugarColumn(ColumnName = "F_DeleteTime")] - public DateTime? DeleteTime { get; set; } - - /// - /// 描述 - /// - [SugarColumn(ColumnName = "F_Description")] - public string Description { get; set; } - - - /// - /// wx openid - /// - [SugarColumn(ColumnName = "F_OpenId")] - public string OpenId { get; set; } - - - /// - /// 单价 - /// - [SugarColumn(ColumnName = "F_Price")] - public decimal Price { get; set; } - - /// - /// 数量 - /// - [SugarColumn(ColumnName = "F_Amount")] - public int Amount { get; set; } - - - - } -} \ No newline at end of file diff --git a/netcore/src/Modularity/Order/NCC.Order.Entitys/Entity/BaseProductDetailsEntity.cs b/netcore/src/Modularity/Order/NCC.Order.Entitys/Entity/BaseProductDetailsEntity.cs deleted file mode 100644 index b86cf02..0000000 --- a/netcore/src/Modularity/Order/NCC.Order.Entitys/Entity/BaseProductDetailsEntity.cs +++ /dev/null @@ -1,81 +0,0 @@ -using NCC.Common.Const; -using SqlSugar; -using System; - -namespace NCC.Order.Entitys -{ - /// - /// 产品信息 - /// - [SugarTable("base_product_details")] - [Tenant(ClaimConst.TENANT_ID)] - public class BaseProductDetailsEntity - { - /// - /// 主键 - /// - [SugarColumn(ColumnName = "F_Id", IsPrimaryKey = true)] - public string Id { get; set; } - - /// - /// 关联商品 - /// - [SugarColumn(ColumnName = "F_ProductId")] - public string ProductId { get; set; } - - /// - /// 标题 - /// - [SugarColumn(ColumnName = "F_Title")] - public string Title { get; set; } - - /// - /// 类型 - /// - [SugarColumn(ColumnName = "F_Type")] - public string Type { get; set; } - - /// - /// 是否能使用优惠券 - /// - [SugarColumn(ColumnName = "F_IsUseCoupo")] - public bool IsUseCoupo { get; set; } - - /// - /// 价格 - /// - [SugarColumn(ColumnName = "F_Price")] - public decimal Price { get; set; } - - /// - /// 原价 - /// - [SugarColumn(ColumnName = "F_OrgPrice")] - public decimal OrgPrice { get; set; } - - /// - /// 备注 - /// - [SugarColumn(ColumnName = "F_Remark")] - public string Remark { get; set; } - - /// - /// 排序 - /// - [SugarColumn(ColumnName = "F_SortCode")] - public long SortCode { get; set; } - - /// - /// 创建用户 - /// - [SugarColumn(ColumnName = "F_CreatorUserId")] - public string CreatorUserId { get; set; } - - /// - /// 创建时间 - /// - [SugarColumn(ColumnName = "F_CreatorTime")] - public DateTime? CreatorTime { get; set; } - - } -} \ No newline at end of file diff --git a/netcore/src/Modularity/Order/NCC.Order.Entitys/Entity/BaseProductEntity.cs b/netcore/src/Modularity/Order/NCC.Order.Entitys/Entity/BaseProductEntity.cs deleted file mode 100644 index 28f4523..0000000 --- a/netcore/src/Modularity/Order/NCC.Order.Entitys/Entity/BaseProductEntity.cs +++ /dev/null @@ -1,194 +0,0 @@ -using NCC.Common.Const; -using SqlSugar; -using System; - -namespace NCC.Order.Entitys -{ - /// - /// 产品信息V1 - /// - [SugarTable("base_product")] - [Tenant(ClaimConst.TENANT_ID)] - public class BaseProductEntity - { - /// - /// 主键 - /// - [SugarColumn(ColumnName = "F_Id", IsPrimaryKey = true)] - public string Id { get; set; } - - /// - /// 产品名称 - /// - [SugarColumn(ColumnName = "F_Title")] - public string Title { get; set; } - - /// - /// 有效期开始时间 - /// - [SugarColumn(ColumnName = "F_ValidStart")] - public DateTime? ValidStart { get; set; } - - /// - /// 有效期结束时间 - /// - [SugarColumn(ColumnName = "F_ValidEnd")] - public DateTime? ValidEnd { get; set; } - - /// - /// 金额/单价 - /// - [SugarColumn(ColumnName = "F_Price")] - public decimal Price { get; set; } - - /// - /// 原价 - /// - [SugarColumn(ColumnName = "F_OriginalPrice")] - public decimal OriginalPrice { get; set; } - - /// - /// 折扣 - /// - [SugarColumn(ColumnName = "F_Discount")] - public decimal Discount { get; set; } - - /// - /// 折后价 - /// - [SugarColumn(ColumnName = "F_DiscountPrice")] - public decimal DiscountPrice { get; set; } - - /// - /// 门店 - /// - [SugarColumn(ColumnName = "F_Store")] - public string Store { get; set; } - - /// - /// 经度 - /// - [SugarColumn(ColumnName = "F_Longitude")] - public string Longitude { get; set; } - - /// - /// 纬度 - /// - [SugarColumn(ColumnName = "F_Latitude")] - public string Latitude { get; set; } - - /// - /// 缩略图 - /// - [SugarColumn(ColumnName = "F_Thumbnail")] - public string Thumbnail { get; set; } - - /// - /// 图片集合 - /// - [SugarColumn(ColumnName = "F_Images")] - public string Images { get; set; } - - /// - /// 主图 - /// - [SugarColumn(ColumnName = "F_ManImage")] - public string ManImage { get; set; } - - /// - /// 产品类型 - /// - [SugarColumn(ColumnName = "F_Type")] - public string Type { get; set; } - - /// - /// 描述 - /// - [SugarColumn(ColumnName = "F_Description")] - public string Description { get; set; } - - /// - /// 创建时间 - /// - [SugarColumn(ColumnName = "F_CreatorTime")] - public DateTime? CreatorTime { get; set; } - - /// - /// 删除用户 - /// - [SugarColumn(ColumnName = "F_DeleteUserId")] - public string DeleteUserId { get; set; } - - /// - /// 修改时间 - /// - [SugarColumn(ColumnName = "F_LastModifyTime")] - public DateTime? LastModifyTime { get; set; } - - /// - /// 修改用户 - /// - [SugarColumn(ColumnName = "F_LastModifyUserId")] - public string LastModifyUserId { get; set; } - - /// - /// 删除时间 - /// - [SugarColumn(ColumnName = "F_DeleteTime")] - public DateTime? DeleteTime { get; set; } - - /// - /// 排序码 - /// - [SugarColumn(ColumnName = "F_SortCode")] - public long SortCode { get; set; } - - /// - /// 标签 - /// - [SugarColumn(ColumnName = "F_Tags")] - public string Tags { get; set; } - - /// - /// 商品描述 - /// - [SugarColumn(ColumnName = "F_Remark")] - public string Remark { get; set; } - - /// - /// 产品状态 - /// - [SugarColumn(ColumnName = "F_Status")] - public int? Status { get; set; } - - /// - /// 创建用户 - /// - [SugarColumn(ColumnName = "F_CreatorUserId")] - public string CreatorUserId { get; set; } - - /// - /// 商家ID - /// - [SugarColumn(ColumnName = "F_BusinessId")] - public string BusinessId { get; set; } - /// - /// 查看量 - /// - [SugarColumn(ColumnName = "F_Visit")] - public int Visit { get; set; } - - /// - /// 容量 - /// - [SugarColumn(ColumnName = "F_Volume")] - public long volume { get; set; } - - /// - /// 有效期-年 - /// - [SugarColumn(ColumnName = "F_Year")] - public decimal Year { get; set; } - - } -} \ No newline at end of file diff --git a/netcore/src/Modularity/Order/NCC.Order.Entitys/Entity/BaseUserBalanceEntity.cs b/netcore/src/Modularity/Order/NCC.Order.Entitys/Entity/BaseUserBalanceEntity.cs deleted file mode 100644 index 0a2d4fa..0000000 --- a/netcore/src/Modularity/Order/NCC.Order.Entitys/Entity/BaseUserBalanceEntity.cs +++ /dev/null @@ -1,51 +0,0 @@ -using NCC.Common.Const; -using SqlSugar; -using System; - -namespace NCC.Order.Entitys -{ - /// - /// 用户余额变动 - /// - [SugarTable("base_user_balance")] - [Tenant(ClaimConst.TENANT_ID)] - public class BaseUserBalanceEntity - { - /// - /// 主键 - /// - [SugarColumn(ColumnName = "F_Id", IsPrimaryKey = true)] - public string Id { get; set; } - - /// - /// 用户ID - /// - [SugarColumn(ColumnName = "F_UserId")] - public string UserId { get; set; } - - /// - /// 余额变动类型 - /// - [SugarColumn(ColumnName = "F_Type")] - public string Type { get; set; } - - /// - /// 订单号或其他来源 - /// - [SugarColumn(ColumnName = "F_SourceId")] - public string SourceId { get; set; } - - /// - /// 余额变动描述 - /// - [SugarColumn(ColumnName = "F_Mark")] - public string Mark { get; set; } - - /// - /// 变动时间 - /// - [SugarColumn(ColumnName = "F_AddTime")] - public DateTime? AddTime { get; set; } - - } -} \ No newline at end of file diff --git a/netcore/src/Modularity/Order/NCC.Order.Entitys/Entity/MarketingRulesDetailEntity.cs b/netcore/src/Modularity/Order/NCC.Order.Entitys/Entity/MarketingRulesDetailEntity.cs deleted file mode 100644 index 9e6d7d1..0000000 --- a/netcore/src/Modularity/Order/NCC.Order.Entitys/Entity/MarketingRulesDetailEntity.cs +++ /dev/null @@ -1,81 +0,0 @@ -using NCC.Common.Const; -using SqlSugar; -using System; - -namespace NCC.Order.Entitys -{ - /// - /// 分销规则设置 - /// - [SugarTable("marketing_rules_detail")] - [Tenant(ClaimConst.TENANT_ID)] - public class MarketingRulesDetailEntity - { - /// - /// 主键 - /// - [SugarColumn(ColumnName = "F_Id", IsPrimaryKey = true)] - public string Id { get; set; } - - /// - /// 规则ID - /// - [SugarColumn(ColumnName = "F_RuleId")] - public string RuleId { get; set; } - - /// - /// 等级名称 - /// - [SugarColumn(ColumnName = "F_Name")] - public string Name { get; set; } - - /// - /// 提成比例 - /// - [SugarColumn(ColumnName = "F_Proportion")] - public decimal Proportion { get; set; } - - /// - /// 满多少能提现 - /// - [SugarColumn(ColumnName = "F_WithdrawalMoney")] - public decimal WithdrawalMoney { get; set; } - - /// - /// 粉丝量范围-开始 - /// - [SugarColumn(ColumnName = "F_NumberStart")] - public string NumberStart { get; set; } - - /// - /// 粉丝量范围-结束（备用） - /// - [SugarColumn(ColumnName = "F_NumberEnd")] - public string NumberEnd { get; set; } - - /// - /// 单次最大提现金额 - /// - [SugarColumn(ColumnName = "F_SingleMaxWithdrawalAmount")] - public decimal SingleMaxWithdrawalAmount { get; set; } - - /// - /// 每个月能提现的数量 - /// - [SugarColumn(ColumnName = "F_MonthWithdrawalCount")] - public int? MonthWithdrawalCount { get; set; } - - /// - /// 排序码 - /// - [SugarColumn(ColumnName = "F_SortCode")] - public long SortCode { get; set; } - - /// - /// 描述 - /// - [SugarColumn(ColumnName = "F_Description")] - public string Description { get; set; } - - } -} \ No newline at end of file diff --git a/netcore/src/Modularity/Order/NCC.Order.Entitys/Entity/MarketingRulesEntity.cs b/netcore/src/Modularity/Order/NCC.Order.Entitys/Entity/MarketingRulesEntity.cs deleted file mode 100644 index d6c64ca..0000000 --- a/netcore/src/Modularity/Order/NCC.Order.Entitys/Entity/MarketingRulesEntity.cs +++ /dev/null @@ -1,111 +0,0 @@ -using NCC.Common.Const; -using SqlSugar; -using System; - -namespace NCC.Order.Entitys -{ - /// - /// 分销规则设置 - /// - [SugarTable("marketing_rules")] - [Tenant(ClaimConst.TENANT_ID)] - public class MarketingRulesEntity - { - /// - /// 主键 - /// - [SugarColumn(ColumnName = "F_Id", IsPrimaryKey = true)] - public string Id { get; set; } - - /// - /// 规则名称 - /// - [SugarColumn(ColumnName = "F_Title")] - public string Title { get; set; } - - /// - /// 提成比例 - /// - [SugarColumn(ColumnName = "F_Proportion")] - public string Proportion { get; set; } - - /// - /// 满多少能提现 - /// - [SugarColumn(ColumnName = "F_WithdrawalMoney")] - public string WithdrawalMoney { get; set; } - - /// - /// 粉丝量范围-开始 - /// - [SugarColumn(ColumnName = "F_NumberStart")] - public string NumberStart { get; set; } - - /// - /// 粉丝量范围-结束（备用） - /// - [SugarColumn(ColumnName = "F_NumberEnd")] - public string NumberEnd { get; set; } - - /// - /// 单次最大提现金额 - /// - [SugarColumn(ColumnName = "F_SingleMaxWithdrawalAmount")] - public string SingleMaxWithdrawalAmount { get; set; } - - /// - /// 每个月能提现的数量 - /// - [SugarColumn(ColumnName = "F_MonthWithdrawalCount")] - public string MonthWithdrawalCount { get; set; } - - /// - /// 规则描述 - /// - [SugarColumn(ColumnName = "F_Description")] - public string Description { get; set; } - - /// - /// 备注 - /// - [SugarColumn(ColumnName = "F_Remark")] - public string Remark { get; set; } - - /// - /// 是否有效 - /// - [SugarColumn(ColumnName = "F_EnabledMark")] - public int? EnabledMark { get; set; } - - /// - /// 排序码 - /// - [SugarColumn(ColumnName = "F_SortCode")] - public long SortCode { get; set; } - - /// - /// 创建时间 - /// - [SugarColumn(ColumnName = "F_CreatorTime")] - public DateTime? CreatorTime { get; set; } - - /// - /// 创建用户 - /// - [SugarColumn(ColumnName = "F_CreatorUserId")] - public string CreatorUserId { get; set; } - - /// - /// 修改时间 - /// - [SugarColumn(ColumnName = "F_LastModifyTime")] - public DateTime? LastModifyTime { get; set; } - - /// - /// 修改用户 - /// - [SugarColumn(ColumnName = "F_LastModifyUserId")] - public string LastModifyUserId { get; set; } - - } -} \ No newline at end of file diff --git a/netcore/src/Modularity/Order/NCC.Order.Entitys/Enum/MonthHistoryEnum.cs b/netcore/src/Modularity/Order/NCC.Order.Entitys/Enum/MonthHistoryEnum.cs deleted file mode 100644 index 6c8010a..0000000 --- a/netcore/src/Modularity/Order/NCC.Order.Entitys/Enum/MonthHistoryEnum.cs +++ /dev/null @@ -1,102 +0,0 @@ -using NCC.Dependency; -using System; -using System.Collections.Generic; -using System.ComponentModel; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace NCC.Food.Entitys.Enum -{ - /// - /// 资金类型 - /// - [SuppressSniffer] - public enum MoneyHistoryType - { - /// - /// - /// - [Description("未知")] - 未知 = 0, - /// - /// 分销提成 - /// - [Description("分销提成")] - 分销提成 = 1, - /// - /// 余额消费 - /// - [Description("余额消费")] - 余额消费 = 3, - /// - /// 充值 - /// - [Description("充值")] - 充值 = 4, - /// - /// 砖石 - /// - [Description("砖石")] - 砖石 = 5, - /// - /// 提现 - /// - [Description("提现")] - 提现 = 6, - /// - /// 匹配次数 - /// - [Description("匹配次数")] - 匹配次数 = 7, - /// - /// 消费 - /// - [Description("消费")] - 消费 = 11, - - /// - /// 退款 - /// - [Description("退款")] - 退款 = 12, - - } - - /// - /// 金额状态枚举 - /// - public enum PriceStatus - { - /// - /// 可用 - /// - [Description("可用")] - 可用 = 1, - /// - /// 锁定 - /// - [Description("锁定")] - 锁定 = 2, - /// - /// 冻结 - /// - [Description("冻结")] - 冻结 = 3, - /// - /// 无效 - /// - [Description("无效")] - 无效 = 4, - /// - /// 使用 - /// - [Description("使用")] - 使用 = 5, - /// - /// 其他 - /// - [Description("其他")] - 其他 = 99, - } -} diff --git a/netcore/src/Modularity/Order/NCC.Order.Entitys/Enum/OrderEnum.cs b/netcore/src/Modularity/Order/NCC.Order.Entitys/Enum/OrderEnum.cs deleted file mode 100644 index b85bf56..0000000 --- a/netcore/src/Modularity/Order/NCC.Order.Entitys/Enum/OrderEnum.cs +++ /dev/null @@ -1,40 +0,0 @@ -using NCC.Dependency; -using System.ComponentModel; - -namespace NCC.Order.Entitys.Enum -{ - [SuppressSniffer] - public enum OrderStatus - { - /// - /// 订单正常 - /// - [Description("未支付")] - No = 1, - /// - /// 已支付 - /// - [Description("已支付")] - Yes = 2, - /// - /// 订单取消 - /// - [Description("订单取消")] - Cancel = 3, - /// - /// 部分退款 - /// - [Description("部分退款")] - PartialNo = 4, - /// - /// 已退款 - /// - [Description("已退款")] - Refunded = 5, - /// - /// 已完成 - /// - [Description("已完成")] - End = 9 - } -} diff --git a/netcore/src/Modularity/Order/NCC.Order.Entitys/Mapper/BaseAmountHistoryMapper.cs b/netcore/src/Modularity/Order/NCC.Order.Entitys/Mapper/BaseAmountHistoryMapper.cs deleted file mode 100644 index 7712237..0000000 --- a/netcore/src/Modularity/Order/NCC.Order.Entitys/Mapper/BaseAmountHistoryMapper.cs +++ /dev/null @@ -1,14 +0,0 @@ -using NCC.Common.Helper; -using NCC.Order.Entitys.Dto.BaseAmountHistory; -using Mapster; -using System.Collections.Generic; - -namespace NCC.Order.Entitys.Mapper.BaseAmountHistory -{ - public class Mapper : IRegister - { - public void Register(TypeAdapterConfig config) - { - } - } -} diff --git a/netcore/src/Modularity/Order/NCC.Order.Entitys/Mapper/BaseBusinessMapper.cs b/netcore/src/Modularity/Order/NCC.Order.Entitys/Mapper/BaseBusinessMapper.cs deleted file mode 100644 index 29bc9fb..0000000 --- a/netcore/src/Modularity/Order/NCC.Order.Entitys/Mapper/BaseBusinessMapper.cs +++ /dev/null @@ -1,25 +0,0 @@ -using NCC.Common.Helper; -using Mapster; -using System.Collections.Generic; -using NCC.Code; - -namespace NCC.Order.Entitys.Mapper.BaseBusiness -{ - public class Mapper : IRegister - { - public void Register(TypeAdapterConfig config) - { - //config.ForType() - // .BeforeMapping((src, desc) => - // { - // desc.Images = src.images.ToJson(); - // }); - - //config.ForType() - //.BeforeMapping((src, desc) => - //{ - // desc.images = src.Images.ToObject(); - //}); - } - } -} diff --git a/netcore/src/Modularity/Order/NCC.Order.Entitys/Mapper/BaseMyCouponMapper.cs b/netcore/src/Modularity/Order/NCC.Order.Entitys/Mapper/BaseMyCouponMapper.cs deleted file mode 100644 index 61ccc1d..0000000 --- a/netcore/src/Modularity/Order/NCC.Order.Entitys/Mapper/BaseMyCouponMapper.cs +++ /dev/null @@ -1,13 +0,0 @@ -using NCC.Common.Helper; -using Mapster; -using System.Collections.Generic; - -namespace NCC.Order.Entitys.Mapper.BaseMyCoupon -{ - public class Mapper : IRegister - { - public void Register(TypeAdapterConfig config) - { - } - } -} diff --git a/netcore/src/Modularity/Order/NCC.Order.Entitys/Mapper/BaseOrderMapper.cs b/netcore/src/Modularity/Order/NCC.Order.Entitys/Mapper/BaseOrderMapper.cs deleted file mode 100644 index 34c6aec..0000000 --- a/netcore/src/Modularity/Order/NCC.Order.Entitys/Mapper/BaseOrderMapper.cs +++ /dev/null @@ -1,14 +0,0 @@ -using NCC.Common.Helper; -using NCC.Order.Entitys.Dto.BaseOrder; -using Mapster; -using System.Collections.Generic; - -namespace NCC.Order.Entitys.Mapper.BaseOrder -{ - public class Mapper : IRegister - { - public void Register(TypeAdapterConfig config) - { - } - } -} diff --git a/netcore/src/Modularity/Order/NCC.Order.Entitys/Mapper/BaseProductDetailsMapper.cs b/netcore/src/Modularity/Order/NCC.Order.Entitys/Mapper/BaseProductDetailsMapper.cs deleted file mode 100644 index 3cb2f30..0000000 --- a/netcore/src/Modularity/Order/NCC.Order.Entitys/Mapper/BaseProductDetailsMapper.cs +++ /dev/null @@ -1,14 +0,0 @@ -using NCC.Common.Helper; -using NCC.Order.Entitys.Dto.BaseProduct; -using Mapster; -using System.Collections.Generic; - -namespace NCC.Order.Entitys.Mapper.BaseProductDetails -{ - public class Mapper : IRegister - { - public void Register(TypeAdapterConfig config) - { - } - } -} diff --git a/netcore/src/Modularity/Order/NCC.Order.Entitys/Mapper/BaseProductMapper.cs b/netcore/src/Modularity/Order/NCC.Order.Entitys/Mapper/BaseProductMapper.cs deleted file mode 100644 index c6ac522..0000000 --- a/netcore/src/Modularity/Order/NCC.Order.Entitys/Mapper/BaseProductMapper.cs +++ /dev/null @@ -1,25 +0,0 @@ -using NCC.Common.Helper; -using NCC.Common.Model; -using NCC.Order.Entitys.Dto.BaseProduct; -using Mapster; -using System.Collections.Generic; -using NCC.Order.Entitys.Dto.BaseUserBalance; - -namespace NCC.Order.Entitys.Mapper.BaseProduct -{ - public class Mapper : IRegister - { - public void Register(TypeAdapterConfig config) - { - config.ForType() - .Map(dest => dest.Images, src => src.images.ToJson()) - ; - config.ForType() - .Map(dest => dest.images, src => src.Images.ToObject>()) - ; - config.ForType() - .Map(dest => dest.images, src => src.Images.ToObject>()) - ; - } - } -} diff --git a/netcore/src/Modularity/Order/NCC.Order.Entitys/Mapper/BaseUserBalanceMapper.cs b/netcore/src/Modularity/Order/NCC.Order.Entitys/Mapper/BaseUserBalanceMapper.cs deleted file mode 100644 index 2511b27..0000000 --- a/netcore/src/Modularity/Order/NCC.Order.Entitys/Mapper/BaseUserBalanceMapper.cs +++ /dev/null @@ -1,14 +0,0 @@ -using NCC.Common.Helper; -using NCC.Order.Entitys.Dto.BaseUserBalance; -using Mapster; -using System.Collections.Generic; - -namespace NCC.Order.Entitys.Mapper.BaseUserBalance -{ - public class Mapper : IRegister - { - public void Register(TypeAdapterConfig config) - { - } - } -} diff --git a/netcore/src/Modularity/Order/NCC.Order.Entitys/Mapper/MarketingRulesDetailMapper.cs b/netcore/src/Modularity/Order/NCC.Order.Entitys/Mapper/MarketingRulesDetailMapper.cs deleted file mode 100644 index eaf54a8..0000000 --- a/netcore/src/Modularity/Order/NCC.Order.Entitys/Mapper/MarketingRulesDetailMapper.cs +++ /dev/null @@ -1,14 +0,0 @@ -using NCC.Common.Helper; -using NCC.Order.Entitys.Dto.MarketingRules; -using Mapster; -using System.Collections.Generic; - -namespace NCC.Order.Entitys.Mapper.MarketingRulesDetail -{ - public class Mapper : IRegister - { - public void Register(TypeAdapterConfig config) - { - } - } -} diff --git a/netcore/src/Modularity/Order/NCC.Order.Entitys/Mapper/MarketingRulesMapper.cs b/netcore/src/Modularity/Order/NCC.Order.Entitys/Mapper/MarketingRulesMapper.cs deleted file mode 100644 index 4fd81bd..0000000 --- a/netcore/src/Modularity/Order/NCC.Order.Entitys/Mapper/MarketingRulesMapper.cs +++ /dev/null @@ -1,14 +0,0 @@ -using NCC.Common.Helper; -using NCC.Order.Entitys.Dto.MarketingRules; -using Mapster; -using System.Collections.Generic; - -namespace NCC.Order.Entitys.Mapper.MarketingRules -{ - public class Mapper : IRegister - { - public void Register(TypeAdapterConfig config) - { - } - } -} diff --git a/netcore/src/Modularity/Order/NCC.Order.Entitys/Model/BaseMateInfoEntity.cs b/netcore/src/Modularity/Order/NCC.Order.Entitys/Model/BaseMateInfoEntity.cs deleted file mode 100644 index ec91e84..0000000 --- a/netcore/src/Modularity/Order/NCC.Order.Entitys/Model/BaseMateInfoEntity.cs +++ /dev/null @@ -1,117 +0,0 @@ -using NCC.Common.Const; -using SqlSugar; -using System; - -namespace NCC.Frends.Entitys -{ - /// - /// 匹配记录 - /// - [SugarTable("base_mate_info")] - [Tenant(ClaimConst.TENANT_ID)] - public class BaseMateInfoEntity - { - /// - /// 主键 - /// - [SugarColumn(ColumnName = "F_Id", IsPrimaryKey = true)] - public string Id { get; set; } - - /// - /// 手机号 - /// - [SugarColumn(ColumnName = "F_Phone")] - public string Phone { get; set; } - - /// - /// 学历 - /// - [SugarColumn(ColumnName = "F_Educational")] - public string Educational { get; set; } - - /// - /// 专业 - /// - [SugarColumn(ColumnName = "F_Major")] - public string Major { get; set; } - - /// - /// 性别 - /// - [SugarColumn(ColumnName = "F_Sex")] - public string Sex { get; set; } - - /// - /// 年龄 - /// - [SugarColumn(ColumnName = "F_Age")] - public string Age { get; set; } - - /// - /// 户籍 - /// - [SugarColumn(ColumnName = "F_CensusRegister")] - public string CensusRegister { get; set; } - - /// - /// 意向城市 - /// - [SugarColumn(ColumnName = "F_IntendedCity")] - public string IntendedCity { get; set; } - - /// - /// 描述 - /// - [SugarColumn(ColumnName = "F_Description")] - public string Description { get; set; } - - /// - /// 匹配时间 - /// - [SugarColumn(ColumnName = "F_CreatorTime")] - public DateTime? CreatorTime { get; set; } - - /// - /// 匹配用户 - /// - [SugarColumn(ColumnName = "F_CreatorUserId")] - public string CreatorUserId { get; set; } - - /// - /// 来源 - /// - [SugarColumn(ColumnName = "F_Source")] - public string Source { get; set; } - - /// - /// 是否下载 - /// - [SugarColumn(ColumnName = "F_IsDown")] - public int? IsDown { get; set; } - - /// - /// 下载时间 - /// - [SugarColumn(ColumnName = "F_DownTime")] - public DateTime? DownTime { get; set; } - - /// - /// 下载类型 - /// - [SugarColumn(ColumnName = "F_DownInfo")] - public string DownInfo { get; set; } - - /// - /// 订单号 - /// - [SugarColumn(ColumnName = "F_OrderNo")] - public string OrderNo { get; set; } - - /// - /// 匹配出的企业数 - /// - [SugarColumn(ColumnName = "F_MateCount")] - public int? MateCount { get; set; } - - } -} \ No newline at end of file diff --git a/netcore/src/Modularity/Order/NCC.Order.Entitys/NCC.Order.Entitys.csproj b/netcore/src/Modularity/Order/NCC.Order.Entitys/NCC.Order.Entitys.csproj deleted file mode 100644 index a5d29ce..0000000 --- a/netcore/src/Modularity/Order/NCC.Order.Entitys/NCC.Order.Entitys.csproj +++ /dev/null @@ -1,15 +0,0 @@ - - - - net6.0 - - - - D:\wesley\project\git\antis-disk\netcore\src\Modularity\SimpleOrder\NCC.Frends.Entitys\NCC.Frends.Entitys.xml - - - - - - - diff --git a/netcore/src/Modularity/Order/NCC.Order.Entitys/NCC.Order.Entitys.xml b/netcore/src/Modularity/Order/NCC.Order.Entitys/NCC.Order.Entitys.xml deleted file mode 100644 index 7b1497e..0000000 --- a/netcore/src/Modularity/Order/NCC.Order.Entitys/NCC.Order.Entitys.xml +++ /dev/null @@ -1,2688 +0,0 @@ - - - - NCC.Order.Entitys - - - - - 用户余额变动修改输入参数 - - - - - 用户ID - - - - - 余额变动类型 - - - - - 订单号或其他来源 - - - - - 余额变动描述 - - - - - 变动时间 - - - - - 用户余额变动输出参数 - - - - - 主键 - - - - - 用户ID - - - - - 余额变动类型 - - - - - 订单号或其他来源 - - - - - 余额变动描述 - - - - - 变动时间 - - - - - 用户余额变动输入参数 - - - - - 主键 - - - - - 用户ID - - - - - 余额变动类型 - - - - - 订单号或其他来源 - - - - - 余额变动描述 - - - - - 变动时间 - - - - - 用户余额变动列表查询输入 - - - - - 选择导出数据key - - - - - - - - - - 用户ID - - - - - 余额变动类型 - - - - - 订单号或其他来源 - - - - - 变动时间 - - - - - 用户余额变动更新输入参数 - - - - - 主键 - - - - - 金额流水记录修改输入参数 - - - - - 容量 - - - - - 产品/套餐编号 - - - - - 用户编号 - - - - - 消费用户编号 - - - - - 来源 - - - - - 状态 - - - - - 创建时间 - - - - - 金额流水记录输出参数 - - - - - 主键 - - - - - 容量 - - - - - 产品/套餐编号 - - - - - 关联订单编号 - - - - - 用户编号 - - - - - 消费用户编号 - - - - - 用户 - - - - - 消费用户 - - - - - 来源 - - - - - 状态 - - - - - 创建时间 - - - - - 删除用户 - - - - - 删除时间 - - - - - 金额流水记录输入参数 - - - - - 主键 - - - - - 容量 - - - - - 产品/套餐编号 - - - - - 用户编号 - - - - - 消费用户编号 - - - - - 用户 - - - - - 消费用户 - - - - - 订单金额 - - - - - 订单编号 - - - - - 来源 - - - - - 状态 - - - - - 创建时间 - - - - - 金额流水记录列表查询输入 - - - - - 选择导出数据key - - - - - - - - - - 容量 - - - - - 产品/套餐编号 - - - - - 用户编号 - - - - - 来源 - - - - - 状态 - - - - - 创建时间 - - - - - 我的下级分销记录 - - - - - 金额流水记录更新输入参数 - - - - - 主键 - - - - - 分销规则设置修改输入参数 - - - - - 规则名称 - - - - - 提成比例 - - - - - 满多少能提现 - - - - - 单次最大提现金额 - - - - - 每个月能提现的数量 - - - - - 规则描述 - - - - - 备注 - - - - - 是否有效 - - - - - 排序码 - - - - - 创建时间 - - - - - 创建用户 - - - - - 修改时间 - - - - - 修改用户 - - - - - 营销规则-等级规则 - - - - - 分销规则设置修改输入参数 - - - - - 主键 - - - - - 等级名称 - - - - - 提成比例 - - - - - 满多少能提现 - - - - - 粉丝量范围-开始 - - - - - 单次最大提现金额 - - - - - 每个月能提现的数量 - - - - - 排序码 - - - - - 描述 - - - - - 分销规则设置输出参数 - - - - - 主键 - - - - - 规则ID - - - - - 等级名称 - - - - - 提成比例 - - - - - 满多少能提现 - - - - - 粉丝量范围-开始 - - - - - 粉丝量范围-结束（备用） - - - - - 单次最大提现金额 - - - - - 每个月能提现的数量 - - - - - 排序码 - - - - - 描述 - - - - - 粉丝数 - - - - - 分销规则设置更新输入参数 - - - - - 主键 - - - - - 分销规则设置输出参数 - - - - - 主键 - - - - - 规则名称 - - - - - 提成比例 - - - - - 满多少能提现 - - - - - 粉丝量范围-开始 - - - - - 粉丝量范围-结束（备用） - - - - - 单次最大提现金额 - - - - - 每个月能提现的数量 - - - - - 规则描述 - - - - - 备注 - - - - - 是否有效 - - - - - 排序码 - - - - - 创建时间 - - - - - 创建用户 - - - - - 修改时间 - - - - - 修改用户 - - - - - 营销规则-等级规则 - - - - - 分销规则设置输入参数 - - - - - 主键 - - - - - 规则名称 - - - - - 提成比例 - - - - - 满多少能提现 - - - - - 单次最大提现金额 - - - - - 每个月能提现的数量 - - - - - 备注 - - - - - 是否有效 - - - - - 排序码 - - - - - 创建时间 - - - - - 创建用户 - - - - - 修改时间 - - - - - 修改用户 - - - - - 营销规则-等级规则 - - - - - 分销规则设置列表查询输入 - - - - - 选择导出数据key - - - - - - - - - - 规则名称 - - - - - 提成比例 - - - - - 满多少能提现 - - - - - 单次最大提现金额 - - - - - 每个月能提现的数量 - - - - - 创建时间 - - - - - 创建用户 - - - - - 修改时间 - - - - - 修改用户 - - - - - 是否有效 - - - - - 分销规则设置更新输入参数 - - - - - 主键 - - - - - 订单模块V1修改输入参数 - - - - - 订单金额 - - - - - 产品ID - - - - - 订单来源 - - - - - 支付方式 h5 native = 扫码支付 - - - - - 描述 - - - - - 数量 - - - - - 订单模块V1输出参数 - - - - - 主键 - - - - - 订单标题 - - - - - 系统订单编号 - - - - - 下单时间 - - - - - 订单金额 - - - - - 产品ID - - - - - 订单状态 关联枚举值/数据字典 - - - - - 发货状态 - - - - - 支付状态 - - - - - 商户/店铺/门店ID - - - - - 售后状态 - - - - - 确认收货时间 - - - - - 使用积分 - - - - - 下单IP - - - - - 卖家备注 - - - - - 订单来源 - - - - - 支付方式 - - - - - 收货电话 - - - - - 收货人姓名 - - - - - 收货详细地址 - - - - - 收货地区 - - - - - 三方订单号 - - - - - 创建时间 - - - - - 创建用户 - - - - - 修改用户 - - - - - 修改时间 - - - - - 删除用户 - - - - - 删除时间 - - - - - 描述 - - - - - 产品信息 - - - - - 订单模块V1输入参数 - - - - - 主键 - - - - - 订单标题 - - - - - 系统订单编号 - - - - - 下单时间 - - - - - 数量 - - - - - 订单金额 - - - - - 产品ID - - - - - 产品名字 - - - - - 订单状态 关联枚举值/数据字典 - - - - - 状态说明 - - - - - 下单IP - - - - - 卖家备注 - - - - - 订单来源 - - - - - 支付方式 - - - - - 三方订单号 - - - - - 创建时间 - - - - - 创建用户 - - - - - 修改用户 - - - - - 修改时间 - - - - - 描述 - - - - - 商品标题 - - - - - 下单用户 - - - - - 商家名 - - - - - 商品图片集合 - - - - - 手机号 - - - - - 商品图片集合 - - - - - 订单模块V1列表查询输入 - - - - - 选择导出数据key - - - - - - - - - - 订单标题 - - - - - 系统订单编号 - - - - - 下单时间 - - - - - 订单金额 - - - - - 订单状态 关联枚举值/数据字典 - - - - - 卖家备注 - - - - - 支付方式 - - - - - 创建用户 - - - - - 下单返回 - - - - - 订单标题 - - - - - 系统订单编号 - - - - - 下单时间 - - - - - 订单金额 - - - - - 产品ID - - - - - openid - - - - - 二维码 base64 - - - - - 订单模块V1更新输入参数 - - - - - 主键 - - - - - 产品信息V1修改输入参数 - - - - - 产品名称 - - - - - 有效期开始时间 - - - - - 有效期结束时间 - - - - - 金额/单价 - - - - - 原价 - - - - - 折扣 - - - - - 图片集合 - - - - - 描述 - - - - - 创建时间 - - - - - 修改时间 - - - - - 修改用户 - - - - - 标签 - - - - - 创建用户 - - - - - 商品详情 - - - - - 商家ID - - - - - 年 - - - - - 容量 - - - - - 产品类型 - - - - - 产品信息V1修改输入参数 - - - - - 主键 - - - - - 标题 - - - - - 是否能使用优惠券 - - - - - 价格 - - - - - 原价 - - - - - 产品信息V1输出参数 - - - - - 主键 - - - - - 关联商品 - - - - - 标题 - - - - - 类型 - - - - - 是否能使用优惠券 - - - - - 价格 - - - - - 原价 - - - - - 备注 - - - - - 排序 - - - - - 创建用户 - - - - - 创建时间 - - - - - 产品信息V1更新输入参数 - - - - - 主键 - - - - - 产品信息V1输出参数 - - - - - 主键 - - - - - 产品名称 - - - - - 有效期开始时间 - - - - - 有效期结束时间 - - - - - 金额/单价 - - - - - 原价 - - - - - 折扣 - - - - - 折后价 - - - - - 门店 - - - - - 经度 - - - - - 纬度 - - - - - 缩略图 - - - - - 图片集合 - - - - - 主图 - - - - - 产品类型 - - - - - 描述 - - - - - 创建时间 - - - - - 删除用户 - - - - - 修改时间 - - - - - 修改用户 - - - - - 删除时间 - - - - - 排序码 - - - - - 标签 - - - - - 商品描述 - - - - - 产品状态 - - - - - 创建用户 - - - - - 商品详情 - - - - - 商家ID - - - - - 年 - - - - - 容量 - - - - - 产品信息V1输入参数 - - - - - 主键 - - - - - 产品名称 - - - - - 有效期开始时间 - - - - - 有效期结束时间 - - - - - 金额/单价 - - - - - 原价 - - - - - 折扣 - - - - - 创建时间 - - - - - 修改时间 - - - - - 修改用户 - - - - - 标签 - - - - - 创建用户 - - - - - 图片集合 - - - - - 图片集合 - - - - - 商家ID - - - - - 年 - - - - - 容量 - - - - - 产品类型 - - - - - 产品信息V1列表查询输入 - - - - - 选择导出数据key - - - - - - - - - - 产品名称 - - - - - 有效期开始时间 - - - - - 有效期结束时间 - - - - - 金额/单价 - - - - - 原价 - - - - - 标签 - - - - - 商家ID - - - - - 类型 - - - - - 产品信息V1更新输入参数 - - - - - 主键 - - - - - 金额流水记录 - - - - - 主键 - - - - - 容量 - - - - - 产品/套餐编号 - - - - - 关联订单编号 - - - - - 用户编号 - - - - - 消费用户编号 - - - - - 来源 - - - - - 状态 - - - - - 创建时间 - - - - - 删除用户 - - - - - 删除时间 - - - - - 商家信息 - - - - - 主键 - - - - - 排序码 - - - - - 描述 - - - - - 创建用户 - - - - - 创建时间 - - - - - 删除用户 - - - - - 删除时间 - - - - - 有效标志 - - - - - 修改用户 - - - - - 修改时间 - - - - - 商家名称 - - - - - 联系电话 - - - - - 标签 - - - - - 图片 - - - - - 地址 - - - - - 经度 - - - - - 维度 - - - - - 区域，省市 - - - - - 商家Logo - - - - - 均价/人 - - - - - 营业时间 - - - - - 关联用户 - - - - - 商家分类 - - - - - 是否首页置顶 - - - - - 优惠券记录 - - - - - 主键 - - - - - 我的优惠券 - - - - - 订单ID - - - - - 券码 - - - - - 二维码 - - - - - 用户ID - - - - - 是否使用 - - - - - 使用商品ID - - - - - 有效开始时间 - - - - - 有效结束时间 - - - - - 备注 - - - - - 创建时间 - - - - - 总金额 - - - - - 使用金额 - - - - - 剩余金额 - - - - - 订单模块V1 - - - - - 主键 - - - - - 订单标题 - - - - - 系统订单编号 - - - - - 下单时间 - - - - - 订单金额 - - - - - 产品ID - - - - - 订单状态 关联枚举值/数据字典 - - - - - 发货状态 - - - - - 支付状态 - - - - - 商户/店铺/门店ID - - - - - 售后状态 - - - - - 确认收货时间 - - - - - 使用积分 - - - - - 下单IP - - - - - 卖家备注 - - - - - 订单来源 - - - - - 支付方式 - - - - - 收货电话 - - - - - 收货人姓名 - - - - - 收货详细地址 - - - - - 收货地区 - - - - - 三方订单号 - - - - - 创建时间 - - - - - 创建用户 - - - - - 修改用户 - - - - - 修改时间 - - - - - 删除用户 - - - - - 删除时间 - - - - - 描述 - - - - - wx openid - - - - - 单价 - - - - - 数量 - - - - - 产品信息 - - - - - 主键 - - - - - 关联商品 - - - - - 标题 - - - - - 类型 - - - - - 是否能使用优惠券 - - - - - 价格 - - - - - 原价 - - - - - 备注 - - - - - 排序 - - - - - 创建用户 - - - - - 创建时间 - - - - - 产品信息V1 - - - - - 主键 - - - - - 产品名称 - - - - - 有效期开始时间 - - - - - 有效期结束时间 - - - - - 金额/单价 - - - - - 原价 - - - - - 折扣 - - - - - 折后价 - - - - - 门店 - - - - - 经度 - - - - - 纬度 - - - - - 缩略图 - - - - - 图片集合 - - - - - 主图 - - - - - 产品类型 - - - - - 描述 - - - - - 创建时间 - - - - - 删除用户 - - - - - 修改时间 - - - - - 修改用户 - - - - - 删除时间 - - - - - 排序码 - - - - - 标签 - - - - - 商品描述 - - - - - 产品状态 - - - - - 创建用户 - - - - - 商家ID - - - - - 查看量 - - - - - 容量 - - - - - 有效期-年 - - - - - 用户余额变动 - - - - - 主键 - - - - - 用户ID - - - - - 余额变动类型 - - - - - 订单号或其他来源 - - - - - 余额变动描述 - - - - - 变动时间 - - - - - 分销规则设置 - - - - - 主键 - - - - - 规则ID - - - - - 等级名称 - - - - - 提成比例 - - - - - 满多少能提现 - - - - - 粉丝量范围-开始 - - - - - 粉丝量范围-结束（备用） - - - - - 单次最大提现金额 - - - - - 每个月能提现的数量 - - - - - 排序码 - - - - - 描述 - - - - - 分销规则设置 - - - - - 主键 - - - - - 规则名称 - - - - - 提成比例 - - - - - 满多少能提现 - - - - - 粉丝量范围-开始 - - - - - 粉丝量范围-结束（备用） - - - - - 单次最大提现金额 - - - - - 每个月能提现的数量 - - - - - 规则描述 - - - - - 备注 - - - - - 是否有效 - - - - - 排序码 - - - - - 创建时间 - - - - - 创建用户 - - - - - 修改时间 - - - - - 修改用户 - - - - - 订单正常 - - - - - 已支付 - - - - - 订单取消 - - - - - 部分退款 - - - - - 已退款 - - - - - 已完成 - - - - - 资金类型 - - - - - - - - - - 分销提成 - - - - - 余额消费 - - - - - 提现 - - - - - 消费 - - - - - 退款 - - - - - 金额状态枚举 - - - - - 可用 - - - - - 锁定 - - - - - 冻结 - - - - - 无效 - - - - - 其他 - - - - diff --git a/netcore/src/Modularity/Order/NCC.Order.Interfaces/IBaseAmountHistoryService.cs b/netcore/src/Modularity/Order/NCC.Order.Interfaces/IBaseAmountHistoryService.cs deleted file mode 100644 index 88591a6..0000000 --- a/netcore/src/Modularity/Order/NCC.Order.Interfaces/IBaseAmountHistoryService.cs +++ /dev/null @@ -1,28 +0,0 @@ -using Microsoft.AspNetCore.Mvc; -using System.Threading.Tasks; - -namespace NCC.Order.Interfaces.BaseAmountHistory -{ - public interface IBaseAmountHistoryService - { - /// - /// 订单分销金额计算 还需要完善 - /// - /// - /// - Task DistributionAccount(string orderId); - - /// - /// 订单 匹配次数增加 - /// - /// - /// - Task UserMatchCountAccount(string orderId); - - /// - /// 获取当前用户所有剩余匹配次数 - /// - /// - int GetMatchOverCount(); - } -} \ No newline at end of file diff --git a/netcore/src/Modularity/Order/NCC.Order.Interfaces/IBaseOrderService.cs b/netcore/src/Modularity/Order/NCC.Order.Interfaces/IBaseOrderService.cs deleted file mode 100644 index 393aa24..0000000 --- a/netcore/src/Modularity/Order/NCC.Order.Interfaces/IBaseOrderService.cs +++ /dev/null @@ -1,22 +0,0 @@ -using Microsoft.AspNetCore.Mvc; -using NCC.Order.Entitys.Dto.BaseOrder; -using System.Threading.Tasks; - -namespace NCC.Order.Interfaces.BaseOrder -{ - public interface IBaseOrderService - { - /// - /// 获取订单模块 - /// - /// 参数 - /// - Task GetInfo(string id); - - /// - /// 扣减用户匹配次数 - /// - /// - Task DeductionCount(string userId, int matchCount = 1); - } -} \ No newline at end of file diff --git a/netcore/src/Modularity/Order/NCC.Order.Interfaces/IBaseProductService.cs b/netcore/src/Modularity/Order/NCC.Order.Interfaces/IBaseProductService.cs deleted file mode 100644 index 6e9d187..0000000 --- a/netcore/src/Modularity/Order/NCC.Order.Interfaces/IBaseProductService.cs +++ /dev/null @@ -1,19 +0,0 @@ -using NCC.Order.Entitys; -using System.Threading.Tasks; - -namespace NCC.Order.Interfaces.BaseProduct -{ - public interface IBaseProductService - { - /// - /// 获取单个产品详情 - /// - /// - /// - /// - Task GetInfo(string id, bool view = false); - - - Task GetEntity(string id); - } -} \ No newline at end of file diff --git a/netcore/src/Modularity/Order/NCC.Order.Interfaces/IBaseUserBalanceService.cs b/netcore/src/Modularity/Order/NCC.Order.Interfaces/IBaseUserBalanceService.cs deleted file mode 100644 index 08a3e1f..0000000 --- a/netcore/src/Modularity/Order/NCC.Order.Interfaces/IBaseUserBalanceService.cs +++ /dev/null @@ -1,6 +0,0 @@ -namespace NCC.Order.Interfaces.BaseUserBalance -{ - public interface IBaseUserBalanceService - { - } -} \ No newline at end of file diff --git a/netcore/src/Modularity/Order/NCC.Order.Interfaces/IMarketingRulesService.cs b/netcore/src/Modularity/Order/NCC.Order.Interfaces/IMarketingRulesService.cs deleted file mode 100644 index 5a6a51b..0000000 --- a/netcore/src/Modularity/Order/NCC.Order.Interfaces/IMarketingRulesService.cs +++ /dev/null @@ -1,20 +0,0 @@ -using NCC.Order.Entitys.Dto.MarketingRules; -using System.Threading.Tasks; - -namespace NCC.Order.Interfaces.MarketingRules -{ - public interface IMarketingRulesService - { - /// - /// 获取正在用的规则 (取一个) - /// - /// - Task CurrentRule(); - /// - /// 获取当前用户等级信息 - /// - /// - /// - Task GetUserRule(string userId=""); - } -} \ No newline at end of file diff --git a/netcore/src/Modularity/Order/NCC.Order.Interfaces/NCC.Order.Interfaces.csproj b/netcore/src/Modularity/Order/NCC.Order.Interfaces/NCC.Order.Interfaces.csproj deleted file mode 100644 index e07ebda..0000000 --- a/netcore/src/Modularity/Order/NCC.Order.Interfaces/NCC.Order.Interfaces.csproj +++ /dev/null @@ -1,11 +0,0 @@ - - - - net6.0 - - - - - - - diff --git a/netcore/src/Modularity/Order/NCC.Order/BaseAmountHistoryService.cs b/netcore/src/Modularity/Order/NCC.Order/BaseAmountHistoryService.cs deleted file mode 100644 index 50754db..0000000 --- a/netcore/src/Modularity/Order/NCC.Order/BaseAmountHistoryService.cs +++ /dev/null @@ -1,490 +0,0 @@ -using NCC.Common.Core.Manager; -using NCC.Common.Enum; -using NCC.Common.Extension; -using NCC.Common.Filter; -using NCC.Dependency; -using NCC.DynamicApiController; -using NCC.FriendlyException; -using NCC.Order.Interfaces.BaseAmountHistory; -using Mapster; -using Microsoft.AspNetCore.Mvc; -using SqlSugar; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Threading.Tasks; -using NCC.Order.Entitys; -using NCC.Order.Entitys.Dto.BaseAmountHistory; -using Yitter.IdGenerator; -using NCC.Common.Helper; -using NCC.JsonSerialization; -using NCC.System.Interfaces.System; -using NCC.Food.Entitys.Enum; -using NCC.Order.Interfaces.MarketingRules; -using NCC.Order.Interfaces.BaseOrder; -using Serilog; -using Antis.Pay.Core.Interface; -using NCC.System.Entitys.Permission; -using NCC.Core.Pay.WeChatPay.V2.Request; -using NCC.Core.Pay.WeChatPay.V2; -using NCC.Core.Pay.WeChatPay; -using Microsoft.Extensions.Options; -using NPOI.POIFS.Properties; - -namespace NCC.Order.BaseAmountHistory -{ - /// - /// 金额流水记录服务 - /// - [ApiDescriptionSettings(Tag = "订单流水", Name = "BaseAmountHistory", Order = 200)] - [Route("api/Order/[controller]")] - public class BaseAmountHistoryService : IBaseAmountHistoryService, IDynamicApiController, ITransient - { - private readonly ISqlSugarRepository _baseAmountHistoryRepository; - private readonly IDbLinkService _dbLinkService; - private readonly IDataBaseService _dataBaseService; - private readonly SqlSugarScope _db; - private readonly IUserManager _userManager; - private readonly IWePay _wepay; - - private readonly IWeChatPayClient _client; - private readonly IOptions _optionsAccessor; - /// - /// 初始化一个类型的新实例 - /// - public BaseAmountHistoryService( - ISqlSugarRepository baseAmountHistoryRepository, - IDbLinkService dbLinkService, - IDataBaseService dataBaseService, - IUserManager userManager, - IWePay wepay, - IWeChatPayClient client, - IOptions optionsAccessor) - { - _baseAmountHistoryRepository = baseAmountHistoryRepository; - _db = _baseAmountHistoryRepository.Context; - _dbLinkService = dbLinkService; - _dataBaseService = dataBaseService; - _userManager = userManager; - _wepay = wepay; - _client = client; - _optionsAccessor = optionsAccessor; - } - - /// - /// 获取金额流水记录 - /// - /// 参数 - /// - [HttpGet("{id}")] - public async Task GetInfo(string id) - { - var dbLink = await _dbLinkService.GetInfo("218239598550058245"); - _db.AddConnection(new ConnectionConfig() - { - ConfigId = dbLink.Id, - DbType = _dataBaseService.ToDbType(dbLink.DbType), - ConnectionString = _dataBaseService.ToConnectionString(dbLink), - InitKeyType = InitKeyType.Attribute, - IsAutoCloseConnection = true - }); - _db.ChangeDatabase(dbLink.Id); - var entity = await _db.Queryable().FirstAsync(p => p.Id == id); - var output = entity.Adapt(); - return output; - } - - /// - /// 获取金额流水记录列表 - /// - /// 请求参数 - /// - [HttpGet("")] - public async Task GetList([FromQuery] BaseAmountHistoryListQueryInput input) - { - var dbLink = await _dbLinkService.GetInfo("218239598550058245"); - _db.AddConnection(new ConnectionConfig() - { - ConfigId = dbLink.Id, - DbType = _dataBaseService.ToDbType(dbLink.DbType), - ConnectionString = _dataBaseService.ToConnectionString(dbLink), - InitKeyType = InitKeyType.Attribute, - IsAutoCloseConnection = true - }); - _db.ChangeDatabase(dbLink.Id); - var sidx = input.sidx == null ? "id" : input.sidx; - List queryCreatorTime = input.creatorTime != null ? input.creatorTime.Split(',').ToObeject>() : null; - DateTime? startCreatorTime = queryCreatorTime != null ? Ext.GetDateTime(queryCreatorTime.First()) : null; - DateTime? endCreatorTime = queryCreatorTime != null ? Ext.GetDateTime(queryCreatorTime.Last()) : null; - var data = await _db.Queryable() - .WhereIF(!string.IsNullOrEmpty(input.money), p => p.Money.Equals(input.money)) - .WhereIF(!string.IsNullOrEmpty(input.productId), p => p.ProductId.Contains(input.productId)) - .WhereIF(!string.IsNullOrEmpty(input.userId), p => p.UserId.Contains(input.userId)) - .WhereIF(!string.IsNullOrEmpty(input.source), p => p.Source.Contains(input.source)) - .WhereIF(!string.IsNullOrEmpty(input.status), p => p.Status.Equals(input.status)) - .WhereIF(queryCreatorTime != null, p => p.CreatorTime >= new DateTime(startCreatorTime.ToDate().Year, startCreatorTime.ToDate().Month, startCreatorTime.ToDate().Day, 0, 0, 0)) - .WhereIF(queryCreatorTime != null, p => p.CreatorTime <= new DateTime(endCreatorTime.ToDate().Year, endCreatorTime.ToDate().Month, endCreatorTime.ToDate().Day, 23, 59, 59)) - //.WhereIF(input.myChildren != null && input.myChildren.Value, p => - //p.Source == SqlFunc.ToString(MoneyHistoryType.分销提成.ToString()) - - //&& SqlFunc.Subqueryable().Where(o => o.ParentId == _userManager.UserId && o.Id == p.PayUserId).Any()) - .Select(p => new BaseAmountHistoryListOutput - { - id = p.Id, - money = p.Money, - productId = p.ProductId, - userId = p.UserId, - source = p.Source, - status = p.Status, - creatorTime = p.CreatorTime, - payUserId = p.PayUserId, - orderId = p.OrderId, - orderMoney = SqlFunc.Subqueryable().Where(od => od.Id == p.OrderId).Select(o => o.Money), - payUserName = SqlFunc.Subqueryable().Where(o => o.Id == p.PayUserId).Select(o => o.RealName), - userName = SqlFunc.Subqueryable().Where(o => o.Id == p.UserId).Select(o => o.RealName) - }).MergeTable().OrderBy(sidx + " " + input.sort).ToPagedListAsync(input.currentPage, input.pageSize); - return PageResult.SqlSugarPageResult(data); - } - - /// - /// 新建金额流水记录 - /// - /// 参数 - /// - [HttpPost("")] - public async Task Create([FromBody] BaseAmountHistoryCrInput input) - { - var dbLink = await _dbLinkService.GetInfo("218239598550058245"); - _db.AddConnection(new ConnectionConfig() - { - ConfigId = dbLink.Id, - DbType = _dataBaseService.ToDbType(dbLink.DbType), - ConnectionString = _dataBaseService.ToConnectionString(dbLink), - InitKeyType = InitKeyType.Attribute, - IsAutoCloseConnection = true - }); - _db.ChangeDatabase(dbLink.Id); - var userInfo = await _userManager.GetUserInfo(); - var entity = input.Adapt(); - entity.Id = YitIdHelper.NextId().ToString(); - entity.CreatorTime = DateTime.Now; - var isOk = await _db.Insertable(entity).IgnoreColumns(ignoreNullColumn: true).ExecuteCommandAsync(); - if (!(isOk > 0)) throw NCCException.Oh(ErrorCode.COM1000); - } - - /// - /// 更新金额流水记录 - /// - /// 主键 - /// 参数 - /// - [HttpPut("{id}")] - [NonAction] - public async Task Update(string id, [FromBody] BaseAmountHistoryUpInput input) - { - var dbLink = await _dbLinkService.GetInfo("218239598550058245"); - _db.AddConnection(new ConnectionConfig() - { - ConfigId = dbLink.Id, - DbType = _dataBaseService.ToDbType(dbLink.DbType), - ConnectionString = _dataBaseService.ToConnectionString(dbLink), - InitKeyType = InitKeyType.Attribute, - IsAutoCloseConnection = true - }); - _db.ChangeDatabase(dbLink.Id); - var entity = input.Adapt(); - var isOk = await _db.Updateable(entity).IgnoreColumns(ignoreAllNullColumns: true).ExecuteCommandAsync(); - if (!(isOk > 0)) throw NCCException.Oh(ErrorCode.COM1001); - } - - /// - /// 删除金额流水记录 - /// - /// - [HttpDelete("{id}")] - [NonAction] - public async Task Delete(string id) - { - var dbLink = await _dbLinkService.GetInfo("218239598550058245"); - _db.AddConnection(new ConnectionConfig() - { - ConfigId = dbLink.Id, - DbType = _dataBaseService.ToDbType(dbLink.DbType), - ConnectionString = _dataBaseService.ToConnectionString(dbLink), - InitKeyType = InitKeyType.Attribute, - IsAutoCloseConnection = true - }); - _db.ChangeDatabase(dbLink.Id); - var entity = await _db.Queryable().FirstAsync(p => p.Id == id); - _ = entity ?? throw NCCException.Oh(ErrorCode.COM1005); - var isOk = await _db.Deleteable().Where(d => d.Id == id).ExecuteCommandAsync(); - if (!(isOk > 0)) throw NCCException.Oh(ErrorCode.COM1002); - } - - /// - /// 获取当前用户所有余额 - /// - /// - [HttpGet("userAmount")] - public decimal GetUserAmount() - { - string UserId = _userManager.UserId; - return _db.Queryable() - .Where(u => - u.UserId == UserId - && u.Status == PriceStatus.可用.GetHashCode() - && u.Source != MoneyHistoryType.消费.ToString() - && u.Source != MoneyHistoryType.退款.ToString() - ).Sum(u => u.Money); - } - /// - /// 获取当前用户所有剩余匹配次数 - /// - /// - [HttpGet("GetMatchOverCount")] - public int GetMatchOverCount() - { - try - { - string UserId = _userManager.UserId; - return decimal.ToInt32(_db.Queryable() - .Where(u => - u.UserId == UserId - && u.Status == PriceStatus.可用.GetHashCode() - && u.Source == MoneyHistoryType.匹配次数.ToString() - - ).Sum(u => u.Money)); - } - catch (Exception) - { - return 0; - } - } - - - [HttpPost("transtest")] - public async Task transtest(int money = 1) - { - var user = _db.Queryable().First(o => o.Id == _userManager.UserId); - string orderid = YitIdHelper.NextId().ToString(); - var request = new WeChatPayPromotionTransfersRequest - { - PartnerTradeNo = orderid, - OpenId = user.OpenId, - CheckName = "NO_CHECK", - ReUserName = user.OpenId, - Amount = money, - Desc = "测试提现", - SpBillCreateIp = "" - }; - return await _client.ExecuteAsync(request, _optionsAccessor.Value); - } - - /// - /// 提现 - /// - /// 提现金额 - /// - [HttpGet("Withdrawal")] - public async Task Withdrawal(decimal money) - { - var user = _db.Queryable().First(o => o.Id == _userManager.UserId); - if (user == null) throw NCCException.Oh("用户信息拉取失败！"); - var cmoney = GetUserAmount(); - if (cmoney < money) throw NCCException.Oh("提现金额超过余额！"); - _db.BeginTran(); - try - { - string wid = YitIdHelper.NextId().ToString(); - string orderid = YitIdHelper.NextId().ToString(); - string? transfer = null; - //....... - //增加余额提现 - await _db.Insertable(new BaseAmountHistoryEntity() - { - CreatorTime = DateTime.Now, - Id = wid, - Money = -money, - OrderId = orderid, - ProductId = "", - Source = MoneyHistoryType.提现.ToString(), - Status = PriceStatus.可用.GetHashCode(), - UserId = _userManager.UserId, - }).ExecuteCommandAsync(); - - - //后面测试在做验证 - if (transfer == null) - { - _db.RollbackTran(); - throw NCCException.Oh("发起提现失败！"); - } - _db.CommitTran(); - } - catch (Exception) - { - _db.RollbackTran(); - } - - - } - - - /// - /// 代理星球首页信息 - /// - /// percentageScale 提成比例 myFans 我的粉丝 balance 余额 - [HttpGet("homeStatistics")] - public async Task HomeStatistics() - { - var rule = await App.GetService().GetUserRule(); - - decimal percentageScale = 0; - decimal myFans = 0; - decimal balance = GetUserAmount(); - if (rule != null) - { - myFans = rule.fansCount; - percentageScale = rule.proportion; - - } - return new - { - percentageScale, - myFans, - balance - }; - } - /// - /// 订单 匹配次数增加 - /// - /// - /// - [HttpPost("UserMatchCountAccount")] - public async Task UserMatchCountAccount(string orderId) - { - - try - { - var order = _db.Queryable().Where(o => o.Id == orderId).First();// await App.GetService().GetInfo(orderId); - if (order == null) - { - Log.Information($"订单 {orderId} 不存在！"); - return; - } - - if (_db.Queryable() - .Where(u => - u.OrderId == orderId - && u.Status == PriceStatus.可用.GetHashCode() - && u.Source == MoneyHistoryType.匹配次数.ToString()).Any()) - { - Log.Information($"订单 {orderId} 已处理过！"); - return; - } - var product = _db.Queryable().Where(o => o.Id == order.ProductId).First(); - if (product != null && product.Discount > 0) - { - List list = new List(); - for (int i = 0; i < product.Discount; i++) - { - //增加次数 - list.Add(new BaseAmountHistoryEntity() - { - CreatorTime = DateTime.Now, - Id = YitIdHelper.NextId().ToString(), - Money = 1, - OrderId = order.Id, - ProductId = order.ProductId, - Source = MoneyHistoryType.匹配次数.ToString(), - Status = PriceStatus.可用.GetHashCode(), - UserId = order.CreatorUserId, - PayUserId = order.CreatorUserId, - ValidStart = product.ValidStart, - ValidEnd = product.ValidEnd, - });//.ExecuteCommandAsync(); - } - await _db.Insertable(list).ExecuteCommandAsync(); - - } - else - { - Log.Information($" 匹配次数计算未进行"); - } - } - catch (Exception ex) - { - Log.Information($"匹配次数计算异常 原因 :{ex.Message}"); - } - } - - /// - /// 订单分销金额计算 还需要完善 分销的条件 不应该是所有人都能 - /// - /// - /// - public async Task DistributionAccount(string orderId) - { - return; - //try - //{ - // var order = _db.Queryable().Where(o => o.Id == orderId).First();// await App.GetService().GetInfo(orderId); - // if (order == null) - // { - // Log.Information($"订单 {orderId} 不存在！"); - // return; - // } - // var parentId = _db.Queryable().Where(o => o.Id == order.CreatorUserId).Select(o => o.ParentId).First(); - - // if (parentId.IsNullOrEmpty()) - // { - // Log.Information($"订单 {orderId}下单用户不是分销成员不进行分销！"); - // return; - // } - // Log.Information($"订单 {orderId} 开始计算分销提成！"); - // var rule = await App.GetService().GetUserRule(parentId); - - // if (order != null && rule != null && rule.proportion > 0) - // { - // decimal money = order.Money; - // money = (rule.proportion / 100) * money; //得到百分比的分销提成 - // if (_db.Queryable().Where(o => o.OrderId == order.Id && o.Source == MoneyHistoryType.分销提成.ToString()).Any()) - // { - // Log.Information($"订单 {order.Id} 已进行过分销不在进行处理！"); - // } - // else if (money <= 0) - // { - // Log.Information($"订单 {order.Id} 分销得到的金额小于等于0 不进行分销 金额= {money} "); - - // } - // else - // { - // //增加余额 - // await _db.Insertable(new BaseAmountHistoryEntity() - // { - // CreatorTime = DateTime.Now, - // Id = YitIdHelper.NextId().ToString(), - // Money = money, - // OrderId = order.Id, - // ProductId = order.ProductId, - // Source = MoneyHistoryType.分销提成.ToString(), - // Status = PriceStatus.可用.GetHashCode(), - // UserId = parentId, - // PayUserId = order.CreatorUserId - // }).ExecuteCommandAsync(); - // } - - // } - // else - // { - // Log.Information($"分销未进行"); - // } - //} - //catch (Exception ex) - //{ - // Log.Information($"分销异常 原因 :{ex.Message}"); - //} - } - - } -} diff --git a/netcore/src/Modularity/Order/NCC.Order/BaseOrderService.cs b/netcore/src/Modularity/Order/NCC.Order/BaseOrderService.cs deleted file mode 100644 index bf403f8..0000000 --- a/netcore/src/Modularity/Order/NCC.Order/BaseOrderService.cs +++ /dev/null @@ -1,910 +0,0 @@ -using NCC.Common.Core.Manager; -using NCC.Common.Enum; -using NCC.Common.Extension; -using NCC.Common.Filter; -using NCC.Dependency; -using NCC.DynamicApiController; -using NCC.FriendlyException; -using NCC.Order.Interfaces.BaseOrder; -using Mapster; -using Microsoft.AspNetCore.Mvc; -using SqlSugar; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Threading.Tasks; -using NCC.Order.Entitys; -using NCC.Order.Entitys.Dto.BaseOrder; -using Yitter.IdGenerator; -using NCC.Common.Helper; -using NCC.JsonSerialization; -using NCC.Common.Model.NPOI; -using NCC.Common.Configuration; -using NCC.DataEncryption; -using NCC.ClayObject; -using NCC.System.Interfaces.System; -using Antis.Pay.Core.Interface; -using Antis.Pay.Core.Model; -using Microsoft.AspNetCore.Mvc; -using Serilog; -using Microsoft.AspNetCore.Http; -using Microsoft.AspNetCore.Authorization; -using NCC.System.Entitys.Permission; -using Microsoft.Extensions.Logging; -using NCC.Common.Extensions; -using NCC.EventBridge; -using NCC.Order.Interfaces.BaseProduct; -using NCC.Code.QrCode; -using NCC.Order.Entitys.Dto.BaseProduct; -using NCC.Order.Interfaces.BaseAmountHistory; -using NCC.Core.Pay.WeChatPay.V2.Request; -using NCC.Core.Pay.WeChatPay.V2; -using NCC.Core.Pay.WeChatPay; -using Microsoft.Extensions.Options; -using NCC.Core.Pay.WeChatPay.V2.Notify; -using NCC.Food.Entitys.Enum; -using NCC.Frends.Entitys; -using Spire.Presentation; -using NCC.System.Entitys.Model.Permission.User; - -namespace NCC.Order.BaseOrder -{ - /// - /// 订单模块服务 - /// - [ApiDescriptionSettings(Tag = "订单模块", Name = "BaseOrder", Order = 200)] - [Route("api/Order/[controller]")] - public class BaseOrderService : IBaseOrderService, IDynamicApiController, ITransient - { - private readonly ISqlSugarRepository _baseOrderRepository; - private readonly IDbLinkService _dbLinkService; - private readonly IDataBaseService _dataBaseService; - private readonly SqlSugarScope _db; - private readonly IUserManager _userManager; - private readonly IWePay _wepay; - private readonly IHttpContextAccessor _httpContextAccessor; - private readonly ILogger _logger; - private readonly IBaseProductService _iProductService; - private readonly IWeChatPayNotifyClient _notifylient; - private readonly IWeChatPayClient _client; - private readonly IOptions _optionsAccessor; - /// - /// 初始化一个类型的新实例 - /// - public BaseOrderService( - ISqlSugarRepository baseOrderRepository, - IDbLinkService dbLinkService, - IDataBaseService dataBaseService, - IUserManager userManager, - IWePay wePay, - IHttpContextAccessor httpContextAccessor, - ILogger logger -, IBaseProductService iProductService, -IWeChatPayNotifyClient notifylient, -IWeChatPayClient client, -IOptions optionsAccessor) - { - _baseOrderRepository = baseOrderRepository; - _db = _baseOrderRepository.Context; - _dbLinkService = dbLinkService; - _dataBaseService = dataBaseService; - _userManager = userManager; - _wepay = wePay; - _httpContextAccessor = httpContextAccessor; - _logger = logger; - _iProductService = iProductService; - _notifylient = notifylient; - _client = client; - _optionsAccessor = optionsAccessor; - } - - /// - /// 获取订单模块 - /// - /// 参数 - /// - [HttpGet("{id}")] - public async Task GetInfo(string id) - { - var dbLink = await _dbLinkService.GetInfo("218239598550058245"); - _db.AddConnection(new ConnectionConfig() - { - ConfigId = dbLink.Id, - DbType = _dataBaseService.ToDbType(dbLink.DbType), - ConnectionString = _dataBaseService.ToConnectionString(dbLink), - InitKeyType = InitKeyType.Attribute, - IsAutoCloseConnection = true - }); - _db.ChangeDatabase(dbLink.Id); - var entity = await _db.Queryable().FirstAsync(p => p.Id == id); - var output = entity.Adapt(); - output.product = _iProductService.GetInfo(output.productId).GetAwaiter().GetResult(); - //output.coupon = _db.Queryable().FirstAsync(o => o.OrderId == entity.Id).Adapt(); - return output; - } - /// - /// 检测订单是否支付 - /// - /// - /// - [HttpGet("CheckOrderPay")] - public async Task CheckOrderPay(string id) - { - var isOk = await _db.Queryable().AnyAsync(p => p.Id == id && p.PayStatus == Entitys.Enum.OrderStatus.Yes.GetHashCode()); - - if (isOk) - { - return await GetInfo(id); - } - return false; - } - /// - /// 获取订单模块列表 - /// - /// 请求参数 - /// - [HttpGet("")] - public async Task GetList([FromQuery] BaseOrderListQueryInput input) - { - var dbLink = await _dbLinkService.GetInfo("218239598550058245"); - _db.AddConnection(new ConnectionConfig() - { - ConfigId = dbLink.Id, - DbType = _dataBaseService.ToDbType(dbLink.DbType), - ConnectionString = _dataBaseService.ToConnectionString(dbLink), - InitKeyType = InitKeyType.Attribute, - IsAutoCloseConnection = true - }); - _db.ChangeDatabase(dbLink.Id); - var user = await _userManager.GetUserInfo(); - var sidx = input.sidx == null ? "orderTime" : input.sidx; - List queryOrderTime = input.orderTime != null ? input.orderTime.Split(',').ToObeject>() : null; - DateTime? startOrderTime = queryOrderTime != null ? Ext.GetDateTime(queryOrderTime.First()) : null; - DateTime? endOrderTime = queryOrderTime != null ? Ext.GetDateTime(queryOrderTime.Last()) : null; - var data = await _db.Queryable((p, u, pd) => - p.ProductId == pd.Id && p.CreatorUserId == u.Id) - .WhereIF(!string.IsNullOrEmpty(input.title), p => p.Title.Contains(input.title)) - .WhereIF(!string.IsNullOrEmpty(input.orderNumber), p => p.OrderNumber.Contains(input.orderNumber)) - .WhereIF(queryOrderTime != null, p => p.OrderTime >= new DateTime(startOrderTime.ToDate().Year, startOrderTime.ToDate().Month, startOrderTime.ToDate().Day, 0, 0, 0)) - .WhereIF(queryOrderTime != null, p => p.OrderTime <= new DateTime(endOrderTime.ToDate().Year, endOrderTime.ToDate().Month, endOrderTime.ToDate().Day, 23, 59, 59)) - .WhereIF(!string.IsNullOrEmpty(input.money), p => p.Money.Equals(input.money)) - .WhereIF(!input.status.IsNullOrEmpty(), p => p.Status.Equals(input.status)) - .WhereIF(!string.IsNullOrEmpty(input.mark), p => p.Mark.Contains(input.mark)) - .WhereIF(!string.IsNullOrEmpty(input.payType), p => p.PayType.Contains(input.payType)) - .WhereIF(!string.IsNullOrEmpty(input.creatorUserId), p => p.CreatorUserId.Equals(input.creatorUserId)) - //.WhereIF(!PubUserEx.AdminUsers.Contains(user.userAccount), p => p.CreatorUserId == user.userId) - - .Select((p, u, pd) => new BaseOrderListOutput - { - id = p.Id, - title = p.Title, - orderNumber = p.OrderNumber, - orderTime = p.OrderTime, - money = p.Money, - productId = p.ProductId, - productName = pd.Title, - status = p.Status, - ip = p.Ip, - mark = p.Mark, - source = p.Source, - payType = p.PayType, - thirdPartyOrderNo = p.ThirdPartyOrderNo, - creatorTime = p.CreatorTime, - creatorUserId = p.CreatorUserId, - lastModifyUserId = p.LastModifyUserId, - lastModifyTime = p.LastModifyTime, - description = p.Description, - productTitle = pd.Title, - userFullName = u.RealName, - amount = p.Amount, - images = pd.Images, - phone = u.MobilePhone - - }).MergeTable().OrderBy(sidx + " " + input.sort).ToPagedListAsync(input.currentPage, input.pageSize); - - return PageResult.SqlSugarPageResult(data); - } - - /// - /// 新建订单模块V1 - /// - /// 参数 - /// - [HttpPost("")] - public async Task Create([FromBody] BaseOrderCrInput input) - { - - var dbLink = await _dbLinkService.GetInfo("218239598550058245"); - _db.AddConnection(new ConnectionConfig() - { - ConfigId = dbLink.Id, - DbType = _dataBaseService.ToDbType(dbLink.DbType), - ConnectionString = _dataBaseService.ToConnectionString(dbLink), - InitKeyType = InitKeyType.Attribute, - IsAutoCloseConnection = true - }); - _db.ChangeDatabase(dbLink.Id); - var userInfo = await _userManager.GetUserInfo(); - var entity = input.Adapt(); - entity.Id = YitIdHelper.NextId().ToString(); - entity.CreatorTime = DateTime.Now; - entity.CreatorUserId = _userManager.UserId; - var isOk = await _db.Insertable(entity).IgnoreColumns(ignoreNullColumn: true).ExecuteCommandAsync(); - if (!(isOk > 0)) throw NCCException.Oh(ErrorCode.COM1000); - } - - /// - /// 获取订单模块无分页列表 - /// - /// 请求参数 - /// - [NonAction] - public async Task GetNoPagingList([FromQuery] BaseOrderListQueryInput input) - { - - var dbLink = await _dbLinkService.GetInfo("218239598550058245"); - _db.AddConnection(new ConnectionConfig() - { - ConfigId = dbLink.Id, - DbType = _dataBaseService.ToDbType(dbLink.DbType), - ConnectionString = _dataBaseService.ToConnectionString(dbLink), - InitKeyType = InitKeyType.Attribute, - IsAutoCloseConnection = true - }); - _db.ChangeDatabase(dbLink.Id); - var sidx = input.sidx == null ? "orderTime" : input.sidx; - List queryOrderTime = input.orderTime != null ? input.orderTime.Split(',').ToObeject>() : null; - DateTime? startOrderTime = queryOrderTime != null ? Ext.GetDateTime(queryOrderTime.First()) : null; - DateTime? endOrderTime = queryOrderTime != null ? Ext.GetDateTime(queryOrderTime.Last()) : null; - var data = await _db.Queryable() - .WhereIF(!string.IsNullOrEmpty(input.title), p => p.Title.Contains(input.title)) - .WhereIF(!string.IsNullOrEmpty(input.orderNumber), p => p.OrderNumber.Contains(input.orderNumber)) - .WhereIF(queryOrderTime != null, p => p.OrderTime >= new DateTime(startOrderTime.ToDate().Year, startOrderTime.ToDate().Month, startOrderTime.ToDate().Day, 0, 0, 0)) - .WhereIF(queryOrderTime != null, p => p.OrderTime <= new DateTime(endOrderTime.ToDate().Year, endOrderTime.ToDate().Month, endOrderTime.ToDate().Day, 23, 59, 59)) - .WhereIF(!string.IsNullOrEmpty(input.money), p => p.Money.Equals(input.money)) - .WhereIF(!input.status.IsNullOrEmpty(), p => p.Status.Equals(input.status)) - .WhereIF(!string.IsNullOrEmpty(input.mark), p => p.Mark.Contains(input.mark)) - .WhereIF(!string.IsNullOrEmpty(input.payType), p => p.PayType.Contains(input.payType)) - .WhereIF(!string.IsNullOrEmpty(input.creatorUserId), p => p.CreatorUserId.Equals(input.creatorUserId)) - .Select(it => new BaseOrderListOutput - { - id = it.Id, - title = it.Title, - orderNumber = it.OrderNumber, - orderTime = it.OrderTime, - money = it.Money, - productId = it.ProductId, - status = it.Status, - ip = it.Ip, - mark = it.Mark, - source = it.Source, - payType = it.PayType, - thirdPartyOrderNo = it.ThirdPartyOrderNo, - creatorTime = it.CreatorTime, - creatorUserId = it.CreatorUserId, - lastModifyUserId = it.LastModifyUserId, - lastModifyTime = it.LastModifyTime, - description = it.Description, - }).MergeTable().OrderBy(sidx + " " + input.sort).ToListAsync(); - return data; - } - - /// - /// 导出订单模块V1 - /// - /// 请求参数 - /// - [HttpGet("Actions/Export")] - public async Task Export([FromQuery] BaseOrderListQueryInput input) - { - var userInfo = await _userManager.GetUserInfo(); - var exportData = new List(); - if (input.dataType == 0) - { - var data = Clay.Object(await this.GetList(input)); - exportData = data.Solidify>().list; - } - else - { - exportData = await this.GetNoPagingList(input); - } - List paramList = "[{\"value\":\"订单标题\",\"field\":\"title\"},{\"value\":\"系统订单编号\",\"field\":\"orderNumber\"},{\"value\":\"下单时间\",\"field\":\"orderTime\"},{\"value\":\"订单金额\",\"field\":\"money\"},{\"value\":\"产品ID\",\"field\":\"productId\"},{\"value\":\"订单状态\",\"field\":\"status\"},{\"value\":\"下单IP\",\"field\":\"ip\"},{\"value\":\"卖家备注\",\"field\":\"mark\"},{\"value\":\"订单来源\",\"field\":\"source\"},{\"value\":\"支付方式\",\"field\":\"payType\"},{\"value\":\"三方订单号\",\"field\":\"thirdPartyOrderNo\"},{\"value\":\"描述\",\"field\":\"description\"},{\"value\":\"创建用户\",\"field\":\"creatorUserId\"},{\"value\":\"创建时间\",\"field\":\"creatorTime\"},{\"value\":\"修改用户\",\"field\":\"lastModifyUserId\"},{\"value\":\"修改时间\",\"field\":\"lastModifyTime\"},]".ToList(); - ExcelConfig excelconfig = new ExcelConfig(); - excelconfig.FileName = "订单模块V1.xls"; - excelconfig.HeadFont = "微软雅黑"; - excelconfig.HeadPoint = 10; - excelconfig.IsAllSizeColumn = true; - excelconfig.ColumnModel = new List(); - List selectKeyList = input.selectKey.Split(',').ToList(); - foreach (var item in selectKeyList) - { - var isExist = paramList.Find(p => p.field == item); - if (isExist != null) - { - excelconfig.ColumnModel.Add(new ExcelColumnModel() { Column = isExist.field, ExcelColumn = isExist.value }); - } - } - var addPath = FileVariable.TemporaryFilePath + excelconfig.FileName; - ExcelExportHelper.Export(exportData, excelconfig, addPath); - var fileName = _userManager.UserId + "|" + addPath + "|xls"; - var output = new - { - name = excelconfig.FileName, - url = "/api/File/Download?encryption=" + DESCEncryption.Encrypt(fileName, "NCC") - }; - return output; - } - - /// - /// 更新订单模块V1 - /// - /// 主键 - /// 参数 - /// - [HttpPut("{id}")] - public async Task Update(string id, [FromBody] BaseOrderUpInput input) - { - var dbLink = await _dbLinkService.GetInfo("218239598550058245"); - _db.AddConnection(new ConnectionConfig() - { - ConfigId = dbLink.Id, - DbType = _dataBaseService.ToDbType(dbLink.DbType), - ConnectionString = _dataBaseService.ToConnectionString(dbLink), - InitKeyType = InitKeyType.Attribute, - IsAutoCloseConnection = true - }); - _db.ChangeDatabase(dbLink.Id); - var entity = input.Adapt(); - entity.LastModifyUserId = _userManager.UserId; - entity.LastModifyTime = DateTime.Now; - var isOk = await _db.Updateable(entity).IgnoreColumns(ignoreAllNullColumns: true).ExecuteCommandAsync(); - if (!(isOk > 0)) throw NCCException.Oh(ErrorCode.COM1001); - } - - /// - /// 删除订单模块 - /// - /// - [HttpDelete("{id}")] - public async Task Delete(string id) - { - var dbLink = await _dbLinkService.GetInfo("218239598550058245"); - _db.AddConnection(new ConnectionConfig() - { - ConfigId = dbLink.Id, - DbType = _dataBaseService.ToDbType(dbLink.DbType), - ConnectionString = _dataBaseService.ToConnectionString(dbLink), - InitKeyType = InitKeyType.Attribute, - IsAutoCloseConnection = true - }); - _db.ChangeDatabase(dbLink.Id); - var entity = await _db.Queryable().FirstAsync(p => p.Id == id); - _ = entity ?? throw NCCException.Oh(ErrorCode.COM1005); - var isOk = await _db.Deleteable().Where(d => d.Id == id).ExecuteCommandAsync(); - if (!(isOk > 0)) throw NCCException.Oh(ErrorCode.COM1002); - } - - #region 下单 - /// - /// 下单 - /// - /// 下单参数 - /// - [HttpPost("AddOrder")] - public async Task AddOrder([FromBody] BaseOrderCrInput input) - { - #region 下单前处理 - var product = await _db.Queryable().FirstAsync(o => o.Id == input.productId); - if (product == null) throw NCCException.Oh($"产品信息未找到！"); - //if (product.ValidEnd < DateTime.Now) throw NCCException.Oh($"产品有效期已过！"); - BaseOrderUnOrderResult result = new BaseOrderUnOrderResult(); - var httpContext = _httpContextAccessor.HttpContext; - var ip = httpContext.GetRemoteIpAddressToIPv4(); - var userInfo = await _userManager.GetUserInfo(); - var entity = input.Adapt(); - entity.Id = entity.OrderNumber = YitIdHelper.NextId().ToString(); - entity.Ip = ip; - entity.Title = product.Title; - entity.CreatorTime = DateTime.Now; - entity.CreatorUserId = _userManager.UserId; - entity.Status = Entitys.Enum.OrderStatus.No; - //entity.OpenId = userInfo.openId; - entity.OrderTime = DateTime.Now; - #endregion - - #region 计算订单金额 单价* 数量 - - if (input.amount < 1) input.amount = 1; - entity.Amount = input.amount; - entity.Price = product.Price; - entity.Money = entity.Price * entity.Amount; - - #endregion - //entity.Money = decimal.Parse("0.01"); - #region 下单过程 - - if (entity.Money <= 0) - { - throw NCCException.Oh(ErrorCode.Order1000); - } - _db.ScopedContext.BeginTran(); - - //添加订单 - try - { - var isOk = await _db.Insertable(entity).IgnoreColumns(ignoreNullColumn: true).ExecuteCommandAsync(); - if (!(isOk > 0)) - { - throw NCCException.Oh(ErrorCode.Order1000); - } - else - { - result = entity.Adapt(); - - //result.data = _wepay.BuildWePay(entity.OpenId, entity.OrderNumber, product.Title, _wepay.GetMoneyYuanToFen(entity.Money), ip, Antis.Pay.Core.Enum.EnumWePayTradeType.JSAPI).ToObject(); - - var request = new WeChatPayUnifiedOrderRequest - { - Body = product.Title, - OutTradeNo = entity.OrderNumber, - TotalFee = entity.Money.GetMoneyYuanToFen(), - SpBillCreateIp = ip, - NotifyUrl = _optionsAccessor.Value.NotifyUrl, - TradeType = "JSAPI", - OpenId = userInfo.openId - }; - var response = await _client.ExecuteAsync(request, _optionsAccessor.Value); - - if (response.ReturnCode == WeChatPayCode.Success && response.ResultCode == WeChatPayCode.Success) - { - //var req = new WeChatPayAppSdkRequest - //{ - // PrepayId = response.PrepayId - //}; - var req = new WeChatPayMiniProgramSdkRequest - { - Package = "prepay_id=" + response.PrepayId - }; - var parameter = await _client.ExecuteAsync(req, _optionsAccessor.Value); - result.data = parameter; - - - } - } - _db.ScopedContext.CommitTran(); - } - catch (Exception ex) - { - _logger.LogInformation($"下单异常：{ex.Message}"); - _db.ScopedContext.RollbackTran(); - } - - return result; - - #endregion - } - - - - /// - /// 充值 - /// - /// 金额 - /// - [HttpPost("recharge")] - public async Task Recharge(decimal money) - { - #region 下单前处理 - if (money <= 0) throw NCCException.Oh($"金额不能小于等于0！"); - BaseOrderUnOrderResult result = new BaseOrderUnOrderResult(); - var httpContext = _httpContextAccessor.HttpContext; - var ip = httpContext.GetRemoteIpAddressToIPv4(); - var userInfo = await _userManager.GetUserInfo(); - var entity = new BaseOrderEntity(); - entity.Id = entity.OrderNumber = YitIdHelper.NextId().ToString(); - entity.Ip = ip; - entity.Title = "充值"; - entity.CreatorTime = DateTime.Now; - entity.CreatorUserId = _userManager.UserId; - entity.Status = Entitys.Enum.OrderStatus.No; - //entity.OpenId = userInfo.openId; - entity.OrderTime = DateTime.Now; - #endregion - - #region 计算订单金额 单价* 数量 - - - entity.Amount = 1; - entity.Price = money; - entity.Money = money; - //entity.Money = decimal.Parse("0.01"); - - #endregion - //entity.Money = decimal.Parse("0.01"); - #region 下单过程 - - //if (entity.OpenId.IsNullOrEmpty() || entity.Money <= 0) - //{ - // throw NCCException.Oh(ErrorCode.Order1000); - //} - _db.ScopedContext.BeginTran(); - - //添加订单 - try - { - var isOk = await _db.Insertable(entity).IgnoreColumns(ignoreNullColumn: true).ExecuteCommandAsync(); - if (!(isOk > 0)) - { - throw NCCException.Oh(ErrorCode.Order1000); - } - else - { - result = entity.Adapt(); - - var request = new WeChatPayUnifiedOrderRequest - { - Body = "充值", - OutTradeNo = entity.OrderNumber, - TotalFee = entity.Money.GetMoneyYuanToFen(), - SpBillCreateIp = ip, - NotifyUrl = _optionsAccessor.Value.NotifyUrl, - TradeType = "APP" - }; - var response = await _client.ExecuteAsync(request, _optionsAccessor.Value); - - if (response.ReturnCode == WeChatPayCode.Success && response.ResultCode == WeChatPayCode.Success) - { - var req = new WeChatPayAppSdkRequest - { - PrepayId = response.PrepayId - }; - var parameter = await _client.ExecuteAsync(req, _optionsAccessor.Value); - result.data = parameter; - } - } - _db.ScopedContext.CommitTran(); - } - catch (Exception ex) - { - _logger.LogInformation($"下单异常：{ex.Message}"); - _db.ScopedContext.RollbackTran(); - } - - return result; - - #endregion - } - #endregion - - #region 支付回调 - - /// - /// 支付后回调处理 - /// - /// - [HttpGet("Unifiedorder"), HttpPost("Unifiedorder")] - [AllowAnonymous] - public async Task Unifiedorder() - { - _logger.LogInformation($"进入支付回调"); - try - { - var notify = await _notifylient.ExecuteAsync(_httpContextAccessor.HttpContext.Request, _optionsAccessor.Value); - _logger.LogInformation("统一下单支付结果通知 => OutTradeNo: " + notify.OutTradeNo); - - if (notify.ReturnCode == WeChatPayCode.Success) - { - _logger.LogInformation("统一下单支付成功: " + notify.OutTradeNo); - if (ChangeOrderStatus(notify.OutTradeNo, Entitys.Enum.OrderStatus.Yes).GetAwaiter().GetResult()) - return WeChatPayNotifyResult.Success; - else return WeChatPayNotifyResult.Failure; - } - - return WeChatPayNotifyResult.Failure; - } - catch (WeChatPayException ex) - { - _logger.LogWarning("出现异常: " + ex.Message); - return WeChatPayNotifyResult.Failure; - } - } - /// - /// 获取当前用户所有剩余匹配次数 - /// - /// - [HttpGet("GetMatchOverCount")] - public int GetMatchOverCount() - { - //return App.GetService().GetMatchOverCount(); - string UserId = _userManager.UserId; - var matchCount = _db.Queryable().Where(o => o.Id == UserId).Select(o => o.ExtensionLong).First(); - return decimal.ToInt32(matchCount); - } - - /// - /// 扣减用户匹配次数 - /// - /// - [NonAction] - public async Task DeductionCount(string userId, int matchCount = 1) - { - - try - { - var count = _db.Queryable().Where(o => o.Id == userId).Select(o => o.ExtensionLong).First(); - if (count >= matchCount) - count -= count; - else - { - return false; - } - await _db.Updateable().SetColumns(o => o.ExtensionLong == count).Where(o => o.Id == userId).ExecuteCommandAsync(); - return true; - } - catch (Exception ee) - { - Log.Information($" 增加用户匹配次数失败 {ee.Message}"); - - } - return false; - } - - /// - /// 扣减用户匹配次数 - /// - /// - [NonAction] - public async Task DeductionCountHistory(string userId, int matchCount = 1) - { - try - { - var history = _db.Queryable() - .Where(u => - u.UserId == userId - && u.Status == PriceStatus.可用.GetHashCode() - && u.Source == MoneyHistoryType.匹配次数.ToString() - ) - .Select(o => o.Id) - .First(); - if (history != null) - { - await _db.Updateable() - .SetColumns(o => o.Status == PriceStatus.使用.GetHashCode()) - .Where(o => o.Id == history) - .ExecuteCommandAsync(); - return true; - } - else - { - return false; - } - } - catch (Exception ee) - { - Log.Information($" 扣减匹配次数失败 {ee.Message}"); - - } - return false; - } - - - - /// - /// 清除过期的匹配次数 - /// - /// - [HttpPost("ClearTimeOutMatchCount")] - public async Task ClearTimeOutMatchCount() - { - try - { - await _db.Updateable() - .SetColumns(o => o.Status == PriceStatus.无效.GetHashCode()) - .Where(o => !SqlFunc.IsNullOrEmpty(o.ValidEnd) && SqlFunc.GetDate() > o.ValidEnd) - .ExecuteCommandAsync(); - } - catch (Exception ee) - { - Log.Information($" 扣减匹配次数失败 {ee.Message}"); - - } - return false; - } - - - /// - /// 支付后回调处理 - /// - /// - [HttpGet("WePayNotify"), HttpPost("WePayNotify")] - [AllowAnonymous] - public string WePayNotify() - { - _logger.LogInformation($"进入支付回调"); - WePayReturnModel payResult = new WePayReturnModel(); - - //支付成功 - if (_wepay.VerifyNotify(out payResult)) - { - _logger.LogInformation($"支付回调验证成功 payResult={payResult.ToJson()}"); - if (ChangeOrderStatus(payResult.OutTradeNo, Entitys.Enum.OrderStatus.Yes).GetAwaiter().GetResult()) - return _wepay.GetReturnXml("SUCCESS", "OK"); - else return _wepay.GetReturnXml("FAIL", "ERROR"); - } - else - { - _logger.LogInformation($"支付回调验证失败 payResult={payResult.ToJson()}"); - return _wepay.GetReturnXml("FAIL", "ERROR"); - } - } - - - /// - /// 支付后回调处理 - /// - /// - [HttpGet("WePayNavNotify"), HttpPost("WePayNavNotify")] - [AllowAnonymous] - public string WePayNavNotify() - { - _logger.LogInformation($"进入扫码支付回调"); - WePayReturnModel payResult = new WePayReturnModel(); - - //支付成功 - if (_wepay.VerifyNotify(out payResult)) - { - _logger.LogInformation($"扫码支付回调验证成功 payResult={payResult.ToJson()}"); - if (ChangeOrderStatus(payResult.OutTradeNo, Entitys.Enum.OrderStatus.Yes).GetAwaiter().GetResult()) - return _wepay.GetReturnXml("SUCCESS", "OK"); - else return _wepay.GetReturnXml("FAIL", "ERROR"); - } - else - { - _logger.LogInformation($"支付回调验证失败 payResult={payResult.ToJson()}"); - return _wepay.GetReturnXml("FAIL", "ERROR"); - } - } - - - /// - /// 修改订单状态 - /// - /// - /// - /// - /// - [HttpPost("ChangeOrderStatus")] - public async Task ChangeOrderStatus(string orderid, Entitys.Enum.OrderStatus status, string tag = "回调") - { - _logger.LogInformation($"Order ChangeOrderStatus orderid={orderid} status={status.GetHashCode()}"); - var order = await _db.Queryable().FirstAsync(o => o.OrderNumber == orderid); // && o.Status == Entitys.Enum.OrderStatus.No - if (order != null) - { - if (tag == "回调" && order.Status != Entitys.Enum.OrderStatus.No) - { - return true;//已处理过 直接成功 - } - //修改订单状态为 已支付 - _logger.LogInformation($"开始事务处理"); - _db.BeginTran(); - try - { - if (!order.ProductId.IsNullOrEmpty()) - { - //decimal zhuanshi = order.Money; - //try - //{ - // if (order.Money == 100) zhuanshi = 110; - // if (order.Money == 200) zhuanshi = 230; - // if (order.Money == 400) zhuanshi = 450; - //} - //catch (Exception) - //{ - - //} - if (order.Source == "匹配") - { - _db.Updateable() - .SetColumns(x => x.OrderNo == order.Id) - .Where(x => x.Id == order.ProductId) - .ExecuteCommand(); - - } - else - { - //增加匹配次数 临时用 - var product = _db.Queryable().Where(o => o.Id == order.ProductId).First(); - if (product != null && product.Discount > 0) - { - try - { - var matchCount = _db.Queryable().Where(o => o.Id == order.CreatorUserId).Select(o => o.ExtensionLong).First(); - - matchCount += decimal.ToInt32(product.Discount); - - await _db.Updateable().SetColumns(o => o.ExtensionLong == matchCount).Where(o => o.Id == order.CreatorUserId).ExecuteCommandAsync(); - - } - catch (Exception ee) - { - Log.Information($" 增加用户匹配次数失败 {ee.Message}"); - } - App.GetService().UserMatchCountAccount(order.Id); - } - } - #region MyRegion - //#region 是充值的情况 - ////增加充值记录 - //await _db.Insertable(new BaseAmountHistoryEntity() - //{ - // CreatorTime = DateTime.Now, - // Id = YitIdHelper.NextId().ToString(), - // Money = order.Money, - // OrderId = orderid, - // ProductId = "", - // Source = MoneyHistoryType.充值.ToString(), - // Status = PriceStatus.可用.GetHashCode(), - // UserId = order.CreatorUserId, - //}).ExecuteCommandAsync(); - ////增加砖石 - //await _db.Insertable(new BaseAmountHistoryEntity() - //{ - // CreatorTime = DateTime.Now, - // Id = YitIdHelper.NextId().ToString(), - // Money = zhuanshi, //order.Money * 10 - // OrderId = orderid, - // ProductId = "", - // Source = MoneyHistoryType.砖石.ToString(), - // Status = PriceStatus.可用.GetHashCode(), - // UserId = order.CreatorUserId, - //}).ExecuteCommandAsync(); - //#endregion - #endregion - } - - - - int update = _db.Updateable( - new BaseOrderEntity - { - Status = Entitys.Enum.OrderStatus.Yes, - PayStatus = Entitys.Enum.OrderStatus.Yes.GetHashCode() - }) - .UpdateColumns( - it => new - { - it.Status, - it.PayStatus - } - ) - .Where(o => o.Id == order.Id) - .ExecuteCommand(); - _logger.LogInformation($"{tag} 订单 状态修改 为已支付{(update > 0 ? "成功" : "失败")}"); - order.Status = Entitys.Enum.OrderStatus.Yes; - - - _db.CommitTran(); - //if (product) - - } - catch (Exception ex) - { - _logger.LogInformation($"{tag} 订单 状态修改失败 消息：{ex.Message}"); - - _db.RollbackTran(); - } - return true; - } - else - { - _logger.LogInformation($" {tag} 订单 状态修改 信息失败 信息未找到 订单号={orderid}！"); - return false; - } - - } - - #endregion - - - } -} diff --git a/netcore/src/Modularity/Order/NCC.Order/BaseProductService.cs b/netcore/src/Modularity/Order/NCC.Order/BaseProductService.cs deleted file mode 100644 index 093eea5..0000000 --- a/netcore/src/Modularity/Order/NCC.Order/BaseProductService.cs +++ /dev/null @@ -1,428 +0,0 @@ -using NCC.Common.Core.Manager; -using NCC.Common.Enum; -using NCC.Common.Extension; -using NCC.Common.Filter; -using NCC.Dependency; -using NCC.DynamicApiController; -using NCC.FriendlyException; -using Mapster; -using Microsoft.AspNetCore.Mvc; -using SqlSugar; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Threading.Tasks; -using NCC.Order.Entitys; -using NCC.Order.Entitys.Dto.BaseProduct; -using Yitter.IdGenerator; -using NCC.Common.Helper; -using NCC.JsonSerialization; -using NCC.Common.Model.NPOI; -using NCC.Common.Configuration; -using NCC.DataEncryption; -using NCC.ClayObject; -using NCC.System.Interfaces.System; -using NCC.Common.Model; -using NCC.Order.Interfaces.BaseProduct; - -namespace NCC.Order.BaseProduct -{ - /// - /// 商品信息服务 - /// - [ApiDescriptionSettings(Tag = "商品信息", Name = "BaseProduct", Order = 200)] - [Route("api/Order/[controller]")] - public class BaseProductService : IBaseProductService, IDynamicApiController, ITransient - { - private readonly ISqlSugarRepository _baseProductRepository; - private readonly ISqlSugarRepository _baseProductDetailsRepository; - private readonly IDbLinkService _dbLinkService; - private readonly IDataBaseService _dataBaseService; - private readonly SqlSugarScope _db; - private readonly IUserManager _userManager; - - /// - /// 初始化一个类型的新实例 - /// - public BaseProductService( - ISqlSugarRepository baseProductRepository, - ISqlSugarRepository baseProductDetailsRepository, - IDbLinkService dbLinkService, - IDataBaseService dataBaseService, - IUserManager userManager) - { - _baseProductRepository = baseProductRepository; - _db = _baseProductRepository.Context; - _baseProductDetailsRepository = baseProductDetailsRepository; - _dbLinkService = dbLinkService; - _dataBaseService = dataBaseService; - _userManager = userManager; - } - - /// - /// 获取产品信息V1 - /// - /// 参数 - /// 参数 - /// - [HttpGet("{id}")] - public async Task GetInfo(string id, bool view = false) - { - var dbLink = await _dbLinkService.GetInfo("218239598550058245"); - _db.AddConnection(new ConnectionConfig() - { - ConfigId = dbLink.Id, - DbType = _dataBaseService.ToDbType(dbLink.DbType), - ConnectionString = _dataBaseService.ToConnectionString(dbLink), - InitKeyType = InitKeyType.Attribute, - IsAutoCloseConnection = true - }); - _db.ChangeDatabase(dbLink.Id); - var entity = await _db.Queryable().FirstAsync(p => p.Id == id); - if (view) - { - //增加浏览量 - await _db.Updateable().SetColumns(x => new BaseProductEntity() - { - Visit = entity.Visit + 1 - }).Where(o => o.Id == entity.Id).ExecuteCommandAsync(); - } - var output = entity.Adapt(); - //if (output.creatorUserId.IsNotEmptyOrNull()) - // output.BusinessInfo = _db.Queryable().FirstAsync(p => p.ReUserId == output.creatorUserId).GetAwaiter().GetResult().Adapt(); - var baseProductDetailsList = await _db.Queryable().Where(w => w.ProductId == entity.Id).ToListAsync(); - output.baseProductDetailsList = baseProductDetailsList.Adapt>(); - return output; - } - - - [HttpGet("GetEntity")] - public async Task GetEntity(string id) - { - - var entity = await _db.Queryable().FirstAsync(p => p.Id == id); - - return entity; - } - - /// - /// 获取产品信息列表 - /// - /// 请求参数 - /// - [HttpGet("")] - public async Task GetList([FromQuery] BaseProductListQueryInput input) - { - var dbLink = await _dbLinkService.GetInfo("218239598550058245"); - _db.AddConnection(new ConnectionConfig() - { - ConfigId = dbLink.Id, - DbType = _dataBaseService.ToDbType(dbLink.DbType), - ConnectionString = _dataBaseService.ToConnectionString(dbLink), - InitKeyType = InitKeyType.Attribute, - IsAutoCloseConnection = true - }); - _db.ChangeDatabase(dbLink.Id); - var sidx = input.sidx == null ? "lastModifyTime" : input.sidx; - List queryValidStart = input.validStart != null ? input.validStart.Split(',').ToObeject>() : null; - DateTime? startValidStart = queryValidStart != null ? Ext.GetDateTime(queryValidStart.First()) : null; - DateTime? endValidStart = queryValidStart != null ? Ext.GetDateTime(queryValidStart.Last()) : null; - List queryValidEnd = input.validEnd != null ? input.validEnd.Split(',').ToObeject>() : null; - DateTime? startValidEnd = queryValidEnd != null ? Ext.GetDateTime(queryValidEnd.First()) : null; - DateTime? endValidEnd = queryValidEnd != null ? Ext.GetDateTime(queryValidEnd.Last()) : null; - var user = await _userManager.GetUserInfo(); - - var data = await _db.Queryable() - .WhereIF(!string.IsNullOrEmpty(input.title), p => p.Title.Contains(input.title)) - .WhereIF(queryValidStart != null, p => p.ValidStart >= new DateTime(startValidStart.ToDate().Year, startValidStart.ToDate().Month, startValidStart.ToDate().Day, 0, 0, 0)) - .WhereIF(queryValidStart != null, p => p.ValidStart <= new DateTime(endValidStart.ToDate().Year, endValidStart.ToDate().Month, endValidStart.ToDate().Day, 23, 59, 59)) - .WhereIF(queryValidEnd != null, p => p.ValidEnd >= new DateTime(startValidEnd.ToDate().Year, startValidEnd.ToDate().Month, startValidEnd.ToDate().Day, 0, 0, 0)) - .WhereIF(queryValidEnd != null, p => p.ValidEnd <= new DateTime(endValidEnd.ToDate().Year, endValidEnd.ToDate().Month, endValidEnd.ToDate().Day, 23, 59, 59)) - .WhereIF(!string.IsNullOrEmpty(input.price), p => p.Price.Equals(input.price)) - .WhereIF(!string.IsNullOrEmpty(input.originalPrice), p => p.OriginalPrice.Equals(input.originalPrice)) - .WhereIF(!string.IsNullOrEmpty(input.tags), p => p.Tags.Contains(input.tags)) - .WhereIF(!string.IsNullOrEmpty(input.type), p => p.Type.Equals(input.type)) - //.WhereIF(!PubUserEx.AdminUsers.Contains(user.userAccount) && user.openId.IsNullOrEmpty(), p => p.CreatorUserId == user.userId) - - - .WhereIF(!input.BusinessId.IsNullOrEmpty(), p => p.CreatorUserId == input.BusinessId) //商家id筛选 - .Select(it => new BaseProductListOutput - { - id = it.Id, - title = it.Title, - validStart = it.ValidStart, - validEnd = it.ValidEnd, - price = it.Price, - originalPrice = it.OriginalPrice, - discount = it.Discount, - creatorTime = it.CreatorTime, - lastModifyTime = it.LastModifyTime, - lastModifyUserId = it.LastModifyUserId, - tags = it.Tags, - creatorUserId = it.CreatorUserId, - images = it.Images, - Visit = it.Visit, - volume = it.volume, - year = it.Year, - type = it.Type, - remark = it.Remark - }).MergeTable().OrderBy(sidx + " " + input.sort).ToPagedListAsync(input.currentPage, input.pageSize); - - //foreach (var item in data.list) - //{ - // if (item.creatorUserId.IsNotEmptyOrNull()) - // item.BusinessInfo = _db.Queryable().FirstAsync(p => p.ReUserId == item.creatorUserId).GetAwaiter().GetResult().Adapt(); - //} - return PageResult.SqlSugarPageResult(data); - } - - - - /// - /// 新建产品信息 - /// - /// 参数 - /// - [HttpPost("")] - public async Task Create([FromBody] BaseProductCrInput input) - { - var dbLink = await _dbLinkService.GetInfo("218239598550058245"); - _db.AddConnection(new ConnectionConfig() - { - ConfigId = dbLink.Id, - DbType = _dataBaseService.ToDbType(dbLink.DbType), - ConnectionString = _dataBaseService.ToConnectionString(dbLink), - InitKeyType = InitKeyType.Attribute, - IsAutoCloseConnection = true - }); - _db.ChangeDatabase(dbLink.Id); - var userInfo = await _userManager.GetUserInfo(); - var entity = input.Adapt(); - entity.Id = YitIdHelper.NextId().ToString(); - entity.CreatorTime = DateTime.Now; - entity.CreatorUserId = _userManager.UserId; - try - { - //开启事务 - _db.BeginTran(); - - //新增产品信息V1记录 - var newEntity = await _db.Insertable(entity).IgnoreColumns(ignoreNullColumn: true).ExecuteReturnEntityAsync(); - - var baseProductDetailsEntityList = input.baseProductDetailsList.Adapt>(); - if (baseProductDetailsEntityList != null) - { - foreach (var item in baseProductDetailsEntityList) - { - item.Id = YitIdHelper.NextId().ToString(); - item.ProductId = newEntity.Id; - } - await _db.Insertable(baseProductDetailsEntityList).ExecuteCommandAsync(); - } - - //关闭事务 - _db.CommitTran(); - } - catch (Exception ex) - { - //回滚事务 - _db.RollbackTran(); - throw NCCException.Oh(ErrorCode.COM1000); - } - } - - /// - /// 获取产品信息V1无分页列表 - /// - /// 请求参数 - /// - [NonAction] - public async Task GetNoPagingList([FromQuery] BaseProductListQueryInput input) - { - var dbLink = await _dbLinkService.GetInfo("218239598550058245"); - _db.AddConnection(new ConnectionConfig() - { - ConfigId = dbLink.Id, - DbType = _dataBaseService.ToDbType(dbLink.DbType), - ConnectionString = _dataBaseService.ToConnectionString(dbLink), - InitKeyType = InitKeyType.Attribute, - IsAutoCloseConnection = true - }); - _db.ChangeDatabase(dbLink.Id); - var sidx = input.sidx == null ? "lastModifyTime" : input.sidx; - List queryValidStart = input.validStart != null ? input.validStart.Split(',').ToObeject>() : null; - DateTime? startValidStart = queryValidStart != null ? Ext.GetDateTime(queryValidStart.First()) : null; - DateTime? endValidStart = queryValidStart != null ? Ext.GetDateTime(queryValidStart.Last()) : null; - List queryValidEnd = input.validEnd != null ? input.validEnd.Split(',').ToObeject>() : null; - DateTime? startValidEnd = queryValidEnd != null ? Ext.GetDateTime(queryValidEnd.First()) : null; - DateTime? endValidEnd = queryValidEnd != null ? Ext.GetDateTime(queryValidEnd.Last()) : null; - var data = await _db.Queryable() - .WhereIF(!string.IsNullOrEmpty(input.title), p => p.Title.Contains(input.title)) - .WhereIF(queryValidStart != null, p => p.ValidStart >= new DateTime(startValidStart.ToDate().Year, startValidStart.ToDate().Month, startValidStart.ToDate().Day, 0, 0, 0)) - .WhereIF(queryValidStart != null, p => p.ValidStart <= new DateTime(endValidStart.ToDate().Year, endValidStart.ToDate().Month, endValidStart.ToDate().Day, 23, 59, 59)) - .WhereIF(queryValidEnd != null, p => p.ValidEnd >= new DateTime(startValidEnd.ToDate().Year, startValidEnd.ToDate().Month, startValidEnd.ToDate().Day, 0, 0, 0)) - .WhereIF(queryValidEnd != null, p => p.ValidEnd <= new DateTime(endValidEnd.ToDate().Year, endValidEnd.ToDate().Month, endValidEnd.ToDate().Day, 23, 59, 59)) - .WhereIF(!string.IsNullOrEmpty(input.price), p => p.Price.Equals(input.price)) - .WhereIF(!string.IsNullOrEmpty(input.originalPrice), p => p.OriginalPrice.Equals(input.originalPrice)) - .WhereIF(!string.IsNullOrEmpty(input.tags), p => p.Tags.Contains(input.tags)) - .Select(it => new BaseProductListOutput - { - id = it.Id, - title = it.Title, - validStart = it.ValidStart, - validEnd = it.ValidEnd, - price = it.Price, - originalPrice = it.OriginalPrice, - discount = it.Discount, - creatorTime = it.CreatorTime, - lastModifyTime = it.LastModifyTime, - lastModifyUserId = it.LastModifyUserId, - tags = it.Tags, - creatorUserId = it.CreatorUserId, - }).MergeTable().OrderBy(sidx + " " + input.sort).ToListAsync(); - return data; - } - - /// - /// 导出产品信息V1 - /// - /// 请求参数 - /// - [HttpGet("Actions/Export")] - public async Task Export([FromQuery] BaseProductListQueryInput input) - { - var userInfo = await _userManager.GetUserInfo(); - var exportData = new List(); - if (input.dataType == 0) - { - var data = Clay.Object(await this.GetList(input)); - exportData = data.Solidify>().list; - } - else - { - exportData = await this.GetNoPagingList(input); - } - List paramList = "[{\"value\":\"产品/套餐\",\"field\":\"title\"},{\"value\":\"金额/单价\",\"field\":\"price\"},{\"value\":\"原价\",\"field\":\"originalPrice\"},{\"value\":\"折扣\",\"field\":\"discount\"},{\"value\":\"标签\",\"field\":\"tags\"},{\"value\":\"有效期 (开始)\",\"field\":\"validStart\"},{\"value\":\"有效期 (结束)\",\"field\":\"validEnd\"},{\"value\":\"创建用户\",\"field\":\"creatorUserId\"},{\"value\":\"创建时间\",\"field\":\"creatorTime\"},{\"value\":\"修改用户\",\"field\":\"lastModifyUserId\"},{\"value\":\"修改时间\",\"field\":\"lastModifyTime\"},]".ToList(); - ExcelConfig excelconfig = new ExcelConfig(); - excelconfig.FileName = "产品信息V1.xls"; - excelconfig.HeadFont = "微软雅黑"; - excelconfig.HeadPoint = 10; - excelconfig.IsAllSizeColumn = true; - excelconfig.ColumnModel = new List(); - List selectKeyList = input.selectKey.Split(',').ToList(); - foreach (var item in selectKeyList) - { - var isExist = paramList.Find(p => p.field == item); - if (isExist != null) - { - excelconfig.ColumnModel.Add(new ExcelColumnModel() { Column = isExist.field, ExcelColumn = isExist.value }); - } - } - var addPath = FileVariable.TemporaryFilePath + excelconfig.FileName; - ExcelExportHelper.Export(exportData, excelconfig, addPath); - var fileName = _userManager.UserId + "|" + addPath + "|xls"; - var output = new - { - name = excelconfig.FileName, - url = "/api/File/Download?encryption=" + DESCEncryption.Encrypt(fileName, "NCC") - }; - return output; - } - - /// - /// 更新产品信息V1 - /// - /// 主键 - /// 参数 - /// - [HttpPut("{id}")] - public async Task Update(string id, [FromBody] BaseProductUpInput input) - { - var dbLink = await _dbLinkService.GetInfo("218239598550058245"); - _db.AddConnection(new ConnectionConfig() - { - ConfigId = dbLink.Id, - DbType = _dataBaseService.ToDbType(dbLink.DbType), - ConnectionString = _dataBaseService.ToConnectionString(dbLink), - InitKeyType = InitKeyType.Attribute, - IsAutoCloseConnection = true - }); - _db.ChangeDatabase(dbLink.Id); - var entity = input.Adapt(); - entity.LastModifyTime = DateTime.Now; - entity.LastModifyUserId = _userManager.UserId; - try - { - //开启事务 - _db.BeginTran(); - - //更新产品信息V1记录 - await _db.Updateable(entity).IgnoreColumns(ignoreAllNullColumns: true).ExecuteCommandAsync(); - - //清空原有数据 - await _db.Deleteable().Where(u => u.ProductId == id).ExecuteCommandAsync(); - //新增新数据 - var baseProductDetailsEntityList = input.baseProductDetailsList.Adapt>(); - if (baseProductDetailsEntityList != null) - { - foreach (var item in baseProductDetailsEntityList) - { - item.Id = YitIdHelper.NextId().ToString(); - item.ProductId = entity.Id; - } - await _db.Insertable(baseProductDetailsEntityList).ExecuteCommandAsync(); - } - - //关闭事务 - _db.CommitTran(); - } - catch (Exception) - { - //回滚事务 - _db.RollbackTran(); - throw NCCException.Oh(ErrorCode.COM1001); - } - } - - /// - /// 删除产品信息V1 - /// - /// - [HttpDelete("{id}")] - public async Task Delete(string id) - { - var dbLink = await _dbLinkService.GetInfo("218239598550058245"); - _db.AddConnection(new ConnectionConfig() - { - ConfigId = dbLink.Id, - DbType = _dataBaseService.ToDbType(dbLink.DbType), - ConnectionString = _dataBaseService.ToConnectionString(dbLink), - InitKeyType = InitKeyType.Attribute, - IsAutoCloseConnection = true - }); - _db.ChangeDatabase(dbLink.Id); - var entity = await _db.Queryable().FirstAsync(p => p.Id == id); - _ = entity ?? throw NCCException.Oh(ErrorCode.COM1005); - try - { - //开启事务 - _db.BeginTran(); - - //删除产品信息V1记录 - await _db.Deleteable().Where(d => d.Id == id).ExecuteCommandAsync(); - - //清空子表数据 - await _db.Deleteable().Where(u => u.ProductId == id).ExecuteCommandAsync(); - - //关闭事务 - _db.CommitTran(); - } - catch (Exception) - { - //回滚事务 - _db.RollbackTran(); - throw NCCException.Oh(ErrorCode.COM1002); - } - } - } -} diff --git a/netcore/src/Modularity/Order/NCC.Order/BaseUserBalanceService.cs b/netcore/src/Modularity/Order/NCC.Order/BaseUserBalanceService.cs deleted file mode 100644 index af093c6..0000000 --- a/netcore/src/Modularity/Order/NCC.Order/BaseUserBalanceService.cs +++ /dev/null @@ -1,185 +0,0 @@ -using NCC.Common.Core.Manager; -using NCC.Common.Enum; -using NCC.Common.Extension; -using NCC.Common.Filter; -using NCC.Dependency; -using NCC.DynamicApiController; -using NCC.FriendlyException; -using NCC.Order.Interfaces.BaseUserBalance; -using Mapster; -using Microsoft.AspNetCore.Mvc; -using SqlSugar; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Threading.Tasks; -using NCC.Order.Entitys; -using NCC.Order.Entitys.Dto.BaseUserBalance; -using Yitter.IdGenerator; -using NCC.Common.Helper; -using NCC.JsonSerialization; -using NCC.System.Interfaces.System; - -namespace NCC.Order.BaseUserBalance -{ - /// - /// 用户余额变动服务 - /// - [ApiDescriptionSettings(Tag = "余额信息",Name = "BaseUserBalance", Order = 200)] - [Route("api/Order/[controller]")] - public class BaseUserBalanceService : IBaseUserBalanceService, IDynamicApiController, ITransient - { - private readonly ISqlSugarRepository _baseUserBalanceRepository; - private readonly IDbLinkService _dbLinkService; - private readonly IDataBaseService _dataBaseService; - private readonly SqlSugarScope _db; - private readonly IUserManager _userManager; - - /// - /// 初始化一个类型的新实例 - /// - public BaseUserBalanceService( - ISqlSugarRepository baseUserBalanceRepository, - IDbLinkService dbLinkService, - IDataBaseService dataBaseService, - IUserManager userManager) - { - _baseUserBalanceRepository = baseUserBalanceRepository; - _db = _baseUserBalanceRepository.Context; - _dbLinkService = dbLinkService; - _dataBaseService = dataBaseService; - _userManager = userManager; - } - - /// - /// 获取用户余额变动 - /// - /// 参数 - /// - [HttpGet("{id}")] - public async Task GetInfo(string id) - { - var dbLink = await _dbLinkService.GetInfo("218239598550058245"); - _db.AddConnection(new ConnectionConfig() - { - ConfigId = dbLink.Id, - DbType = _dataBaseService.ToDbType(dbLink.DbType), - ConnectionString = _dataBaseService.ToConnectionString(dbLink), - InitKeyType = InitKeyType.Attribute, - IsAutoCloseConnection = true - }); - _db.ChangeDatabase(dbLink.Id); - var entity = await _db.Queryable().FirstAsync(p => p.Id == id); - var output = entity.Adapt(); - return output; - } - - /// - /// 获取用户余额变动列表 - /// - /// 请求参数 - /// - [HttpGet("")] - public async Task GetList([FromQuery] BaseUserBalanceListQueryInput input) - { - var dbLink = await _dbLinkService.GetInfo("218239598550058245"); - _db.AddConnection(new ConnectionConfig() - { - ConfigId = dbLink.Id, - DbType = _dataBaseService.ToDbType(dbLink.DbType), - ConnectionString = _dataBaseService.ToConnectionString(dbLink), - InitKeyType = InitKeyType.Attribute, - IsAutoCloseConnection = true - }); - _db.ChangeDatabase(dbLink.Id); - var sidx = input.sidx == null ? "id" : input.sidx; - var data = await _db.Queryable() - .WhereIF(!string.IsNullOrEmpty(input.userId), p => p.UserId.Contains(input.userId)) - .WhereIF(!string.IsNullOrEmpty(input.type), p => p.Type.Contains(input.type)) - .WhereIF(!string.IsNullOrEmpty(input.sourceId), p => p.SourceId.Contains(input.sourceId)) - //.WhereIF(!string.IsNullOrEmpty(input.addTime), p => p.AddTime.Contains(input.addTime)) - .Select(it=> new BaseUserBalanceListOutput - { - id = it.Id, - userId=it.UserId, - type=it.Type, - sourceId=it.SourceId, - mark=it.Mark, - addTime=it.AddTime, - }).MergeTable().OrderBy(sidx+" "+input.sort).ToPagedListAsync(input.currentPage, input.pageSize); - return PageResult.SqlSugarPageResult(data); - } - - /// - /// 新建用户余额变动 - /// - /// 参数 - /// - [HttpPost("")] - public async Task Create([FromBody] BaseUserBalanceCrInput input) - { - var dbLink = await _dbLinkService.GetInfo("218239598550058245"); - _db.AddConnection(new ConnectionConfig() - { - ConfigId = dbLink.Id, - DbType = _dataBaseService.ToDbType(dbLink.DbType), - ConnectionString = _dataBaseService.ToConnectionString(dbLink), - InitKeyType = InitKeyType.Attribute, - IsAutoCloseConnection = true - }); - _db.ChangeDatabase(dbLink.Id); - var userInfo = await _userManager.GetUserInfo(); - var entity = input.Adapt(); - entity.Id = YitIdHelper.NextId().ToString(); - var isOk = await _db.Insertable(entity).IgnoreColumns(ignoreNullColumn: true).ExecuteCommandAsync(); - if (!(isOk > 0)) throw NCCException.Oh(ErrorCode.COM1000); - } - - /// - /// 更新用户余额变动 - /// - /// 主键 - /// 参数 - /// - [HttpPut("{id}")] - public async Task Update(string id, [FromBody] BaseUserBalanceUpInput input) - { - var dbLink = await _dbLinkService.GetInfo("218239598550058245"); - _db.AddConnection(new ConnectionConfig() - { - ConfigId = dbLink.Id, - DbType = _dataBaseService.ToDbType(dbLink.DbType), - ConnectionString = _dataBaseService.ToConnectionString(dbLink), - InitKeyType = InitKeyType.Attribute, - IsAutoCloseConnection = true - }); - _db.ChangeDatabase(dbLink.Id); - var entity = input.Adapt(); - var isOk = await _db.Updateable(entity).IgnoreColumns(ignoreAllNullColumns: true).ExecuteCommandAsync(); - if (!(isOk > 0)) throw NCCException.Oh(ErrorCode.COM1001); - } - - /// - /// 删除用户余额变动 - /// - /// - [HttpDelete("{id}")] - public async Task Delete(string id) - { - var dbLink = await _dbLinkService.GetInfo("218239598550058245"); - _db.AddConnection(new ConnectionConfig() - { - ConfigId = dbLink.Id, - DbType = _dataBaseService.ToDbType(dbLink.DbType), - ConnectionString = _dataBaseService.ToConnectionString(dbLink), - InitKeyType = InitKeyType.Attribute, - IsAutoCloseConnection = true - }); - _db.ChangeDatabase(dbLink.Id); - var entity = await _db.Queryable().FirstAsync(p => p.Id == id); - _ = entity ?? throw NCCException.Oh(ErrorCode.COM1005); - var isOk = await _db.Deleteable().Where(d => d.Id == id).ExecuteCommandAsync(); - if (!(isOk > 0)) throw NCCException.Oh(ErrorCode.COM1002); - } - } -} diff --git a/netcore/src/Modularity/Order/NCC.Order/MarketingRulesService.cs b/netcore/src/Modularity/Order/NCC.Order/MarketingRulesService.cs deleted file mode 100644 index b9cfbc9..0000000 --- a/netcore/src/Modularity/Order/NCC.Order/MarketingRulesService.cs +++ /dev/null @@ -1,511 +0,0 @@ -using NCC.Common.Core.Manager; -using NCC.Common.Enum; -using NCC.Common.Extension; -using NCC.Common.Filter; -using NCC.Dependency; -using NCC.DynamicApiController; -using NCC.FriendlyException; -using NCC.Order.Interfaces.MarketingRules; -using Mapster; -using Microsoft.AspNetCore.Mvc; -using SqlSugar; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Threading.Tasks; -using NCC.Order.Entitys; -using NCC.Order.Entitys.Dto.MarketingRules; -using Yitter.IdGenerator; -using NCC.Common.Helper; -using NCC.JsonSerialization; -using NCC.Common.Model.NPOI; -using NCC.Common.Configuration; -using NCC.DataEncryption; -using NCC.ClayObject; -using NCC.System.Interfaces.System; -using NCC.System.Interfaces.Permission; - -namespace NCC.Order.MarketingRules -{ - /// - /// 分销规则设置服务 - /// - [ApiDescriptionSettings(Tag = "分销规则设置", Name = "MarketingRules", Order = 200)] - [Route("api/Order/[controller]")] - public class MarketingRulesService : IMarketingRulesService, IDynamicApiController, ITransient - { - private readonly ISqlSugarRepository _marketingRulesRepository; - private readonly ISqlSugarRepository _marketingRulesDetailRepository; - private readonly IDbLinkService _dbLinkService; - private readonly IDataBaseService _dataBaseService; - private readonly SqlSugarScope _db; - private readonly IUserManager _userManager; - - /// - /// 初始化一个类型的新实例 - /// - public MarketingRulesService( - ISqlSugarRepository marketingRulesRepository, - ISqlSugarRepository marketingRulesDetailRepository, - IDbLinkService dbLinkService, - IDataBaseService dataBaseService, - IUserManager userManager) - { - _marketingRulesRepository = marketingRulesRepository; - _db = _marketingRulesRepository.Context; - _marketingRulesDetailRepository = marketingRulesDetailRepository; - _dbLinkService = dbLinkService; - _dataBaseService = dataBaseService; - _userManager = userManager; - } - - /// - /// 获取分销规则设置 - /// - /// 参数 - /// - [HttpGet("{id}")] - public async Task GetInfo(string id) - { - var dbLink = await _dbLinkService.GetInfo("218239598550058245"); - _db.AddConnection(new ConnectionConfig() - { - ConfigId = dbLink.Id, - DbType = _dataBaseService.ToDbType(dbLink.DbType), - ConnectionString = _dataBaseService.ToConnectionString(dbLink), - InitKeyType = InitKeyType.Attribute, - IsAutoCloseConnection = true - }); - _db.ChangeDatabase(dbLink.Id); - var entity = await _db.Queryable().FirstAsync(p => p.Id == id); - var output = entity.Adapt(); - - var marketingRulesDetailList = await _db.Queryable().Where(w => w.RuleId == entity.Id).ToListAsync(); - output.marketingRulesDetailList = marketingRulesDetailList.Adapt>(); - return output; - } - /// - /// 获取正在用的规则 (取一个) - /// - /// - [HttpGet("current")] - public async Task CurrentRule() - { - - var entity = await _db.Queryable().FirstAsync(p => p.EnabledMark == 1); - var output = entity.Adapt(); - - var marketingRulesDetailList = await _db.Queryable().Where(w => w.RuleId == entity.Id).ToListAsync(); - output.marketingRulesDetailList = marketingRulesDetailList.Adapt>(); - return output; - } - /// - /// 获取当前用户等级信息 - /// - /// - [HttpGet("userRule")] - public async Task GetUserRule(string userid = "") - { - MarketingRulesDetailInfoOutput output = new MarketingRulesDetailInfoOutput(); - var rule = await App.GetService().CurrentRule(); - int fansCount = 1;// await App.GetService().GetUserFansCount(userid); - - if (rule != null) - { - var list = rule.marketingRulesDetailList.OrderBy(o => o.numberStart.ToInt()); - output = list.First(); - foreach (var item in list) - { - if (fansCount >= item.numberStart.ToInt()) output = item; - } - } - output.fansCount = fansCount; - return output; - } - - - /// - /// 获取分销规则设置列表 - /// - /// 请求参数 - /// - [HttpGet("")] - public async Task GetList([FromQuery] MarketingRulesListQueryInput input) - { - var dbLink = await _dbLinkService.GetInfo("218239598550058245"); - _db.AddConnection(new ConnectionConfig() - { - ConfigId = dbLink.Id, - DbType = _dataBaseService.ToDbType(dbLink.DbType), - ConnectionString = _dataBaseService.ToConnectionString(dbLink), - InitKeyType = InitKeyType.Attribute, - IsAutoCloseConnection = true - }); - _db.ChangeDatabase(dbLink.Id); - var sidx = input.sidx == null ? "sortCode" : input.sidx; - List queryProportion = input.proportion != null ? input.proportion.Split(',').ToObeject>() : null; - var startProportion = input.proportion != null && !string.IsNullOrEmpty(queryProportion.First().ToString()) ? queryProportion.First() : decimal.MinValue; - var endProportion = input.proportion != null && !string.IsNullOrEmpty(queryProportion.Last().ToString()) ? queryProportion.Last() : decimal.MaxValue; - List queryWithdrawalMoney = input.withdrawalMoney != null ? input.withdrawalMoney.Split(',').ToObeject>() : null; - var startWithdrawalMoney = input.withdrawalMoney != null && !string.IsNullOrEmpty(queryWithdrawalMoney.First().ToString()) ? queryWithdrawalMoney.First() : decimal.MinValue; - var endWithdrawalMoney = input.withdrawalMoney != null && !string.IsNullOrEmpty(queryWithdrawalMoney.Last().ToString()) ? queryWithdrawalMoney.Last() : decimal.MaxValue; - List querySingleMaxWithdrawalAmount = input.singleMaxWithdrawalAmount != null ? input.singleMaxWithdrawalAmount.Split(',').ToObeject>() : null; - var startSingleMaxWithdrawalAmount = input.singleMaxWithdrawalAmount != null && !string.IsNullOrEmpty(querySingleMaxWithdrawalAmount.First().ToString()) ? querySingleMaxWithdrawalAmount.First() : decimal.MinValue; - var endSingleMaxWithdrawalAmount = input.singleMaxWithdrawalAmount != null && !string.IsNullOrEmpty(querySingleMaxWithdrawalAmount.Last().ToString()) ? querySingleMaxWithdrawalAmount.Last() : decimal.MaxValue; - List queryMonthWithdrawalCount = input.monthWithdrawalCount != null ? input.monthWithdrawalCount.Split(',').ToObeject>() : null; - var startMonthWithdrawalCount = input.monthWithdrawalCount != null && !string.IsNullOrEmpty(queryMonthWithdrawalCount.First().ToString()) ? queryMonthWithdrawalCount.First() : decimal.MinValue; - var endMonthWithdrawalCount = input.monthWithdrawalCount != null && !string.IsNullOrEmpty(queryMonthWithdrawalCount.Last().ToString()) ? queryMonthWithdrawalCount.Last() : decimal.MaxValue; - List queryCreatorTime = input.creatorTime != null ? input.creatorTime.Split(',').ToObeject>() : null; - DateTime? startCreatorTime = queryCreatorTime != null ? Ext.GetDateTime(queryCreatorTime.First()) : null; - DateTime? endCreatorTime = queryCreatorTime != null ? Ext.GetDateTime(queryCreatorTime.Last()) : null; - List queryLastModifyTime = input.lastModifyTime != null ? input.lastModifyTime.Split(',').ToObeject>() : null; - DateTime? startLastModifyTime = queryLastModifyTime != null ? Ext.GetDateTime(queryLastModifyTime.First()) : null; - DateTime? endLastModifyTime = queryLastModifyTime != null ? Ext.GetDateTime(queryLastModifyTime.Last()) : null; - var data = await _db.Queryable() - .WhereIF(!string.IsNullOrEmpty(input.title), p => p.Title.Contains(input.title)) - .WhereIF(queryProportion != null, p => SqlFunc.Between(p.Proportion, startProportion, endProportion)) - .WhereIF(queryWithdrawalMoney != null, p => SqlFunc.Between(p.WithdrawalMoney, startWithdrawalMoney, endWithdrawalMoney)) - .WhereIF(querySingleMaxWithdrawalAmount != null, p => SqlFunc.Between(p.SingleMaxWithdrawalAmount, startSingleMaxWithdrawalAmount, endSingleMaxWithdrawalAmount)) - .WhereIF(queryMonthWithdrawalCount != null, p => SqlFunc.Between(p.MonthWithdrawalCount, startMonthWithdrawalCount, endMonthWithdrawalCount)) - .WhereIF(queryCreatorTime != null, p => p.CreatorTime >= new DateTime(startCreatorTime.ToDate().Year, startCreatorTime.ToDate().Month, startCreatorTime.ToDate().Day, 0, 0, 0)) - .WhereIF(queryCreatorTime != null, p => p.CreatorTime <= new DateTime(endCreatorTime.ToDate().Year, endCreatorTime.ToDate().Month, endCreatorTime.ToDate().Day, 23, 59, 59)) - .WhereIF(!string.IsNullOrEmpty(input.creatorUserId), p => p.CreatorUserId.Equals(input.creatorUserId)) - .WhereIF(queryLastModifyTime != null, p => p.LastModifyTime >= new DateTime(startLastModifyTime.ToDate().Year, startLastModifyTime.ToDate().Month, startLastModifyTime.ToDate().Day, 0, 0, 0)) - .WhereIF(queryLastModifyTime != null, p => p.LastModifyTime <= new DateTime(endLastModifyTime.ToDate().Year, endLastModifyTime.ToDate().Month, endLastModifyTime.ToDate().Day, 23, 59, 59)) - .WhereIF(!string.IsNullOrEmpty(input.lastModifyUserId), p => p.LastModifyUserId.Equals(input.lastModifyUserId)) - .WhereIF(input.enabledMark != null, p => p.EnabledMark == input.enabledMark) - .Select(it => new MarketingRulesListOutput - { - id = it.Id, - title = it.Title, - proportion = it.Proportion, - withdrawalMoney = it.WithdrawalMoney, - singleMaxWithdrawalAmount = it.SingleMaxWithdrawalAmount, - monthWithdrawalCount = it.MonthWithdrawalCount, - remark = it.Remark, - enabledMark = it.EnabledMark, - sortCode = it.SortCode, - creatorTime = it.CreatorTime, - creatorUserId = it.CreatorUserId, - lastModifyTime = it.LastModifyTime, - lastModifyUserId = it.LastModifyUserId, - }).MergeTable().OrderBy(sidx + " " + input.sort) - .Mapper(it => - { - if (input.enabledMark != null && input.enabledMark > 0) - { - var marketingRulesDetailList = _db.Queryable().Where(w => w.RuleId == it.id).ToList(); - it.details = marketingRulesDetailList.Adapt>(); - - } - }) - .ToPagedListAsync(input.currentPage, input.pageSize); - return PageResult.SqlSugarPageResult(data); - } - - /// - /// 新建分销规则设置 - /// - /// 参数 - /// - [HttpPost("")] - public async Task Create([FromBody] MarketingRulesCrInput input) - { - var dbLink = await _dbLinkService.GetInfo("218239598550058245"); - _db.AddConnection(new ConnectionConfig() - { - ConfigId = dbLink.Id, - DbType = _dataBaseService.ToDbType(dbLink.DbType), - ConnectionString = _dataBaseService.ToConnectionString(dbLink), - InitKeyType = InitKeyType.Attribute, - IsAutoCloseConnection = true - }); - _db.ChangeDatabase(dbLink.Id); - var userInfo = await _userManager.GetUserInfo(); - var entity = input.Adapt(); - entity.Id = YitIdHelper.NextId().ToString(); - entity.CreatorTime = DateTime.Now; - entity.CreatorUserId = _userManager.UserId; - try - { - //开启事务 - _db.BeginTran(); - - //新增分销规则设置记录 - var newEntity = await _db.Insertable(entity).IgnoreColumns(ignoreNullColumn: true).ExecuteReturnEntityAsync(); - - var marketingRulesDetailEntityList = input.marketingRulesDetailList.Adapt>(); - if (marketingRulesDetailEntityList != null) - { - foreach (var item in marketingRulesDetailEntityList) - { - item.Id = YitIdHelper.NextId().ToString(); - item.RuleId = newEntity.Id; - } - await _db.Insertable(marketingRulesDetailEntityList).ExecuteCommandAsync(); - } - - //关闭事务 - _db.CommitTran(); - } - catch (Exception) - { - //回滚事务 - _db.RollbackTran(); - throw NCCException.Oh(ErrorCode.COM1000); - } - } - - /// - /// 获取分销规则设置无分页列表 - /// - /// 请求参数 - /// - [NonAction] - public async Task GetNoPagingList([FromQuery] MarketingRulesListQueryInput input) - { - var dbLink = await _dbLinkService.GetInfo("218239598550058245"); - _db.AddConnection(new ConnectionConfig() - { - ConfigId = dbLink.Id, - DbType = _dataBaseService.ToDbType(dbLink.DbType), - ConnectionString = _dataBaseService.ToConnectionString(dbLink), - InitKeyType = InitKeyType.Attribute, - IsAutoCloseConnection = true - }); - _db.ChangeDatabase(dbLink.Id); - var sidx = input.sidx == null ? "sortCode" : input.sidx; - List queryProportion = input.proportion != null ? input.proportion.Split(',').ToObeject>() : null; - var startProportion = input.proportion != null && !string.IsNullOrEmpty(queryProportion.First().ToString()) ? queryProportion.First() : decimal.MinValue; - var endProportion = input.proportion != null && !string.IsNullOrEmpty(queryProportion.Last().ToString()) ? queryProportion.Last() : decimal.MaxValue; - List queryWithdrawalMoney = input.withdrawalMoney != null ? input.withdrawalMoney.Split(',').ToObeject>() : null; - var startWithdrawalMoney = input.withdrawalMoney != null && !string.IsNullOrEmpty(queryWithdrawalMoney.First().ToString()) ? queryWithdrawalMoney.First() : decimal.MinValue; - var endWithdrawalMoney = input.withdrawalMoney != null && !string.IsNullOrEmpty(queryWithdrawalMoney.Last().ToString()) ? queryWithdrawalMoney.Last() : decimal.MaxValue; - List querySingleMaxWithdrawalAmount = input.singleMaxWithdrawalAmount != null ? input.singleMaxWithdrawalAmount.Split(',').ToObeject>() : null; - var startSingleMaxWithdrawalAmount = input.singleMaxWithdrawalAmount != null && !string.IsNullOrEmpty(querySingleMaxWithdrawalAmount.First().ToString()) ? querySingleMaxWithdrawalAmount.First() : decimal.MinValue; - var endSingleMaxWithdrawalAmount = input.singleMaxWithdrawalAmount != null && !string.IsNullOrEmpty(querySingleMaxWithdrawalAmount.Last().ToString()) ? querySingleMaxWithdrawalAmount.Last() : decimal.MaxValue; - List queryMonthWithdrawalCount = input.monthWithdrawalCount != null ? input.monthWithdrawalCount.Split(',').ToObeject>() : null; - var startMonthWithdrawalCount = input.monthWithdrawalCount != null && !string.IsNullOrEmpty(queryMonthWithdrawalCount.First().ToString()) ? queryMonthWithdrawalCount.First() : decimal.MinValue; - var endMonthWithdrawalCount = input.monthWithdrawalCount != null && !string.IsNullOrEmpty(queryMonthWithdrawalCount.Last().ToString()) ? queryMonthWithdrawalCount.Last() : decimal.MaxValue; - List queryCreatorTime = input.creatorTime != null ? input.creatorTime.Split(',').ToObeject>() : null; - DateTime? startCreatorTime = queryCreatorTime != null ? Ext.GetDateTime(queryCreatorTime.First()) : null; - DateTime? endCreatorTime = queryCreatorTime != null ? Ext.GetDateTime(queryCreatorTime.Last()) : null; - List queryLastModifyTime = input.lastModifyTime != null ? input.lastModifyTime.Split(',').ToObeject>() : null; - DateTime? startLastModifyTime = queryLastModifyTime != null ? Ext.GetDateTime(queryLastModifyTime.First()) : null; - DateTime? endLastModifyTime = queryLastModifyTime != null ? Ext.GetDateTime(queryLastModifyTime.Last()) : null; - var data = await _db.Queryable() - .WhereIF(!string.IsNullOrEmpty(input.title), p => p.Title.Contains(input.title)) - .WhereIF(queryProportion != null, p => SqlFunc.Between(p.Proportion, startProportion, endProportion)) - .WhereIF(queryWithdrawalMoney != null, p => SqlFunc.Between(p.WithdrawalMoney, startWithdrawalMoney, endWithdrawalMoney)) - .WhereIF(querySingleMaxWithdrawalAmount != null, p => SqlFunc.Between(p.SingleMaxWithdrawalAmount, startSingleMaxWithdrawalAmount, endSingleMaxWithdrawalAmount)) - .WhereIF(queryMonthWithdrawalCount != null, p => SqlFunc.Between(p.MonthWithdrawalCount, startMonthWithdrawalCount, endMonthWithdrawalCount)) - .WhereIF(queryCreatorTime != null, p => p.CreatorTime >= new DateTime(startCreatorTime.ToDate().Year, startCreatorTime.ToDate().Month, startCreatorTime.ToDate().Day, 0, 0, 0)) - .WhereIF(queryCreatorTime != null, p => p.CreatorTime <= new DateTime(endCreatorTime.ToDate().Year, endCreatorTime.ToDate().Month, endCreatorTime.ToDate().Day, 23, 59, 59)) - .WhereIF(!string.IsNullOrEmpty(input.creatorUserId), p => p.CreatorUserId.Equals(input.creatorUserId)) - .WhereIF(queryLastModifyTime != null, p => p.LastModifyTime >= new DateTime(startLastModifyTime.ToDate().Year, startLastModifyTime.ToDate().Month, startLastModifyTime.ToDate().Day, 0, 0, 0)) - .WhereIF(queryLastModifyTime != null, p => p.LastModifyTime <= new DateTime(endLastModifyTime.ToDate().Year, endLastModifyTime.ToDate().Month, endLastModifyTime.ToDate().Day, 23, 59, 59)) - .WhereIF(!string.IsNullOrEmpty(input.lastModifyUserId), p => p.LastModifyUserId.Equals(input.lastModifyUserId)) - .Select(it => new MarketingRulesListOutput - { - id = it.Id, - title = it.Title, - proportion = it.Proportion, - withdrawalMoney = it.WithdrawalMoney, - singleMaxWithdrawalAmount = it.SingleMaxWithdrawalAmount, - monthWithdrawalCount = it.MonthWithdrawalCount, - remark = it.Remark, - enabledMark = it.EnabledMark, - sortCode = it.SortCode, - creatorTime = it.CreatorTime, - creatorUserId = it.CreatorUserId, - lastModifyTime = it.LastModifyTime, - lastModifyUserId = it.LastModifyUserId, - }).MergeTable().OrderBy(sidx + " " + input.sort).ToListAsync(); - return data; - } - - /// - /// 导出分销规则设置 - /// - /// 请求参数 - /// - [HttpGet("Actions/Export")] - public async Task Export([FromQuery] MarketingRulesListQueryInput input) - { - var userInfo = await _userManager.GetUserInfo(); - var exportData = new List(); - if (input.dataType == 0) - { - var data = Clay.Object(await this.GetList(input)); - exportData = data.Solidify>().list; - } - else - { - exportData = await this.GetNoPagingList(input); - } - List paramList = "[{\"value\":\"规则名称\",\"field\":\"title\"},{\"value\":\"提成比例 (%)\",\"field\":\"proportion\"},{\"value\":\"最低提现金额\",\"field\":\"withdrawalMoney\"},{\"value\":\"单次最大提现金额\",\"field\":\"singleMaxWithdrawalAmount\"},{\"value\":\"每个月提现次数\",\"field\":\"monthWithdrawalCount\"},{\"value\":\"备注\",\"field\":\"remark\"},{\"value\":\"排序码\",\"field\":\"sortCode\"},{\"value\":\"是否有效\",\"field\":\"enabledMark\"},{\"value\":\"创建用户\",\"field\":\"creatorUserId\"},{\"value\":\"创建时间\",\"field\":\"creatorTime\"},{\"value\":\"修改用户\",\"field\":\"lastModifyUserId\"},{\"value\":\"修改时间\",\"field\":\"lastModifyTime\"},]".ToList(); - ExcelConfig excelconfig = new ExcelConfig(); - excelconfig.FileName = "分销规则设置.xls"; - excelconfig.HeadFont = "微软雅黑"; - excelconfig.HeadPoint = 10; - excelconfig.IsAllSizeColumn = true; - excelconfig.ColumnModel = new List(); - List selectKeyList = input.selectKey.Split(',').ToList(); - foreach (var item in selectKeyList) - { - var isExist = paramList.Find(p => p.field == item); - if (isExist != null) - { - excelconfig.ColumnModel.Add(new ExcelColumnModel() { Column = isExist.field, ExcelColumn = isExist.value }); - } - } - var addPath = FileVariable.TemporaryFilePath + excelconfig.FileName; - ExcelExportHelper.Export(exportData, excelconfig, addPath); - var fileName = _userManager.UserId + "|" + addPath + "|xls"; - var output = new - { - name = excelconfig.FileName, - url = "/api/File/Download?encryption=" + DESCEncryption.Encrypt(fileName, "NCC") - }; - return output; - } - - /// - /// 批量删除分销规则设置 - /// - /// 主键数组 - /// - [HttpPost("batchRemove")] - public async Task BatchRemove([FromBody] List ids) - { - var dbLink = await _dbLinkService.GetInfo("218239598550058245"); - _db.AddConnection(new ConnectionConfig() - { - ConfigId = dbLink.Id, - DbType = _dataBaseService.ToDbType(dbLink.DbType), - ConnectionString = _dataBaseService.ToConnectionString(dbLink), - InitKeyType = InitKeyType.Attribute, - IsAutoCloseConnection = true - }); - _db.ChangeDatabase(dbLink.Id); - var entitys = await _db.Queryable().In(it => it.Id, ids).ToListAsync(); - if (entitys.Count > 0) - { - try - { - //开启事务 - _db.BeginTran(); - //批量删除分销规则设置 - await _db.Deleteable().In(d => d.Id, ids).ExecuteCommandAsync(); - - //清空子表数据 - await _db.Deleteable().In(u => u.RuleId, ids).ExecuteCommandAsync(); - //关闭事务 - _db.CommitTran(); - } - catch (Exception) - { - //回滚事务 - _db.RollbackTran(); - throw NCCException.Oh(ErrorCode.COM1002); - } - } - } - - /// - /// 更新分销规则设置 - /// - /// 主键 - /// 参数 - /// - [HttpPut("{id}")] - public async Task Update(string id, [FromBody] MarketingRulesUpInput input) - { - var dbLink = await _dbLinkService.GetInfo("218239598550058245"); - _db.AddConnection(new ConnectionConfig() - { - ConfigId = dbLink.Id, - DbType = _dataBaseService.ToDbType(dbLink.DbType), - ConnectionString = _dataBaseService.ToConnectionString(dbLink), - InitKeyType = InitKeyType.Attribute, - IsAutoCloseConnection = true - }); - _db.ChangeDatabase(dbLink.Id); - var entity = input.Adapt(); - entity.LastModifyTime = DateTime.Now; - entity.LastModifyUserId = _userManager.UserId; - try - { - //开启事务 - _db.BeginTran(); - - //更新分销规则设置记录 - await _db.Updateable(entity).IgnoreColumns(ignoreAllNullColumns: true).ExecuteCommandAsync(); - - //清空原有数据 - await _db.Deleteable().Where(u => u.RuleId == id).ExecuteCommandAsync(); - //新增新数据 - var marketingRulesDetailEntityList = input.marketingRulesDetailList.Adapt>(); - if (marketingRulesDetailEntityList != null) - { - foreach (var item in marketingRulesDetailEntityList) - { - item.Id = YitIdHelper.NextId().ToString(); - item.RuleId = entity.Id; - } - await _db.Insertable(marketingRulesDetailEntityList).ExecuteCommandAsync(); - } - - //关闭事务 - _db.CommitTran(); - } - catch (Exception) - { - //回滚事务 - _db.RollbackTran(); - throw NCCException.Oh(ErrorCode.COM1001); - } - } - - /// - /// 删除分销规则设置 - /// - /// - [HttpDelete("{id}")] - public async Task Delete(string id) - { - var dbLink = await _dbLinkService.GetInfo("218239598550058245"); - _db.AddConnection(new ConnectionConfig() - { - ConfigId = dbLink.Id, - DbType = _dataBaseService.ToDbType(dbLink.DbType), - ConnectionString = _dataBaseService.ToConnectionString(dbLink), - InitKeyType = InitKeyType.Attribute, - IsAutoCloseConnection = true - }); - _db.ChangeDatabase(dbLink.Id); - var entity = await _db.Queryable().FirstAsync(p => p.Id == id); - _ = entity ?? throw NCCException.Oh(ErrorCode.COM1005); - try - { - //开启事务 - _db.BeginTran(); - - //删除分销规则设置记录 - await _db.Deleteable().Where(d => d.Id == id).ExecuteCommandAsync(); - - //清空子表数据 - await _db.Deleteable().Where(u => u.RuleId == id).ExecuteCommandAsync(); - - //关闭事务 - _db.CommitTran(); - } - catch (Exception) - { - //回滚事务 - _db.RollbackTran(); - throw NCCException.Oh(ErrorCode.COM1002); - } - } - } -} diff --git a/netcore/src/Modularity/Order/NCC.Order/NCC.Order.csproj b/netcore/src/Modularity/Order/NCC.Order/NCC.Order.csproj deleted file mode 100644 index 938b99a..0000000 --- a/netcore/src/Modularity/Order/NCC.Order/NCC.Order.csproj +++ /dev/null @@ -1,23 +0,0 @@ - - - - net6.0 - - - - D:\wesley\project\git\antis-disk\netcore\src\Modularity\SimpleOrder\NCC.Order\NCC.Frends.xml - - - - bin\Release\$(AssemblyName).xml - - - - - - - - - - - diff --git a/netcore/src/Modularity/Order/NCC.Order/NCC.Order.xml b/netcore/src/Modularity/Order/NCC.Order/NCC.Order.xml deleted file mode 100644 index 35d136d..0000000 --- a/netcore/src/Modularity/Order/NCC.Order/NCC.Order.xml +++ /dev/null @@ -1,364 +0,0 @@ - - - - NCC.Order - - - - - 金额流水记录服务 - - - - - 初始化一个类型的新实例 - - - - - 获取金额流水记录 - - 参数 - - - - - 获取金额流水记录列表 - - 请求参数 - - - - - 新建金额流水记录 - - 参数 - - - - - 更新金额流水记录 - - 主键 - 参数 - - - - - 删除金额流水记录 - - - - - - 获取当前用户所有余额 - - - - - - 提现 - - 提现金额 - - - - - 代理星球首页信息 - - percentageScale 提成比例 myFans 我的粉丝 balance 余额 - - - - 订单分销金额计算 还需要完善 分销的条件 不应该是所有人都能 - - - - - - - 订单模块服务 - - - - - 初始化一个类型的新实例 - - - - - 获取订单模块 - - 参数 - - - - - 检测订单是否支付 - - - - - - - 获取订单模块列表 - - 请求参数 - - - - - 新建订单模块V1 - - 参数 - - - - - 获取订单模块无分页列表 - - 请求参数 - - - - - 导出订单模块V1 - - 请求参数 - - - - - 更新订单模块V1 - - 主键 - 参数 - - - - - 删除订单模块 - - - - - - 下单 - - 下单参数 - - - - - 支付后回调处理 - - - - - - 支付后回调处理 - - - - - - 计算用户等级 | 有效期信息（会员） - - - 产品id - - - - - 修改订单状态 - - - - - - - - - 商品信息服务 - - - - - 初始化一个类型的新实例 - - - - - 获取产品信息V1 - - 参数 - 参数 - - - - - 获取产品信息列表 - - 请求参数 - - - - - 新建产品信息 - - 参数 - - - - - 获取产品信息V1无分页列表 - - 请求参数 - - - - - 导出产品信息V1 - - 请求参数 - - - - - 更新产品信息V1 - - 主键 - 参数 - - - - - 删除产品信息V1 - - - - - - 用户余额变动服务 - - - - - 初始化一个类型的新实例 - - - - - 获取用户余额变动 - - 参数 - - - - - 获取用户余额变动列表 - - 请求参数 - - - - - 新建用户余额变动 - - 参数 - - - - - 更新用户余额变动 - - 主键 - 参数 - - - - - 删除用户余额变动 - - - - - - 分销规则设置服务 - - - - - 初始化一个类型的新实例 - - - - - 获取分销规则设置 - - 参数 - - - - - 获取正在用的规则 (取一个) - - - - - - 获取当前用户等级信息 - - - - - - 获取分销规则设置列表 - - 请求参数 - - - - - 新建分销规则设置 - - 参数 - - - - - 获取分销规则设置无分页列表 - - 请求参数 - - - - - 导出分销规则设置 - - 请求参数 - - - - - 批量删除分销规则设置 - - 主键数组 - - - - - 更新分销规则设置 - - 主键 - 参数 - - - - - 删除分销规则设置 - - - - -