bug修复

Areas/Api/Controllers/Main/MerchantAmountSummayController.cs

@@ -15,7 +15,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) : base(accessor)

Areas/Api/Controllers/Main/MerchantDepositBackController.cs

@@ -19,7 +19,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 MerchantDepositBackController : BaseController
     {
         public MerchantDepositBackController(IHttpContextAccessor accessor) : base(accessor)
@@ -67,8 +67,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/Main/MerchantDepositOrderController.cs

@@ -16,7 +16,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) : base(accessor)
@@ -112,10 +112,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 CreateDate = "";
+            var StartDate = "";
+            var EndDate = "";
             var query = MerchantDepositOrderService.Query(" and Status=1 and MerchantId=" + 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 + "月";
+            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); //考核结束时间

Util/Main/MerchantAmountSummayUtil.cs

@@ -24,42 +24,45 @@ namespace MySystem
             var query = MerchantDepositOrderService.Query(" and Status=1 and 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++)
+            if (query.Id > 0)
             {
-                month = month.AddMonths(i + 1);
-                TradeMonth = month.ToString("yyyy-MM");
-                var check = MerchantAmountSummayService.Query(" and IsAct=1 and TradeMonth='" + TradeMonth + "' and MerchantId=" + MerchantId + "");
-                if (check.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++)
                 {
-                    dic = 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.Id > 0) Status = 2;
-                    //未通过
-                    if (TradeAmount < 10000 && IsJoin != 3 && check.Id > 0) Status = -1;
+                    month = month.AddMonths(i + 1);
+                    TradeMonth = month.ToString("yyyy-MM");
+                    var check = MerchantAmountSummayService.Query(" and IsAct=1 and TradeMonth='" + TradeMonth + "' and MerchantId=" + MerchantId + "");
+                    if (check.Id > 0)
+                    {
+                        dic = 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.Id > 0) Status = 2;
+                        //未通过
+                        if (TradeAmount < 10000 && IsJoin != 3 && check.Id > 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;