调整

AppStart/Redis/MySql/QrCodeTradeStat.cs

@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using Library;
 using System.Linq;
-using MySystem.Models.Main;
+using MySystem.Models.Main1;
 
 namespace MySystem
 {

Areas/Api/Controllers/Main/MerchantInfoController.cs

@@ -429,7 +429,7 @@ 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>>();
-            IQueryable<MerchantQrCode> query = maindb.MerchantQrCode.Where(m => m.MerchantId == MerchantId).OrderByDescending(m => m.Id);
+            IQueryable<Models.Main1.MerchantQrCode> query = main1db.MerchantQrCode.Where(m => m.MerchantId == MerchantId && m.QueryCount == 2).OrderByDescending(m => m.Id);
             TotalCount = query.Count();
             if (PageNum == 1)
             {
@@ -440,7 +440,7 @@ namespace MySystem.Areas.Api.Controllers.v1
                 int skipNum = PageSize * (PageNum - 1);
                 query = query.Skip(skipNum).Take(PageSize);
             }
-            foreach (MerchantQrCode item in query.ToList())
+            foreach (Models.Main1.MerchantQrCode item in query.ToList())
             {
                 Dictionary<string, object> curData = new Dictionary<string, object>();
                 curData.Add("SnNo", item.SnNo); //sn

Areas/Api/Controllers/Main/PosMachinesController.cs

@@ -297,7 +297,7 @@ namespace MySystem.Areas.Api.Controllers.v1
             {
                 PageSize = 100000;
             }
-            IQueryable<PosMachinesTwo> query = main1db.PosMachinesTwo.Where(m => m.Status > -1 && m.BuyUserId == UserId && m.BindingState == 1);
+            IQueryable<PosMachinesTwo> query = main1db.PosMachinesTwo.Where(m => m.Status > -1 && m.BuyUserId == UserId && m.BindingState == 1 && m.OpId == 2);
             if (!string.IsNullOrEmpty(SnNo))
             {
                 query = query.Where(m => m.PosSn == SnNo);
@@ -331,7 +331,7 @@ namespace MySystem.Areas.Api.Controllers.v1
                 curData.Add("Id", subdata.Id); //Id
                 decimal Deposit = 299;
                 if (BrandId == 6)
-                { 
+                {
                     Deposit = 249;
                 }
                 if (!string.IsNullOrEmpty(subdata.PrizeParams))
@@ -341,7 +341,7 @@ namespace MySystem.Areas.Api.Controllers.v1
                 curData.Add("Deposit", Deposit);
                 MerchantAddInfo merchant = main1db.MerchantAddInfo.FirstOrDefault(m => m.Id == subdata.BindMerchantId) ?? new MerchantAddInfo();
                 curData.Add("BindedMerchant", merchant.CertMerchantName);
-                curData.Add("IsLeader",IsLeader);
+                curData.Add("IsLeader", IsLeader);
                 dataList.Add(curData);
             }
             return dataList;
@@ -407,7 +407,7 @@ namespace MySystem.Areas.Api.Controllers.v1
                 curData.Add("FromStore", store.StoreName); //来自仓库
                 decimal Deposit = 299;
                 if (BrandId == 6)
-                { 
+                {
                     Deposit = 249;
                 }
                 if (!string.IsNullOrEmpty(subdata.PrizeParams))
@@ -415,7 +415,7 @@ namespace MySystem.Areas.Api.Controllers.v1
                     Deposit = decimal.Parse(function.CheckNum(subdata.PrizeParams));
                 }
                 curData.Add("Deposit", Deposit);
-                curData.Add("IsLeader",IsLeader);
+                curData.Add("IsLeader", IsLeader);
                 dataList.Add(curData);
             }
             return dataList;
@@ -482,14 +482,14 @@ namespace MySystem.Areas.Api.Controllers.v1
                     curData.Add("ActDays", ts.TotalDays.ToString("f0")); //活动剩余天数
                 }
                 else
-                { 
+                {
                     curData.Add("ActDays", 0); //活动剩余天数
                 }
                 curData.Add("CreateDate", subdata.CreateDate.Value.ToString("yyyy-MM-dd")); //机具初始日期
                 curData.Add("EndDate", subdata.RecycEndDate == null ? "" : subdata.RecycEndDate.Value.ToString("yyyy-MM-dd")); //截止日期
                 decimal Deposit = 299;
                 if (BrandId == 6)
-                { 
+                {
                     Deposit = 249;
                 }
                 if (!string.IsNullOrEmpty(subdata.PrizeParams))
@@ -497,7 +497,7 @@ namespace MySystem.Areas.Api.Controllers.v1
                     Deposit = decimal.Parse(function.CheckNum(subdata.PrizeParams));
                 }
                 curData.Add("Deposit", Deposit);
-                curData.Add("IsLeader",IsLeader);
+                curData.Add("IsLeader", IsLeader);
                 dataList.Add(curData);
             }
             return dataList;

Service/Main/ConsumerProfitService.cs

@@ -33,14 +33,7 @@ namespace MySystem.Service.Main
             fields.Add("Status"); //状态
             fields.Add("MerchantId"); //商户
             fields.Add("ConsumerId"); //消费者
-            fields.Add("OrderNo"); //订单号
-            fields.Add("PayMode"); //支付方式
-            fields.Add("PayMoney"); //支付金额
-            fields.Add("ReturnMoney"); //已返金额
-            fields.Add("SnNo"); //SN号
-            fields.Add("MaxDivi"); //最大分红
-            fields.Add("CurDivi"); //当前分红
-            fields.Add("IsAct"); //是否活动
+            fields.Add("GetMoney"); //分红金额
 
             Dictionary<string, object> obj = new DbService(AppConfig.Base.mainTables, _conn).IndexData("ConsumerProfit", relationData, orderBy, page, limit, condition, fields);
             List<Dictionary<string, object>> diclist = obj["data"] as List<Dictionary<string, object>>;
@@ -55,14 +48,7 @@ namespace MySystem.Service.Main
             fields.Add("Status"); //状态
             fields.Add("MerchantId"); //商户
             fields.Add("ConsumerId"); //消费者
-            fields.Add("OrderNo"); //订单号
-            fields.Add("PayMode"); //支付方式
-            fields.Add("PayMoney"); //支付金额
-            fields.Add("ReturnMoney"); //已返金额
-            fields.Add("SnNo"); //SN号
-            fields.Add("MaxDivi"); //最大分红
-            fields.Add("CurDivi"); //当前分红
-            fields.Add("IsAct"); //是否活动
+            fields.Add("GetMoney"); //分红金额
 
             Dictionary<string, object> obj = new DbService(AppConfig.Base.mainTables, _conn).IndexData("ConsumerProfit", relationData, orderBy, page, limit, condition, fields);
             List<Dictionary<string, object>> diclist = obj["data"] as List<Dictionary<string, object>>;

Util/Business/BusinessUtil.cs

@@ -133,13 +133,13 @@ namespace MySystem
                 foreach (Dictionary<string, object> dic in dics)
                 {
                     Dictionary<string, object> cdata = new Dictionary<string, object>();
-                    var CreateDate = DateTime.Parse(subdata["CreateDate"].ToString());
+                    var CreateDate = DateTime.Parse(dic["CreateDate"].ToString());
                     var TradeDate = CreateDate.Month + "月" + CreateDate.Day + "日" + " " + CreateDate.ToString("HH:mm");
                     cdata.Add("ProfitDate", TradeDate); //分红时间
                     cdata.Add("ProfitAmount", decimal.Parse(dic["GetMoney"].ToString()).ToString("f2")); //分红金额
                     dataList.Add(cdata);
                 }
-                obj.Add("ProfitTotalAmount", ConsumerProfitService.Sum("GetMoney", " and OrderId=" + int.Parse(subdata["Id"].ToString())).ToString("f2")); //分红总金额
+                obj.Add("ProfitTotalAmount", ConsumerProfitService.Sum(" and OrderId=" + int.Parse(subdata["Id"].ToString()), "GetMoney").ToString("f2")); //分红总金额
                 obj.Add("ProfitList", dataList); //订单分红记录列表
             }
             return obj;

Util/WorkSpace/WorkSpaceUtil.cs

@@ -50,6 +50,7 @@ namespace MySystem
             Obj.Add("TotalAmount", TotalAmount.ToString("f2")); //营总收益
             MerchantInfo merchant = MerchantInfoService.Query(MerchantId);
             decimal AllocationAmount = merchant.ActMaxAmount - merchant.ActCurrentAmount;
+            if(AllocationAmount < 0) AllocationAmount = 0;
             Obj.Add("AllocationAmount", AllocationAmount); //未分配活动金额
             Obj.Add("TotalOrder", TotalOrder); //累计订单
             Obj.Add("TotalUser", TotalUser); //会员数