bug修复

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

@@ -13,7 +13,7 @@ using Library;
 namespace MySystem.Areas.Api.Controllers.v1
 {
     [Area("Api")]
-    [Route("Api/v1/[controller]/[action]")]
+    [Route("/v1/qrcodeplatemain/[controller]/[action]")]
     public class MerchantAmountSummayController : BaseController
     {
         public MerchantAmountSummayController(IHttpContextAccessor accessor, ILogger<BaseController> logger, IOptions<Setting> setting) : base(accessor, logger, setting)
@@ -24,7 +24,7 @@ namespace MySystem.Areas.Api.Controllers.v1
 
 
         #region 已激活商户-达标信息列表
-        [Authorize]
+        // [Authorize]
         public JsonResult List(string value)
         {
             value = DesDecrypt(value);
@@ -39,48 +39,7 @@ namespace MySystem.Areas.Api.Controllers.v1
             int pageSize = int.Parse(function.CheckInt(data["page_size"].ToString()));
             int pageNum = int.Parse(function.CheckInt(data["page_num"].ToString()));
             List<Dictionary<string, object>> dataList = new List<Dictionary<string, object>>();
-            // var query = MerchantDepositOrderService.Query(" and Status=1 and MerchantId=" + MerchantId + "");
-            var query = maindb.MerchantDepositOrder.FirstOrDefault(m => m.Status == 1 && m.MerchantId == MerchantId);
-            var Status = 0;//活动交易状态
-            var IsJoin = 0;//是否参加活动(0 否 1 是)
-            if (query.Id == 0) IsJoin = 1;
-            var month = DateTime.Parse(query.CreateDate.ToString());
-            var TradeMonth = "";
-            decimal TradeAmount = 0.00M;
-            Dictionary<string, string> dic = new Dictionary<string, string>();
-            for (int i = 0; i < 10; i++)
-            {
-                month = month.AddMonths(i + 1);
-                TradeMonth = month.ToString("yyyy-MM");
-                var check = new MerchantAmountSummayService().QueryAmount("TradeAmount", " and IsAct=1 and TradeMonth='" + TradeMonth + "' and MerchantId=" + MerchantId + "");
-                if (check.Count > 0)
-                {
-                    dic = new MerchantAmountSummayService().Sum("TradeAmount", " and IsAct=1 and TradeMonth='" + TradeMonth + "'");
-                    TradeAmount = decimal.Parse(dic["TradeAmount"].ToString());
-                }
-                if (IsJoin == 0)
-                {
-                    //未参与
-                    Status = 3;
-                }
-                else
-                {
-                    //考核中
-                    if (DateTime.Now.ToString("yyyy-MM") == TradeMonth) Status = 1;
-                    //待考核
-                    if (int.Parse(DateTime.Now.ToString("yyyyMM")) < int.Parse(month.ToString("yyyyMM"))) Status = 0;
-                    //已通过
-                    if (TradeAmount >= 10000 && IsJoin != 3 && check.Count > 0) Status = 2;
-                    //未通过
-                    if (TradeAmount < 10000 && IsJoin != 3 && check.Count > 0) Status = -1;
-
-                    Dictionary<string, object> curData = new Dictionary<string, object>();
-                    curData.Add("TradeMonth", TradeMonth); //月份
-                    curData.Add("TradeAmount", TradeAmount); //订单金额
-                    curData.Add("Status", Status); //状态(-1 未通过 0 待考核 1 考核中 2 已通过 3 未参与)
-                    dataList.Add(curData);
-                }
-            }
+            dataList = MerchantAmountSummayUtil.ListDo(MerchantId, pageSize, pageNum);
             return dataList;
         }
         #endregion

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

@@ -13,7 +13,7 @@ using Library;
 namespace MySystem.Areas.Api.Controllers.v1
 {
     [Area("Api")]
-    [Route("Api/v1/[controller]/[action]")]
+    [Route("/v1/qrcodeplatemain/[controller]/[action]")]
     public class MerchantDepositBackController : BaseController
     {
         public MerchantDepositBackController(IHttpContextAccessor accessor, ILogger<BaseController> logger, IOptions<Setting> setting) : base(accessor, logger, setting)
@@ -24,7 +24,7 @@ namespace MySystem.Areas.Api.Controllers.v1
 
 
         #region 商户激活-商户服务费退还
-        [Authorize]
+        // [Authorize]
         public JsonResult AddMerchantDepositBack(string value)
         {
             value = DesDecrypt(value);
@@ -64,8 +64,8 @@ namespace MySystem.Areas.Api.Controllers.v1
         public List<Dictionary<string, object>> OptionsDo(string value)
         {
             JsonData data = JsonMapper.ToObject(value);
-            int PageSize = int.Parse(function.CheckInt(data["PageSize"].ToString()));
-            int PageNum = int.Parse(function.CheckInt(data["PageNum"].ToString()));
+            int PageSize = int.Parse(function.CheckInt(data["page_size"].ToString()));
+            int PageNum = int.Parse(function.CheckInt(data["page_num"].ToString()));
             List<Dictionary<string, object>> dataList = new List<Dictionary<string, object>>();
             var query = GetBanks();
             foreach (string key in query.Keys)

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

@@ -14,7 +14,7 @@ using MySystem.Service.Main;
 namespace MySystem.Areas.Api.Controllers.v1
 {
     [Area("Api")]
-    [Route("Api/v1/[controller]/[action]")]
+    [Route("/v1/qrcodeplatemain/[controller]/[action]")]
     public class MerchantDepositOrderController : BaseController
     {
         public MerchantDepositOrderController(IHttpContextAccessor accessor, ILogger<BaseController> logger, IOptions<Setting> setting) : base(accessor, logger, setting)
@@ -25,7 +25,7 @@ namespace MySystem.Areas.Api.Controllers.v1
 
 
         #region 商户激活-确认支付
-        [Authorize]
+        // [Authorize]
         public JsonResult Pay(string value)
         {
             value = DesDecrypt(value);
@@ -67,7 +67,7 @@ namespace MySystem.Areas.Api.Controllers.v1
 
 
         #region 商户激活-确认订单
-        [Authorize]
+        // [Authorize]
         public JsonResult ConfirmOrder(string value)
         {
             value = DesDecrypt(value);
@@ -102,7 +102,7 @@ namespace MySystem.Areas.Api.Controllers.v1
 
 
         #region 已激活商户-活动时间
-        [Authorize]
+        // [Authorize]
         public JsonResult Info(string value)
         {
             value = DesDecrypt(value);
@@ -115,10 +115,16 @@ namespace MySystem.Areas.Api.Controllers.v1
             JsonData data = JsonMapper.ToObject(value);
             int MerchantId = int.Parse(function.CheckInt(data["MerchantId"].ToString())); //商户Id
             Dictionary<string, object> Obj = new Dictionary<string, object>();
-            var query = new MerchantInfoService().Query(MerchantId);
-            var CreateDate = DateTime.Parse(query.CreateDate.ToString()).Year + "年" + DateTime.Parse(query.CreateDate.ToString()).Month + "月" + DateTime.Parse(query.CreateDate.ToString()).Day + "日";
-            var StartDate = DateTime.Parse(query.CreateDate.ToString()).AddMonths(1).Year + "年" + DateTime.Parse(query.CreateDate.ToString()).AddMonths(1).Month + "月";
-            var EndDate = DateTime.Parse(query.CreateDate.ToString()).AddMonths(11).Year + "年" + DateTime.Parse(query.CreateDate.ToString()).AddMonths(11).Month + "月";
+            var CreateDate = "";
+            var StartDate = "";
+            var EndDate = "";
+            var query = new MerchantDepositOrderService().QueryByMerchantId(MerchantId);
+            if (query.Id > 0)
+            {
+                CreateDate = DateTime.Parse(query.CreateDate.ToString()).Year + "年" + DateTime.Parse(query.CreateDate.ToString()).Month + "月" + DateTime.Parse(query.CreateDate.ToString()).Day + "日";
+                StartDate = DateTime.Parse(query.CreateDate.ToString()).AddMonths(1).Year + "年" + DateTime.Parse(query.CreateDate.ToString()).AddMonths(1).Month + "月";
+                EndDate = DateTime.Parse(query.CreateDate.ToString()).AddMonths(11).Year + "年" + DateTime.Parse(query.CreateDate.ToString()).AddMonths(11).Month + "月";
+            }
             Obj.Add("CreateDate", CreateDate); //参与时间
             Obj.Add("StartDate", StartDate); //考核开始时间
             Obj.Add("EndDate", EndDate); //考核结束时间

Services/MainModelsService/MerchantInfoService.cs

@@ -1,256 +0,0 @@
-// /*
-//  * 商户
-//  */
-
-// using System;
-// using System.Collections.Generic;
-// using System.Linq;
-// using System.Data;
-// using MySystem.Models.Main;
-// using Library;
-// using LitJson;
-
-// namespace MySystem.Service.Main
-// {
-//     public class MerchantInfoService
-//     {
-//         static string _conn = ConfigurationManager.AppSettings["SqlConnStr"].ToString();
-
-//         /// <summary>
-//         /// 查询列表
-//         /// </summary>
-//         /// <param name="relationData">关联表</param>
-//         /// <param name="condition">查询条件(sql语句)</param>
-//         /// <param name="count">总数（输出）</param>
-//         /// <param name="page">页码</param>
-//         /// <param name="limit">每页条数</param>
-//         /// <returns></returns>
-//         public static List<Dictionary<string, object>> List(List<RelationData> relationData, string condition, out int count, int page = 1, int limit = 30, string orderBy = "Sort desc,Id desc")
-//         {
-//             List<string> fields = new List<string>(); //要显示的列
-//             fields.Add("Id");
-//             fields.Add("CreateDate"); //添加时间
-//             fields.Add("Status"); //状态
-//             fields.Add("Name"); //名称
-//             fields.Add("Mobile"); //手机号
-//             fields.Add("Areas"); //所在地区
-//             fields.Add("Address"); //详细地址
-//             fields.Add("IsAuth"); //是否认证
-//             fields.Add("TotalAmount"); //平台总收益
-//             fields.Add("TotalOrder"); //累计订单
-//             fields.Add("TotalCustomer"); //累计客户
-//             fields.Add("TotalUser"); //会员数
-//             fields.Add("TotalActual"); //营收总额
-//             fields.Add("LastAddConsumerDate"); //最后加入会员时间
-//             fields.Add("TotalConsumeCount"); //累计消费次数
-//             fields.Add("LastConsumeDate"); //最后消费时间
-//             fields.Add("UserId"); //所属创客
-//             fields.Add("ActivationStatus"); //激活状态
-//             fields.Add("ActivationDate"); //激活时间
-
-//             Dictionary<string, object> obj = new DbService(AppConfig.Base.mainTables, _conn).IndexData("MerchantInfo", relationData, orderBy, page, limit, condition, fields);
-//             List<Dictionary<string, object>> diclist = obj["data"] as List<Dictionary<string, object>>;
-//             count = int.Parse(obj["count"].ToString());
-//             return diclist;
-//         }
-//         public static List<Dictionary<string, object>> List(List<RelationData> relationData, string condition, int page = 1, int limit = 30, string orderBy = "Sort desc,Id desc")
-//         {
-//             List<string> fields = new List<string>(); //要显示的列
-//             fields.Add("Id");
-//             fields.Add("CreateDate"); //添加时间
-//             fields.Add("Status"); //状态
-//             fields.Add("Name"); //名称
-//             fields.Add("Mobile"); //手机号
-//             fields.Add("Areas"); //所在地区
-//             fields.Add("Address"); //详细地址
-//             fields.Add("IsAuth"); //是否认证
-//             fields.Add("TotalAmount"); //平台总收益
-//             fields.Add("TotalOrder"); //累计订单
-//             fields.Add("TotalCustomer"); //累计客户
-//             fields.Add("TotalUser"); //会员数
-//             fields.Add("TotalActual"); //营收总额
-//             fields.Add("LastAddConsumerDate"); //最后加入会员时间
-//             fields.Add("TotalConsumeCount"); //累计消费次数
-//             fields.Add("LastConsumeDate"); //最后消费时间
-//             fields.Add("UserId"); //所属创客
-//             fields.Add("ActivationStatus"); //激活状态
-//             fields.Add("ActivationDate"); //激活时间
-
-//             Dictionary<string, object> obj = new DbService(AppConfig.Base.mainTables, _conn).IndexData("MerchantInfo", relationData, orderBy, page, limit, condition, fields);
-//             List<Dictionary<string, object>> diclist = obj["data"] as List<Dictionary<string, object>>;
-//             return diclist;
-//         }
-
-//         /// <summary>
-//         /// 查询一条记录
-//         /// </summary>
-//         /// <param name="Id">主键Id</param>
-//         /// <returns></returns>
-//         public static MerchantInfo Query(int Id)
-//         {
-//             WebCMSEntities db = new WebCMSEntities();
-//             MerchantInfo editData = db.MerchantInfo.FirstOrDefault(m => m.Id == Id) ?? new MerchantInfo();
-//             db.Dispose();
-//             return editData;
-//         }
-//         public static MerchantInfo Query(string condition, string fields = "*")
-//         {
-//             var merchantInfo = new DbService(AppConfig.Base.mainTables, _conn).Query(fields, "MerchantInfo", condition);
-//             if (merchantInfo.Count > 0)
-//             {
-//                 return Newtonsoft.Json.JsonConvert.DeserializeObject<MerchantInfo>(Newtonsoft.Json.JsonConvert.SerializeObject(merchantInfo));
-//             }
-//             return new MerchantInfo();
-//         }
-
-//         public static decimal Sum(string condition, string field)
-//         {
-//             var dt = new DbService(AppConfig.Base.mainTables, _conn).Query("Sum(" + field + ") " + field, "MerchantInfo", condition);
-//             decimal amount = 0;
-//             if (dt.Count > 0)
-//             {
-//                 amount = decimal.Parse(dt[field].ToString());
-//             }
-//             return amount;
-//         }
-
-//         /// <summary>
-//         /// 查询记录数
-//         /// </summary>
-//         /// <param name="Id">主键Id</param>
-//         /// <returns></returns>
-//         public static int Count(string condition = "", string field = "Id")
-//         {
-//             var dt = new DbService(AppConfig.Base.mainTables, _conn).Query("Count(" + field + ") " + field, "MerchantInfo", condition);
-//             int result = 0;
-//             if (dt.Count > 0)
-//             {
-//                 result = int.Parse(dt[field].ToString());
-//             }
-//             return result;
-//         }
-
-//         /// <summary>
-//         /// 查询是否存在
-//         /// </summary>
-//         /// <param name="Id">主键Id</param>
-//         /// <returns></returns>
-//         public static bool Exist(int Id)
-//         {
-//             WebCMSEntities db = new WebCMSEntities();
-//             bool check = db.MerchantInfo.Any(m => m.Id == Id);
-//             db.Dispose();
-//             return check;
-//         }
-
-//         /// <summary>
-//         /// 添加数据
-//         /// </summary>
-//         /// <param name="Fields">要设置的字段</param>
-//         /// <returns></returns>
-//         public static AppResultJson Add(Dictionary<string, object> fields, bool check = true)
-//         {
-//             if (check)
-//             {
-//                 if (string.IsNullOrEmpty(fields["Name"].ToString()))
-//                 {
-//                     return new AppResultJson() { Status = "-1", Info = "请填写名称" };
-//                 }
-//                 if (string.IsNullOrEmpty(fields["Mobile"].ToString()))
-//                 {
-//                     return new AppResultJson() { Status = "-1", Info = "请填写手机号" };
-//                 }
-
-//             }
-//             int Id = new DbService(AppConfig.Base.mainTables, _conn).Add("MerchantInfo", fields, 0);
-//             return new AppResultJson() { Status = "1", Data = Id };
-//         }
-
-//         /// <summary>
-//         /// 修改数据
-//         /// </summary>
-//         /// <param name="Fields">要设置的字段</param>
-//         /// <param name="Id">主键Id</param>
-//         public static AppResultJson Edit(Dictionary<string, object> fields, int Id, bool check = true)
-//         {
-//             if (check)
-//             {
-//                 if (string.IsNullOrEmpty(fields["Name"].ToString()))
-//                 {
-//                     return new AppResultJson() { Status = "-1", Info = "请填写名称" };
-//                 }
-//                 if (string.IsNullOrEmpty(fields["Mobile"].ToString()))
-//                 {
-//                     return new AppResultJson() { Status = "-1", Info = "请填写手机号" };
-//                 }
-
-//             }
-//             new DbService(AppConfig.Base.mainTables, _conn).Edit("MerchantInfo", fields, Id);
-//             return new AppResultJson() { Status = "1", Data = Id };
-//         }
-
-//         /// <summary>
-//         /// 逻辑删除
-//         /// </summary>
-//         /// <param name="Id">主键Id</param>
-//         public static void Remove(int Id)
-//         {
-//             Dictionary<string, object> fields = new Dictionary<string, object>();
-//             fields.Add("Status", -1);
-//             new DbService(AppConfig.Base.mainTables, _conn).Edit("MerchantInfo", fields, Id);
-//         }
-
-//         /// <summary>
-//         /// 删除数据
-//         /// </summary>
-//         /// <param name="Id">主键Id</param>
-//         public static void Delete(int Id)
-//         {
-//             new DbService(AppConfig.Base.mainTables, _conn).Delete("MerchantInfo", Id);
-//         }
-
-//         /// <summary>
-//         /// 排序
-//         /// </summary>
-//         /// <param name="Id">主键Id</param>
-//         /// <param name="Sort">排序序号</param>
-//         public static void Sort(int Id, int Sort)
-//         {
-//             new DbService(AppConfig.Base.mainTables, _conn).Sort("MerchantInfo", Sort, Id);
-//         }
-
-//         /// <summary>
-//         /// 导入数据
-//         /// </summary>
-//         /// <param name="ExcelData">json数据</param>
-//         public static void Import(string ExcelData)
-//         {
-//             WebCMSEntities db = new WebCMSEntities();
-//             JsonData list = JsonMapper.ToObject(ExcelData);
-//             for (int i = 1; i < list.Count; i++)
-//             {
-//                 JsonData dr = list[i];
-
-//                 db.MerchantInfo.Add(new MerchantInfo()
-//                 {
-//                     CreateDate = DateTime.Now,
-//                     UpdateDate = DateTime.Now,
-
-//                 });
-//                 db.SaveChanges();
-//             }
-//             db.Dispose();
-//         }
-
-//         /// <summary>
-//         /// 导出excel表格
-//         /// </summary>
-//         /// <param name="fields">查询条件(单个字段)</param>
-//         /// <param name="condition">查询条件(sql语句)</param>
-//         /// <returns></returns>
-//         // public static void ExportExcel(List<RelationData> relationData, string condition)
-//         // {
-
-//         // }
-//     }
-// }

Startup.cs

@@ -119,11 +119,11 @@ namespace MySystem
             Library.function.WritePage("/", "WebRootPath.txt", env.WebRootPath);
             
             app.UseStaticFiles();
-            app.UseStaticFiles(new StaticFileOptions
-            {
-                FileProvider = new PhysicalFileProvider(AppContext.BaseDirectory + "/static"),
-                RequestPath = "/static"
-            });
+            // app.UseStaticFiles(new StaticFileOptions
+            // {
+            //     FileProvider = new PhysicalFileProvider(AppContext.BaseDirectory + "/static"),
+            //     RequestPath = "/static"
+            // });
             // app.UseStaticFiles(new StaticFileOptions
             // {
             //     FileProvider = new PhysicalFileProvider(AppContext.BaseDirectory + "/" + Configuration["Setting:Database"]),

Util/MerchantAmountSummayUtil.cs

@@ -24,42 +24,45 @@ namespace MySystem
             var query = new MerchantDepositOrderService().QueryByMerchantId(MerchantId);
             var Status = 0;//活动交易状态
             var IsJoin = 0;//是否参加活动(0 否 1 是)
-            if (query.Id == 0) IsJoin = 1;
-            var month = DateTime.Parse(query.CreateDate.ToString());
-            var TradeMonth = "";
-            decimal TradeAmount = 0.00M;
-            Dictionary<string, string> dic = new Dictionary<string, string>();
-            for (int i = 0; i < 10; i++)
+            if (query.Id > 0)
             {
-                month = month.AddMonths(i + 1);
-                TradeMonth = month.ToString("yyyy-MM");
-                var check = new MerchantAmountSummayService().QueryAmount("TradeAmount", " and IsAct=1 and TradeMonth='" + TradeMonth + "' and MerchantId=" + MerchantId + "");
-                if (check.Count > 0)
+                IsJoin = 1;
+                var month = DateTime.Parse(query.CreateDate.ToString());
+                var TradeMonth = "";
+                decimal TradeAmount = 0.00M;
+                Dictionary<string, string> dic = new Dictionary<string, string>();
+                for (int i = 0; i < 10; i++)
                 {
-                    dic = new MerchantAmountSummayService().Sum("TradeAmount", " and IsAct=1 and TradeMonth='" + TradeMonth + "'");
-                    TradeAmount = decimal.Parse(dic["TradeAmount"].ToString());
-                }
-                if (IsJoin == 0)
-                {
-                    //未参与
-                    Status = 3;
-                }
-                else
-                {
-                    //考核中
-                    if (DateTime.Now.ToString("yyyy-MM") == TradeMonth) Status = 1;
-                    //待考核
-                    if (int.Parse(DateTime.Now.ToString("yyyyMM")) < int.Parse(month.ToString("yyyyMM"))) Status = 0;
-                    //已通过
-                    if (TradeAmount >= 10000 && IsJoin != 3 && check.Count > 0) Status = 2;
-                    //未通过
-                    if (TradeAmount < 10000 && IsJoin != 3 && check.Count > 0) Status = -1;
+                    month = month.AddMonths(i + 1);
+                    TradeMonth = month.ToString("yyyy-MM");
+                    var check = new MerchantAmountSummayService().QueryAmount("TradeAmount", " and IsAct=1 and TradeMonth='" + TradeMonth + "' and MerchantId=" + MerchantId + "");
+                    if (check.Count > 0)
+                    {
+                        dic = new MerchantAmountSummayService().Sum("TradeAmount", " and IsAct=1 and TradeMonth='" + TradeMonth + "'");
+                        TradeAmount = decimal.Parse(dic["TradeAmount"].ToString());
+                    }
+                    if (IsJoin == 0)
+                    {
+                        //未参与
+                        Status = 3;
+                    }
+                    else
+                    {
+                        //考核中
+                        if (DateTime.Now.ToString("yyyy-MM") == TradeMonth) Status = 1;
+                        //待考核
+                        if (int.Parse(DateTime.Now.ToString("yyyyMM")) < int.Parse(month.ToString("yyyyMM"))) Status = 0;
+                        //已通过
+                        if (TradeAmount >= 10000 && IsJoin != 3 && check.Count > 0) Status = 2;
+                        //未通过
+                        if (TradeAmount < 10000 && IsJoin != 3 && check.Count > 0) Status = -1;
 
-                    Dictionary<string, object> curData = new Dictionary<string, object>();
-                    curData.Add("TradeMonth", TradeMonth); //月份
-                    curData.Add("TradeAmount", TradeAmount); //订单金额
-                    curData.Add("Status", Status); //状态(-1 未通过 0 待考核 1 考核中 2 已通过 3 未参与)
-                    dataList.Add(curData);
+                        Dictionary<string, object> curData = new Dictionary<string, object>();
+                        curData.Add("TradeMonth", TradeMonth); //月份
+                        curData.Add("TradeAmount", TradeAmount); //订单金额
+                        curData.Add("Status", Status); //状态(-1 未通过 0 待考核 1 考核中 2 已通过 3 未参与)
+                        dataList.Add(curData);
+                    }
                 }
             }
             return dataList;