整理接口

AppStart/Redis/Mysql/MerchantParamSetDbconn.cs

@@ -12,21 +12,10 @@ namespace MySystem
         #region 获取单个字段
         public MerchantParamSet Get(int Id)
         {
-            string key = "MerchantParamSet:" + Id;
-            if (RedisDbconn.Instance.Exists(key))
-            {
-                MerchantParamSet obj = RedisDbconn.Instance.Get<MerchantParamSet>(key);
-                if (obj != null)
-                {
-                    return obj;
-                }
-            }
             WebCMSEntities db = new WebCMSEntities();
             MerchantParamSet order = db.MerchantParamSet.FirstOrDefault(m => m.Id == Id);
             if (order != null)
             {
-                RedisDbconn.Instance.Set(key, order);
-                RedisDbconn.Instance.SetExpire(key, Library.function.get_Random(1800, 5400));
             }
             return order;
         }

AppStart/RelationClass.cs

@@ -51,47 +51,7 @@ namespace MySystem
         #region 收支明细变动类型
         public static string GetChangeTypeInfo(int key)
         {
-            if (key == 0) return "激活奖励";
-            if (key == 1) return "交易分润";
-            if (key == 11) return "月月红";
-            if (key == 12) return "交易奖励";
-            if (key == 2) return "提现申请";
-            if (key == 3) return "提现代付";
-            if (key == 4) return "提现手续费";
-            if (key == 5) return "提现税点扣除";
-            if (key == 6) return "提现失败，解冻";
-            if (key == 61) return "系统冻结";
-            if (key == 62) return "系统解冻";
-            if (key == 63) return "系统扣减";
-            if (key == 64) return "系统奖励";
-            if (key == 65) return "押金暂扣";
-            if (key == 66) return "押金退还";
-            if (key == 7) return "系统扣除";
-            if (key == 10) return "办卡奖励";
-            if (key == 20) return "余额支付";
-            if (key == 21) return "余额退款";
-            if (key == 22) return "余额退款手续费";
-            if (key == 30) return "红包奖励";
-            if (key == 31) return "活动奖励";
-            if (key == 40) return "商户达标返";
-            if (key == 50) return "开机奖励";
-            if (key == 60) return "流量卡分佣";
-            if (key == 111) return "分润补贴";
-            if (key == 112) return "推荐奖励";
-            if (key == 113) return "招商节奖励";
-            if (key == 114) return "私董会分红";
-            if (key == 115) return "分仓奖励";
-            if (key == 116) return "大盟主奖励";
-            if (key == 117) return "盟主奖励(储蓄金入账)";
-            if (key == 118) return "盟主奖励(购机奖励)";
-            if (key == 119) return "分仓临时额度退还";
-            if (key == 120) return "运营中心(购机奖励)";
-            if (key == 121) return "运营中心奖励";
-            if (key == 122) return "推荐大盟主奖励";
-            if (key == 123) return "推荐小盟主奖励";
-            if (key == 124) return "扣机具货款";
-            if (key == 125) return "软件服务费";
-            if (key == 126) return "机具货款退还";
+            if (key == 1) return "达标奖励";
             return "";
         }
         #endregion
@@ -99,8 +59,8 @@ namespace MySystem
         #region 机具类型
         public static string GetPosSnTypeInfo(int key)
         {
-            if (key == 0) return "兑换机";
-            if (key == 1) return "循环机";
+            if (key == 0) return "兑换码";
+            if (key == 1) return "循环码";
             return "";
         }
         #endregion

Areas/Api/Controllers/v1/MainServer/ActiveRewardController.cs

@@ -0,0 +1,143 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Data;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Http;
+using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Options;
+using Microsoft.AspNetCore.Authorization;
+using System.Web;
+using MySystem.MainModels;
+using LitJson;
+using Library;
+
+namespace MySystem.Areas.Api.Controllers.v1.pos
+{
+    [Area("Api")]
+    [Route("Api/v1/[controller]/[action]")]
+    public class ActiveRewardController : BaseController
+    {
+        public ActiveRewardController(IHttpContextAccessor accessor, ILogger<BaseController> logger, IOptions<Setting> setting) : base(accessor, logger, setting)
+        {
+            OtherMySqlConn.connstr = Library.ConfigurationManager.AppSettings["SqlConnStr"].ToString();
+        }
+
+
+        #region 首页-客小爽产品-收益查看-达标奖励
+        [Authorize]
+        public JsonResult StatList(string value)
+        {
+            value = DesDecrypt(value);
+            JsonData data = JsonMapper.ToObject(value);
+            List<Dictionary<string, object>> dataList = StatListDo(value);
+            return Json(new AppResultJson() { Status = "1", Info = "", Data = dataList });
+        }
+        public List<Dictionary<string, object>> StatListDo(string value)
+        {
+            JsonData data = JsonMapper.ToObject(value);
+            int UserId = int.Parse(function.CheckInt(data["UserId"].ToString())); //创客
+            string TradeMonth = data["TradeMonth"].ToString();
+            int PageSize = int.Parse(function.CheckInt(data["PageSize"].ToString()));
+            int PageNum = int.Parse(function.CheckInt(data["PageNum"].ToString()));
+            int Kind = int.Parse(function.CheckInt(data["Kind"].ToString()));
+            string Date = Kind == 1 ? "%Y%m%d" : "%Y%m";
+            string TradeMonthCondi = "";
+            if(Kind == 2)
+            {
+                string StartTradeMonth = TradeMonth + "-01 00:00:00";
+                string EndTradeMonth = DateTime.Parse(StartTradeMonth).AddMonths(1).ToString("yyyy-MM-dd HH:mm:ss");
+                TradeMonthCondi = " and CreateDate>='" + StartTradeMonth + "' and CreateDate>='" + EndTradeMonth + "'";
+            }
+            List<Dictionary<string, object>> dataList = new List<Dictionary<string, object>>();
+            DataTable dt = CustomerSqlConn.dtable("select DATE_FORMAT(CreateDate,'" + Date + "'),sum(RewardAmount) from ActiveReward where UserId=" + UserId + TradeMonthCondi + " group by DATE_FORMAT(CreateDate,'" + Date + "') order by DATE_FORMAT(CreateDate,'" + Date + "') desc limit 10", AppConfig.Base.SqlConnStr);
+            foreach (DataRow dr in dt.Rows)
+            {
+                string subdata = dr[0].ToString();
+                decimal RewardAmount = decimal.Parse(dr[1].ToString());
+                Dictionary<string, object> curData = new Dictionary<string, object>();
+                curData.Add("RewardAmount", RewardAmount); //奖励金额
+                if (Kind == 1)
+                {
+                    curData.Add("ActDate", subdata.Substring(0, 4) + "年" + subdata.Substring(4, 2) + "月" + subdata.Substring(6, 2) + "日"); //激活时间
+                }
+                else
+                {
+                    curData.Add("ActDate", subdata.Substring(0, 4) + "年" + subdata.Substring(4, 2) + "月"); //激活时间
+                }
+                curData.Add("ActDateValue", subdata); //激活时间值
+                dataList.Add(curData);
+            }
+            return dataList;
+        }
+        #endregion
+
+
+        #region 首页-客小爽产品-收益查看-达标奖励-明细
+        [Authorize]
+        public JsonResult StatDetail(string value)
+        {
+            value = DesDecrypt(value);
+            JsonData data = JsonMapper.ToObject(value);
+            List<Dictionary<string, object>> dataList = StatDetailDo(value);
+            return Json(new AppResultJson() { Status = "1", Info = "", Data = dataList });
+        }
+        public List<Dictionary<string, object>> StatDetailDo(string value)
+        {
+            JsonData data = JsonMapper.ToObject(value);
+            int UserId = int.Parse(function.CheckInt(data["UserId"].ToString())); //创客
+            string ActDate = data["ActDate"].ToString(); //激活时间
+            int PageSize = int.Parse(function.CheckInt(data["PageSize"].ToString()));
+            int PageNum = int.Parse(function.CheckInt(data["PageNum"].ToString()));
+            List<Dictionary<string, object>> dataList = new List<Dictionary<string, object>>();
+            DateTime start = DateTime.Parse(ActDate + " 00:00:00");
+            DateTime end = DateTime.Parse(ActDate + " 23:59:59");
+            IQueryable<ActiveReward> query = maindb.ActiveReward.Where(m => m.UserId == UserId && m.CreateDate >= start && m.CreateDate <= end);
+            if (PageNum == 1)
+            {
+                query = query.Take(PageSize);
+            }
+            else
+            {
+                int skipNum = PageSize * (PageNum - 1);
+                query = query.Skip(skipNum).Take(PageSize);
+            }
+            foreach (var subdata in query.ToList())
+            {
+                Dictionary<string, object> curData = new Dictionary<string, object>();
+                PosMerchantInfo merchant = PosMerchantInfoDbconn.Instance.Get(subdata.MerchantId) ?? new PosMerchantInfo();
+                curData.Add("SnNo", subdata.KqSnNo);
+                curData.Add("MerchantName", merchant.MerchantName); //商户名称
+                curData.Add("RewardAmount", subdata.RewardAmount); //奖励金额
+                dataList.Add(curData);
+            }
+            return dataList;
+        }
+        #endregion
+
+
+
+        #region 检查签名是否合法，合法返回1，不合法返回提示信息
+
+        /// <summary>
+        /// 检查签名是否合法，合法返回1，不合法返回提示信息
+        /// </summary>
+        /// <param name="value">请求的参数(json字符串)</param>
+        /// <param name="signField">要签名的字段</param>
+        /// <returns></returns>
+        private string CheckSign(string value, string[] signField)
+        {
+            JsonData json = JsonMapper.ToObject(value);
+            Dictionary<string, string> dic = new Dictionary<string, string>();
+            for (int i = 0; i < signField.Length; i++)
+            {
+                dic.Add(signField[i], json[signField[i]].ToString());
+            }
+            string sign = json["sign"].ToString(); //客户端签名字符串
+            return new Sign().sign(dic, sign);
+        }
+
+        #endregion
+
+    }
+}

Areas/Api/Controllers/v1/MainServer/MerchantInfoController.cs

@@ -130,12 +130,10 @@ namespace MySystem.Areas.Api.Controllers.v1
         public List<Dictionary<string, object>> MyMerchantDo(string value, out Dictionary<string, object> Other)
         {
             JsonData data = JsonMapper.ToObject(value);
+            string SearchKey = data["SearchKey"].ToString(); //搜索关键词
             int UserId = int.Parse(function.CheckInt(data["UserId"].ToString())); //创客
-            int ProductType = int.Parse(function.CheckInt(data["ProductType"].ToString())); //产品类型
             int ActiveStatus = int.Parse(function.CheckInt(data["ActiveStatus"].ToString())); //商户激活状态
-            decimal MinTrade = decimal.Parse(function.CheckNum(data["MinTrade"].ToString())); //本月交易额最低值
-            decimal MaxTrade = decimal.Parse(function.CheckNum(data["MaxTrade"].ToString())); //本月交易额最高值
-            string ActTime = data["ActTime"].ToString(); //激活时间
+            int Kind = int.Parse(function.CheckInt(data["Kind"].ToString()));
             string Sort = data["Sort"].ToString(); //排序
             int PageSize = int.Parse(function.CheckInt(data["PageSize"].ToString()));
             int PageNum = int.Parse(function.CheckInt(data["PageNum"].ToString()));
@@ -147,36 +145,15 @@ namespace MySystem.Areas.Api.Controllers.v1
             int ProductCount = query.Count();
             int ProductActCount = query.Count(m => m.ActivationStatus == 1);
             int ProductUnActCount = ProductCount - ProductActCount;
-            // if (ProductType > 0)
-            // {
-            //     if (ProductType == 1)
-            //     {
-            //         query = query.Where(m => m.QueryCount > 0).ToList();
-            //     }
-            //     else if (ProductType == 2)
-            //     { 
-            //         query = query.Where(m => m.Status > 0).ToList();
-            //     }
-            // }
+            if (!string.IsNullOrEmpty(SearchKey))
+            {
+                query = query.Where(m => m.Name.Contains(SearchKey));
+            }
             if (ActiveStatus > 0)
             {
                 if (ActiveStatus == 2) ActiveStatus = 0;
                 query = query.Where(m => m.ActivationStatus == ActiveStatus);
             }
-            if (MinTrade > 0)
-            {
-                query = query.Where(m => m.TotalAmount >= MinTrade);
-            }
-            if (MaxTrade > 0)
-            {
-                query = query.Where(m => m.TotalAmount <= MaxTrade);
-            }
-            if (!string.IsNullOrEmpty(ActTime))
-            {
-                DateTime Start = DateTime.Parse(ActTime + "-01-01 00:00:00");
-                DateTime End = Start.AddYears(1);
-                query = query.Where(m => m.ActivationDate >= Start && m.ActivationDate < End);
-            }
             if (Sort == "trade")
             {
                 query = query.OrderByDescending(m => m.TotalAmount);
@@ -196,20 +173,20 @@ namespace MySystem.Areas.Api.Controllers.v1
             }
             foreach (var item in query.ToList())
             {
-                MerchantInfo subdata = MerchantInfoDbconn.Instance.Get(item.Id) ?? new MerchantInfo();
                 Dictionary<string, object> curData = new Dictionary<string, object>();
-                curData.Add("MerchantName", subdata.Name); //商户姓名
-                curData.Add("KqRegTime", subdata.CreateDate == null ? "" : subdata.CreateDate.Value.ToString("yyyy-MM-dd")); //渠道注册时间
+                curData.Add("MerchantName", item.Name); //商户姓名
+                curData.Add("KqRegTime", item.CreateDate == null ? "" : item.CreateDate.Value.ToString("yyyy-MM-dd")); //渠道注册时间
                 curData.Add("Id", item.Id); //Id
-                curData.Add("ThisMonthTrade", item.TotalAmount); //当月交易额
+                curData.Add("TotalAmount", item.TotalAmount); //交易额
+                curData.Add("TodayTrade", 0); //今日交易额
+                curData.Add("TradeCount", 0); //交易笔数
+                curData.Add("TodayTradeCount", 0); //今日交易笔数
                 dataList.Add(curData);
             }
             Other = new Dictionary<string, object>();
             Other.Add("TotalCount", TotalCount); //商户数
-            Other.Add("ActCount", ActCount); //商户激活数
-            Other.Add("ProductCount", ProductCount); //当前产品商户总数
-            Other.Add("ProductActCount", ProductActCount); //当前产品已激活数
-            Other.Add("ProductUnActCount", ProductUnActCount); //当前产品未激活数
+            Other.Add("ActCount", ActCount); //商户达标数
+            Other.Add("UnActCount", ProductUnActCount); //未达标数
             return dataList;
         }
         #endregion
@@ -232,22 +209,102 @@ namespace MySystem.Areas.Api.Controllers.v1
             int Id = int.Parse(function.CheckInt(data["Id"].ToString()));
             MerchantInfo merchant = MerchantInfoDbconn.Instance.Get(Id) ?? new MerchantInfo();
             MerchantAddInfo addinfo = MerchantAddInfoDbconn.Instance.Get(Id) ?? new MerchantAddInfo();
-            // MerchantAddInfoController controller = new MerchantAddInfoController(_accessor, _logger, _setting);
             Obj.Add("MerchantName", merchant.Name); //商户名称
-            // Obj.Add("MainType", controller.GetSubjects()[addinfo.SubjectType]); //主体类型
             Obj.Add("LegalName", addinfo.CertLegalPerson); //企业法人
-            // Obj.Add("MerchantShortName", addinfo.MerchantShortname); //企业简称
-            // Obj.Add("SettleRule", addinfo.SettlementId); //结算规则
-            // Obj.Add("CreditCode", addinfo.BusinessCode); //商户信用代码
             Obj.Add("MerchantMobile", addinfo.MobilePhone); //商户手机号
-            Obj.Add("MerchantMobile", DefaultPic(merchant.Logo));
-            // Obj.Add("Areas", merchant.Areas); //省份
+            Obj.Add("SubjectType", addinfo.SubjectType); //主体类型
+            Obj.Add("CreateDate", merchant.CreateDate == null ? "" : merchant.CreateDate.Value.ToString("yyyy-MM-dd HH:mm:ss")); //注册时间
+            Obj.Add("ActivationDate", merchant.ActivationDate == null ? "" : merchant.ActivationDate.Value.ToString("yyyy-MM-dd HH:mm:ss")); //达标时间
+            Obj.Add("TotalAmount", merchant.TotalAmount); //总交易额
             return Obj;
         }
         #endregion
 
 
 
+        #region 创客-首页-我的商户-商户详情-交易统计
+        [Authorize]
+        public JsonResult MerchantTradeList(string value)
+        {
+            value = DesDecrypt(value);
+            JsonData data = JsonMapper.ToObject(value);
+            List<Dictionary<string, object>> dataList = MerchantTradeListDo(value);
+            return Json(new AppResultJson() { Status = "1", Info = "", Data = dataList });
+        }
+        public List<Dictionary<string, object>> MerchantTradeListDo(string value)
+        {
+            JsonData data = JsonMapper.ToObject(value);
+            string TradeMonth = data["TradeMonth"].ToString(); //交易月
+            int MerchantId = int.Parse(function.CheckInt(data["MerchantId"].ToString())); //商户Id
+            int PageSize = int.Parse(function.CheckInt(data["PageSize"].ToString()));
+            int PageNum = int.Parse(function.CheckInt(data["PageNum"].ToString()));
+            List<Dictionary<string, object>> dataList = new List<Dictionary<string, object>>();
+            IQueryable<PosMerchantTradeSummay> query = maindb.PosMerchantTradeSummay.Where(m => m.MerchantId == MerchantId && m.TradeMonth == TradeMonth).OrderByDescending(m => m.TradeDate);
+            if (PageNum == 1)
+            {
+                query = query.Take(PageSize);
+            }
+            else
+            {
+                int skipNum = PageSize * (PageNum - 1);
+                query = query.Skip(skipNum).Take(PageSize);
+            }
+            foreach (PosMerchantTradeSummay item in query)
+            {
+                Dictionary<string, object> curData = new Dictionary<string, object>();
+                curData.Add("TradeDate", item.TradeDate); //交易日
+                curData.Add("TradeAmt", item.TradeAmount); //交易金额
+                curData.Add("ActTradeAmt", 0); //活动交易金额
+                curData.Add("UnActTradeAmt", 0); //非活动交易金额
+                curData.Add("TradeCount", 0); //交易笔数
+                dataList.Add(curData);
+            }
+            return dataList;
+        }
+        #endregion
+
+
+        #region 创客-首页-我的商户-商户详情-码牌
+        [Authorize]
+        public JsonResult QrCodeList(string value)
+        {
+            value = DesDecrypt(value);
+            JsonData data = JsonMapper.ToObject(value);
+            List<Dictionary<string, object>> dataList = QrCodeListDo(value);
+            return Json(new AppResultJson() { Status = "1", Info = "", Data = dataList });
+        }
+        public List<Dictionary<string, object>> QrCodeListDo(string value)
+        {
+            JsonData data = JsonMapper.ToObject(value);
+            int MerchantId = int.Parse(function.CheckInt(data["MerchantId"].ToString())); //商户Id
+            int PageSize = int.Parse(function.CheckInt(data["PageSize"].ToString()));
+            int PageNum = int.Parse(function.CheckInt(data["PageNum"].ToString()));
+            List<Dictionary<string, object>> dataList = new List<Dictionary<string, object>>();
+            IQueryable<MerchantQrCode> query = maindb.MerchantQrCode.Where(m => m.MerchantId == MerchantId).OrderByDescending(m => m.Id);
+            if (PageNum == 1)
+            {
+                query = query.Take(PageSize);
+            }
+            else
+            {
+                int skipNum = PageSize * (PageNum - 1);
+                query = query.Skip(skipNum).Take(PageSize);
+            }
+            foreach (MerchantQrCode item in query)
+            {
+                Dictionary<string, object> curData = new Dictionary<string, object>();
+                curData.Add("SnNo", item.SnNo); //sn
+                curData.Add("TradeAmount", 0);
+                dataList.Add(curData);
+            }
+            return dataList;
+        }
+        #endregion
+
+
+
+
+
         #region 首页-我的商户-商户搜索
         [Authorize]
         public JsonResult MerchantSearch(string value)

Areas/Api/Controllers/v1/MainServer/MerchantParamSetController.cs

@@ -109,8 +109,16 @@ namespace MySystem.Areas.Api.Controllers.v1
             }
             Dictionary<string, object> Obj = new Dictionary<string, object>();
             int Id = int.Parse(function.CheckInt(data["Id"].ToString()));
-            MerchantParamSet query = MerchantParamSetDbconn.Instance.Get(Id) ?? new MerchantParamSet();
-            query.Id = Id;
+            MerchantParamSet query = maindb.MerchantParamSet.FirstOrDefault(m => m.Id == Id);
+            if(query == null)
+            {
+                query = maindb.MerchantParamSet.Add(new MerchantParamSet()
+                {
+                    Id = Id,
+                    CreateDate = DateTime.Now,
+                }).Entity;
+                maindb.SaveChanges();
+            }
             query.UpdateDate = DateTime.Now; //修改时间
             query.IsAll = IsAll; //是否收全额
             query.MinPayMoney = MinPayMoney; //订单参与门槛
@@ -118,6 +126,7 @@ namespace MySystem.Areas.Api.Controllers.v1
             query.ProfitDays = ProfitDays; //分红期限（天）
             query.DiviPercent = DiviPercent; //最大分红比例
             query.DiviPersons = DiviPersons; //单笔订单分红人数
+            maindb.SaveChanges();
             Obj.Add("UpdateDate", query.UpdateDate.Value.ToString("yyyy-MM-dd HH:mm:ss")); //更新时间
             return new AppResultJson() { Status = "1", Info = "", Data = Obj };
         }

Areas/Api/Controllers/v1/MainServer/OrdersController.cs

@@ -1027,6 +1027,68 @@ namespace MySystem.Areas.Api.Controllers.v1
         #endregion
 
 
+
+
+
+
+
+        #region 首页-客小爽产品-机具管理-机具申请-要兑换的码牌
+        [Authorize]
+        public JsonResult ExchangeMachines(string value)
+        {
+            value = DesDecrypt(value);
+            JsonData data = JsonMapper.ToObject(value);
+            Dictionary<string, object> Other = new Dictionary<string, object>();
+            List<Dictionary<string, object>> dataList = ExchangeMachinesDo(value, out Other);
+            return Json(new AppResultJson() { Status = "1", Info = "", Data = dataList, Other = Other });
+        }
+        public List<Dictionary<string, object>> ExchangeMachinesDo(string value, out Dictionary<string, object> Other)
+        {
+            JsonData data = JsonMapper.ToObject(value);
+            int UserId = int.Parse(function.CheckInt(data["UserId"].ToString())); //创客
+            int PageSize = int.Parse(function.CheckInt(data["PageSize"].ToString()));
+            int PageNum = int.Parse(function.CheckInt(data["PageNum"].ToString()));
+            DateTime now = DateTime.Now;
+            List<Dictionary<string, object>> dataList = new List<Dictionary<string, object>>();
+            List<KqProducts> KqProducts = maindb.KqProducts.ToList();
+            IQueryable<PosMachines> query = maindb.PosMachines.Where(m => m.Status > -1 && m.BuyUserId == UserId && m.IsPurchase == 0);
+            int ExpiredCount = query.Count(m => m.RecycEndDate < now);
+            int ActCount = query.Count(m => m.ActivationState == 1);
+            query = query.Where(m => m.RecycEndDate >= now && (m.ActivationState == 1 || (!string.IsNullOrEmpty(m.SeoKeyword) && m.SeoKeyword != "0")));
+            if (PageNum == 1)
+            {
+                query = query.Take(PageSize);
+            }
+            else
+            {
+                int skipNum = PageSize * (PageNum - 1);
+                query = query.Skip(skipNum).Take(PageSize);
+            }
+            foreach (var subdata in query.ToList())
+            {
+                Dictionary<string, object> curData = new Dictionary<string, object>();
+                curData.Add("SnId", subdata.Id); //机具Id
+                curData.Add("SnNo", subdata.PosSn); //SN号
+                curData.Add("MachineType", RelationClass.GetPosSnTypeInfo(subdata.PosSnType)); //机具类型
+                int day = 0;
+                if (subdata.RecycEndDate != null)
+                {
+                    TimeSpan ts = subdata.RecycEndDate.Value - DateTime.Now;
+                    day = ts.Days;
+                }
+                curData.Add("RecycDays", day); //循环剩余天数
+                curData.Add("EndDate", subdata.RecycEndDate == null ? "" : subdata.RecycEndDate.Value.ToString("yyyy-MM-dd")); //截止日期
+                dataList.Add(curData);
+            }
+            Other = new Dictionary<string, object>();
+            Other.Add("ActCount", ActCount); //激活数
+            Other.Add("ExpiredCount", ExpiredCount); //过期数
+            Other.Add("MinCount", 1); //最少领取数
+            return dataList;
+        }
+        #endregion
+
+
         #region 检查签名是否合法，合法返回1，不合法返回提示信息
 
         /// <summary>