Browse Source

接口调整

lcl 1 year ago
parent
commit
2b8668dee7
40 changed files with 135 additions and 364 deletions
  1. 1 1
      AppStart/WeChatFunction.cs
  2. 5 5
      Areas/Api/Controllers/v1/MainServer/ActivityInfoController.cs
  3. 6 6
      Areas/Api/Controllers/v1/MainServer/AdvertismentController.cs
  4. 3 3
      Areas/Api/Controllers/v1/MainServer/ColController.cs
  5. 18 18
      Areas/Api/Controllers/v1/MainServer/ConsumerOrdersController.cs
  6. 6 6
      Areas/Api/Controllers/v1/MainServer/ConsumerProfitController.cs
  7. 4 4
      Areas/Api/Controllers/v1/MainServer/IndexIconListController.cs
  8. 1 0
      Areas/Api/Controllers/v1/MainServer/MerchantInfoController.cs
  9. 13 13
      Areas/Api/Controllers/v1/MainServer/PosMachinesController.cs
  10. 8 8
      Areas/Api/Controllers/v1/MainServer/ServiceCenterController.cs
  11. 3 3
      Areas/Api/Controllers/v1/MainServer/UserBackKindController.cs
  12. 9 9
      Areas/Api/Controllers/v1/MainServer/UserCardRecordController.cs
  13. 4 4
      Areas/Api/Controllers/v1/MainServer/UserCenterIconListController.cs
  14. 3 3
      Areas/Api/Controllers/v1/MainServer/UserLevelSetController.cs
  15. 0 231
      Areas/Api/Controllers/v1/MainServer/UsersController.cs
  16. 3 2
      Controllers/HomeController.cs
  17. 2 2
      Services/ActivityInfoService.cs
  18. 2 2
      Services/AdvertismentService.cs
  19. 2 2
      Services/ColService.cs
  20. 2 2
      Services/ConsumerOrdersService.cs
  21. 2 2
      Services/ConsumerProfitService.cs
  22. 2 2
      Services/ConsumersService.cs
  23. 2 2
      Services/IndexIconListService.cs
  24. 2 2
      Services/KqProductsService.cs
  25. 2 2
      Services/MerchantAmountSummayService.cs
  26. 2 2
      Services/MerchantForMobileService.cs
  27. 2 2
      Services/MerchantInfoService.cs
  28. 2 2
      Services/MerchantQrCodeService.cs
  29. 2 2
      Services/OrderForNoService.cs
  30. 2 2
      Services/OrderProductService.cs
  31. 2 2
      Services/OrdersService.cs
  32. 2 2
      Services/PageInfoService.cs
  33. 2 2
      Services/PosMachinesService.cs
  34. 2 2
      Services/PosMachinesTwoService.cs
  35. 2 2
      Services/ServiceCenterService.cs
  36. 2 2
      Services/UploadParamsService.cs
  37. 2 2
      Services/UserBackKindService.cs
  38. 2 2
      Services/UserCardForWeChatService.cs
  39. 2 2
      Services/UserCenterIconListService.cs
  40. 2 2
      Services/UserLevelSetService.cs

+ 1 - 1
AppStart/WeChatFunction.cs

@@ -229,7 +229,7 @@ namespace MySystem
             result.Add("out_order_no", OrderNo); //商户分账单号
             result.Add("out_return_no", ReturnNo); //商户回退单号
             result.Add("return_mchid", ReturnMchId); //回退商户号
-            result.Add("amount", Amount); //回退金额
+            result.Add("amount", ReturnAmount); //回退金额
             result.Add("description", "用户退款"); //回退描述
             string req = Newtonsoft.Json.JsonConvert.SerializeObject(result);
             string resp = postJson("https://api.mch.weixin.qq.com/v3/profitsharing/return-orders", req, prikey, MchId, serialNo);

+ 5 - 5
Areas/Api/Controllers/v1/MainServer/ActivityInfoController.cs

@@ -40,13 +40,13 @@ namespace MySystem.Areas.Api.Controllers.v1
             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>>();
-            List<ActivityInfo> query = new ActivityInfoService().List(new List<FieldItem>(), "", PageNum, PageSize);
-            foreach (ActivityInfo subdata in query)
+            List<Dictionary<string, object>> query = new ActivityInfoService().List(new List<FieldItem>(), "", PageNum, PageSize);
+            foreach (Dictionary<string, object> subdata in query)
             {
                 Dictionary<string, object> curData = new Dictionary<string, object>();
-                curData.Add("ActBanner", DefaultPic(subdata.ActBanner)); //活动Banner图片
-                curData.Add("Id", subdata.Id); //Id
-                curData.Add("Status", subdata.Status); //Status
+                curData.Add("ActBanner", DefaultPic(subdata["ActBanner"].ToString())); //活动Banner图片
+                curData.Add("Id", subdata["Id"].ToString()); //Id
+                curData.Add("Status", subdata["Status"].ToString()); //Status
                 dataList.Add(curData);
             }
             return dataList;

+ 6 - 6
Areas/Api/Controllers/v1/MainServer/AdvertismentController.cs

@@ -62,15 +62,15 @@ namespace MySystem.Areas.Api.Controllers.v1
             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>>();
-            List<Advertisment> query = new AdvertismentService().List(new List<FieldItem>(), " and ColId like '003001%'", PageNum, PageSize);
+            List<Dictionary<string, object>> query = new AdvertismentService().List(new List<FieldItem>(), " and ColId like '003001%'", PageNum, PageSize);
             foreach (var subdata in query)
             {
                 Dictionary<string, object> curData = new Dictionary<string, object>();
-                curData.Add("Title", subdata.Title); //标题
-                curData.Add("PicPath", DefaultPic(subdata.PicPath)); //图片
-                curData.Add("Url", subdata.Url); //链接地址
-                curData.Add("Parameter", subdata.SeoTitle); //参数
-                curData.Add("Id", subdata.Id);
+                curData.Add("Title", subdata["Title"].ToString()); //标题
+                curData.Add("PicPath", DefaultPic(subdata["PicPath"].ToString())); //图片
+                curData.Add("Url", subdata["Url"].ToString()); //链接地址
+                curData.Add("Parameter", subdata["SeoTitle"].ToString()); //参数
+                curData.Add("Id", subdata["Id"].ToString());
                 dataList.Add(curData);
             }
             return dataList;

+ 3 - 3
Areas/Api/Controllers/v1/MainServer/ColController.cs

@@ -40,12 +40,12 @@ namespace MySystem.Areas.Api.Controllers.v1
             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>>();
-            List<Models.Col> query = new ColService().List(new List<FieldItem>(), " and ColId like '004%'", PageNum, PageSize);
+            List<Dictionary<string, object>> query = new ColService().List(new List<FieldItem>(), " and ColId like '004%'", PageNum, PageSize);
             foreach (var subdata in query)
             {
                 Dictionary<string, object> curData = new Dictionary<string, object>();
-                curData.Add("Id", subdata.Id); //Id
-                curData.Add("ColName", subdata.ColName); //名称
+                curData.Add("Id", subdata["Id"].ToString()); //Id
+                curData.Add("ColName", subdata["ColName"].ToString()); //名称
                 dataList.Add(curData);
             }
             return dataList;

+ 18 - 18
Areas/Api/Controllers/v1/MainServer/ConsumerOrdersController.cs

@@ -123,18 +123,18 @@ namespace MySystem.Areas.Api.Controllers.v1
             {
                 condition += " and OrderNo='" + OrderNo + "'";
             }
-            List<ConsumerOrders> query = new ConsumerOrdersService().List(new List<FieldItem>(), condition, PageNum, PageSize);
+            List<Dictionary<string, object>> query = new ConsumerOrdersService().List(new List<FieldItem>(), condition, PageNum, PageSize);
             foreach (var subdata in query)
             {
                 Dictionary<string, object> curData = new Dictionary<string, object>();
-                curData.Add("OrderNo", subdata.OrderNo); //订单号
-                curData.Add("PayMode", subdata.PayMode); //支付方式
-                curData.Add("PayMoney", subdata.PayMoney); //支付金额
-                curData.Add("ReturnMoney", subdata.ReturnMoney); //已返金额
-                curData.Add("SnNo", subdata.SnNo); //SN号
-                curData.Add("Id", subdata.Id); //Id
-                curData.Add("Status", subdata.Status); //Status
-                curData.Add("CreateDate", subdata.CreateDate == null ? "" : subdata.CreateDate.Value.ToString("yyyy-MM-dd HH:mm:ss")); //CreateDate
+                curData.Add("OrderNo", subdata["OrderNo"].ToString()); //订单号
+                curData.Add("PayMode", subdata["PayMode"].ToString()); //支付方式
+                curData.Add("PayMoney", subdata["PayMoney"].ToString()); //支付金额
+                curData.Add("ReturnMoney", subdata["ReturnMoney"].ToString()); //已返金额
+                curData.Add("SnNo", subdata["SnNo"].ToString()); //SN号
+                curData.Add("Id", subdata["Id"].ToString()); //Id
+                curData.Add("Status", subdata["Status"].ToString()); //Status
+                curData.Add("CreateDate", subdata["CreateDate"].ToString()); //CreateDate
                 curData.Add("MerchantName", ""); //门店信息
                 dataList.Add(curData);
             }
@@ -160,17 +160,17 @@ namespace MySystem.Areas.Api.Controllers.v1
             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>>();
-            List<ConsumerOrders> query = new ConsumerOrdersService().List(new List<FieldItem>(), " and ConsumerId=" + ConsumerId, PageNum, PageSize);
-            foreach (ConsumerOrders subdata in query)
+            List<Dictionary<string, object>> query = new ConsumerOrdersService().List(new List<FieldItem>(), " and ConsumerId=" + ConsumerId, PageNum, PageSize);
+            foreach (Dictionary<string, object> subdata in query)
             {
-                MerchantInfo merchant = MerchantInfoDbconn.Instance.Get(subdata.MerchantId) ?? new MerchantInfo();
+                MerchantInfo merchant = MerchantInfoDbconn.Instance.Get(int.Parse(subdata["MerchantId"].ToString())) ?? new MerchantInfo();
                 Dictionary<string, object> curData = new Dictionary<string, object>();
-                curData.Add("OrderNo", subdata.OrderNo); //订单号
-                curData.Add("PayMoney", subdata.PayMoney); //支付金额
-                curData.Add("ReturnMoney", subdata.ReturnMoney); //已返金额
-                curData.Add("Id", subdata.Id); //Id
-                curData.Add("Status", subdata.Status); //Status
-                curData.Add("CreateDate", subdata.CreateDate == null ? "" : subdata.CreateDate.Value.ToString("yyyy-MM-dd HH:mm:ss")); //CreateDate
+                curData.Add("OrderNo", subdata["OrderNo"].ToString()); //订单号
+                curData.Add("PayMoney", subdata["PayMoney"].ToString()); //支付金额
+                curData.Add("ReturnMoney", subdata["ReturnMoney"].ToString()); //已返金额
+                curData.Add("Id", subdata["Id"].ToString()); //Id
+                curData.Add("Status", subdata["Status"].ToString()); //Status
+                curData.Add("CreateDate", subdata["CreateDate"].ToString()); //CreateDate
                 curData.Add("MerchantName", merchant.Name); //商户名称
                 dataList.Add(curData);
             }

+ 6 - 6
Areas/Api/Controllers/v1/MainServer/ConsumerProfitController.cs

@@ -41,16 +41,16 @@ namespace MySystem.Areas.Api.Controllers.v1
             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>>();
-            List<ConsumerProfit> query = new ConsumerProfitService().List(new List<FieldItem>(), " and ConsumerId=" + ConsumerId, PageNum, PageSize);
+            List<Dictionary<string, object>> query = new ConsumerProfitService().List(new List<FieldItem>(), " and ConsumerId=" + ConsumerId, PageNum, PageSize);
             foreach (var subdata in query)
             {
-                MerchantInfo merchant = MerchantInfoDbconn.Instance.Get(subdata.MerchantId) ?? new MerchantInfo();
+                MerchantInfo merchant = MerchantInfoDbconn.Instance.Get(int.Parse(subdata["MerchantId"].ToString())) ?? new MerchantInfo();
                 Dictionary<string, object> curData = new Dictionary<string, object>();
-                curData.Add("GetMoney", subdata.GetMoney); //分红金额
-                curData.Add("Id", subdata.Id); //Id
-                curData.Add("CreateDate", subdata.CreateDate == null ? "" : subdata.CreateDate.Value.ToString("yyyy-MM-dd HH:mm:ss")); //CreateDate
+                curData.Add("GetMoney", subdata["GetMoney"].ToString()); //分红金额
+                curData.Add("Id", subdata["Id"].ToString()); //Id
+                curData.Add("CreateDate", subdata["CreateDate"].ToString()); //CreateDate
                 curData.Add("MerchantName", merchant.Name); //商户名称
-                curData.Add("OrderNo", subdata.SeoTitle); //订单号
+                curData.Add("OrderNo", subdata["SeoTitle"].ToString()); //订单号
                 dataList.Add(curData);
             }
             return dataList;

+ 4 - 4
Areas/Api/Controllers/v1/MainServer/IndexIconListController.cs

@@ -40,13 +40,13 @@ namespace MySystem.Areas.Api.Controllers.v1
             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>>();
-            List<IndexIconList> query = new IndexIconListService().List(new List<FieldItem>(), "", PageNum, PageSize);
+            List<Dictionary<string, object>> query = new IndexIconListService().List(new List<FieldItem>(), "", PageNum, PageSize);
             foreach (var subdata in query)
             {
                 Dictionary<string, object> curData = new Dictionary<string, object>();
-                curData.Add("Icon", DefaultPic(subdata.Icon)); //图标
-                curData.Add("Title", subdata.Title); //标题
-                curData.Add("Url", subdata.Url); //跳转地址
+                curData.Add("Icon", DefaultPic(subdata["Icon"].ToString())); //图标
+                curData.Add("Title", subdata["Title"].ToString()); //标题
+                curData.Add("Url", subdata["Url"].ToString()); //跳转地址
                 dataList.Add(curData);
             }
             return dataList;

+ 1 - 0
Areas/Api/Controllers/v1/MainServer/MerchantInfoController.cs

@@ -847,6 +847,7 @@ namespace MySystem.Areas.Api.Controllers.v1
                     return Json(new AppResultJson() { Status = "-1", Info = "登录密码不正确" });
                 }
                 Obj.Add("Id", 1);
+                Obj.Add("Token", PublicFunction.AppToken(1, JwtSecret, JwtIss, "merchant"));
                 return Json(new AppResultJson() { Status = "1", Info = "", Data = Obj });
             }
             MerchantForMobile find = new MerchantForMobileService().Query(Mobile);

+ 13 - 13
Areas/Api/Controllers/v1/MainServer/PosMachinesController.cs

@@ -42,15 +42,15 @@ namespace MySystem.Areas.Api.Controllers.v1
             int PageNum = int.Parse(function.CheckInt(data["PageNum"].ToString()));
             List<Dictionary<string, object>> dataList = new List<Dictionary<string, object>>();
             MerchantInfo merchant = MerchantInfoDbconn.Instance.Get(BindMerchantId) ?? new MerchantInfo();
-            List<PosMachines> query = new PosMachinesService().List(new List<FieldItem>(), " and BindMerchantId=" + BindMerchantId, PageNum, PageSize);
+            List<Dictionary<string, object>> query = new PosMachinesService().List(new List<FieldItem>(), " and BindMerchantId=" + BindMerchantId, PageNum, PageSize);
             foreach (var subdata in query)
             {
                 Dictionary<string, object> curData = new Dictionary<string, object>();
-                curData.Add("BindingTime", subdata.BindingTime == null ? "" : subdata.BindingTime.Value.ToString("yyyy-MM-dd HH:mm:ss")); //绑定时间
-                curData.Add("PosSn", subdata.PosSn); //SN编号
-                curData.Add("Id", subdata.Id); //Id
+                curData.Add("BindingTime", subdata["BindingTime"].ToString()); //绑定时间
+                curData.Add("PosSn", subdata["PosSn"].ToString()); //SN编号
+                curData.Add("Id", subdata["Id"].ToString()); //Id
                 curData.Add("MerchantName", merchant.Name); //商户名称
-                string CheckKey = "_" + subdata.Id;
+                string CheckKey = "_" + subdata["Id"].ToString();
                 int BindCount = MachineForQrCodeDbconn.Instance.GetList(BindMerchantId).Count(m => m.DataId.EndsWith(CheckKey));
                 curData.Add("BindCount", BindCount); //关联数量
                 dataList.Add(curData);
@@ -128,13 +128,13 @@ namespace MySystem.Areas.Api.Controllers.v1
             int PageNum = int.Parse(function.CheckInt(data["PageNum"].ToString()));
             string CheckKey = "_" + BindMerchantId;
             List<Dictionary<string, object>> dataList = new List<Dictionary<string, object>>();
-            List<MerchantQrCode> query = new MerchantQrCodeService().List(new List<FieldItem>(), " and MerchantId=" + BindMerchantId, 1, 1000);
-            foreach (MerchantQrCode subdata in query)
+            List<Dictionary<string, object>> query = new MerchantQrCodeService().List(new List<FieldItem>(), " and MerchantId=" + BindMerchantId, 1, 1000);
+            foreach (Dictionary<string, object> subdata in query)
             {
                 Dictionary<string, object> curData = new Dictionary<string, object>();
-                curData.Add("BindingTime", subdata.UpdateDate == null ? "" : subdata.UpdateDate.Value.ToString("yyyy-MM-dd HH:mm:ss")); //绑定时间
-                curData.Add("PosSn", subdata.SnNo); //SN编号
-                curData.Add("Id", subdata.Id); //Id
+                curData.Add("BindingTime", subdata["UpdateDate"].ToString()); //绑定时间
+                curData.Add("PosSn", subdata["SnNo"].ToString()); //SN编号
+                curData.Add("Id", subdata["Id"].ToString()); //Id
                 dataList.Add(curData);
             }
             return dataList;
@@ -195,12 +195,12 @@ namespace MySystem.Areas.Api.Controllers.v1
             {
                 condition += " and BindMerchantId=" + BindMerchantId;
             }
-            List<PosMachines> query = new PosMachinesService().List(new List<FieldItem>(), condition, PageNum, PageSize);
+            List<Dictionary<string, object>> query = new PosMachinesService().List(new List<FieldItem>(), condition, PageNum, PageSize);
             foreach (var subdata in query)
             {
                 Dictionary<string, object> curData = new Dictionary<string, object>();
-                curData.Add("BindingTime", subdata.BindingTime == null ? "" : subdata.BindingTime.Value.ToString("yyyy-MM-dd HH:mm:ss")); //绑定时间
-                curData.Add("PosSn", subdata.PosSn); //SN编号
+                curData.Add("BindingTime", subdata["BindingTime"].ToString()); //绑定时间
+                curData.Add("PosSn", subdata["PosSn"].ToString()); //SN编号
                 curData.Add("MerchantName", ""); //商户名称
                 curData.Add("MerchantLogo", ""); //商户Logo
                 dataList.Add(curData);

+ 8 - 8
Areas/Api/Controllers/v1/MainServer/ServiceCenterController.cs

@@ -46,12 +46,12 @@ namespace MySystem.Areas.Api.Controllers.v1
             {
                 condition += " and CategoryId=" + CategoryId;
             }
-            List<ServiceCenter> querys = new ServiceCenterService().List(new List<FieldItem>(), condition, PageNum, PageSize);
-            foreach (ServiceCenter subdata in querys)
+            List<Dictionary<string, object>> querys = new ServiceCenterService().List(new List<FieldItem>(), condition, PageNum, PageSize);
+            foreach (Dictionary<string, object> subdata in querys)
             {
                 Dictionary<string, object> curData = new Dictionary<string, object>();
-                curData.Add("Title", subdata.Title); //标题
-                curData.Add("Id", subdata.Id); //Id
+                curData.Add("Title", subdata["Title"].ToString()); //标题
+                curData.Add("Id", subdata["Id"].ToString()); //Id
                 dataList.Add(curData);
             }
             return dataList;
@@ -81,12 +81,12 @@ namespace MySystem.Areas.Api.Controllers.v1
             {
                 condition += " and Title like '%" + SearchKey + "%'";
             }
-            List<ServiceCenter> querys = new ServiceCenterService().List(new List<FieldItem>(), condition, PageNum, PageSize);
-            foreach (ServiceCenter subdata in querys)
+            List<Dictionary<string, object>> querys = new ServiceCenterService().List(new List<FieldItem>(), condition, PageNum, PageSize);
+            foreach (Dictionary<string, object> subdata in querys)
             {
                 Dictionary<string, object> curData = new Dictionary<string, object>();
-                curData.Add("Title", subdata.Title); //标题
-                curData.Add("Id", subdata.Id); //Id
+                curData.Add("Title", subdata["Title"].ToString()); //标题
+                curData.Add("Id", subdata["Id"].ToString()); //Id
                 dataList.Add(curData);
             }
             return dataList;

+ 3 - 3
Areas/Api/Controllers/v1/MainServer/UserBackKindController.cs

@@ -38,12 +38,12 @@ namespace MySystem.Areas.Api.Controllers.v1
             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>>();
-            List<UserBackKind> query = new UserBackKindService().List(new List<FieldItem>(), "", PageNum, PageSize);
+            List<Dictionary<string, object>> query = new UserBackKindService().List(new List<FieldItem>(), "", PageNum, PageSize);
             foreach (var subdata in query)
             {
                 Dictionary<string, object> curData = new Dictionary<string, object>();
-                curData.Add("Name", subdata.Name); //名称
-                curData.Add("Id", subdata.Id); //Id
+                curData.Add("Name", subdata["Name"].ToString()); //名称
+                curData.Add("Id", subdata["Id"].ToString()); //Id
                 dataList.Add(curData);
             }
             return dataList;

+ 9 - 9
Areas/Api/Controllers/v1/MainServer/UserCardRecordController.cs

@@ -90,21 +90,21 @@ namespace MySystem.Areas.Api.Controllers.v1
             { 
                 OrderBy = "Id desc";
             }
-            List<Consumers> query = new ConsumersService().List(new List<FieldItem>() , condition, PageNum, PageSize, OrderBy);
+            List<Dictionary<string, object>> query = new ConsumersService().List(new List<FieldItem>() , condition, PageNum, PageSize, OrderBy);
             foreach (var ConsumersData in query)
             {
                 Dictionary<string, object> curData = new Dictionary<string, object>();
-                curData.Add("ConsumerId", RelationClass.GetConsumersInfo(ConsumersData.Id)); //消费者
+                curData.Add("ConsumerId", RelationClass.GetConsumersInfo(int.Parse(ConsumersData["Id"].ToString()))); //消费者
                 Dictionary<string, object> Consumer = new Dictionary<string, object>();
-                Consumer.Add("NickName", ConsumersData.NickName); //昵称
-                Consumer.Add("HeadPhoto", ConsumersData.HeadPhoto); //头像
-                Consumer.Add("CurIntgegral", ConsumersData.CurIntgegral); //当前积分
-                Consumer.Add("TotalAmount", ConsumersData.TotalAmount); //累计消费金额
-                Consumer.Add("TotalConsumCount", ConsumersData.TotalConsumCount); //累计消费次数
-                Consumer.Add("LastConsumDate", ConsumersData.LastConsumDate); //最近消费时间
+                Consumer.Add("NickName", ConsumersData["NickName"].ToString()); //昵称
+                Consumer.Add("HeadPhoto", ConsumersData["HeadPhoto"].ToString()); //头像
+                Consumer.Add("CurIntgegral", ConsumersData["CurIntgegral"].ToString()); //当前积分
+                Consumer.Add("TotalAmount", ConsumersData["TotalAmount"].ToString()); //累计消费金额
+                Consumer.Add("TotalConsumCount", ConsumersData["TotalConsumCount"].ToString()); //累计消费次数
+                Consumer.Add("LastConsumDate", ConsumersData["LastConsumDate"].ToString()); //最近消费时间
                 curData.Add("Consumer", Consumer);
 
-                curData.Add("CreateDate", ConsumersData.CreateDate == null ? "" : ConsumersData.CreateDate.Value.ToString("yyyy-MM-dd HH:mm:ss")); //CreateDate
+                curData.Add("CreateDate", ConsumersData["CreateDate"].ToString()); //CreateDate
                 int ConsumeCount = 0;
                 for (int i = 0; i < 7; i++)
                 {

+ 4 - 4
Areas/Api/Controllers/v1/MainServer/UserCenterIconListController.cs

@@ -39,13 +39,13 @@ namespace MySystem.Areas.Api.Controllers.v1
             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>>();
-            List<UserCenterIconList> query = new UserCenterIconListService().List(new List<FieldItem>(), "", PageNum, PageSize);
+            List<Dictionary<string, object>> query = new UserCenterIconListService().List(new List<FieldItem>(), "", PageNum, PageSize);
             foreach (var subdata in query)
             {
                 Dictionary<string, object> curData = new Dictionary<string, object>();
-                curData.Add("Icon", DefaultPic(subdata.Icon)); //图标
-                curData.Add("Title", subdata.Title); //标题
-                curData.Add("Url", subdata.Url); //跳转地址
+                curData.Add("Icon", DefaultPic(subdata["Icon"].ToString())); //图标
+                curData.Add("Title", subdata["Title"].ToString()); //标题
+                curData.Add("Url", subdata["Url"].ToString()); //跳转地址
                 dataList.Add(curData);
             }
             return dataList;

+ 3 - 3
Areas/Api/Controllers/v1/MainServer/UserLevelSetController.cs

@@ -39,12 +39,12 @@ namespace MySystem.Areas.Api.Controllers.v1
             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>>();
-            List<UserLevelSet> query = new UserLevelSetService().List(new List<FieldItem>(), "", PageNum, PageSize);
+            List<Dictionary<string, object>> query = new UserLevelSetService().List(new List<FieldItem>(), "", PageNum, PageSize);
             foreach (var subdata in query)
             {
                 Dictionary<string, object> curData = new Dictionary<string, object>();
-                curData.Add("Name", subdata.Name); //等级名称
-                curData.Add("Id", subdata.Id); //Id
+                curData.Add("Name", subdata["Name"].ToString()); //等级名称
+                curData.Add("Id", subdata["Id"].ToString()); //Id
                 dataList.Add(curData);
             }
             return dataList;

+ 0 - 231
Areas/Api/Controllers/v1/MainServer/UsersController.cs

@@ -1736,237 +1736,6 @@ namespace MySystem.Areas.Api.Controllers.v1
         #endregion
 
 
-        #region 创客-首页-我的创客-创客详情
-        [Authorize]
-        public JsonResult MyMakerDetail(string value)
-        {
-            value = DesDecrypt(value);
-            JsonData data = JsonMapper.ToObject(value);
-            Dictionary<string, object> Obj = MyMakerDetailDo(value);
-            return Json(new AppResultJson() { Status = "1", Info = "", Data = Obj });
-        }
-        public Dictionary<string, object> MyMakerDetailDo(string value)
-        {
-            JsonData data = JsonMapper.ToObject(value);
-            string UserId = data["UserId"].ToString(); //创客Id
-            string DateKind = data["DateKind"].ToString(); //查询时间
-            Dictionary<string, object> Obj = new Dictionary<string, object>();
-            decimal TradeTotal = 0;
-            int ActTotal = 0;
-            if (DateKind == "1")
-            {
-                for (int i = 0; i <= 7; i++)
-                {
-                    string Date = DateTime.Now.AddDays(-i).ToString("yyyyMMdd");
-                    TradeTotal += UserTradeDaySummaryDbconn.Instance.GetDateTrade(int.Parse(UserId), Date, "team");
-                    ActTotal += UserDataDbconn.Instance.GetTeamPosActCount(int.Parse(UserId), Date);
-                }
-            }
-            else if (DateKind == "2")
-            {
-                for (int i = 0; i <= 6; i++)
-                {
-                    string Month = DateTime.Now.AddMonths(-i).ToString("yyyyMM");
-                    TradeTotal += UserTradeDaySummaryDbconn.Instance.GetMonthTrade(int.Parse(UserId), Month, "team");
-                    ActTotal += UserDataDbconn.Instance.GetTeamPosActCount(int.Parse(UserId), Month);
-                }
-            }
-            Obj.Add("TradeTotal", TradeTotal); //总交易
-            Obj.Add("ActTotal", ActTotal); //总激活数
-
-            List<KqProducts> products = new KqProductsService().List(new List<FieldItem>(), "", 1, 100);
-            List<KqProducts> productall = products.Prepend(new KqProducts()
-            {
-                Id = 0,
-                Name = "全部",
-            }).ToList();
-            //交易分类占比
-            List<Dictionary<string, object>> TradePercentList = new List<Dictionary<string, object>>();
-            foreach (KqProducts product in products)
-            {
-                decimal Total = 0;
-                if (DateKind == "1")
-                {
-                    for (int i = 0; i <= 7; i++)
-                    {
-                        string Date = DateTime.Now.AddDays(-i).ToString("yyyyMMdd");
-                        Total += UserTradeDaySummaryDbconn.Instance.GetDateTradeForBrand(int.Parse(UserId), Date, product.Id, "team");
-                    }
-                }
-                else if (DateKind == "2")
-                {
-                    for (int i = 0; i <= 6; i++)
-                    {
-                        string Month = DateTime.Now.AddMonths(-i).ToString("yyyyMM");
-                        Total += UserTradeDaySummaryDbconn.Instance.GetMonthTradeForBrand(int.Parse(UserId), Month, product.Id, "team");
-                    }
-                }
-                if (Total > 0)
-                {
-                    Dictionary<string, object> item = new Dictionary<string, object>();
-                    item.Add("Name", product.Name); //产品名称
-                    item.Add("TradeAmt", Total); //交易额
-                    TradePercentList.Add(item);
-                }
-            }
-            Obj.Add("TradePercent", TradePercentList);
-
-            //交易趋势图
-            List<Dictionary<string, object>> TradeTrendList = new List<Dictionary<string, object>>();
-            foreach (KqProducts product in productall)
-            {
-                Dictionary<string, object> item = new Dictionary<string, object>();
-                item.Add("Name", product.Name); //产品名称
-                List<Dictionary<string, object>> TimeList = new List<Dictionary<string, object>>();
-                if (DateKind == "1")
-                {
-                    for (int i = 7; i >= 0; i--)
-                    {
-                        DateTime Date = DateTime.Now.AddDays(-i);
-                        Dictionary<string, object> subitem = new Dictionary<string, object>();
-                        subitem.Add("TimeString", Date.ToString("MMdd")); //交易日期/月份
-                        if (product.Id > 0)
-                        {
-                            subitem.Add("TradeAmt", UserTradeDaySummaryDbconn.Instance.GetDateTradeForBrand(int.Parse(UserId), Date.ToString("yyyyMMdd"), product.Id, "team"));  //交易额
-                        }
-                        else
-                        {
-                            subitem.Add("TradeAmt", UserTradeDaySummaryDbconn.Instance.GetDateTrade(int.Parse(UserId), Date.ToString("yyyyMMdd"), "team"));  //交易额
-                        }
-                        TimeList.Add(subitem);
-                    }
-                }
-                else if (DateKind == "2")
-                {
-                    for (int i = 6; i >= 0; i--)
-                    {
-                        DateTime Month = DateTime.Now.AddMonths(-i);
-                        Dictionary<string, object> subitem = new Dictionary<string, object>();
-                        subitem.Add("TimeString", Month.ToString("yyyyMM")); //交易日期/月份
-                        if (product.Id > 0)
-                        {
-                            subitem.Add("TradeAmt", UserTradeDaySummaryDbconn.Instance.GetMonthTradeForBrand(int.Parse(UserId), Month.ToString("yyyyMM"), product.Id, "team"));  //交易额
-                        }
-                        else
-                        {
-                            subitem.Add("TradeAmt", UserTradeDaySummaryDbconn.Instance.GetMonthTrade(int.Parse(UserId), Month.ToString("yyyyMM"), "team"));  //交易额
-                        }
-                        TimeList.Add(subitem);
-                    }
-                }
-                item.Add("Times", TimeList); //交易额
-                TradeTrendList.Add(item);
-            }
-            Obj.Add("TradeTrend", TradeTrendList);
-
-            //新增激活商户分类占比
-            List<Dictionary<string, object>> ActMerchantPercentList = new List<Dictionary<string, object>>();
-            foreach (KqProducts product in products)
-            {
-                int Total = 0;
-                if (DateKind == "1")
-                {
-                    for (int i = 0; i <= 7; i++)
-                    {
-                        string Date = DateTime.Now.AddDays(-i).ToString("yyyyMMdd");
-                        Total += UserDataDbconn.Instance.GetTeamBrandPosActCount(int.Parse(UserId), product.Id, Date);
-                    }
-                }
-                else if (DateKind == "2")
-                {
-                    for (int i = 0; i <= 6; i++)
-                    {
-                        string Month = DateTime.Now.AddMonths(-i).ToString("yyyyMM");
-                        Total += UserDataDbconn.Instance.GetTeamBrandPosActCount(int.Parse(UserId), product.Id, Month);
-                    }
-                }
-                if (Total > 0)
-                {
-                    Dictionary<string, object> item = new Dictionary<string, object>();
-                    item.Add("Name", product.Name); //产品名称
-                    item.Add("ActCount", Total); //激活数
-                    ActMerchantPercentList.Add(item);
-                }
-            }
-            Obj.Add("ActMerchantPercent", ActMerchantPercentList);
-
-            //新增激活商户趋势图
-            List<Dictionary<string, object>> ActMerchantTrendList = new List<Dictionary<string, object>>();
-            foreach (KqProducts product in productall)
-            {
-                Dictionary<string, object> item = new Dictionary<string, object>();
-                item.Add("Name", product.Name); //产品名称
-                List<Dictionary<string, object>> TimeList = new List<Dictionary<string, object>>();
-                if (DateKind == "1")
-                {
-                    for (int i = 7; i >= 0; i--)
-                    {
-                        DateTime Date = DateTime.Now.AddDays(-i);
-                        Dictionary<string, object> subitem = new Dictionary<string, object>();
-                        subitem.Add("TimeString", Date.ToString("MMdd")); //统计日期/月份
-                        if (product.Id > 0)
-                        {
-                            subitem.Add("ActCount", UserDataDbconn.Instance.GetTeamBrandPosActCount(int.Parse(UserId), product.Id, Date.ToString("yyyyMMdd")));  //激活数
-                        }
-                        else
-                        {
-                            subitem.Add("ActCount", UserDataDbconn.Instance.GetTeamPosActCount(int.Parse(UserId), Date.ToString("yyyyMMdd")));  //激活数
-                        }
-                        TimeList.Add(subitem);
-                    }
-                }
-                else if (DateKind == "2")
-                {
-                    for (int i = 6; i >= 0; i--)
-                    {
-                        string Month = DateTime.Now.AddMonths(-i).ToString("yyyyMM");
-                        Dictionary<string, object> subitem = new Dictionary<string, object>();
-                        subitem.Add("TimeString", Month); //统计日期/月份
-                        if (product.Id > 0)
-                        {
-                            subitem.Add("ActCount", UserDataDbconn.Instance.GetTeamBrandPosActCount(int.Parse(UserId), product.Id, Month));  //激活数
-                        }
-                        else
-                        {
-                            subitem.Add("ActCount", UserDataDbconn.Instance.GetTeamPosActCount(int.Parse(UserId), Month));  //激活数
-                        }
-                        TimeList.Add(subitem);
-                    }
-                }
-                item.Add("Times", TimeList); //交易额
-                ActMerchantTrendList.Add(item);
-            }
-            Obj.Add("ActMerchantTrend", ActMerchantTrendList);
-
-            //创客新增趋势图
-            List<Dictionary<string, object>> MakerAddList = new List<Dictionary<string, object>>();
-            if (DateKind == "1")
-            {
-                for (int i = 7; i >= 0; i--)
-                {
-                    string Date = DateTime.Now.AddDays(-i).ToString("yyyyMMdd");
-                    Dictionary<string, object> item = new Dictionary<string, object>();
-                    item.Add("TimeString", Date);
-                    item.Add("AddCount", UsersDbconn.Instance.GetTeamNewUserCount(int.Parse(UserId), Date));
-                    MakerAddList.Add(item);
-                }
-            }
-            else if (DateKind == "2")
-            {
-                for (int i = 6; i >= 0; i--)
-                {
-                    string Month = DateTime.Now.AddMonths(-i).ToString("yyyyMM");
-                    Dictionary<string, object> item = new Dictionary<string, object>();
-                    item.Add("TimeString", Month);
-                    item.Add("AddCount", UsersDbconn.Instance.GetTeamNewUserCount(int.Parse(UserId), Month));
-                    MakerAddList.Add(item);
-                }
-            }
-            Obj.Add("MakerAdd", MakerAddList);
-            return Obj;
-        }
-        #endregion
-
 
         #region 首页-我的创客-未实名创客
         [Authorize]

+ 3 - 2
Controllers/HomeController.cs

@@ -5,6 +5,7 @@ using MySystem.MainModels;
 using System.Linq;
 using Library;
 using LitJson;
+using System;
 
 namespace MySystem.Controllers
 {
@@ -69,9 +70,9 @@ namespace MySystem.Controllers
 
             // result = new WeChatFunction().AddReceive("1645266943", "PERSONAL_OPENID", "ooDpv5LkCKEguE-LMZO-rSV4TDpk", "", "USER");
             // result = new WeChatFunction().QueryProfitShare("1645266943", "4200001815202306025662773463", "2023060213335030713572885");
-            // result = new WeChatFunction().Unfreeze("1646405429", "4200001820202306086592864584", "2023060811312079575627854", "结算");
+            result = new WeChatFunction().Unfreeze("1646405429","4200001838202306096719040741","2023060911284179905894403", "结算");
 
-            // result = new WeChatFunction().ProfitShareReturn("1645266943", "1611167423", "2023060816051515927220860", string ReturnNo, decimal Amount)
+            // result = new WeChatFunction().ProfitShareReturn("1646405429", "1611167423", "2023060810550382756164803", DateTime.Now.ToString("yyyyMMddHHmmssfff") + function.get_Random(8), 0.02M);
 
             return result;
         }

+ 2 - 2
Services/ActivityInfoService.cs

@@ -23,10 +23,10 @@ namespace MySystem
         /// <param name="page">页码</param>
         /// <param name="limit">每页条数</param>
         /// <returns></returns>
-        public List<ActivityInfo> List(List<FieldItem> fields, string condition, int page = 1, int limit = 30, string orderby = "Id desc")
+        public List<Dictionary<string, object>> List(List<FieldItem> fields, string condition, int page = 1, int limit = 30, string orderby = "Id desc")
         {
             Dictionary<string, object> obj = new DbService(AppConfig.Base.mainTables, _conn).IndexData("ActivityInfo", fields, orderby, "0", page, limit, condition);
-            List<ActivityInfo> diclist = obj["data"] as List<ActivityInfo>;
+            List<Dictionary<string, object>> diclist = obj["data"] as List<Dictionary<string, object>>;
             return diclist;
         }
 

+ 2 - 2
Services/AdvertismentService.cs

@@ -23,10 +23,10 @@ namespace MySystem
         /// <param name="page">页码</param>
         /// <param name="limit">每页条数</param>
         /// <returns></returns>
-        public List<Advertisment> List(List<FieldItem> fields, string condition, int page = 1, int limit = 30, string orderby = "Id desc")
+        public List<Dictionary<string, object>> List(List<FieldItem> fields, string condition, int page = 1, int limit = 30, string orderby = "Id desc")
         {
             Dictionary<string, object> obj = new DbService(AppConfig.Base.bsTables, _conn).IndexData("Advertisment", fields, orderby, "0", page, limit, condition);
-            List<Advertisment> diclist = obj["data"] as List<Advertisment>;
+            List<Dictionary<string, object>> diclist = obj["data"] as List<Dictionary<string, object>>;
             return diclist;
         }
 

+ 2 - 2
Services/ColService.cs

@@ -23,10 +23,10 @@ namespace MySystem
         /// <param name="page">页码</param>
         /// <param name="limit">每页条数</param>
         /// <returns></returns>
-        public List<Col> List(List<FieldItem> fields, string condition, int page = 1, int limit = 30, string orderby = "Id desc")
+        public List<Dictionary<string, object>> List(List<FieldItem> fields, string condition, int page = 1, int limit = 30, string orderby = "Id desc")
         {
             Dictionary<string, object> obj = new DbService(AppConfig.Base.bsTables, _conn).IndexData("Col", fields, orderby, "0", page, limit, condition);
-            List<Col> diclist = obj["data"] as List<Col>;
+            List<Dictionary<string, object>> diclist = obj["data"] as List<Dictionary<string, object>>;
             return diclist;
         }
 

+ 2 - 2
Services/ConsumerOrdersService.cs

@@ -23,10 +23,10 @@ namespace MySystem
         /// <param name="page">页码</param>
         /// <param name="limit">每页条数</param>
         /// <returns></returns>
-        public List<ConsumerOrders> List(List<FieldItem> fields, string condition, int page = 1, int limit = 30, string orderby = "Id desc")
+        public List<Dictionary<string, object>> List(List<FieldItem> fields, string condition, int page = 1, int limit = 30, string orderby = "Id desc")
         {
             Dictionary<string, object> obj = new DbService(AppConfig.Base.mainTables, _conn).IndexData("ConsumerOrders", fields, orderby, "0", page, limit, condition);
-            List<ConsumerOrders> diclist = obj["data"] as List<ConsumerOrders>;
+            List<Dictionary<string, object>> diclist = obj["data"] as List<Dictionary<string, object>>;
             return diclist;
         }
 

+ 2 - 2
Services/ConsumerProfitService.cs

@@ -23,10 +23,10 @@ namespace MySystem
         /// <param name="page">页码</param>
         /// <param name="limit">每页条数</param>
         /// <returns></returns>
-        public List<ConsumerProfit> List(List<FieldItem> fields, string condition, int page = 1, int limit = 30, string orderby = "Id desc")
+        public List<Dictionary<string, object>> List(List<FieldItem> fields, string condition, int page = 1, int limit = 30, string orderby = "Id desc")
         {
             Dictionary<string, object> obj = new DbService(AppConfig.Base.mainTables, _conn).IndexData("ConsumerProfit", fields, orderby, "0", page, limit, condition);
-            List<ConsumerProfit> diclist = obj["data"] as List<ConsumerProfit>;
+            List<Dictionary<string, object>> diclist = obj["data"] as List<Dictionary<string, object>>;
             return diclist;
         }
 

+ 2 - 2
Services/ConsumersService.cs

@@ -23,10 +23,10 @@ namespace MySystem
         /// <param name="page">页码</param>
         /// <param name="limit">每页条数</param>
         /// <returns></returns>
-        public List<Consumers> List(List<FieldItem> fields, string condition, int page = 1, int limit = 30, string orderby = "Id desc")
+        public List<Dictionary<string, object>> List(List<FieldItem> fields, string condition, int page = 1, int limit = 30, string orderby = "Id desc")
         {
             Dictionary<string, object> obj = new DbService(AppConfig.Base.mainTables, _conn).IndexData("Consumers", fields, orderby, "0", page, limit, condition);
-            List<Consumers> diclist = obj["data"] as List<Consumers>;
+            List<Dictionary<string, object>> diclist = obj["data"] as List<Dictionary<string, object>>;
             return diclist;
         }
 

+ 2 - 2
Services/IndexIconListService.cs

@@ -23,10 +23,10 @@ namespace MySystem
         /// <param name="page">页码</param>
         /// <param name="limit">每页条数</param>
         /// <returns></returns>
-        public List<IndexIconList> List(List<FieldItem> fields, string condition, int page = 1, int limit = 30, string orderby = "Id desc")
+        public List<Dictionary<string, object>> List(List<FieldItem> fields, string condition, int page = 1, int limit = 30, string orderby = "Id desc")
         {
             Dictionary<string, object> obj = new DbService(AppConfig.Base.mainTables, _conn).IndexData("IndexIconList", fields, orderby, "0", page, limit, condition);
-            List<IndexIconList> diclist = obj["data"] as List<IndexIconList>;
+            List<Dictionary<string, object>> diclist = obj["data"] as List<Dictionary<string, object>>;
             return diclist;
         }
 

+ 2 - 2
Services/KqProductsService.cs

@@ -23,10 +23,10 @@ namespace MySystem
         /// <param name="page">页码</param>
         /// <param name="limit">每页条数</param>
         /// <returns></returns>
-        public List<KqProducts> List(List<FieldItem> fields, string condition, int page = 1, int limit = 30, string orderby = "Id desc")
+        public List<Dictionary<string, object>> List(List<FieldItem> fields, string condition, int page = 1, int limit = 30, string orderby = "Id desc")
         {
             Dictionary<string, object> obj = new DbService(AppConfig.Base.mainTables, _conn).IndexData("KqProducts", fields, orderby, "0", page, limit, condition);
-            List<KqProducts> diclist = obj["data"] as List<KqProducts>;
+            List<Dictionary<string, object>> diclist = obj["data"] as List<Dictionary<string, object>>;
             return diclist;
         }
 

+ 2 - 2
Services/MerchantAmountSummayService.cs

@@ -23,10 +23,10 @@ namespace MySystem
         /// <param name="page">页码</param>
         /// <param name="limit">每页条数</param>
         /// <returns></returns>
-        public List<MerchantAmountSummay> List(List<FieldItem> fields, string condition, int page = 1, int limit = 30, string orderby = "Id desc")
+        public List<Dictionary<string, object>> List(List<FieldItem> fields, string condition, int page = 1, int limit = 30, string orderby = "Id desc")
         {
             Dictionary<string, object> obj = new DbService(AppConfig.Base.mainTables, _conn).IndexData("MerchantAmountSummay", fields, orderby, "0", page, limit, condition);
-            List<MerchantAmountSummay> diclist = obj["data"] as List<MerchantAmountSummay>;
+            List<Dictionary<string, object>> diclist = obj["data"] as List<Dictionary<string, object>>;
             return diclist;
         }
 

+ 2 - 2
Services/MerchantForMobileService.cs

@@ -23,10 +23,10 @@ namespace MySystem
         /// <param name="page">页码</param>
         /// <param name="limit">每页条数</param>
         /// <returns></returns>
-        public List<MerchantForMobile> List(List<FieldItem> fields, string condition, int page = 1, int limit = 30, string orderby = "Id desc")
+        public List<Dictionary<string, object>> List(List<FieldItem> fields, string condition, int page = 1, int limit = 30, string orderby = "Id desc")
         {
             Dictionary<string, object> obj = new DbService(AppConfig.Base.mainTables, _conn).IndexData("MerchantForMobile", fields, orderby, "0", page, limit, condition);
-            List<MerchantForMobile> diclist = obj["data"] as List<MerchantForMobile>;
+            List<Dictionary<string, object>> diclist = obj["data"] as List<Dictionary<string, object>>;
             return diclist;
         }
 

+ 2 - 2
Services/MerchantInfoService.cs

@@ -23,10 +23,10 @@ namespace MySystem
         /// <param name="page">页码</param>
         /// <param name="limit">每页条数</param>
         /// <returns></returns>
-        public List<MerchantInfo> List(List<FieldItem> fields, string condition, int page = 1, int limit = 30, string orderby = "Id desc")
+        public List<Dictionary<string, object>> List(List<FieldItem> fields, string condition, int page = 1, int limit = 30, string orderby = "Id desc")
         {
             Dictionary<string, object> obj = new DbService(AppConfig.Base.mainTables, _conn).IndexData("MerchantInfo", fields, orderby, "0", page, limit, condition);
-            List<MerchantInfo> diclist = obj["data"] as List<MerchantInfo>;
+            List<Dictionary<string, object>> diclist = obj["data"] as List<Dictionary<string, object>>;
             return diclist;
         }
 

+ 2 - 2
Services/MerchantQrCodeService.cs

@@ -23,10 +23,10 @@ namespace MySystem
         /// <param name="page">页码</param>
         /// <param name="limit">每页条数</param>
         /// <returns></returns>
-        public List<MerchantQrCode> List(List<FieldItem> fields, string condition, int page = 1, int limit = 30, string orderby = "Id desc")
+        public List<Dictionary<string, object>> List(List<FieldItem> fields, string condition, int page = 1, int limit = 30, string orderby = "Id desc")
         {
             Dictionary<string, object> obj = new DbService(AppConfig.Base.mainTables, _conn).IndexData("MerchantQrCode", fields, orderby, "0", page, limit, condition);
-            List<MerchantQrCode> diclist = obj["data"] as List<MerchantQrCode>;
+            List<Dictionary<string, object>> diclist = obj["data"] as List<Dictionary<string, object>>;
             return diclist;
         }
 

+ 2 - 2
Services/OrderForNoService.cs

@@ -23,10 +23,10 @@ namespace MySystem
         /// <param name="page">页码</param>
         /// <param name="limit">每页条数</param>
         /// <returns></returns>
-        public List<OrderForNo> List(List<FieldItem> fields, string condition, int page = 1, int limit = 30, string orderby = "Id desc")
+        public List<Dictionary<string, object>> List(List<FieldItem> fields, string condition, int page = 1, int limit = 30, string orderby = "Id desc")
         {
             Dictionary<string, object> obj = new DbService(AppConfig.Base.mainTables, _conn).IndexData("OrderForNo", fields, orderby, "0", page, limit, condition);
-            List<OrderForNo> diclist = obj["data"] as List<OrderForNo>;
+            List<Dictionary<string, object>> diclist = obj["data"] as List<Dictionary<string, object>>;
             return diclist;
         }
 

+ 2 - 2
Services/OrderProductService.cs

@@ -23,10 +23,10 @@ namespace MySystem
         /// <param name="page">页码</param>
         /// <param name="limit">每页条数</param>
         /// <returns></returns>
-        public List<OrderProduct> List(List<FieldItem> fields, string condition, int page = 1, int limit = 30, string orderby = "Id desc")
+        public List<Dictionary<string, object>> List(List<FieldItem> fields, string condition, int page = 1, int limit = 30, string orderby = "Id desc")
         {
             Dictionary<string, object> obj = new DbService(AppConfig.Base.bsTables, _conn).IndexData("OrderProduct", fields, orderby, "0", page, limit, condition);
-            List<OrderProduct> diclist = obj["data"] as List<OrderProduct>;
+            List<Dictionary<string, object>> diclist = obj["data"] as List<Dictionary<string, object>>;
             return diclist;
         }
 

+ 2 - 2
Services/OrdersService.cs

@@ -23,10 +23,10 @@ namespace MySystem
         /// <param name="page">页码</param>
         /// <param name="limit">每页条数</param>
         /// <returns></returns>
-        public List<Orders> List(List<FieldItem> fields, string condition, int page = 1, int limit = 30, string orderby = "Id desc")
+        public List<Dictionary<string, object>> List(List<FieldItem> fields, string condition, int page = 1, int limit = 30, string orderby = "Id desc")
         {
             Dictionary<string, object> obj = new DbService(AppConfig.Base.bsTables, _conn).IndexData("Orders", fields, orderby, "0", page, limit, condition);
-            List<Orders> diclist = obj["data"] as List<Orders>;
+            List<Dictionary<string, object>> diclist = obj["data"] as List<Dictionary<string, object>>;
             return diclist;
         }
 

+ 2 - 2
Services/PageInfoService.cs

@@ -23,10 +23,10 @@ namespace MySystem
         /// <param name="page">页码</param>
         /// <param name="limit">每页条数</param>
         /// <returns></returns>
-        public List<PageInfo> List(List<FieldItem> fields, string condition, int page = 1, int limit = 30, string orderby = "Id desc")
+        public List<Dictionary<string, object>> List(List<FieldItem> fields, string condition, int page = 1, int limit = 30, string orderby = "Id desc")
         {
             Dictionary<string, object> obj = new DbService(AppConfig.Base.bsTables, _conn).IndexData("PageInfo", fields, orderby, "0", page, limit, condition);
-            List<PageInfo> diclist = obj["data"] as List<PageInfo>;
+            List<Dictionary<string, object>> diclist = obj["data"] as List<Dictionary<string, object>>;
             return diclist;
         }
 

+ 2 - 2
Services/PosMachinesService.cs

@@ -23,10 +23,10 @@ namespace MySystem
         /// <param name="page">页码</param>
         /// <param name="limit">每页条数</param>
         /// <returns></returns>
-        public List<PosMachines> List(List<FieldItem> fields, string condition, int page = 1, int limit = 30, string orderby = "Id desc")
+        public List<Dictionary<string, object>> List(List<FieldItem> fields, string condition, int page = 1, int limit = 30, string orderby = "Id desc")
         {
             Dictionary<string, object> obj = new DbService(AppConfig.Base.mainTables, _conn).IndexData("PosMachines", fields, orderby, "0", page, limit, condition);
-            List<PosMachines> diclist = obj["data"] as List<PosMachines>;
+            List<Dictionary<string, object>> diclist = obj["data"] as List<Dictionary<string, object>>;
             return diclist;
         }
 

+ 2 - 2
Services/PosMachinesTwoService.cs

@@ -23,10 +23,10 @@ namespace MySystem
         /// <param name="page">页码</param>
         /// <param name="limit">每页条数</param>
         /// <returns></returns>
-        public List<PosMachinesTwo> List(List<FieldItem> fields, string condition, int page = 1, int limit = 30, string orderby = "Id desc")
+        public List<Dictionary<string, object>> List(List<FieldItem> fields, string condition, int page = 1, int limit = 30, string orderby = "Id desc")
         {
             Dictionary<string, object> obj = new DbService(AppConfig.Base.mainTables, _conn).IndexData("PosMachinesTwo", fields, orderby, "0", page, limit, condition);
-            List<PosMachinesTwo> diclist = obj["data"] as List<PosMachinesTwo>;
+            List<Dictionary<string, object>> diclist = obj["data"] as List<Dictionary<string, object>>;
             return diclist;
         }
 

+ 2 - 2
Services/ServiceCenterService.cs

@@ -23,10 +23,10 @@ namespace MySystem
         /// <param name="page">页码</param>
         /// <param name="limit">每页条数</param>
         /// <returns></returns>
-        public List<ServiceCenter> List(List<FieldItem> fields, string condition, int page = 1, int limit = 30, string orderby = "Id desc")
+        public List<Dictionary<string, object>> List(List<FieldItem> fields, string condition, int page = 1, int limit = 30, string orderby = "Id desc")
         {
             Dictionary<string, object> obj = new DbService(AppConfig.Base.mainTables, _conn).IndexData("ServiceCenter", fields, orderby, "0", page, limit, condition);
-            List<ServiceCenter> diclist = obj["data"] as List<ServiceCenter>;
+            List<Dictionary<string, object>> diclist = obj["data"] as List<Dictionary<string, object>>;
             return diclist;
         }
 

+ 2 - 2
Services/UploadParamsService.cs

@@ -23,10 +23,10 @@ namespace MySystem
         /// <param name="page">页码</param>
         /// <param name="limit">每页条数</param>
         /// <returns></returns>
-        public List<UploadParams> List(List<FieldItem> fields, string condition, int page = 1, int limit = 30, string orderby = "Id desc")
+        public List<Dictionary<string, object>> List(List<FieldItem> fields, string condition, int page = 1, int limit = 30, string orderby = "Id desc")
         {
             Dictionary<string, object> obj = new DbService(AppConfig.Base.mainTables, _conn).IndexData("UploadParams", fields, orderby, "0", page, limit, condition);
-            List<UploadParams> diclist = obj["data"] as List<UploadParams>;
+            List<Dictionary<string, object>> diclist = obj["data"] as List<Dictionary<string, object>>;
             return diclist;
         }
 

+ 2 - 2
Services/UserBackKindService.cs

@@ -23,10 +23,10 @@ namespace MySystem
         /// <param name="page">页码</param>
         /// <param name="limit">每页条数</param>
         /// <returns></returns>
-        public List<UserBackKind> List(List<FieldItem> fields, string condition, int page = 1, int limit = 30, string orderby = "Id desc")
+        public List<Dictionary<string, object>> List(List<FieldItem> fields, string condition, int page = 1, int limit = 30, string orderby = "Id desc")
         {
             Dictionary<string, object> obj = new DbService(AppConfig.Base.mainTables, _conn).IndexData("UserBackKind", fields, orderby, "0", page, limit, condition);
-            List<UserBackKind> diclist = obj["data"] as List<UserBackKind>;
+            List<Dictionary<string, object>> diclist = obj["data"] as List<Dictionary<string, object>>;
             return diclist;
         }
 

+ 2 - 2
Services/UserCardForWeChatService.cs

@@ -23,10 +23,10 @@ namespace MySystem
         /// <param name="page">页码</param>
         /// <param name="limit">每页条数</param>
         /// <returns></returns>
-        public List<UserCardForWeChat> List(List<FieldItem> fields, string condition, int page = 1, int limit = 30, string orderby = "Id desc")
+        public List<Dictionary<string, object>> List(List<FieldItem> fields, string condition, int page = 1, int limit = 30, string orderby = "Id desc")
         {
             Dictionary<string, object> obj = new DbService(AppConfig.Base.mainTables, _conn).IndexData("UserCardForWeChat", fields, orderby, "0", page, limit, condition);
-            List<UserCardForWeChat> diclist = obj["data"] as List<UserCardForWeChat>;
+            List<Dictionary<string, object>> diclist = obj["data"] as List<Dictionary<string, object>>;
             return diclist;
         }
 

+ 2 - 2
Services/UserCenterIconListService.cs

@@ -23,10 +23,10 @@ namespace MySystem
         /// <param name="page">页码</param>
         /// <param name="limit">每页条数</param>
         /// <returns></returns>
-        public List<UserCenterIconList> List(List<FieldItem> fields, string condition, int page = 1, int limit = 30, string orderby = "Id desc")
+        public List<Dictionary<string, object>> List(List<FieldItem> fields, string condition, int page = 1, int limit = 30, string orderby = "Id desc")
         {
             Dictionary<string, object> obj = new DbService(AppConfig.Base.mainTables, _conn).IndexData("UserCenterIconList", fields, orderby, "0", page, limit, condition);
-            List<UserCenterIconList> diclist = obj["data"] as List<UserCenterIconList>;
+            List<Dictionary<string, object>> diclist = obj["data"] as List<Dictionary<string, object>>;
             return diclist;
         }
 

+ 2 - 2
Services/UserLevelSetService.cs

@@ -23,10 +23,10 @@ namespace MySystem
         /// <param name="page">页码</param>
         /// <param name="limit">每页条数</param>
         /// <returns></returns>
-        public List<UserLevelSet> List(List<FieldItem> fields, string condition, int page = 1, int limit = 30, string orderby = "Id desc")
+        public List<Dictionary<string, object>> List(List<FieldItem> fields, string condition, int page = 1, int limit = 30, string orderby = "Id desc")
         {
             Dictionary<string, object> obj = new DbService(AppConfig.Base.mainTables, _conn).IndexData("UserLevelSet", fields, orderby, "0", page, limit, condition);
-            List<UserLevelSet> diclist = obj["data"] as List<UserLevelSet>;
+            List<Dictionary<string, object>> diclist = obj["data"] as List<Dictionary<string, object>>;
             return diclist;
         }