DuGuYang 3 лет назад
Родитель
Сommit
6831de283e

+ 1 - 1
Areas/Admin/Controllers/MainServer/ActiveRewardController.cs

@@ -242,7 +242,7 @@ namespace MySystem.Areas.Admin.Controllers
             }
             Dictionary<string, object> other = new Dictionary<string, object>();
             string RewardAmount = "0.00";//奖励金额
-            DataTable dt = OtherMySqlConn.dtable("select sum(RewardAmount) from ActiveReward where BrandId='" + ViewBag.BrandId + "'" + condition);
+            DataTable dt = OtherMySqlConn.dtable("select sum(RewardAmount) from ActiveReward where BrandId='" + BrandId + "'" + condition);
             if (dt.Rows.Count > 0)
             {
                 RewardAmount = decimal.Parse(function.CheckNum(dt.Rows[0][0].ToString())).ToString("f2");

+ 1 - 1
Areas/Admin/Controllers/MainServer/ProfitSubsidyDetailController.cs

@@ -116,7 +116,7 @@ namespace MySystem.Areas.Admin.Controllers
             else
             {
                 var start = DateTime.Now.AddMonths(-1).ToString("yyyyMM");
-                condition += " and TradeMonth=" + start;
+                condition += " and TradeMonth>=" + start;
 
                 // var check = db.ProfitSubsidyDetail.Any(m => Convert.ToInt32(m.TradeMonth) >= Convert.ToInt32(start));
                 // if (check)

+ 2 - 2
Areas/Admin/Controllers/MainServer/TradeRecordController.cs

@@ -62,7 +62,7 @@ namespace MySystem.Areas.Admin.Controllers
             Fields.Add("SnNo", "2"); //快钱SN号
             Fields.Add("TopUserId", "0"); //顶级创客
 
-            string condition = " and Status>-1";
+            string condition = " and Status>-1 and BrandId =" + BrandId;
             //商户编号
             if (!string.IsNullOrEmpty(MerchantNo))
             {
@@ -152,7 +152,7 @@ namespace MySystem.Areas.Admin.Controllers
                     var Info = function.ReadInstance("/WritePage/TradeRecord/TradeRecord" + BrandId + ".txt");
                     if (string.IsNullOrEmpty(Info))
                     {
-                        function.WritePage("/WritePage/TradeRecord/", "TradeRecord" + BrandId + "..txt", minId.ToString());
+                        function.WritePage("/WritePage/TradeRecord/", "TradeRecord" + BrandId + ".txt", minId.ToString());
                         condition += " and Id >=" + minId;
                     }
                     else