整理代码

Common/OpenFeign.cs

@@ -0,0 +1,27 @@
+using Common;
+using NuGet.DependencyResolver;
+
+namespace Util
+{
+    /// <summary>
+    /// Json任何类型读取到字符串属性
+    /// 因为 System.Text.Json 必须严格遵守类型一致，当非字符串读取到字符属性时报错：
+    /// The JSON value could not be converted to System.String.
+    /// </summary>
+    public class OpenFeign
+    {
+        public static T GetInfo<T>(string Url, string Param)
+        {
+            string ReturnData = Function.PostWebRequest(Url, Param);
+            T Obj = Newtonsoft.Json.JsonConvert.DeserializeObject<T>(ReturnData);
+            return Obj;
+        }
+
+        public static List<T> GetList<T>(string Url, string Param)
+        {
+            string ReturnData = Function.PostWebRequest(Url, Param);
+            List<T> List = Newtonsoft.Json.JsonConvert.DeserializeObject<List<T>>(ReturnData);
+            return List;
+        }
+    }
+}

Constant/OpenFeignUrl.cs

@@ -0,0 +1,10 @@
+namespace Infrastructure.Constant
+{
+    public class OpenFeignUrl
+    {
+        /// <summary>
+        /// 获取消费者信息
+        /// </summary>
+        public static readonly string GetConsumerInfo = "http://127.0.0.1/api/xxxx/getconsumer";
+    }
+}

Controllers/ConsumerMySelfModuleController.cs

@@ -0,0 +1,74 @@
+using Attribute;
+using Common;
+using Dto;
+using Vo;
+using Enums;
+using Filters;
+using Infrastructure;
+using Infrastructure.Model;
+using Mapster;
+using Microsoft.AspNetCore.Mvc;
+using Middleware;
+using Model;
+using Services;
+using Model.Base;
+
+namespace Controllers
+{
+    /// <summary>
+    /// ConsumerMySelfModule)Controller
+    /// </summary>
+    // [Route("ConsumerMySelfModule")]
+    // [ApiExplorerSettings(GroupName = "ConsumerMySelfModule")]
+    public class ConsumerMySelfModuleController : BaseController
+    {
+        /// <summary>
+        /// api分组接口
+        /// </summary>
+        private readonly IConsumerOrdersService _ConsumerOrdersService;
+        private readonly IConsumerProfitService _ConsumerProfitService;
+
+
+        public ConsumerMySelfModuleController(IConsumerOrdersService ConsumerOrdersService,IConsumerProfitService ConsumerProfitService)
+        {
+            _ConsumerOrdersService = ConsumerOrdersService;
+            _ConsumerProfitService = ConsumerProfitService;
+
+        }
+
+        /// <summary>
+        /// 消费者板块我的-订单列表
+        /// </summary>
+        /// <param name="parm">请求参数</param>
+        /// <returns>消费者板块我的-订单列表</returns>
+        [HttpGet]
+        [Route("/v1/lkbmall/ConsumerMySelfModule/getConsumerOrdersList")]
+        public IActionResult GetConsumerOrdersList([FromQuery] PagerInfo page, [FromQuery] ConsumerMySelfModuleGetConsumerOrdersListDto parm)
+        {
+            var response = _ConsumerOrdersService.GetConsumerOrdersList(page, parm);
+            return SUCCESS(response);
+        }
+
+
+
+
+        /// <summary>
+        /// 消费者板块我的-分红列表
+        /// </summary>
+        /// <param name="parm">请求参数</param>
+        /// <returns>消费者板块我的-分红列表</returns>
+        [HttpGet]
+        [Route("/v1/lkbmall/ConsumerMySelfModule/getConsumerProfitList")]
+        public IActionResult GetConsumerProfitList([FromQuery] PagerInfo page, [FromQuery] ConsumerMySelfModuleGetConsumerProfitListDto parm)
+        {
+            var response = _ConsumerProfitService.GetConsumerProfitList(page, parm);
+            return SUCCESS(response);
+        }
+
+
+
+
+
+
+    }
+}

Controllers/MerchantBussinessModuleController.cs

@@ -0,0 +1,75 @@
+using Attribute;
+using Common;
+using Dto;
+using Vo;
+using Enums;
+using Filters;
+using Infrastructure;
+using Infrastructure.Model;
+using Mapster;
+using Microsoft.AspNetCore.Mvc;
+using Middleware;
+using Model;
+using Services;
+using Model.Base;
+using System.Security.Permissions;
+using Infrastructure.Constant;
+
+namespace Controllers
+{
+    /// <summary>
+    /// MerchantBussinessModule)Controller
+    /// </summary>
+    // [Route("MerchantBussinessModule")]
+    // [ApiExplorerSettings(GroupName = "MerchantBussinessModule")]
+    public class MerchantBussinessModuleController : BaseController
+    {
+        /// <summary>
+        /// api分组接口
+        /// </summary>
+        private readonly IConsumerOrdersService _ConsumerOrdersService;
+
+
+        public MerchantBussinessModuleController(IConsumerOrdersService ConsumerOrdersService)
+        {
+            _ConsumerOrdersService = ConsumerOrdersService;
+
+        }
+
+        /// <summary>
+        /// 商户板块经营数据-获取经营数据详情列表
+        /// </summary>
+        /// <param name="parm">请求参数</param>
+        /// <returns>商户板块经营数据-获取经营数据详情列表</returns>
+        [HttpGet]
+        [Route("/v1/lkbmall/MerchantBussinessModule/getBussinessInfoDetailList")]
+        public IActionResult GetBussinessInfoDetailList([FromQuery] PagerInfo page, [FromQuery] MerchantBussinessModuleGetBussinessInfoDetailListDto parm)
+        {
+            var response = _ConsumerOrdersService.GetBussinessInfoDetailList(page, parm);
+            return SUCCESS(response);
+        }
+
+
+
+
+        /// <summary>
+        /// 商户板块经营数据-获取订单详情
+        /// </summary>
+        /// <param name="parm">请求参数</param>
+        /// <returns>商户板块经营数据-获取订单详情</returns>
+        [HttpGet]
+        [Route("/v1/lkbmall/MerchantBussinessModule/getOrderDetail")]
+        public IActionResult GetOrderDetail([FromQuery] MerchantBussinessModuleGetOrderDetailDto parm)
+        {
+            var response = _ConsumerOrdersService.GetFirst(x => x.MerchantId == parm.MerchantId).Adapt<MerchantBussinessModuleGetOrderDetailVo>();
+            response.Consumer = Util.OpenFeign.GetInfo<ConsumerVo>(OpenFeignUrl.GetConsumerInfo, "Id=" + response.ConsumerId);
+            return SUCCESS(response);
+        }
+
+
+
+
+
+
+    }
+}

Controllers/MerchantWorkBenchModuleController.cs

@@ -0,0 +1,106 @@
+using Attribute;
+using Common;
+using Dto;
+using Vo;
+using Enums;
+using Filters;
+using Infrastructure;
+using Infrastructure.Model;
+using Mapster;
+using Microsoft.AspNetCore.Mvc;
+using Middleware;
+using Model;
+using Services;
+using Model.Base;
+
+namespace Controllers
+{
+    /// <summary>
+    /// MerchantWorkBenchModule)Controller
+    /// </summary>
+    // [Route("MerchantWorkBenchModule")]
+    // [ApiExplorerSettings(GroupName = "MerchantWorkBenchModule")]
+    public class MerchantWorkBenchModuleController : BaseController
+    {
+        /// <summary>
+        /// api分组接口
+        /// </summary>
+        private readonly IMerchantDepositOrdersService _MerchantDepositOrdersService;
+
+
+        public MerchantWorkBenchModuleController(IMerchantDepositOrdersService MerchantDepositOrdersService)
+        {
+            _MerchantDepositOrdersService = MerchantDepositOrdersService;
+
+        }
+
+        /// <summary>
+        /// 商户板块工作台-已激活商户活动时间
+        /// </summary>
+        /// <param name="parm">请求参数</param>
+        /// <returns>商户板块工作台-已激活商户活动时间</returns>
+        [HttpGet]
+        [Route("/v1/lkbmall/MerchantWorkBenchModule/getActedMerchantActivityInfo")]
+        public IActionResult GetActedMerchantActivityInfo([FromQuery] MerchantWorkBenchModuleGetActedMerchantActivityInfoDto parm)
+        {
+            var response = _MerchantDepositOrdersService.GetFirst(x => x.MerchantId == parm.MerchantId).Adapt<MerchantWorkBenchModuleGetActedMerchantActivityInfoVo>();
+            return SUCCESS(response);
+        }
+
+
+
+
+        /// <summary>
+        /// 商户板块工作台-已激活商户达标信息
+        /// </summary>
+        /// <param name="parm">请求参数</param>
+        /// <returns>商户板块工作台-已激活商户达标信息</returns>
+        [HttpGet]
+        [Route("/v1/lkbmall/MerchantWorkBenchModule/getActedMerchantStandardsInfo")]
+        public IActionResult GetActedMerchantStandardsInfo([FromQuery] MerchantWorkBenchModuleGetActedMerchantStandardsInfoDto parm)
+        {
+            var response = _MerchantDepositOrdersService.GetActedMerchantStandardsInfo(parm);
+            return SUCCESS(response);
+        }
+
+
+
+
+        /// <summary>
+        /// 商户板块工作台-商户激活确认订单
+        /// </summary>
+        /// <param name="parm">请求参数</param>
+        /// <returns>商户板块工作台-商户激活确认订单</returns>
+        [HttpPost]
+        [Route("/v1/lkbmall/MerchantWorkBenchModule/actMerchantConfirmOrder")]
+        public IActionResult ActMerchantConfirmOrder([FromBody] MerchantWorkBenchModuleActMerchantConfirmOrderDto parm)
+        {
+            var modal = parm.Adapt<MerchantDepositOrders>().ToCreate(HttpContext);
+            var response = _MerchantDepositOrdersService.Add(modal);
+            return ToResponse(response);
+        }
+
+
+
+
+        /// <summary>
+        /// 商户板块工作台-商户激活订单支付
+        /// </summary>
+        /// <param name="parm">请求参数</param>
+        /// <returns>商户板块工作台-商户激活订单支付</returns>
+        [HttpPost]
+        [Route("/v1/lkbmall/MerchantWorkBenchModule/actMerchantOrderPay")]
+        public IActionResult ActMerchantOrderPay([FromBody] MerchantWorkBenchModuleActMerchantOrderPayDto parm)
+        {
+            var modal = parm.Adapt<MerchantDepositOrders>().ToCreate(HttpContext);
+            var response = _MerchantDepositOrdersService.Add(modal);
+            return ToResponse(response);
+        }
+
+
+
+
+
+
+    }
+}

Model/Database/ConsumerOrders.cs

@@ -0,0 +1,180 @@
+namespace Model
+{
+    /// <summary>
+    /// 消费记录表 consumer_orders
+    /// </summary>
+    [SugarTable("consumer_orders", "消费记录表")]
+    [Tenant("0")]
+    public class ConsumerOrders
+    {
+        /// <summary>
+        /// 平台订单号
+        /// </summary>
+        [SugarColumn(ColumnDescription = "平台订单号", Length = 50, ColumnName = "order_no")]
+        public string OrderNo { get; set; }
+
+
+        /// <summary>
+        /// 好哒订单号
+        /// </summary>
+        [SugarColumn(ColumnDescription = "好哒订单号", Length = 50, ColumnName = "orderno_hd")]
+        public string OrdernoHd { get; set; }
+
+
+        /// <summary>
+        /// 微信订单号
+        /// </summary>
+        [SugarColumn(ColumnDescription = "微信订单号", Length = 50, ColumnName = "wechat_order_no")]
+        public string WechatOrderNo { get; set; }
+
+
+        /// <summary>
+        /// 支付宝订单号
+        /// </summary>
+        [SugarColumn(ColumnDescription = "支付宝订单号", Length = 50, ColumnName = "alipay_order_no")]
+        public string AlipayOrderNo { get; set; }
+
+
+        /// <summary>
+        /// 支付方式
+        /// </summary>
+        [SugarColumn(ColumnDescription = "支付方式", ColumnName = "pay_mode")]
+        public int PayMode { get; set; }
+
+
+        /// <summary>
+        /// 支付金额
+        /// </summary>
+        [SugarColumn(ColumnDescription = "支付金额", ColumnName = "pay_money")]
+        public decimal PayMoney { get; set; }
+
+
+        /// <summary>
+        /// 来源设备号
+        /// </summary>
+        [SugarColumn(ColumnDescription = "来源设备号", Length = 50, ColumnName = "equipment_no")]
+        public string EquipmentNo { get; set; }
+
+
+        /// <summary>
+        /// 最大分红金额
+        /// </summary>
+        [SugarColumn(ColumnDescription = "最大分红金额", ColumnName = "max_divi")]
+        public decimal MaxDivi { get; set; }
+
+
+        /// <summary>
+        /// 当前分红金额
+        /// </summary>
+        [SugarColumn(ColumnDescription = "当前分红金额", ColumnName = "cur_divi")]
+        public decimal CurDivi { get; set; }
+
+
+        /// <summary>
+        /// 是否活动订单
+        /// </summary>
+        [SugarColumn(ColumnDescription = "是否活动订单", ColumnName = "is_act")]
+        public int IsAct { get; set; }
+
+
+        /// <summary>
+        /// 实收金额
+        /// </summary>
+        [SugarColumn(ColumnDescription = "实收金额", ColumnName = "act_money")]
+        public decimal ActMoney { get; set; }
+
+
+        /// <summary>
+        /// 是否分账
+        /// </summary>
+        [SugarColumn(ColumnDescription = "是否分账", ColumnName = "divide_flag")]
+        public int DivideFlag { get; set; }
+
+
+        /// <summary>
+        /// 分账日志
+        /// </summary>
+        [SugarColumn(ColumnDescription = "分账日志", ColumnName = "divide_log")]
+        public string DivideLog { get; set; }
+
+
+        /// <summary>
+        /// 活动记录Id
+        /// </summary>
+        [SugarColumn(ColumnDescription = "活动记录Id", ColumnName = "active_record_id")]
+        public int ActiveRecordId { get; set; }
+
+
+        /// <summary>
+        /// 订单结算金额
+        /// </summary>
+        [SugarColumn(ColumnDescription = "订单结算金额", ColumnName = "settle_amount")]
+        public decimal SettleAmount { get; set; }
+
+
+        /// <summary>
+        /// 返现队列标记
+        /// </summary>
+        [SugarColumn(ColumnDescription = "返现队列标记", ColumnName = "return_flag")]
+        public int ReturnFlag { get; set; }
+
+
+        /// <summary>
+        /// 活动配置参数
+        /// </summary>
+        [SugarColumn(ColumnDescription = "活动配置参数", Length = 500, ColumnName = "active_parameter")]
+        public string ActiveParameter { get; set; }
+
+
+        /// <summary>
+        /// 商户Id
+        /// </summary>
+        [SugarColumn(ColumnDescription = "商户Id", ColumnName = "merchant_id")]
+        public int MerchantId { get; set; }
+
+
+        /// <summary>
+        /// 商户进件渠道
+        /// </summary>
+        [SugarColumn(ColumnDescription = "商户进件渠道", ColumnName = "merchant_channel")]
+        public int MerchantChannel { get; set; }
+
+
+        /// <summary>
+        /// 所属代理
+        /// </summary>
+        [SugarColumn(ColumnDescription = "所属代理", ColumnName = "user_id")]
+        public int UserId { get; set; }
+
+
+        /// <summary>
+        /// 消费者Id
+        /// </summary>
+        [SugarColumn(ColumnDescription = "消费者Id", ColumnName = "consumer_id")]
+        public int ConsumerId { get; set; }
+
+
+        /// <summary>
+        /// 分账时间
+        /// </summary>
+        [SugarColumn(ColumnDescription = "分账时间", ColumnName = "divide_date")]
+        public DateTime? DivideDate { get; set; }
+
+
+        /// <summary>
+        /// 交易月份
+        /// </summary>
+        [SugarColumn(ColumnDescription = "交易月份", Length = 6, ColumnName = "trade_month")]
+        public string TradeMonth { get; set; }
+
+
+        /// <summary>
+        /// 交易日期
+        /// </summary>
+        [SugarColumn(ColumnDescription = "交易日期", Length = 8, ColumnName = "trade_date")]
+        public string TradeDate { get; set; }
+
+
+
+    }
+}

Model/Database/ConsumerProfit.cs

@@ -0,0 +1,75 @@
+namespace Model
+{
+    /// <summary>
+    /// 消费者分红记录表 consumer_profit
+    /// </summary>
+    [SugarTable("consumer_profit", "消费者分红记录表")]
+    [Tenant("0")]
+    public class ConsumerProfit
+    {
+        /// <summary>
+        /// 消费者Id
+        /// </summary>
+        [SugarColumn(ColumnDescription = "消费者Id", ColumnName = "consumer_id")]
+        public int ConsumerId { get; set; }
+
+
+        /// <summary>
+        /// 商户Id
+        /// </summary>
+        [SugarColumn(ColumnDescription = "商户Id", ColumnName = "merchant_id")]
+        public int MerchantId { get; set; }
+
+
+        /// <summary>
+        /// 分红金额
+        /// </summary>
+        [SugarColumn(ColumnDescription = "分红金额", ColumnName = "get_money")]
+        public decimal GetMoney { get; set; }
+
+
+        /// <summary>
+        /// 返现订单Id
+        /// </summary>
+        [SugarColumn(ColumnDescription = "返现订单Id", ColumnName = "order_id")]
+        public int OrderId { get; set; }
+
+
+        /// <summary>
+        /// 商户进件渠道
+        /// </summary>
+        [SugarColumn(ColumnDescription = "商户进件渠道", ColumnName = "merchant_channel")]
+        public int MerchantChannel { get; set; }
+
+
+        /// <summary>
+        /// 支付方式
+        /// </summary>
+        [SugarColumn(ColumnDescription = "支付方式", ColumnName = "pay_mode")]
+        public int PayMode { get; set; }
+
+
+        /// <summary>
+        /// 触发订单Id
+        /// </summary>
+        [SugarColumn(ColumnDescription = "触发订单Id", ColumnName = "source_order_id")]
+        public int SourceOrderId { get; set; }
+
+
+        /// <summary>
+        /// 交易月份
+        /// </summary>
+        [SugarColumn(ColumnDescription = "交易月份", Length = 6, ColumnName = "trade_month")]
+        public string TradeMonth { get; set; }
+
+
+        /// <summary>
+        /// 交易日期
+        /// </summary>
+        [SugarColumn(ColumnDescription = "交易日期", Length = 8, ColumnName = "trade_date")]
+        public string TradeDate { get; set; }
+
+
+
+    }
+}

Model/Database/MerchantDepositOrders.cs

@@ -0,0 +1,61 @@
+namespace Model
+{
+    /// <summary>
+    /// 商户服务费缴纳记录表 merchant_deposit_orders
+    /// </summary>
+    [SugarTable("merchant_deposit_orders", "商户服务费缴纳记录表")]
+    [Tenant("0")]
+    public class MerchantDepositOrders
+    {
+        /// <summary>
+        /// 商户Id
+        /// </summary>
+        [SugarColumn(ColumnDescription = "商户Id", ColumnName = "merchant_id")]
+        public int MerchantId { get; set; }
+
+
+        /// <summary>
+        /// 所属代理Id
+        /// </summary>
+        [SugarColumn(ColumnDescription = "所属代理Id", ColumnName = "user_id")]
+        public int UserId { get; set; }
+
+
+        /// <summary>
+        /// 激活支付金额
+        /// </summary>
+        [SugarColumn(ColumnDescription = "激活支付金额", ColumnName = "act_pay_price")]
+        public decimal ActPayPrice { get; set; }
+
+
+        /// <summary>
+        /// 订单号
+        /// </summary>
+        [SugarColumn(ColumnDescription = "订单号", Length = 50, ColumnName = "order_no")]
+        public string OrderNo { get; set; }
+
+
+        /// <summary>
+        /// 支付方式
+        /// </summary>
+        [SugarColumn(ColumnDescription = "支付方式", ColumnName = "pay_mode")]
+        public int PayMode { get; set; }
+
+
+        /// <summary>
+        /// 交易月份
+        /// </summary>
+        [SugarColumn(ColumnDescription = "交易月份", Length = 6, ColumnName = "trade_month")]
+        public string TradeMonth { get; set; }
+
+
+        /// <summary>
+        /// 交易日期
+        /// </summary>
+        [SugarColumn(ColumnDescription = "交易日期", Length = 8, ColumnName = "trade_date")]
+        public string TradeDate { get; set; }
+
+
+
+    }
+}

Model/Dto/ConsumerMySelfModuleGetConsumerOrdersListDto.cs

@@ -0,0 +1,26 @@
+using System;
+using System.ComponentModel.DataAnnotations;
+using Model.Base;
+
+namespace Dto
+{
+    /// <summary>
+    /// 我的-订单列表
+    /// </summary>
+    public class ConsumerMySelfModuleGetConsumerOrdersListDto
+    {
+        /// <summary>
+        /// 支付方式
+        /// </summary>
+        public int PayMode { get; set; }
+
+
+        /// <summary>
+        /// 微信或支付宝Id
+        /// </summary>
+        public string OpenId { get; set; }
+
+
+
+    }
+}

Model/Dto/ConsumerMySelfModuleGetConsumerProfitListDto.cs

@@ -0,0 +1,32 @@
+using System;
+using System.ComponentModel.DataAnnotations;
+using Model.Base;
+
+namespace Dto
+{
+    /// <summary>
+    /// 我的-分红列表
+    /// </summary>
+    public class ConsumerMySelfModuleGetConsumerProfitListDto
+    {
+        /// <summary>
+        /// 支付方式
+        /// </summary>
+        public int PayMode { get; set; }
+
+
+        /// <summary>
+        /// 微信或支付宝Id
+        /// </summary>
+        public string OpenId { get; set; }
+
+
+        /// <summary>
+        /// 类型(1 支付宝 2 微信)
+        /// </summary>
+        public string Kind { get; set; }
+
+
+
+    }
+}

Model/Dto/MerchantBussinessModuleGetBussinessInfoDetailListDto.cs

@@ -0,0 +1,28 @@
+using System;
+using System.ComponentModel.DataAnnotations;
+using Model.Base;
+
+namespace Dto
+{
+    /// <summary>
+    /// 经营数据-获取经营数据详情列表
+    /// </summary>
+    public class MerchantBussinessModuleGetBussinessInfoDetailListDto
+    {
+        /// <summary>
+        /// 商户Id
+        /// </summary>
+        [Required(ErrorMessage = "商户Id不能为空")]
+        public int MerchantId { get; set; }
+
+
+        /// <summary>
+        /// 交易日期
+        /// </summary>
+        [Required(ErrorMessage = "交易日期不能为空")]
+        public string TradeDate { get; set; }
+
+
+
+    }
+}

Model/Dto/MerchantBussinessModuleGetOrderDetailDto.cs

@@ -0,0 +1,21 @@
+using System;
+using System.ComponentModel.DataAnnotations;
+using Model.Base;
+
+namespace Dto
+{
+    /// <summary>
+    /// 经营数据-获取订单详情
+    /// </summary>
+    public class MerchantBussinessModuleGetOrderDetailDto
+    {
+        /// <summary>
+        /// 商户Id
+        /// </summary>
+        [Required(ErrorMessage = "商户Id不能为空")]
+        public int MerchantId { get; set; }
+
+
+
+    }
+}

Model/Dto/MerchantWorkBenchModuleActMerchantConfirmOrderDto.cs

@@ -0,0 +1,22 @@
+using System;
+using System.ComponentModel.DataAnnotations;
+using Model.Base;
+
+namespace Dto
+{
+    /// <summary>
+    /// 工作台-商户激活确认订单
+    /// </summary>
+    public class MerchantWorkBenchModuleActMerchantConfirmOrderDto
+    {
+        /// <summary>
+        /// 商户Id
+        /// </summary>
+        [Required(ErrorMessage = "商户Id不能为空")]
+        [RegularExpression(@"^\d+$", ErrorMessage = "商户Id格式有误")]
+        public int MerchantId { get; set; }
+
+
+
+    }
+}

Model/Dto/MerchantWorkBenchModuleActMerchantOrderPayDto.cs

@@ -0,0 +1,26 @@
+using System;
+using System.ComponentModel.DataAnnotations;
+using Model.Base;
+
+namespace Dto
+{
+    /// <summary>
+    /// 工作台-商户激活订单支付
+    /// </summary>
+    public class MerchantWorkBenchModuleActMerchantOrderPayDto
+    {
+        /// <summary>
+        /// 支付方式
+        /// </summary>
+        public int PayMode { get; set; }
+
+
+        /// <summary>
+        /// 订单Id
+        /// </summary>
+        public string OrderId { get; set; }
+
+
+
+    }
+}

Model/Dto/MerchantWorkBenchModuleGetActedMerchantActivityInfoDto.cs

@@ -0,0 +1,22 @@
+using System;
+using System.ComponentModel.DataAnnotations;
+using Model.Base;
+
+namespace Dto
+{
+    /// <summary>
+    /// 工作台-已激活商户活动时间
+    /// </summary>
+    public class MerchantWorkBenchModuleGetActedMerchantActivityInfoDto
+    {
+        /// <summary>
+        /// 商户Id
+        /// </summary>
+        [Required(ErrorMessage = "商户Id不能为空")]
+        [RegularExpression(@"^\d+$", ErrorMessage = "商户Id格式有误")]
+        public int MerchantId { get; set; }
+
+
+
+    }
+}

Model/Dto/MerchantWorkBenchModuleGetActedMerchantStandardsInfoDto.cs

@@ -0,0 +1,22 @@
+using System;
+using System.ComponentModel.DataAnnotations;
+using Model.Base;
+
+namespace Dto
+{
+    /// <summary>
+    /// 工作台-已激活商户达标信息
+    /// </summary>
+    public class MerchantWorkBenchModuleGetActedMerchantStandardsInfoDto
+    {
+        /// <summary>
+        /// 商户Id
+        /// </summary>
+        [Required(ErrorMessage = "商户Id不能为空")]
+        [RegularExpression(@"^\d+$", ErrorMessage = "商户Id格式有误")]
+        public int MerchantId { get; set; }
+
+
+
+    }
+}

Model/Vo/ConsumerMySelfModuleGetConsumerOrdersListVo.cs

@@ -0,0 +1,60 @@
+using Newtonsoft.Json;
+
+namespace Vo
+{
+    /// <summary>
+    /// 我的-订单列表
+    /// </summary>
+    public class ConsumerMySelfModuleGetConsumerOrdersListVo
+    {
+        /// <summary>
+        /// 平台订单号
+        /// </summary>
+        public string OrderNo { get; set; }
+
+
+        /// <summary>
+        /// 支付金额
+        /// </summary>
+        public decimal PayMoney { get; set; }
+
+
+        /// <summary>
+        /// 当前分红金额
+        /// </summary>
+        public decimal CurDivi { get; set; }
+
+
+        /// <summary>
+        /// 商户Id
+        /// </summary>
+        public int MerchantId { get; set; }
+
+
+        /// <summary>
+        /// 商户进件渠道
+        /// </summary>
+        public int MerchantChannel { get; set; }
+
+
+        /// <summary>
+        /// 商户名称
+        /// </summary>
+        public string MerchantName { get; set; }
+
+
+        /// <summary>
+        /// 商户简称
+        /// </summary>
+        public string MerchantShortName { get; set; }
+
+
+        /// <summary>
+        /// Other.总数
+        /// </summary>
+        public string Count { get; set; }
+
+
+
+    }
+}

Model/Vo/ConsumerMySelfModuleGetConsumerProfitListVo.cs

@@ -0,0 +1,108 @@
+using Newtonsoft.Json;
+
+namespace Vo
+{
+    /// <summary>
+    /// 我的-分红列表
+    /// </summary>
+    public class ConsumerMySelfModuleGetConsumerProfitListVo
+    {
+        /// <summary>
+        /// 消费者Id
+        /// </summary>
+        public int ConsumerId { get; set; }
+
+
+        /// <summary>
+        /// 商户Id
+        /// </summary>
+        public int MerchantId { get; set; }
+
+
+        /// <summary>
+        /// 分红金额
+        /// </summary>
+        public decimal GetMoney { get; set; }
+
+
+        /// <summary>
+        /// 返现订单Id
+        /// </summary>
+        public int OrderId { get; set; }
+
+
+        /// <summary>
+        /// 商户进件渠道
+        /// </summary>
+        public int MerchantChannel { get; set; }
+
+
+        /// <summary>
+        /// 支付方式
+        /// </summary>
+        public int PayMode { get; set; }
+
+
+        /// <summary>
+        /// 触发订单Id
+        /// </summary>
+        public int SourceOrderId { get; set; }
+
+
+        /// <summary>
+        /// 商户名称
+        /// </summary>
+        public string MerchantName { get; set; }
+
+
+        /// <summary>
+        /// 商户简称
+        /// </summary>
+        public string MerchantShortName { get; set; }
+
+
+        /// <summary>
+        /// Other.总数
+        /// </summary>
+        public string Count { get; set; }
+
+
+        /// <summary>
+        /// 创建时间
+        /// </summary>
+        public string CreateDate { get; set; }
+
+
+        /// <summary>
+        /// 支付金额
+        /// </summary>
+        public string PayMoney { get; set; }
+
+
+        /// <summary>
+        /// 已返金额
+        /// </summary>
+        public string ReturnMoney { get; set; }
+
+
+        /// <summary>
+        /// 订单号
+        /// </summary>
+        public string OrderNo { get; set; }
+
+
+        /// <summary>
+        /// 消费记录表
+        /// </summary>
+        public GetConsumerOrderVo GetConsumerOrder;
+
+
+        /// <summary>
+        /// 商户进件资料表
+        /// </summary>
+        public GetMerchantAddInfoVo GetMerchantAddInfo;
+
+
+
+    }
+}

Model/Vo/MerchantBussinessModuleGetBussinessInfoDetailListVo.cs

@@ -0,0 +1,54 @@
+using Newtonsoft.Json;
+
+namespace Vo
+{
+    /// <summary>
+    /// 经营数据-获取经营数据详情列表
+    /// </summary>
+    public class MerchantBussinessModuleGetBussinessInfoDetailListVo
+    {
+        /// <summary>
+        /// 平台订单号
+        /// </summary>
+        public string OrderNo { get; set; }
+
+
+        /// <summary>
+        /// 支付方式
+        /// </summary>
+        public int PayMode { get; set; }
+
+
+        /// <summary>
+        /// 支付金额
+        /// </summary>
+        public decimal PayMoney { get; set; }
+
+
+        /// <summary>
+        /// 是否活动订单
+        /// </summary>
+        public int IsAct { get; set; }
+
+
+        /// <summary>
+        /// 商户Id
+        /// </summary>
+        public int MerchantId { get; set; }
+
+
+        /// <summary>
+        /// 商户进件渠道
+        /// </summary>
+        public int MerchantChannel { get; set; }
+
+
+        /// <summary>
+        /// Other.总数
+        /// </summary>
+        public string Count { get; set; }
+
+
+
+    }
+}

Model/Vo/MerchantBussinessModuleGetOrderDetailVo.cs

@@ -0,0 +1,127 @@
+using Model;
+using Newtonsoft.Json;
+
+namespace Vo
+{
+    /// <summary>
+    /// 经营数据-获取订单详情
+    /// </summary>
+    public class MerchantBussinessModuleGetOrderDetailVo
+    {
+        /// <summary>
+        /// 支付方式
+        /// </summary>
+        public int PayMode { get; set; }
+
+
+        /// <summary>
+        /// 支付金额
+        /// </summary>
+        public decimal PayMoney { get; set; }
+
+
+        /// <summary>
+        /// 最大分红金额
+        /// </summary>
+        public decimal MaxDivi { get; set; }
+
+
+        /// <summary>
+        /// 当前分红金额
+        /// </summary>
+        public decimal CurDivi { get; set; }
+
+
+        /// <summary>
+        /// 是否活动订单
+        /// </summary>
+        public int IsAct { get; set; }
+
+
+        /// <summary>
+        /// 返现队列标记
+        /// </summary>
+        public int ReturnFlag { get; set; }
+
+
+        /// <summary>
+        /// 商户Id
+        /// </summary>
+        public int MerchantId { get; set; }
+
+
+        /// <summary>
+        /// 商户进件渠道
+        /// </summary>
+        public int MerchantChannel { get; set; }
+
+
+        /// <summary>
+        /// 消费者Id
+        /// </summary>
+        public int ConsumerId { get; set; }
+
+
+        /// <summary>
+        /// 品牌(0 银联 1 好哒))
+        /// </summary>
+        public string BrandId { get; set; }
+
+
+        /// <summary>
+        /// 剩余返现金额
+        /// </summary>
+        public string LeaveDiviAmount { get; set; }
+
+
+        /// <summary>
+        /// 商户名称
+        /// </summary>
+        public string MerchantName { get; set; }
+
+
+        /// <summary>
+        /// 商户简称
+        /// </summary>
+        public string MerchantShortName { get; set; }
+
+
+        /// <summary>
+        /// ProfitList.返现记录Id
+        /// </summary>
+        public string DiviId { get; set; }
+
+
+        /// <summary>
+        /// ProfitList.返现日期
+        /// </summary>
+        public string DiviDate { get; set; }
+
+
+        /// <summary>
+        /// ProfitList.返现金额
+        /// </summary>
+        public string DiviAmount { get; set; }
+
+
+        /// <summary>
+        /// 消费者信息表
+        /// </summary>
+        public ConsumerVo Consumer;
+
+
+        /// <summary>
+        /// 商户基本信息表
+        /// </summary>
+        public MerchantVo Merchant;
+
+
+        /// <summary>
+        /// 消费者分红记录表
+        /// </summary>
+        public List<GetConsumerPrifitVo> GetConsumerPrifit;
+
+
+
+    }
+}

Model/Vo/MerchantWorkBenchModuleActMerchantOrderPayVo.cs

@@ -0,0 +1,18 @@
+using Newtonsoft.Json;
+
+namespace Vo
+{
+    /// <summary>
+    /// 工作台-商户激活订单支付
+    /// </summary>
+    public class MerchantWorkBenchModuleActMerchantOrderPayVo
+    {
+        /// <summary>
+        /// 支付宝微信SDK所需数据
+        /// </summary>
+        public string PayData { get; set; }
+
+
+
+    }
+}

Model/Vo/MerchantWorkBenchModuleGetActedMerchantActivityInfoVo.cs

@@ -0,0 +1,30 @@
+using Newtonsoft.Json;
+
+namespace Vo
+{
+    /// <summary>
+    /// 工作台-已激活商户活动时间
+    /// </summary>
+    public class MerchantWorkBenchModuleGetActedMerchantActivityInfoVo
+    {
+        /// <summary>
+        /// 考核开始时间
+        /// </summary>
+        public string StartDate { get; set; }
+
+
+        /// <summary>
+        /// 考核结束时间
+        /// </summary>
+        public string EndDate { get; set; }
+
+
+        /// <summary>
+        /// 考核状态(-1 未参与 0 考核中 1 已通过 2 未通过 101 待领取 100 已领取 99 发放中)
+        /// </summary>
+        public string Status { get; set; }
+
+
+
+    }
+}

Model/Vo/MerchantWorkBenchModuleGetActedMerchantStandardsInfoVo.cs

@@ -0,0 +1,30 @@
+using Newtonsoft.Json;
+
+namespace Vo
+{
+    /// <summary>
+    /// 工作台-已激活商户达标信息
+    /// </summary>
+    public class MerchantWorkBenchModuleGetActedMerchantStandardsInfoVo
+    {
+        /// <summary>
+        /// 月份
+        /// </summary>
+        public string TradeMonth { get; set; }
+
+
+        /// <summary>
+        /// 交易金额
+        /// </summary>
+        public string TradeAmount { get; set; }
+
+
+        /// <summary>
+        /// 状态(-1 未通过 0 待考核 1 考核中 2 已通过 3 未参与)
+        /// </summary>
+        public string Status { get; set; }
+
+
+
+    }
+}

Model/Vo/SubGetConsumerProfitList/GetConsumerOrderVo.cs

@@ -0,0 +1,144 @@
+using Newtonsoft.Json;
+
+namespace Vo
+{
+    /// <summary>
+    /// 我的-分红列表消费记录表
+    /// </summary>
+    public class GetConsumerOrderVo
+    {
+        /// <summary>
+        /// 平台订单号
+        /// </summary>
+        public string OrderNo;
+
+
+        /// <summary>
+        /// 好哒订单号
+        /// </summary>
+        public string OrdernoHd;
+
+
+        /// <summary>
+        /// 微信订单号
+        /// </summary>
+        public string WechatOrderNo;
+
+
+        /// <summary>
+        /// 支付宝订单号
+        /// </summary>
+        public string AlipayOrderNo;
+
+
+        /// <summary>
+        /// 支付方式
+        /// </summary>
+        public int PayMode;
+
+
+        /// <summary>
+        /// 支付金额
+        /// </summary>
+        public decimal PayMoney;
+
+
+        /// <summary>
+        /// 来源设备号
+        /// </summary>
+        public string EquipmentNo;
+
+
+        /// <summary>
+        /// 最大分红金额
+        /// </summary>
+        public decimal MaxDivi;
+
+
+        /// <summary>
+        /// 当前分红金额
+        /// </summary>
+        public decimal CurDivi;
+
+
+        /// <summary>
+        /// 是否活动订单
+        /// </summary>
+        public int IsAct;
+
+
+        /// <summary>
+        /// 实收金额
+        /// </summary>
+        public decimal ActMoney;
+
+
+        /// <summary>
+        /// 是否分账
+        /// </summary>
+        public int DivideFlag;
+
+
+        /// <summary>
+        /// 分账日志
+        /// </summary>
+        public string DivideLog;
+
+
+        /// <summary>
+        /// 活动记录Id
+        /// </summary>
+        public int ActiveRecordId;
+
+
+        /// <summary>
+        /// 订单结算金额
+        /// </summary>
+        public decimal SettleAmount;
+
+
+        /// <summary>
+        /// 返现队列标记
+        /// </summary>
+        public int ReturnFlag;
+
+
+        /// <summary>
+        /// 活动配置参数
+        /// </summary>
+        public string ActiveParameter;
+
+
+        /// <summary>
+        /// 商户Id
+        /// </summary>
+        public int MerchantId;
+
+
+        /// <summary>
+        /// 商户进件渠道
+        /// </summary>
+        public int MerchantChannel;
+
+
+        /// <summary>
+        /// 所属代理
+        /// </summary>
+        public int UserId;
+
+
+        /// <summary>
+        /// 消费者Id
+        /// </summary>
+        public int ConsumerId;
+
+
+        /// <summary>
+        /// 分账时间
+        /// </summary>
+        public DateTime? DivideDate;
+
+
+
+    }
+}

Model/Vo/SubGetConsumerProfitList/GetMerchantAddInfoVo.cs

@@ -0,0 +1,348 @@
+using Newtonsoft.Json;
+
+namespace Vo
+{
+    /// <summary>
+    /// 我的-分红列表商户进件资料表
+    /// </summary>
+    public class GetMerchantAddInfoVo
+    {
+        /// <summary>
+        /// 商户名称
+        /// </summary>
+        public string MerchantName;
+
+
+        /// <summary>
+        /// 商户简称
+        /// </summary>
+        public string MerchantShortName;
+
+
+        /// <summary>
+        /// 商户注册手机号
+        /// </summary>
+        public string RegisterMobile;
+
+
+        /// <summary>
+        /// 管理员真实姓名
+        /// </summary>
+        public string ManagerRealname;
+
+
+        /// <summary>
+        /// 管理员身份证号
+        /// </summary>
+        public string ManagerIdcard;
+
+
+        /// <summary>
+        /// 管理员手机号
+        /// </summary>
+        public string ManagerMobile;
+
+
+        /// <summary>
+        /// 管理员身份证地址
+        /// </summary>
+        public string IdcardAddress;
+
+
+        /// <summary>
+        /// 管理员邮箱地址
+        /// </summary>
+        public string ManagerEmail;
+
+
+        /// <summary>
+        /// 商户主体类型
+        /// </summary>
+        public string SubjectType;
+
+
+        /// <summary>
+        /// 商户门店地址
+        /// </summary>
+        public string StoreAddress;
+
+
+        /// <summary>
+        /// 商户门店所属区域
+        /// </summary>
+        public string StoreAreas;
+
+
+        /// <summary>
+        /// 管理员身份证类型
+        /// </summary>
+        public string IdcardType;
+
+
+        /// <summary>
+        /// 身份证有效开始时间
+        /// </summary>
+        public DateTime? CardPeriodBegin;
+
+
+        /// <summary>
+        /// 身份证有效结束时间
+        /// </summary>
+        public DateTime? CardPeriodEnd;
+
+
+        /// <summary>
+        /// 身份证正面图
+        /// </summary>
+        public string IdcardFront;
+
+
+        /// <summary>
+        /// 身份证反面图
+        /// </summary>
+        public string IdcardBack;
+
+
+        /// <summary>
+        /// 商户结算卡号
+        /// </summary>
+        public string PaymentCardNo;
+
+
+        /// <summary>
+        /// 商户结算卡银行名称
+        /// </summary>
+        public string PaymentBankName;
+
+
+        /// <summary>
+        /// 商户结算卡开卡地区
+        /// </summary>
+        public string PaymentCardAreas;
+
+
+        /// <summary>
+        /// 商户结算卡开卡银行支行号
+        /// </summary>
+        public string BankNo;
+
+
+        /// <summary>
+        /// 商户结算卡银行简称
+        /// </summary>
+        public string PaymentBankShortName;
+
+
+        /// <summary>
+        /// 商户结算账户类型
+        /// </summary>
+        public string PaymentAccountType;
+
+
+        /// <summary>
+        /// 商户入驻结算规则Id
+        /// </summary>
+        public int SettlementId;
+
+
+        /// <summary>
+        /// 商户所属行业
+        /// </summary>
+        public string QualificationType;
+
+
+        /// <summary>
+        /// 好哒所属行业Id
+        /// </summary>
+        public int BusinessId;
+
+
+        /// <summary>
+        /// 优惠费率活动值
+        /// </summary>
+        public string ActivitiesRate;
+
+
+        /// <summary>
+        /// 优惠费率活动Id
+        /// </summary>
+        public string ActivitiesId;
+
+
+        /// <summary>
+        /// 商户结算卡开户名称
+        /// </summary>
+        public string PaymentAccountName;
+
+
+        /// <summary>
+        /// 商户经营场景类型
+        /// </summary>
+        public string SalesScenesType;
+
+
+        /// <summary>
+        /// 商户服务手机号
+        /// </summary>
+        public string MerchantServiceMobile;
+
+
+        /// <summary>
+        /// 商户营业许可证编号
+        /// </summary>
+        public string LicenseNumber;
+
+
+        /// <summary>
+        /// 商户营业执照有效开始时间
+        /// </summary>
+        public DateTime? LicenseStartDate;
+
+
+        /// <summary>
+        /// 商户营业执照有效结束时间
+        /// </summary>
+        public DateTime? LicenseEndDate;
+
+
+        /// <summary>
+        /// 商户营业执照
+        /// </summary>
+        public string LicenseImg;
+
+
+        /// <summary>
+        /// 商户进件渠道
+        /// </summary>
+        public int MerchantChannel;
+
+
+        /// <summary>
+        /// 商户店内环境照片
+        /// </summary>
+        public string InstoreImg;
+
+
+        /// <summary>
+        /// 商户门头照片
+        /// </summary>
+        public string StoreentranceImg;
+
+
+        /// <summary>
+        /// 好哒商户补充资料
+        /// </summary>
+        public string Extra1;
+
+
+        /// <summary>
+        /// 好哒正面人像照
+        /// </summary>
+        public string FaceRecognition;
+
+
+        /// <summary>
+        /// 好哒行业许可证照片
+        /// </summary>
+        public string IndustryLicense1;
+
+
+        /// <summary>
+        /// 好哒收银台照片
+        /// </summary>
+        public string CheckstandImg;
+
+
+        /// <summary>
+        /// 好哒开户许可证照片
+        /// </summary>
+        public string OpenAccountLicenses;
+
+
+        /// <summary>
+        /// 好哒商户类型
+        /// </summary>
+        public string ChannelKind;
+
+
+        /// <summary>
+        /// 好哒商户结算卡照片
+        /// </summary>
+        public string BankCard;
+
+
+        /// <summary>
+        /// 好哒法人手持身份证正面照片
+        /// </summary>
+        public string PersonWithIdcard;
+
+
+        /// <summary>
+        /// 好哒经营地区区域码
+        /// </summary>
+        public string AreaNo;
+
+
+        /// <summary>
+        /// 商户结算卡开卡银行总行号
+        /// </summary>
+        public string HeadBankNo;
+
+
+        /// <summary>
+        /// 商户结算卡开卡地区域码
+        /// </summary>
+        public string PaymentBankAreasNo;
+
+
+        /// <summary>
+        /// 好哒开户许可证开户名
+        /// </summary>
+        public string OpenAccountName;
+
+
+        /// <summary>
+        /// 好哒开户账户类型
+        /// </summary>
+        public int AccountType;
+
+
+        /// <summary>
+        /// 好哒营业执照类型
+        /// </summary>
+        public int LicenceType;
+
+
+        /// <summary>
+        /// 好哒银行预留手机号
+        /// </summary>
+        public string ResserveMobile;
+
+
+        /// <summary>
+        /// 场所类型
+        /// </summary>
+        public int PlaceType;
+
+
+        /// <summary>
+        /// 品牌
+        /// </summary>
+        public int BrandId;
+
+
+        /// <summary>
+        /// 好哒收款商户号
+        /// </summary>
+        public string MchtNo;
+
+
+        /// <summary>
+        /// 商户支付宝账号
+        /// </summary>
+        public string AlipayAccount;
+
+
+
+    }
+}

Model/Vo/SubGetOrderDetail/ConsumerVo.cs

@@ -0,0 +1,30 @@
+using Newtonsoft.Json;
+
+namespace Vo
+{
+    /// <summary>
+    /// 经营数据-获取订单详情消费者信息表
+    /// </summary>
+    public class ConsumerVo
+    {
+        /// <summary>
+        /// 消费者头像
+        /// </summary>
+        public string HeadPhoto;
+
+
+        /// <summary>
+        /// 消费者昵称
+        /// </summary>
+        public string NickName;
+
+
+        /// <summary>
+        /// 手机号
+        /// </summary>
+        public string Mobile;
+
+
+
+    }
+}

Model/Vo/SubGetOrderDetail/GetConsumerPrifitVo.cs

@@ -0,0 +1,54 @@
+using Newtonsoft.Json;
+
+namespace Vo
+{
+    /// <summary>
+    /// 经营数据-获取订单详情消费者分红记录表
+    /// </summary>
+    public class GetConsumerPrifitVo
+    {
+        /// <summary>
+        /// 消费者Id
+        /// </summary>
+        public int ConsumerId;
+
+
+        /// <summary>
+        /// 商户Id
+        /// </summary>
+        public int MerchantId;
+
+
+        /// <summary>
+        /// 分红金额
+        /// </summary>
+        public decimal GetMoney;
+
+
+        /// <summary>
+        /// 返现订单Id
+        /// </summary>
+        public int OrderId;
+
+
+        /// <summary>
+        /// 商户进件渠道
+        /// </summary>
+        public int MerchantChannel;
+
+
+        /// <summary>
+        /// 支付方式
+        /// </summary>
+        public int PayMode;
+
+
+        /// <summary>
+        /// 触发订单Id
+        /// </summary>
+        public int SourceOrderId;
+
+
+
+    }
+}

Model/Vo/SubGetOrderDetail/MerchantVo.cs

@@ -0,0 +1,30 @@
+using Newtonsoft.Json;
+
+namespace Vo
+{
+    /// <summary>
+    /// 经营数据-获取订单详情商户基本信息表
+    /// </summary>
+    public class MerchantVo
+    {
+        /// <summary>
+        /// 商户名称
+        /// </summary>
+        public string Name;
+
+
+        /// <summary>
+        /// 详细地址
+        /// </summary>
+        public string Address;
+
+
+        /// <summary>
+        /// 所属区域
+        /// </summary>
+        public string Areas;
+
+
+
+    }
+}

Services/ConsumerOrdersService.cs

@@ -0,0 +1,59 @@
+using Attribute;
+using Dto;
+using Vo;
+using Model;
+using Model.Base;
+using Repository;
+using Service;
+using Microsoft.AspNetCore.Mvc;
+
+namespace Services
+{
+    /// <summary>
+    /// 消费记录表Service业务层处理
+    /// </summary>
+    [AppService(ServiceType = typeof(IConsumerOrdersService), ServiceLifetime = LifeTime.Transient)]
+    public class ConsumerOrdersService : BaseService<ConsumerOrders>, IConsumerOrdersService
+    {
+        /// <summary>
+        /// 商户板块-经营数据-获取经营数据详情列表
+        /// </summary>
+        /// <param name="parm">请求参数</param>
+        /// <returns>商户板块经营数据-获取经营数据详情列表</returns>
+        public PagedInfo<MerchantBussinessModuleGetBussinessInfoDetailListVo> GetBussinessInfoDetailList([FromQuery] PagerInfo page, [FromQuery] MerchantBussinessModuleGetBussinessInfoDetailListDto parm)
+        {
+            //开始拼装查询条件
+            var predicate = Expressionable.Create<ConsumerOrders>();
+            predicate = predicate.AndIF(parm.MerchantId != null, m => m.MerchantId == parm.MerchantId);
+            predicate = predicate.AndIF(!string.IsNullOrEmpty(parm.TradeDate), m => m.TradeDate.Contains(parm.TradeDate));
+            var response = Queryable()
+                .Where(predicate.ToExpression())
+                .ToPage<ConsumerOrders, MerchantBussinessModuleGetBussinessInfoDetailListVo>(page);
+            return response;
+        }
+
+
+
+
+        /// <summary>
+        /// 消费者板块-我的-订单列表
+        /// </summary>
+        /// <param name="parm">请求参数</param>
+        /// <returns>消费者板块我的-订单列表</returns>
+        public PagedInfo<ConsumerMySelfModuleGetConsumerOrdersListVo> GetConsumerOrdersList([FromQuery] PagerInfo page, [FromQuery] ConsumerMySelfModuleGetConsumerOrdersListDto parm)
+        {
+            //开始拼装查询条件
+            var predicate = Expressionable.Create<ConsumerOrders>();
+            predicate = predicate.AndIF(parm.PayMode != null, m => m.PayMode == parm.PayMode);
+            var response = Queryable()
+                .Where(predicate.ToExpression())
+                .ToPage<ConsumerOrders, ConsumerMySelfModuleGetConsumerOrdersListVo>(page);
+            return response;
+        }
+
+
+
+
+
+    }
+}

Services/ConsumerProfitService.cs

@@ -0,0 +1,39 @@
+using Attribute;
+using Dto;
+using Vo;
+using Model;
+using Model.Base;
+using Repository;
+using Service;
+using Microsoft.AspNetCore.Mvc;
+
+namespace Services
+{
+    /// <summary>
+    /// 消费者分红记录表Service业务层处理
+    /// </summary>
+    [AppService(ServiceType = typeof(IConsumerProfitService), ServiceLifetime = LifeTime.Transient)]
+    public class ConsumerProfitService : BaseService<ConsumerProfit>, IConsumerProfitService
+    {
+        /// <summary>
+        /// 消费者板块-我的-分红列表
+        /// </summary>
+        /// <param name="parm">请求参数</param>
+        /// <returns>消费者板块我的-分红列表</returns>
+        public PagedInfo<ConsumerMySelfModuleGetConsumerProfitListVo> GetConsumerProfitList([FromQuery] PagerInfo page, [FromQuery] ConsumerMySelfModuleGetConsumerProfitListDto parm)
+        {
+            //开始拼装查询条件
+            var predicate = Expressionable.Create<ConsumerProfit>();
+            predicate = predicate.AndIF(parm.PayMode != null, m => m.PayMode == parm.PayMode);
+            var response = Queryable()
+                .Where(predicate.ToExpression())
+                .ToPage<ConsumerProfit, ConsumerMySelfModuleGetConsumerProfitListVo>(page);
+            return response;
+        }
+
+
+
+
+
+    }
+}

Services/IService/IConsumerOrdersService.cs

@@ -0,0 +1,29 @@
+using Dto;
+using Vo;
+using Model;
+using Model.Base;
+using Microsoft.AspNetCore.Mvc;
+
+namespace Services
+{
+    public interface IConsumerOrdersService : IBaseService<ConsumerOrders>
+    {
+        /// <summary>
+        /// 商户板块-经营数据-获取经营数据详情列表
+        /// </summary>
+        /// <param name="parm">请求参数</param>
+        /// <returns>商户板块经营数据-获取经营数据详情列表</returns>
+        PagedInfo<MerchantBussinessModuleGetBussinessInfoDetailListVo> GetBussinessInfoDetailList([FromQuery] PagerInfo page, [FromQuery] MerchantBussinessModuleGetBussinessInfoDetailListDto parm);
+
+
+        /// <summary>
+        /// 消费者板块-我的-订单列表
+        /// </summary>
+        /// <param name="parm">请求参数</param>
+        /// <returns>消费者板块我的-订单列表</returns>
+        PagedInfo<ConsumerMySelfModuleGetConsumerOrdersListVo> GetConsumerOrdersList([FromQuery] PagerInfo page, [FromQuery] ConsumerMySelfModuleGetConsumerOrdersListDto parm);
+
+
+
+    }
+}

Services/IService/IConsumerProfitService.cs

@@ -0,0 +1,21 @@
+using Dto;
+using Vo;
+using Model;
+using Model.Base;
+using Microsoft.AspNetCore.Mvc;
+
+namespace Services
+{
+    public interface IConsumerProfitService : IBaseService<ConsumerProfit>
+    {
+        /// <summary>
+        /// 消费者板块-我的-分红列表
+        /// </summary>
+        /// <param name="parm">请求参数</param>
+        /// <returns>消费者板块我的-分红列表</returns>
+        PagedInfo<ConsumerMySelfModuleGetConsumerProfitListVo> GetConsumerProfitList([FromQuery] PagerInfo page, [FromQuery] ConsumerMySelfModuleGetConsumerProfitListDto parm);
+
+
+
+    }
+}

Services/IService/IMerchantDepositOrdersService.cs

@@ -0,0 +1,21 @@
+using Dto;
+using Vo;
+using Model;
+using Model.Base;
+using Microsoft.AspNetCore.Mvc;
+
+namespace Services
+{
+    public interface IMerchantDepositOrdersService : IBaseService<MerchantDepositOrders>
+    {
+        /// <summary>
+        /// 商户板块-工作台-已激活商户达标信息
+        /// </summary>
+        /// <param name="parm">请求参数</param>
+        /// <returns>商户板块工作台-已激活商户达标信息</returns>
+        PagedInfo<MerchantWorkBenchModuleGetActedMerchantStandardsInfoVo> GetActedMerchantStandardsInfo([FromQuery] MerchantWorkBenchModuleGetActedMerchantStandardsInfoDto parm);
+
+
+
+    }
+}

Services/MerchantDepositOrdersService.cs

@@ -0,0 +1,39 @@
+using Attribute;
+using Dto;
+using Vo;
+using Model;
+using Model.Base;
+using Repository;
+using Service;
+using Microsoft.AspNetCore.Mvc;
+
+namespace Services
+{
+    /// <summary>
+    /// 商户服务费缴纳记录表Service业务层处理
+    /// </summary>
+    [AppService(ServiceType = typeof(IMerchantDepositOrdersService), ServiceLifetime = LifeTime.Transient)]
+    public class MerchantDepositOrdersService : BaseService<MerchantDepositOrders>, IMerchantDepositOrdersService
+    {
+        /// <summary>
+        /// 商户板块-工作台-已激活商户达标信息
+        /// </summary>
+        /// <param name="parm">请求参数</param>
+        /// <returns>商户板块工作台-已激活商户达标信息</returns>
+        public PagedInfo<MerchantWorkBenchModuleGetActedMerchantStandardsInfoVo> GetActedMerchantStandardsInfo([FromQuery] MerchantWorkBenchModuleGetActedMerchantStandardsInfoDto parm)
+        {
+            //开始拼装查询条件
+            var predicate = Expressionable.Create<MerchantDepositOrders>();
+            predicate = predicate.AndIF(parm.MerchantId != null, m => m.MerchantId == parm.MerchantId);
+            var response = Queryable()
+                .Where(predicate.ToExpression())
+                .ToPage<MerchantDepositOrders, MerchantWorkBenchModuleGetActedMerchantStandardsInfoVo>(new PagerInfo());
+            return response;
+        }
+
+
+
+
+
+    }
+}