Merge branch 'DuGuYang' into feature-dgy-后台测试

AppStart/DictionaryClass/DictionaryClass.cs

@@ -139,6 +139,22 @@ namespace MySystem
         #endregion
 
 
+        #region ChangeTypes字典
+
+        public Dictionary<string, string> getChangeTypesDic()
+        {
+            List<ChangeTypes> ChangeTypesList = db.ChangeTypes.ToList();
+            Dictionary<string, string> ChangeTypesDic = new Dictionary<string, string>();
+            foreach (ChangeTypes subChangeTypes in ChangeTypesList)
+            {
+                ChangeTypesDic.Add(subChangeTypes.Id.ToString(), subChangeTypes.Name.ToString());
+            }
+            return ChangeTypesDic;
+        }
+
+        #endregion
+
+
         #region Users字典
 
         public Dictionary<string, string> getUsersDic()

AppStart/RelationClassForConst.cs

@@ -24,158 +24,167 @@ namespace MySystem
 
         public static string GetChangeTypeInfo(int key)
         {
-            string result = "";
-            switch (key)
+            using (WebCMSEntities db = new WebCMSEntities())
             {
-                case 0:
-                    result = "激活奖励";
-                    break;
-                case 1:
-                    result = "交易分润";
-                    break;
-                case 11:
-                    result = "月月红";
-                    break;
-                case 12:
-                    result = "交易奖励";
-                    break;
-                case 2:
-                    result = "提现申请";
-                    break;
-                case 3:
-                    result = "提现代付";
-                    break;
-                case 4:
-                    result = "提现手续费";
-                    break;
-                case 5:
-                    result = "提现税点扣除";
-                    break;
-                case 6:
-                    result = "提现失败，解冻";
-                    break;
-                case 61:
-                    result = "系统冻结";
-                    break;
-                case 62:
-                    result = "系统解冻";
-                    break;
-                case 63:
-                    result = "系统扣减";
-                    break;
-                case 64:
-                    result = "系统奖励";
-                    break;
-                case 65:
-                    result = "押金暂扣";
-                    break;
-                case 66:
-                    result = "押金退还";
-                    break;
-                case 7:
-                    result = "系统扣除";
-                    break;
-                case 10:
-                    result = "办卡奖励";
-                    break;
-                case 20:
-                    result = "余额支付";
-                    break;
-                case 21:
-                    result = "余额退款";
-                    break;
-                case 22:
-                    result = "余额退款手续费";
-                    break;
-                case 30:
-                    result = "红包奖励";
-                    break;
-                case 31:
-                    result = "活动奖励";
-                    break;
-                case 40:
-                    result = "商户达标返";
-                    break;
-                case 50:
-                    result = "开机奖励";
-                    break;
-                case 60:
-                    result = "流量卡分佣";
-                    break;
-                case 111:
-                    result = "分润补贴";
-                    break;
-                case 112:
-                    result = "推荐奖励";
-                    break;
-                case 113:
-                    result = "招商节奖励";
-                    break;
-                case 114:
-                    result = "私董会分红";
-                    break;
-                case 115:
-                    result = "分仓奖励";
-                    break;
-                case 116:
-                    result = "大盟主奖励";
-                    break;
-                case 117:
-                    result = "大盟主奖励(储蓄金入账)";
-                    break;
-                case 118:
-                    result = "大盟主奖励(购机奖励)";
-                    break;
-                case 119:
-                    result = "分仓临时额度退还";
-                    break;
-                case 120:
-                    result = "运营中心(购机奖励)";
-                    break;
-                case 121:
-                    result = "运营中心奖励";
-                    break;
-                case 122:
-                    result = "推荐大盟主奖励";
-                    break;
-                case 123:
-                    result = "推荐小盟主奖励";
-                    break;
-                case 124:
-                    result = "扣机具货款";
-                    break;
-                case 125:
-                    result = "软件服务费";
-                    break;
-                case 126:
-                    result = "机具货款退还";
-                    break;
-                case 127:
-                    result = "运营中心分仓奖励";
-                    break;
-                case 128:
-                    result = "合伙人(购机奖励)";
-                    break;
-                case 130:
-                    result = "码牌激活奖励";
-                    break;
-                case 131:
-                    result = "预发临时额度退还";
-                    break;
-                case 132:
-                    result = "直营团队提现";
-                    break;
-                case 133:
-                    result = "立刷加码奖励";
-                    break;
-                case 201:
-                    result = "分期预扣款";
-                    break;
-                case 202:
-                    result = "创客预扣款";
-                    break;
+                ChangeTypes item = db.ChangeTypes.FirstOrDefault(m => m.Id == key);
+                if (item != null)
+                {
+                    return item.Name;
+                }
             }
-            return result;
+            return "";
+            // string result = "";
+            // switch (key)
+            // {
+            //     case 0:
+            //         result = "激活奖励";
+            //         break;
+            //     case 1:
+            //         result = "交易分润";
+            //         break;
+            //     case 11:
+            //         result = "月月红";
+            //         break;
+            //     case 12:
+            //         result = "交易奖励";
+            //         break;
+            //     case 2:
+            //         result = "提现申请";
+            //         break;
+            //     case 3:
+            //         result = "提现代付";
+            //         break;
+            //     case 4:
+            //         result = "提现手续费";
+            //         break;
+            //     case 5:
+            //         result = "提现税点扣除";
+            //         break;
+            //     case 6:
+            //         result = "提现失败，解冻";
+            //         break;
+            //     case 61:
+            //         result = "系统冻结";
+            //         break;
+            //     case 62:
+            //         result = "系统解冻";
+            //         break;
+            //     case 63:
+            //         result = "系统扣减";
+            //         break;
+            //     case 64:
+            //         result = "系统奖励";
+            //         break;
+            //     case 65:
+            //         result = "押金暂扣";
+            //         break;
+            //     case 66:
+            //         result = "押金退还";
+            //         break;
+            //     case 7:
+            //         result = "系统扣除";
+            //         break;
+            //     case 10:
+            //         result = "办卡奖励";
+            //         break;
+            //     case 20:
+            //         result = "余额支付";
+            //         break;
+            //     case 21:
+            //         result = "余额退款";
+            //         break;
+            //     case 22:
+            //         result = "余额退款手续费";
+            //         break;
+            //     case 30:
+            //         result = "红包奖励";
+            //         break;
+            //     case 31:
+            //         result = "活动奖励";
+            //         break;
+            //     case 40:
+            //         result = "商户达标返";
+            //         break;
+            //     case 50:
+            //         result = "开机奖励";
+            //         break;
+            //     case 60:
+            //         result = "流量卡分佣";
+            //         break;
+            //     case 111:
+            //         result = "分润补贴";
+            //         break;
+            //     case 112:
+            //         result = "推荐奖励";
+            //         break;
+            //     case 113:
+            //         result = "招商节奖励";
+            //         break;
+            //     case 114:
+            //         result = "私董会分红";
+            //         break;
+            //     case 115:
+            //         result = "分仓奖励";
+            //         break;
+            //     case 116:
+            //         result = "大盟主奖励";
+            //         break;
+            //     case 117:
+            //         result = "大盟主奖励(储蓄金入账)";
+            //         break;
+            //     case 118:
+            //         result = "大盟主奖励(购机奖励)";
+            //         break;
+            //     case 119:
+            //         result = "分仓临时额度退还";
+            //         break;
+            //     case 120:
+            //         result = "运营中心(购机奖励)";
+            //         break;
+            //     case 121:
+            //         result = "运营中心奖励";
+            //         break;
+            //     case 122:
+            //         result = "推荐大盟主奖励";
+            //         break;
+            //     case 123:
+            //         result = "推荐小盟主奖励";
+            //         break;
+            //     case 124:
+            //         result = "扣机具货款";
+            //         break;
+            //     case 125:
+            //         result = "软件服务费";
+            //         break;
+            //     case 126:
+            //         result = "机具货款退还";
+            //         break;
+            //     case 127:
+            //         result = "运营中心分仓奖励";
+            //         break;
+            //     case 128:
+            //         result = "合伙人(购机奖励)";
+            //         break;
+            //     case 130:
+            //         result = "码牌激活奖励";
+            //         break;
+            //     case 131:
+            //         result = "预发临时额度退还";
+            //         break;
+            //     case 132:
+            //         result = "直营团队提现";
+            //         break;
+            //     case 133:
+            //         result = "立刷加码奖励";
+            //         break;
+            //     case 201:
+            //         result = "分期预扣款";
+            //         break;
+            //     case 202:
+            //         result = "创客预扣款";
+            //         break;
+            // }
+            // return result;
         }
 
         public static string GetTradeTypeInfo(int key)

Areas/Admin/Controllers/BsServer/ColController.cs

@@ -172,12 +172,12 @@ namespace MySystem.Areas.Admin.Controllers
                 EnName = new PublicFunction().TranslateZHToEn(col.ColName);
                 EnName = EnName.Replace(" ", "").Replace("'", "").ToLower();
             }
-            //判断英文名是否存在
+            //判断中文名是否存在
             string CheckCol = code.Substring(0, 3);
-            Col check = bsdb.Col.FirstOrDefault(m => m.ColId.StartsWith(CheckCol) && m.ColEnName == EnName);
+            Col check = bsdb.Col.FirstOrDefault(m => m.ColId.StartsWith(CheckCol) && m.ColName == col.ColName);
             if (check != null)
             {
-                return "英文名已存在";
+                return "中文名已存在";
             }
             Col add = bsdb.Col.Add(new Col()
             {
@@ -267,13 +267,13 @@ namespace MySystem.Areas.Admin.Controllers
                 EnName = new PublicFunction().TranslateZHToEn(col.ColName);
                 EnName = EnName.Replace(" ", "").Replace("'", "").ToLower();
             }
-            //判断英文名是否存在
-            string CheckCol = PColId.Substring(0, 3);
-            Col check = bsdb.Col.FirstOrDefault(m => m.ColId.StartsWith(CheckCol) && m.ColEnName == EnName && m.ColEnName != OldEnName);
-            if (check != null)
-            {
-                return "英文名已存在";
-            }
+            // //判断英文名是否存在
+            // string CheckCol = PColId.Substring(0, 3);
+            // Col check = bsdb.Col.FirstOrDefault(m => m.ColId.StartsWith(CheckCol) && m.ColEnName == EnName && m.ColEnName != OldEnName);
+            // if (check != null)
+            // {
+            //     return "英文名已存在";
+            // }
             Col editData = bsdb.Col.FirstOrDefault(c => c.ColId == col.ColId);
             if (editData != null)
             {

Areas/Admin/Controllers/MainServer/MerchantColController.cs

@@ -152,11 +152,11 @@ namespace MySystem.Areas.Admin.Controllers
                 EnName = new PublicFunction().TranslateZHToEn(col.ColName);
                 EnName = EnName.Replace(" ", "").Replace("'", "").ToLower();
             }
-            //判断英文名是否存在
-            MerchantCol check = db.MerchantCol.FirstOrDefault(m => m.MerchantId == MerchantId && m.ColEnName == EnName);
+            //判断中文名是否存在
+            MerchantCol check = db.MerchantCol.FirstOrDefault(m => m.MerchantId == MerchantId && m.ColName == col.ColName);
             if (check != null)
             {
-                return "英文名已存在";
+                return "中文名已存在";
             }
             //构造英文名路径，用于url地址
             string ColEnNav = EnName;
@@ -256,12 +256,12 @@ namespace MySystem.Areas.Admin.Controllers
                 EnName = new PublicFunction().TranslateZHToEn(col.ColName);
                 EnName = EnName.Replace(" ", "").Replace("'", "").ToLower();
             }
-            //判断英文名是否存在
-            MerchantCol check = db.MerchantCol.FirstOrDefault(m => m.MerchantId == MerchantId && m.ColEnName == EnName && m.ColEnName != OldEnName);
-            if (check != null)
-            {
-                return "英文名已存在";
-            }
+            // //判断英文名是否存在
+            // MerchantCol check = db.MerchantCol.FirstOrDefault(m => m.MerchantId == MerchantId && m.ColEnName == EnName && m.ColEnName != OldEnName);
+            // if (check != null)
+            // {
+            //     return "英文名已存在";
+            // }
             //构造英文名路径，用于url地址
             string ColEnNav = EnName;
             if (!string.IsNullOrEmpty(PColId))

Areas/Admin/Controllers/MainServer/OrdersController.cs

@@ -611,8 +611,75 @@ namespace MySystem.Areas.Admin.Controllers
                     var Remark = "";
                     var orderProduct = db.OrderProduct.FirstOrDefault(m => m.OrderId == order.Id) ?? new OrderProduct();
                     Remark = orderProduct.ProductName + "退款至余额";
-                    string SendData = "{\"OrderId\":\"" + data.Id + "\",\"Operator\":\"" + SysUserName + "_" + SysRealName + "\",\"Amount\":\"" + data.RefundActAmount + "\",\"Remark\":\"" + Remark + "\"}";
-                    RedisDbconn.Instance.AddList("RefundQueue", SendData);
+                    // string SendData = "{\"OrderId\":\"" + data.Id + "\",\"Operator\":\"" + SysUserName + "_" + SysRealName + "\",\"Amount\":\"" + data.RefundActAmount + "\",\"Remark\":\"" + Remark + "\"}";
+                    // RedisDbconn.Instance.AddList("RefundQueue", SendData);
+
+                    bool op = true;
+                    decimal TotalPrice = order.TotalPrice;
+                    decimal Amount = data.RefundActAmount;
+                    if(order.PayMode == 1)
+                    {
+                        PublicAccountSet set = db.PublicAccountSet.FirstOrDefault() ?? new PublicAccountSet();
+                        string result = new Alipay.AlipayPublicClass(_accessor.HttpContext).Refund(set.AlipayAppId, set.AlipayPrivateKey, set.AlipayPublicKey, order.OrderNo, Amount);
+                    }
+                    else if(order.PayMode == 3)
+                    {
+                        UserAccount user = db.UserAccount.FirstOrDefault(m => m.Id == order.UserId);
+                        if (user == null)
+                        {
+                            user = db.UserAccount.Add(new UserAccount()
+                            {
+                                Id = order.UserId,
+                                UserId = order.UserId,
+                            }).Entity;
+                            db.SaveChanges();
+                        }
+                        decimal BeforeTotalAmount = user.TotalAmount; //变更前总金额
+                        decimal BeforeFreezeAmount = user.FreezeAmount; //变更前冻结金额
+                        decimal BeforeBalanceAmount = user.BalanceAmount; //变更前余额
+                        user.BalanceAmount += Amount;
+                        decimal AfterTotalAmount = user.TotalAmount; //变更后总金额
+                        decimal AfterFreezeAmount = user.FreezeAmount; //变更后冻结金额
+                        decimal AfterBalanceAmount = user.BalanceAmount; //变更后余额
+                        db.UserAccountRecord.Add(new UserAccountRecord()
+                        {
+                            CreateDate = DateTime.Now,
+                            UpdateDate = DateTime.Now,
+                            UserId = order.UserId, //创客
+                            ChangeType = 21, //变动类型
+                            ChangeAmount = Amount, //变更金额
+                            BeforeTotalAmount = BeforeTotalAmount, //变更前总金额
+                            AfterTotalAmount = AfterTotalAmount, //变更后总金额
+                            BeforeFreezeAmount = BeforeFreezeAmount, //变更前冻结金额
+                            AfterFreezeAmount = AfterFreezeAmount, //变更后冻结金额
+                            BeforeBalanceAmount = BeforeBalanceAmount, //变更前余额
+                            AfterBalanceAmount = AfterBalanceAmount, //变更后余额
+                            QueryCount = order.Id,
+                            Remark = Remark,
+                        });
+                    }
+                    if(op)
+                    {
+                        order.RefundStatus = 1;
+                        order.RefundActAmount = Amount;
+                        db.OrderRefund.Add(new OrderRefund()
+                        {
+                            CreateDate = DateTime.Now,
+                            Mobile = order.Mobile,
+                            Amount = Amount,
+                            SeoDescription = Remark,
+                            ProductId = order.ProductId.ToString(),
+                            OrderId = order.Id,
+                            UserId = order.UserId,
+                        });
+                    }
+                    else
+                    {
+                        order.RefundStatus = 0;
+                        order.RefundReason = null;
+                        order.RefundActAmount = 0;
+                    }
+                    db.SaveChanges();
                 }
             }
             return "success";

Areas/Admin/Controllers/MainServer/PosMachinesTwoChangeController.cs

@@ -174,9 +174,12 @@ namespace MySystem.Areas.Admin.Controllers
                 }
 
                 //是否为第一台机具
-                int IsFirst = int.Parse(dic["FirstFlag"].ToString());
-                if (IsFirst == 0) dic["IsFirst"] = "否";
-                if (IsFirst == 1) dic["IsFirst"] = "是";
+                // int IsFirst = int.Parse(dic["FirstFlag"].ToString());
+                // if (IsFirst == 0) dic["IsFirst"] = "否";
+                // if (IsFirst == 1) dic["IsFirst"] = "是";
+
+                dic["IsFirst"] = int.Parse(dic["FirstFlag"].ToString()) == 1 ? "首台" : "非首台"; //是否首台(机具奖励发放)
+                dic["PosIsFirst"] = int.Parse(dic["FirstFlag"].ToString()) == 1 ? "首台" : "非首台"; //是否首台(服务费领取)
 
                 //循环开始时间
                 if (!string.IsNullOrEmpty(dic["RecycEndDate"].ToString()))

Areas/Admin/Controllers/MainServer/PosMachinesTwoController.cs

@@ -197,9 +197,12 @@ namespace MySystem.Areas.Admin.Controllers
                 }
 
                 //是否为第一台机具
-                int IsFirst = int.Parse(dic["FirstFlag"].ToString());
-                if (IsFirst == 0) dic["IsFirst"] = "否";
-                if (IsFirst == 1) dic["IsFirst"] = "是";
+                // int IsFirst = int.Parse(dic["FirstFlag"].ToString());
+                // if (IsFirst == 0) dic["IsFirst"] = "否";
+                // if (IsFirst == 1) dic["IsFirst"] = "是";
+
+                dic["IsFirst"] = int.Parse(dic["FirstFlag"].ToString()) == 1 ? "首台" : "非首台"; //是否首台(机具奖励发放)
+                dic["PosIsFirst"] = int.Parse(dic["FirstFlag"].ToString()) == 1 ? "首台" : "非首台"; //是否首台(服务费领取)
 
                 //实际押金
                 string SeoKeyword = dic["SeoKeyword"].ToString();

Areas/Admin/Controllers/MainServer/PosMerchantInfoListController.cs

@@ -1123,8 +1123,10 @@ namespace MySystem.Areas.Admin.Controllers
                             curData.Add("MerchantName", item.MerchantName); //商户名称
                             curData.Add("MerchantMobile", item.MerchantMobile); //商户手机号
                             curData.Add("MerIdcardNo", item.MerIdcardNo); //商户身份证号
-                            curData.Add("IsFirstName", IsFirstName); //是否首台
-                            curData.Add("IsFirst", IsFirst);
+                            curData.Add("IsFirstName", posInfo.FirstFlag == 1 ? "首台" : "非首台"); //是否首台(服务费领取)
+                            curData.Add("PosIsFirstName", posInfo.IsFirst == 1 ? "首台" : "非首台"); //是否首台(机具奖励发放)
+                            curData.Add("IsFirst", posInfo.FirstFlag);
+                            curData.Add("PosIsFirst", posInfo.IsFirst);
                             curData.Add("BindingTime", string.IsNullOrEmpty(posInfo.BindingTime.ToString()) ? "" : Convert.ToDateTime(posInfo.BindingTime).ToString("yyyy-MM-dd HH:mm:ss")); //绑定时间
                             curData.Add("ActivationTime", string.IsNullOrEmpty(posInfo.ActivationTime.ToString()) ? "" : Convert.ToDateTime(posInfo.ActivationTime).ToString("yyyy-MM-dd HH:mm:ss")); //激活时间
                             dataList.Add(curData);

Areas/Admin/Controllers/MainServer/SysToolsController.cs

@@ -4038,7 +4038,7 @@ namespace MySystem.Areas.Admin.Controllers
                 return "请输入选择费率";
             }
             string Fee = "0.63";
-            if(FeeType == 3)
+            if (FeeType == 3)
             {
                 Fee = "0.6";
             }
@@ -4051,11 +4051,11 @@ namespace MySystem.Areas.Admin.Controllers
                 if (posInfo.Id > 0)
                 {
                     string RecordId = "";
-                    if(RecordFlag == 1)
+                    if (RecordFlag == 1)
                     {
                         decimal ChangeFee = decimal.Parse(Fee);
                         PosMachinesFeeChangeRecord query = db.PosMachinesFeeChangeRecord.FirstOrDefault(m => m.PosId == posInfo.Id && m.ChangeFee == ChangeFee && m.Status == 0);
-                        if(query == null)
+                        if (query == null)
                         {
                             query = db.PosMachinesFeeChangeRecord.Add(new PosMachinesFeeChangeRecord()
                             {
@@ -5152,12 +5152,22 @@ namespace MySystem.Areas.Admin.Controllers
                 {
                     var info = "";
                     var IsFirst = "";//是否首台机具
+                    IsFirst += pos.IsFirst == 1 ? "首台(服务费领取)" + "\n" : "非首台(服务费领取)" + "\n";
+                    IsFirst += pos.FirstFlag == 1 ? "首台(机具奖励发放)" + "\n" : "非首台(机具奖励发放)" + "\n";
                     if (function.CheckNull(mer.MerIdcardNo).Contains("*") || function.CheckNull(mer.MerchantMobile).Contains("*") || function.CheckNull(mer.MerRealName).Contains("*") || string.IsNullOrEmpty(mer.MerRealName))
                     {
                         info = "机具" + PosSn + "所对应的商户未认证";
                     }
                     var merchantId = db.PosMerchantInfo.Where(m => m.MerIdcardNo == mer.MerIdcardNo && m.MerRealName == mer.MerRealName && m.MerchantMobile == mer.MerchantMobile).Min(m => m.Id);
-                    // if (mer.Id <= merchantId)
+                    // // if (mer.Id <= merchantId)
+                    // // {
+                    // //     IsFirst = "首台";
+                    // // }
+                    // // else
+                    // // {
+                    // //     IsFirst = "非首台";
+                    // // }
+                    // if (pos.FirstFlag == 1)
                     // {
                     //     IsFirst = "首台";
                     // }
@@ -5165,14 +5175,6 @@ namespace MySystem.Areas.Admin.Controllers
                     // {
                     //     IsFirst = "非首台";
                     // }
-                    if (pos.FirstFlag == 1)
-                    {
-                        IsFirst = "首台";
-                    }
-                    else
-                    {
-                        IsFirst = "非首台";
-                    }
                     var depositRreturn = db.MerchantDepositReturns.Where(m => m.MerchantId == mer.Id).OrderByDescending(m => m.CreateDate).FirstOrDefault() ?? new MerchantDepositReturns();
                     var IsOk = "";//是否达标
                     var timeInfo = "";

Areas/Admin/Controllers/MainServer/UsersController.cs

@@ -1837,6 +1837,15 @@ namespace MySystem.Areas.Admin.Controllers
                 dic["JCountyl"] = Convert.ToInt32(Info["JCountyl"].ToString());
                 dic["YAmtyl"] = Convert.ToDecimal(Info["YAmtyl"].ToString());
 
+                dic["TotalAmtyl2"] = Convert.ToDecimal(Info["TotalAmtyl2"].ToString());
+                dic["DAmtyl2"] = Convert.ToDecimal(Info["DAmtyl2"].ToString());
+                dic["JAmtyl2"] = Convert.ToDecimal(Info["JAmtyl2"].ToString());
+                dic["JfAmtyl2"] = Convert.ToDecimal(Info["JfAmtyl2"].ToString());
+                dic["JCountyl2"] = Convert.ToInt32(Info["JCountyl2"].ToString());
+                dic["YAmtyl2"] = Convert.ToDecimal(Info["YAmtyl2"].ToString());
+
+                dic["TotalPosAmount"] = Convert.ToDecimal(dic["TotalAmtfc"].ToString()) + Convert.ToDecimal(dic["TotalAmtwd"].ToString()) + Convert.ToDecimal(dic["TotalAmtyl"].ToString()) + Convert.ToDecimal(dic["TotalAmtyl2"].ToString());
+
                 dic["TBCount"] = Info["TBCount"].ToString();
                 dic["TACount"] = Info["TACount"].ToString();
 
@@ -1859,7 +1868,7 @@ namespace MySystem.Areas.Admin.Controllers
             int JCountwd = 0;
             decimal YAmtwd = 0;
 
-            //盈利期
+            //盈利期(稳定期A)
             decimal TotalAmtyl = 0;
             decimal DAmtyl = 0;
             decimal JAmtyl = 0;
@@ -1867,6 +1876,16 @@ namespace MySystem.Areas.Admin.Controllers
             int JCountyl = 0;
             decimal YAmtyl = 0;
 
+            //盈利期(稳定期B)
+            decimal TotalAmtyls = 0;
+            decimal DAmtyls = 0;
+            decimal JAmtyls = 0;
+            decimal JfAmtyls = 0;
+            int JCountyls = 0;
+            decimal YAmtyls = 0;
+
+            decimal TotalPosAmount = 0;
+
             //团队
             //扶持期
             decimal TotalAmtfc1 = 0;
@@ -1884,7 +1903,7 @@ namespace MySystem.Areas.Admin.Controllers
             int JCountwd1 = 0;
             decimal YAmtwd1 = 0;
 
-            //盈利期
+            //盈利期(稳定期A)
             decimal TotalAmtyl1 = 0;
             decimal DAmtyl1 = 0;
             decimal JAmtyl1 = 0;
@@ -1892,13 +1911,23 @@ namespace MySystem.Areas.Admin.Controllers
             int JCountyl1 = 0;
             decimal YAmtyl1 = 0;
 
+            //盈利期(稳定期B)
+            decimal TotalAmtyl1s = 0;
+            decimal DAmtyl1s = 0;
+            decimal JAmtyl1s = 0;
+            decimal JfAmtyl1s = 0;
+            int JCountyl1s = 0;
+            decimal YAmtyl1s = 0;
+
+            decimal TotalPosAmount1 = 0;
+
             int PBCount = 0;
             int PACount = 0;
             int TBCount = 0;
             int TACount = 0;
 
             Dictionary<string, object> other = new Dictionary<string, object>();
-            DataTable dt = OtherMySqlConn.dtable("SELECT Sum(HelpDirectTradeAmt + HelpDirectDebitTradeAmt),Sum(if (QueryCount = 0,HelpDirectTradeAmt,0)),Sum(if (QueryCount = 0,HelpDirectDebitTradeAmt - HelpDirectDebitCapTradeAmt,0)),Sum(if (QueryCount = 0,HelpDirectDebitCapTradeAmt,0)),Sum(if (QueryCount = 0,HelpDirectDebitCapNum,0)),Sum(if (QueryCount = 1,HelpDirectTradeAmt,0)),Sum(NotHelpDirectTradeAmt + NotHelpDirectDebitTradeAmt),Sum(if (QueryCount = 0,NotHelpDirectTradeAmt,0)),Sum(if (QueryCount = 0,NotHelpDirectDebitTradeAmt - NotHelpDirectDebitCapTradeAmt,0)),Sum(if (QueryCount = 0,NotHelpDirectDebitCapTradeAmt,0)),Sum(if (QueryCount = 0,NotHelpDirectDebitCapNum,0)),Sum(if (QueryCount = 1,NotHelpDirectTradeAmt,0)),Sum(ProfitDirectTradeAmt + ProfitDirectDebitTradeAmt),Sum(if (QueryCount = 0,ProfitDirectTradeAmt,0)),Sum(if (QueryCount = 0,ProfitDirectDebitTradeAmt - ProfitDirectDebitCapTradeAmt,0)),Sum(if (QueryCount = 0,ProfitDirectDebitCapTradeAmt,0)),Sum(if (QueryCount = 0,ProfitDirectDebitCapNum,0)),Sum(if (QueryCount = 1,ProfitDirectTradeAmt,0))from TradeDaySummary where SeoTitle = 'self' and UserId =" + ParentId + "" + con);
+            DataTable dt = CustomerSqlConn.dtable("SELECT Sum(HelpDirectTradeAmt + HelpDirectDebitTradeAmt),Sum(if (QueryCount = 0,HelpDirectTradeAmt,0)),Sum(if (QueryCount = 0,HelpDirectDebitTradeAmt - HelpDirectDebitCapTradeAmt,0)),Sum(if (QueryCount = 0,HelpDirectDebitCapTradeAmt,0)),Sum(if (QueryCount = 0,HelpDirectDebitCapNum,0)),Sum(if (QueryCount = 1,HelpDirectTradeAmt,0)),Sum(NotHelpDirectTradeAmt + NotHelpDirectDebitTradeAmt),Sum(if (QueryCount = 0,NotHelpDirectTradeAmt,0)),Sum(if (QueryCount = 0,NotHelpDirectDebitTradeAmt - NotHelpDirectDebitCapTradeAmt,0)),Sum(if (QueryCount = 0,NotHelpDirectDebitCapTradeAmt,0)),Sum(if (QueryCount = 0,NotHelpDirectDebitCapNum,0)),Sum(if (QueryCount = 1,NotHelpDirectTradeAmt,0)),Sum(ProfitDirectTradeAmt + ProfitDirectDebitTradeAmt),Sum(if (QueryCount = 0,ProfitDirectTradeAmt,0)),Sum(if (QueryCount = 0,ProfitDirectDebitTradeAmt - ProfitDirectDebitCapTradeAmt,0)),Sum(if (QueryCount = 0,ProfitDirectDebitCapTradeAmt,0)),Sum(if (QueryCount = 0,ProfitDirectDebitCapNum,0)),Sum(if (QueryCount = 1,ProfitDirectTradeAmt,0))from TradeDaySummary where SeoTitle = 'self' and UserId =" + ParentId + "" + con, MysqlConn.ReadSqlConnStr);
             if (dt.Rows.Count > 0)
             {
                 TotalAmtfc = Convert.ToDecimal(function.CheckNum(dt.Rows[0][0].ToString()));
@@ -1922,15 +1951,29 @@ namespace MySystem.Areas.Admin.Controllers
                 JCountyl = Convert.ToInt32(function.CheckInt(dt.Rows[0][16].ToString()));
                 YAmtyl = Convert.ToDecimal(function.CheckNum(dt.Rows[0][17].ToString()));
             }
+
+            dt = CustomerSqlConn.dtable("SELECT Sum(ProfitTradeAmt + ProfitDebitTradeAmt),Sum(if (QueryCount = 0,ProfitTradeAmt,0)),Sum(if (QueryCount = 0,ProfitDebitTradeAmt - ProfitDebitCapTradeAmt,0)),Sum(if (QueryCount = 0,ProfitDebitCapTradeAmt,0)),Sum(if (QueryCount = 0,ProfitDebitCapNum,0)),Sum(if (QueryCount = 1,ProfitTradeAmt,0)) from TradeDaySummary2 where SeoTitle = 'self' and UserId =" + ParentId + "" + con, MysqlConn.ReadSqlConnStr);
+            if (dt.Rows.Count > 0)
+            {
+                TotalAmtyls = Convert.ToDecimal(function.CheckNum(dt.Rows[0][0].ToString()));
+                DAmtyls = Convert.ToDecimal(function.CheckNum(dt.Rows[0][1].ToString()));
+                JAmtyls = Convert.ToDecimal(function.CheckNum(dt.Rows[0][2].ToString()));
+                JfAmtyls = Convert.ToDecimal(function.CheckNum(dt.Rows[0][3].ToString()));
+                JCountyls = Convert.ToInt32(function.CheckInt(dt.Rows[0][4].ToString()));
+                YAmtyls = Convert.ToDecimal(function.CheckNum(dt.Rows[0][5].ToString()));
+            }
+
+            TotalPosAmount = TotalAmtfc + TotalAmtwd + TotalAmtyl + TotalAmtyls;
+
             //统计激活数(个人、团队)
-            dt = OtherMySqlConn.dtable("SELECT SUM(if(SeoTitle='self',ActiveBuddyMerStatus,0)),SUM(if(SeoTitle='team',ActiveBuddyMerStatus,0)) FROM UserTradeMonthSummary WHERE UserId= " + ParentId + "" + cons);
+            dt = CustomerSqlConn.dtable("SELECT SUM(if(SeoTitle='self',ActiveBuddyMerStatus,0)),SUM(if(SeoTitle='team',ActiveBuddyMerStatus,0)) FROM UserTradeMonthSummary WHERE UserId= " + ParentId + "" + cons, MysqlConn.ReadSqlConnStr);
             if (dt.Rows.Count > 0)
             {
                 PACount = Convert.ToInt32(function.CheckNum(dt.Rows[0][0].ToString()));
                 TACount = Convert.ToInt32(function.CheckNum(dt.Rows[0][1].ToString()));
             }
 
-            DataTable dts = OtherMySqlConn.dtable("SELECT Sum(HelpNonDirectTradeAmt + HelpNonDirectDebitTradeAmt),Sum(if (QueryCount = 0,HelpNonDirectTradeAmt,0)),Sum(if (QueryCount = 0,HelpNonDirectDebitTradeAmt - HelpNonDirectDebitCapTradeAmt,0)),Sum(if (QueryCount = 0,HelpNonDirectDebitCapTradeAmt,0)),Sum(if (QueryCount = 0,HelpNonDirectDebitCapNum,0)),Sum(if (QueryCount = 1,HelpNonDirectTradeAmt,0)),Sum(NotHelpNonDirectTradeAmt + NotHelpNonDirectDebitTradeAmt),Sum(if (QueryCount = 0,NotHelpNonDirectTradeAmt,0)),Sum(if (QueryCount = 0,NotHelpNonDirectDebitTradeAmt - NotHelpNonDirectDebitCapTradeAmt,0)),Sum(if (QueryCount = 0,NotHelpNonDirectDebitCapTradeAmt,0)),Sum(if (QueryCount = 0,NotHelpNonDirectDebitCapNum,0)),Sum(if (QueryCount = 1,NotHelpNonDirectTradeAmt,0)),Sum(ProfitNonDirectTradeAmt + ProfitNonDirectDebitTradeAmt),Sum(if (QueryCount = 0,ProfitNonDirectTradeAmt,0)),Sum(if (QueryCount = 0,ProfitNonDirectDebitTradeAmt - ProfitNonDirectDebitCapTradeAmt,0)),Sum(if (QueryCount = 0,ProfitNonDirectDebitCapTradeAmt,0)),Sum(if (QueryCount = 0,ProfitNonDirectDebitCapNum,0)),Sum(if (QueryCount = 1,ProfitNonDirectTradeAmt,0))from TradeDaySummary where SeoTitle = 'team' and UserId =" + ParentId + "" + con);
+            DataTable dts = CustomerSqlConn.dtable("SELECT Sum(HelpNonDirectTradeAmt + HelpNonDirectDebitTradeAmt),Sum(if (QueryCount = 0,HelpNonDirectTradeAmt,0)),Sum(if (QueryCount = 0,HelpNonDirectDebitTradeAmt - HelpNonDirectDebitCapTradeAmt,0)),Sum(if (QueryCount = 0,HelpNonDirectDebitCapTradeAmt,0)),Sum(if (QueryCount = 0,HelpNonDirectDebitCapNum,0)),Sum(if (QueryCount = 1,HelpNonDirectTradeAmt,0)),Sum(NotHelpNonDirectTradeAmt + NotHelpNonDirectDebitTradeAmt),Sum(if (QueryCount = 0,NotHelpNonDirectTradeAmt,0)),Sum(if (QueryCount = 0,NotHelpNonDirectDebitTradeAmt - NotHelpNonDirectDebitCapTradeAmt,0)),Sum(if (QueryCount = 0,NotHelpNonDirectDebitCapTradeAmt,0)),Sum(if (QueryCount = 0,NotHelpNonDirectDebitCapNum,0)),Sum(if (QueryCount = 1,NotHelpNonDirectTradeAmt,0)),Sum(ProfitNonDirectTradeAmt + ProfitNonDirectDebitTradeAmt),Sum(if (QueryCount = 0,ProfitNonDirectTradeAmt,0)),Sum(if (QueryCount = 0,ProfitNonDirectDebitTradeAmt - ProfitNonDirectDebitCapTradeAmt,0)),Sum(if (QueryCount = 0,ProfitNonDirectDebitCapTradeAmt,0)),Sum(if (QueryCount = 0,ProfitNonDirectDebitCapNum,0)),Sum(if (QueryCount = 1,ProfitNonDirectTradeAmt,0))from TradeDaySummary where SeoTitle = 'team' and UserId =" + ParentId + "" + con, MysqlConn.ReadSqlConnStr);
             if (dts.Rows.Count > 0)
             {
                 TotalAmtfc1 = Convert.ToDecimal(function.CheckNum(dts.Rows[0][0].ToString()));
@@ -1955,6 +1998,19 @@ namespace MySystem.Areas.Admin.Controllers
                 YAmtyl1 = Convert.ToDecimal(function.CheckNum(dts.Rows[0][17].ToString()));
             }
 
+            dt = CustomerSqlConn.dtable("SELECT Sum(ProfitTradeAmt + ProfitDebitTradeAmt),Sum(if (QueryCount = 0,ProfitTradeAmt,0)),Sum(if (QueryCount = 0,ProfitDebitTradeAmt - ProfitDebitCapTradeAmt,0)),Sum(if (QueryCount = 0,ProfitDebitCapTradeAmt,0)),Sum(if (QueryCount = 0,ProfitDebitCapNum,0)),Sum(if (QueryCount = 1,ProfitTradeAmt,0)) from TradeDaySummary2 where SeoTitle = 'team' and UserId =" + ParentId + "" + con, MysqlConn.ReadSqlConnStr);
+            if (dt.Rows.Count > 0)
+            {
+                TotalAmtyl1s = Convert.ToDecimal(function.CheckNum(dt.Rows[0][0].ToString()));
+                DAmtyl1s = Convert.ToDecimal(function.CheckNum(dt.Rows[0][1].ToString()));
+                JAmtyl1s = Convert.ToDecimal(function.CheckNum(dt.Rows[0][2].ToString()));
+                JfAmtyl1s = Convert.ToDecimal(function.CheckNum(dt.Rows[0][3].ToString()));
+                JCountyl1s = Convert.ToInt32(function.CheckInt(dt.Rows[0][4].ToString()));
+                YAmtyl1s = Convert.ToDecimal(function.CheckNum(dt.Rows[0][5].ToString()));
+            }
+
+            TotalPosAmount1 = TotalAmtfc1 + TotalAmtwd1 + TotalAmtyl1 + TotalAmtyl1s;
+
             other.Add("TotalAmtfc", TotalAmtfc);
             other.Add("DAmtfc", DAmtfc);
             other.Add("JAmtfc", JAmtfc);
@@ -1976,6 +2032,13 @@ namespace MySystem.Areas.Admin.Controllers
             other.Add("JCountyl", JCountyl);
             other.Add("YAmtyl", YAmtyl);
 
+            other.Add("TotalAmtyls", TotalAmtyls);
+            other.Add("DAmtyls", DAmtyls);
+            other.Add("JAmtyls", JAmtyls);
+            other.Add("JfAmtyls", JfAmtyls);
+            other.Add("JCountyls", JCountyls);
+            other.Add("YAmtyls", YAmtyls);
+
             other.Add("TotalAmtfc1", TotalAmtfc1);
             other.Add("DAmtfc1", DAmtfc1);
             other.Add("JAmtfc1", JAmtfc1);
@@ -1997,6 +2060,17 @@ namespace MySystem.Areas.Admin.Controllers
             other.Add("JCountyl1", JCountyl1);
             other.Add("YAmtyl1", YAmtyl1);
 
+            other.Add("TotalAmtyl1s", TotalAmtyl1s);
+            other.Add("DAmtyl1s", DAmtyl1s);
+            other.Add("JAmtyl1s", JAmtyl1s);
+            other.Add("JfAmtyl1s", JfAmtyl1s);
+            other.Add("JCountyl1s", JCountyl1s);
+            other.Add("YAmtyl1s", YAmtyl1s);
+
+            other.Add("TotalPosAmount", TotalPosAmount);
+            other.Add("TotalPosAmount1", TotalPosAmount1);
+
+
             other.Add("PBCount", PBCount);
             other.Add("PACount", PACount);
             other.Add("TBCount", TBCount);
@@ -2055,7 +2129,7 @@ namespace MySystem.Areas.Admin.Controllers
             int JCountwd = 0;
             decimal YAmtwd = 0;
 
-            //盈利期
+            //盈利期(稳定期A)
             decimal TotalAmtyl = 0;
             decimal DAmtyl = 0;
             decimal JAmtyl = 0;
@@ -2063,6 +2137,16 @@ namespace MySystem.Areas.Admin.Controllers
             int JCountyl = 0;
             decimal YAmtyl = 0;
 
+            //盈利期(稳定期B)
+            decimal TotalAmtyl2 = 0;
+            decimal DAmtyl2 = 0;
+            decimal JAmtyl2 = 0;
+            decimal JfAmtyl2 = 0;
+            int JCountyl2 = 0;
+            decimal YAmtyl2 = 0;
+
+            decimal TotalPosAmount = 0;
+
             int BCount = 0;
             int ACount = 0;
             int PBCount = 0;
@@ -2071,7 +2155,7 @@ namespace MySystem.Areas.Admin.Controllers
             int TACount = 0;
 
             Dictionary<string, object> obj = new Dictionary<string, object>();
-            DataTable dt = OtherMySqlConn.dtable("SELECT Sum(HelpNonDirectTradeAmt + HelpNonDirectDebitTradeAmt),Sum(if (QueryCount = 0,HelpNonDirectTradeAmt,0)),Sum(if (QueryCount = 0,HelpNonDirectDebitTradeAmt - HelpNonDirectDebitCapTradeAmt,0)),Sum(if (QueryCount = 0,HelpNonDirectDebitCapTradeAmt,0)),Sum(if (QueryCount = 0,HelpNonDirectDebitCapNum,0)),Sum(if (QueryCount = 1,HelpNonDirectTradeAmt,0)),Sum(NotHelpNonDirectTradeAmt + NotHelpNonDirectDebitTradeAmt),Sum(if (QueryCount = 0,NotHelpNonDirectTradeAmt,0)),Sum(if (QueryCount = 0,NotHelpNonDirectDebitTradeAmt - NotHelpNonDirectDebitCapTradeAmt,0)),Sum(if (QueryCount = 0,NotHelpNonDirectDebitCapTradeAmt,0)),Sum(if (QueryCount = 0,NotHelpNonDirectDebitCapNum,0)),Sum(if (QueryCount = 1,NotHelpNonDirectTradeAmt,0)),Sum(ProfitNonDirectTradeAmt + ProfitNonDirectDebitTradeAmt),Sum(if (QueryCount = 0,ProfitNonDirectTradeAmt,0)),Sum(if (QueryCount = 0,ProfitNonDirectDebitTradeAmt - ProfitNonDirectDebitCapTradeAmt,0)),Sum(if (QueryCount = 0,ProfitNonDirectDebitCapTradeAmt,0)),Sum(if (QueryCount = 0,ProfitNonDirectDebitCapNum,0)),Sum(if (QueryCount = 1,ProfitNonDirectTradeAmt,0))from TradeDaySummary where SeoTitle = 'team'" + condition);
+            DataTable dt = CustomerSqlConn.dtable("SELECT Sum(HelpNonDirectTradeAmt + HelpNonDirectDebitTradeAmt),Sum(if (QueryCount = 0,HelpNonDirectTradeAmt,0)),Sum(if (QueryCount = 0,HelpNonDirectDebitTradeAmt - HelpNonDirectDebitCapTradeAmt,0)),Sum(if (QueryCount = 0,HelpNonDirectDebitCapTradeAmt,0)),Sum(if (QueryCount = 0,HelpNonDirectDebitCapNum,0)),Sum(if (QueryCount = 1,HelpNonDirectTradeAmt,0)),Sum(NotHelpNonDirectTradeAmt + NotHelpNonDirectDebitTradeAmt),Sum(if (QueryCount = 0,NotHelpNonDirectTradeAmt,0)),Sum(if (QueryCount = 0,NotHelpNonDirectDebitTradeAmt - NotHelpNonDirectDebitCapTradeAmt,0)),Sum(if (QueryCount = 0,NotHelpNonDirectDebitCapTradeAmt,0)),Sum(if (QueryCount = 0,NotHelpNonDirectDebitCapNum,0)),Sum(if (QueryCount = 1,NotHelpNonDirectTradeAmt,0)),Sum(ProfitNonDirectTradeAmt + ProfitNonDirectDebitTradeAmt),Sum(if (QueryCount = 0,ProfitNonDirectTradeAmt,0)),Sum(if (QueryCount = 0,ProfitNonDirectDebitTradeAmt - ProfitNonDirectDebitCapTradeAmt,0)),Sum(if (QueryCount = 0,ProfitNonDirectDebitCapTradeAmt,0)),Sum(if (QueryCount = 0,ProfitNonDirectDebitCapNum,0)),Sum(if (QueryCount = 1,ProfitNonDirectTradeAmt,0))from TradeDaySummary where SeoTitle = 'team'" + condition, MysqlConn.ReadSqlConnStr);
             if (dt.Rows.Count > 0)
             {
                 TotalAmtfc = Convert.ToDecimal(function.CheckNum(dt.Rows[0][0].ToString()));
@@ -2095,8 +2179,23 @@ namespace MySystem.Areas.Admin.Controllers
                 JCountyl = Convert.ToInt32(function.CheckInt(dt.Rows[0][16].ToString()));
                 YAmtyl = Convert.ToDecimal(function.CheckNum(dt.Rows[0][17].ToString()));
             }
+
+            dt = CustomerSqlConn.dtable("SELECT Sum(ProfitTradeAmt + ProfitDebitTradeAmt),Sum(if (QueryCount = 0,ProfitTradeAmt,0)),Sum(if (QueryCount = 0,ProfitDebitTradeAmt - ProfitDebitCapTradeAmt,0)),Sum(if (QueryCount = 0,ProfitDebitCapTradeAmt,0)),Sum(if (QueryCount = 0,ProfitDebitCapNum,0)),Sum(if (QueryCount = 1,ProfitTradeAmt,0)) from TradeDaySummary2 where SeoTitle = 'team'" + condition, MysqlConn.ReadSqlConnStr);
+            if (dt.Rows.Count > 0)
+            {
+
+                TotalAmtyl2 = Convert.ToDecimal(function.CheckNum(dt.Rows[0][0].ToString()));
+                DAmtyl2 = Convert.ToDecimal(function.CheckNum(dt.Rows[0][1].ToString()));
+                JAmtyl2 = Convert.ToDecimal(function.CheckNum(dt.Rows[0][2].ToString()));
+                JfAmtyl2 = Convert.ToDecimal(function.CheckNum(dt.Rows[0][3].ToString()));
+                JCountyl2 = Convert.ToInt32(function.CheckInt(dt.Rows[0][4].ToString()));
+                YAmtyl2 = Convert.ToDecimal(function.CheckNum(dt.Rows[0][5].ToString()));
+            }
+
+            TotalPosAmount = TotalAmtfc + TotalAmtwd + TotalAmtyl + TotalAmtyl2;
+
             //统计激活数(个人、团队)
-            dt = OtherMySqlConn.dtable("SELECT SUM(if(SeoTitle='team',ActiveBuddyMerStatus,0)) FROM UserTradeMonthSummary WHERE UserId= " + UserId + "" + cons);
+            dt = CustomerSqlConn.dtable("SELECT SUM(if(SeoTitle='team',ActiveBuddyMerStatus,0)) FROM UserTradeMonthSummary WHERE UserId= " + UserId + "" + cons, MysqlConn.ReadSqlConnStr);
             if (dt.Rows.Count > 0)
             {
                 TACount = Convert.ToInt32(function.CheckNum(dt.Rows[0][0].ToString()));
@@ -2124,6 +2223,15 @@ namespace MySystem.Areas.Admin.Controllers
             obj.Add("JCountyl", JCountyl);
             obj.Add("YAmtyl", YAmtyl);
 
+            obj.Add("TotalAmtyl2", TotalAmtyl2);
+            obj.Add("DAmtyl2", DAmtyl2);
+            obj.Add("JAmtyl2", JAmtyl2);
+            obj.Add("JfAmtyl2", JfAmtyl2);
+            obj.Add("JCountyl2", JCountyl2);
+            obj.Add("YAmtyl2", YAmtyl2);
+
+            obj.Add("TotalPosAmount", TotalPosAmount);
+
             obj.Add("BCount", BCount);
             obj.Add("ACount", ACount);
             obj.Add("PBCount", PBCount);
@@ -2865,7 +2973,7 @@ namespace MySystem.Areas.Admin.Controllers
             new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).Edit("Users", Fields, Id);
             AddSysLog(Id, "Users", "SetLogoutDate");
             return "success";
-        } 
+        }
 
         #endregion
 

Areas/Admin/Views/MainServer/UserAccountRecord/Index.cshtml

@@ -80,15 +80,33 @@
                             </select>
                         </div>
                     </div> *@
+                     @{
+                        Dictionary<string, string> ProfitObjectsActivesDic = new MySystem.DictionaryClass().getChangeTypesDic();
+                    }
                     <div class="layui-inline">
+                        <label class="layui-form-label">交易类型</label>
+                        <div class="layui-input-inline">
+                            <select id="ChangeType" name="ChangeType" lay-search="">
+                                <option value="">全部...</option>
+                                @foreach (string key in ProfitObjectsActivesDic.Keys)
+                                {
+                                    <option value="@key">@ProfitObjectsActivesDic[key]</option>
+                                }
+                            </select>
+                        </div>
+                    </div>
+
+                    @* <div class="layui-inline">
                         <label class="layui-form-label">交易类型</label>
                         <div class="layui-input-inline">
                             <select id="ChangeType" name="ChangeType" lay-search="">
                                 <option value="">全部...</option>
                                 <option value="0">激活奖励</option>
                                 <option value="1">交易分润</option>
-                                @* <option value="11">月月红</option> *@
-                                @* <option value="12">交易奖励</option> *@
+
+                                <option value="11">月月红1</option>
+                                <option value="12">交易奖励1</option>
+                                
                                 <option value="2">提现申请</option>
                                 <option value="3">提现代付</option>
                                 <option value="4">提现手续费</option>
@@ -100,14 +118,20 @@
                                 <option value="64">人工增加</option>
                                 <option value="65">押金暂扣</option>
                                 <option value="66">押金退还</option>
-                                @* <option value="7">系统扣除</option> *@
-                                @* <option value="10">办卡奖励</option> *@
+
+                                <option value="7">系统扣除1</option>
+                                <option value="10">办卡奖励1</option>
+
                                 <option value="20">余额支付</option>
-                                @* <option value="21">余额退款</option>
-                                <option value="22">余额退款手续费</option> *@
+
+                                <option value="21">余额退款1</option>
+                                <option value="22">余额退款手续费1</option>
+
                                 <option value="30">红包奖励</option>
                                 <option value="31">活动奖励</option>
-                                @* <option value="40">商户达标返</option> *@
+
+                                <option value="40">商户达标返1</option>
+
                                 <option value="50">开机奖励</option>
                                 <option value="60">流量卡分佣</option>
                                 <option value="111">分润补贴</option>
@@ -135,7 +159,8 @@
                                 <option value="202">创客预扣款</option>
                             </select>
                         </div>
-                    </div>
+                    </div> *@
+                    
                     <div class="layui-inline">
                         <label class="layui-form-label">产品类型</label>
                         <div class="layui-input-inline">

Areas/Admin/Views/MainServer/Users/Children.cshtml

@@ -91,23 +91,27 @@
 
             <div class="layui-card-body">
                 <blockquote class="layui-elem-quote layui-text">
-                    个人交易额：
+                    个人交易额：<span style="color: #f00;" id="TotalPosAmount">0.00</span>
                     </br>
                     刷卡交易总额(扶)(元)：<span style="color: #f00;" id="TotalAmtfc">0.00</span>　| 贷记卡交易额(扶)(元)：<span style="color: #f00;" id="DAmtfc">0.00</span>　|　借记卡非封顶交易额(扶)(元)：<span style="color: #f00;" id="JAmtfc">0.00</span>　|　借记卡封顶交易额(扶)(元)：<span style="color: #f00;" id="JfAmtfc">0.00</span>　|　借记卡交易笔数(扶)(元)：<span style="color: #f00;" id="JCountfc">0.00</span>　|　云闪付小额交易额(扶)(元)：<span style="color: #f00;" id="YAmtfc">0.00</span>
                     </br>
                     刷卡交易总额(稳)(元)：<span style="color: #f00;" id="TotalAmtwd">0.00</span>　| 贷记卡交易额(稳)(元)：<span style="color: #f00;" id="DAmtwd">0.00</span>　|　借记卡非封顶交易额(稳)(元)：<span style="color: #f00;" id="JAmtwd">0.00</span>　|　借记卡封顶交易额(稳)(元)：<span style="color: #f00;" id="JfAmtwd">0.00</span>　|　借记卡交易笔数(稳)(元)：<span style="color: #f00;" id="JCountwd">0.00</span>　|　云闪付小额交易额(稳)(元)：<span style="color: #f00;" id="YAmtwd">0.00</span>
                     </br>
-                    刷卡交易总额(盈)(元)：<span style="color: #f00;" id="TotalAmtyl">0.00</span>　| 贷记卡交易额(盈)(元)：<span style="color: #f00;" id="DAmtyl">0.00</span>　|　借记卡非封顶交易额(盈)(元)：<span style="color: #f00;" id="JAmtyl">0.00</span>　|　借记卡封顶交易额(盈)(元)：<span style="color: #f00;" id="JfAmtyl">0.00</span>　|　借记卡交易笔数(盈)(元)：<span style="color: #f00;" id="JCountyl">0.00</span>　|　云闪付小额交易额(盈)(元)：<span style="color: #f00;" id="YAmtyl">0.00</span>
+                    刷卡交易总额(稳A)(元)：<span style="color: #f00;" id="TotalAmtyl">0.00</span>　| 贷记卡交易额(稳A)(元)：<span style="color: #f00;" id="DAmtyl">0.00</span>　|　借记卡非封顶交易额(稳A)(元)：<span style="color: #f00;" id="JAmtyl">0.00</span>　|　借记卡封顶交易额(稳A)(元)：<span style="color: #f00;" id="JfAmtyl">0.00</span>　|　借记卡交易笔数(稳A)(元)：<span style="color: #f00;" id="JCountyl">0.00</span>　|　云闪付小额交易额(稳A)(元)：<span style="color: #f00;" id="YAmtyl">0.00</span>
+                    </br>
+                    刷卡交易总额(稳B)(元)：<span style="color: #f00;" id="TotalAmtyls">0.00</span>　| 贷记卡交易额(稳B)(元)：<span style="color: #f00;" id="DAmtyls">0.00</span>　|　借记卡非封顶交易额(稳B)(元)：<span style="color: #f00;" id="JAmtyls">0.00</span>　|　借记卡封顶交易额(稳B)(元)：<span style="color: #f00;" id="JfAmtyls">0.00</span>　|　借记卡交易笔数(稳B)(元)：<span style="color: #f00;" id="JCountyls">0.00</span>　|　云闪付小额交易额(稳B)(元)：<span style="color: #f00;" id="YAmtyls">0.00</span>
                     </br>
                     个人机具绑定总数：<span style="color: #f00;" id="PBCount">0</span>　| 个人机具激活总数：<span style="color: #f00;" id="PACount">0</span>　
                     </br>
-                    团队交易额：
+                    团队交易额：<span style="color: #f00;" id="TotalPosAmount1">0.00</span>
                     </br>
                     刷卡交易总额(扶)(元)：<span style="color: #f00;" id="TotalAmtfc1">0.00</span>　| 贷记卡交易额(扶)(元)：<span style="color: #f00;" id="DAmtfc1">0.00</span>　|　借记卡非封顶交易额(扶)(元)：<span style="color: #f00;" id="JAmtfc1">0.00</span>　|　借记卡封顶交易额(扶)(元)：<span style="color: #f00;" id="JfAmtfc1">0.00</span>　|　借记卡交易笔数(扶)(元)：<span style="color: #f00;" id="JCountfc1">0.00</span>　|　云闪付小额交易额(扶)(元)：<span style="color: #f00;" id="YAmtfc1">0.00</span>
                     </br>
                     刷卡交易总额(稳)(元)：<span style="color: #f00;" id="TotalAmtwd1">0.00</span>　| 贷记卡交易额(稳)(元)：<span style="color: #f00;" id="DAmtwd1">0.00</span>　|　借记卡非封顶交易额(稳)(元)：<span style="color: #f00;" id="JAmtwd1">0.00</span>　|　借记卡封顶交易额(稳)(元)：<span style="color: #f00;" id="JfAmtwd1">0.00</span>　|　借记卡交易笔数(稳)(元)：<span style="color: #f00;" id="JCountwd1">0.00</span>　|　云闪付小额交易额(稳)(元)：<span style="color: #f00;" id="YAmtwd1">0.00</span>
                     </br>
-                    刷卡交易总额(盈)(元)：<span style="color: #f00;" id="TotalAmtyl1">0.00</span>　| 贷记卡交易额(盈)(元)：<span style="color: #f00;" id="DAmtyl1">0.00</span>　|　借记卡非封顶交易额(盈)(元)：<span style="color: #f00;" id="JAmtyl1">0.00</span>　|　借记卡封顶交易额(盈)(元)：<span style="color: #f00;" id="JfAmtyl1">0.00</span>　|　借记卡交易笔数(盈)(元)：<span style="color: #f00;" id="JCountyl1">0.00</span>　|　云闪付小额交易额(盈)(元)：<span style="color: #f00;" id="YAmtyl1">0.00</span>
+                    刷卡交易总额(稳A)(元)：<span style="color: #f00;" id="TotalAmtyl1">0.00</span>　| 贷记卡交易额(稳A)(元)：<span style="color: #f00;" id="DAmtyl1">0.00</span>　|　借记卡非封顶交易额(稳A)(元)：<span style="color: #f00;" id="JAmtyl1">0.00</span>　|　借记卡封顶交易额(稳A)(元)：<span style="color: #f00;" id="JfAmtyl1">0.00</span>　|　借记卡交易笔数(稳A)(元)：<span style="color: #f00;" id="JCountyl1">0.00</span>　|　云闪付小额交易额(稳A)(元)：<span style="color: #f00;" id="YAmtyl1">0.00</span>
+                    </br>
+                    刷卡交易总额(稳B)(元)：<span style="color: #f00;" id="TotalAmtyl1s">0.00</span>　| 贷记卡交易额(稳B)(元)：<span style="color: #f00;" id="DAmtyl1s">0.00</span>　|　借记卡非封顶交易额(稳B)(元)：<span style="color: #f00;" id="JAmtyl1s">0.00</span>　|　借记卡封顶交易额(稳B)(元)：<span style="color: #f00;" id="JfAmtyl1s">0.00</span>　|　借记卡交易笔数(稳B)(元)：<span style="color: #f00;" id="JCountyl1s">0.00</span>　|　云闪付小额交易额(稳B)(元)：<span style="color: #f00;" id="YAmtyl1s">0.00</span>
                     </br>
                     团队机具绑定总数：<span style="color: #f00;" id="TBCount">0</span>　| 团队机具激活总数：<span style="color: #f00;" id="TACount">0</span>　
                 

appsettings.Development.json

@@ -19,7 +19,7 @@
     "OssHost": "http://oss.kexiaoshuang.com",
     "Database": "KxsMainServer",
     "SqlConnStr": "server=47.109.31.237;port=3306;user=KxsMainServer;password=FrW8ZfxlcaVdm1r0;database=KxsMainServer;charset=utf8;",
-    "ReadSqlConnStr": "server=47.109.31.237;port=3306;user=KxsMainServer;password=FrW8ZfxlcaVdm1r0;database=KxsMainServer;charset=utf8;",
+    "ReadSqlConnStr": "server=rr-2vc53lrwpwm1ewscogo.mysql.cn-chengdu.rds.aliyuncs.com;port=3306;user=liuyang;password=liu#yang@2023;database=KxsProfitServer;charset=utf8;",
     "StatSqlConnStr": "server=47.109.31.237;port=3306;user=KxsMainServer;password=FrW8ZfxlcaVdm1r0;database=KxsMainServer;charset=utf8;ConnectionTimeout=600;DefaultCommandTimeout=600;",
     "OpSqlConnStr": "server=47.109.31.237;port=3306;user=KxsOpServer;password=r7jwZ8ydLoeswDR4;database=KxsOpServer;charset=utf8;",
     "BsSqlConnStr": "server=47.109.31.237;port=3306;user=KxsBsServer;password=wyA1bEhi6aAkN8SB;database=KxsBsServer;charset=utf8;",

wwwroot/layuiadmin/modules_main/FirstPosIndex_Admin.js

@@ -95,7 +95,8 @@ layui.config({
             , { field: 'MerchantName', width: 200, title: '商户名称', sort: true }
             , { field: 'MerchantMobile', width: 200, title: '商户手机号', sort: true }
             , { field: 'MerIdcardNo', width: 200, title: '商户身份证号', sort: true }
-            , { field: 'IsFirstName', width: 200, title: '是否首台', sort: true }
+            , { field: 'IsFirstName', width: 200, title: '是否首台(服务费领取)', sort: true }
+            , { field: 'PosIsFirstName', width: 200, title: '是否首台(机具奖励发放)', sort: true }
             , { field: 'BindingTime', width: 200, title: '绑定时间', sort: true }
             , { field: 'ActivationTime', width: 200, title: '激活时间', sort: true }
             , { title: '操作', align: 'left', toolbar: '#table-list-tools', fixed: 'right' }

wwwroot/layuiadmin/modules_main/PosMachinesTwoChange_Admin.js

@@ -145,7 +145,8 @@ layui.config({
             , { field: 'RecycStartDate', width: 200, title: '循环开始时间', sort: true }
             , { field: 'RecycEndDate', width: 200, title: '循环截止时间', sort: true }
             , { field: 'UserInfo', width: 200, title: '大盟主券标记', sort: true }
-            , { field: 'IsFirst', width: 200, title: '是否第一台机具', sort: true }
+            , { field: 'IsFirst', width: 200, title: '是否首台(服务费领取)', sort: true }
+            , { field: 'PosIsFirst', width: 200, title: '是否首台(机具奖励发放)', sort: true }
             , { field: 'SeoKeyword', width: 200, title: '押金金额', sort: true }
             , { field: 'UpFeeFlag', width: 200, title: '调升标记', sort: true }
             , { field: 'UpFeeDate', width: 200, title: '调升时间', sort: true }

wwwroot/layuiadmin/modules_main/PosMachinesTwo_Admin.js

@@ -168,7 +168,8 @@ layui.config({
             , { field: 'RecycEndDate', width: 200, title: '循环截止时间', sort: true }
             , { field: 'UserInfo', width: 200, title: '大盟主券标记', sort: true }
             , { field: 'OpCode', width: 200, title: '所属运营中心', sort: true }
-            , { field: 'IsFirst', width: 200, title: '是否第一台机具', sort: true }
+            , { field: 'IsFirst', width: 200, title: '是否首台(服务费领取)', sort: true }
+            , { field: 'PosIsFirst', width: 200, title: '是否首台(机具奖励发放)', sort: true }
             , { field: 'SeoKeyword', width: 200, title: '实际押金金额', sort: true }
             , { field: 'PrizeParams', width: 200, title: '设置押金金额', sort: true }
             , { title: '操作', width: 100, align: 'center', fixed: 'right', toolbar: '#table-list-tools' }

wwwroot/layuiadmin/modules_main/UsersChildren_Admin.js

@@ -99,7 +99,8 @@ layui.config({
             , { field: 'Id', width: 100, title: 'ID', sort: true }
             , { field: 'MakerCode', width: 200, title: '创客编号', sort: true, templet: '#MakerCodeTpl' }
             , { field: 'RealName', width: 200, title: '创客姓名', sort: true }
-
+            , { field: 'TotalPosAmount', width: 200, title: 'POS交易总额', sort: true }
+            
             , { field: 'TotalAmtfc', width: 200, title: '刷卡交易总额(扶)', sort: true }
             , { field: 'DAmtfc', width: 200, title: '贷记卡交易额(扶)', sort: true }
             , { field: 'JAmtfc', width: 200, title: '借记卡非封顶交易额(扶)', sort: true }
@@ -114,12 +115,19 @@ layui.config({
             , { field: 'JCountwd', width: 200, title: '借记卡交易笔数(稳)', sort: true }
             , { field: 'YAmtwd', width: 200, title: '云闪付小额交易额(稳)', sort: true }
 
-            , { field: 'TotalAmtyl', width: 200, title: '刷卡交易总额(盈)', sort: true }
-            , { field: 'DAmtyl', width: 200, title: '贷记卡交易额(盈)', sort: true }
-            , { field: 'JAmtyl', width: 200, title: '借记卡非封顶交易额(盈)', sort: true }
-            , { field: 'JfAmtyl', width: 200, title: '借记卡封顶交易额(盈)', sort: true }
-            , { field: 'JCountyl', width: 200, title: '借记卡交易笔数(盈)', sort: true }
-            , { field: 'YAmtyl', width: 200, title: '云闪付小额交易额(盈)', sort: true }
+            , { field: 'TotalAmtyl', width: 200, title: '刷卡交易总额(稳A)', sort: true }
+            , { field: 'DAmtyl', width: 200, title: '贷记卡交易额(稳A)', sort: true }
+            , { field: 'JAmtyl', width: 200, title: '借记卡非封顶交易额(稳A)', sort: true }
+            , { field: 'JfAmtyl', width: 200, title: '借记卡封顶交易额(稳A)', sort: true }
+            , { field: 'JCountyl', width: 200, title: '借记卡交易笔数(稳A)', sort: true }
+            , { field: 'YAmtyl', width: 200, title: '云闪付小额交易额(稳A)', sort: true }
+
+            , { field: 'TotalAmtyl2', width: 200, title: '刷卡交易总额(稳B)', sort: true }
+            , { field: 'DAmtyl2', width: 200, title: '贷记卡交易额(稳B)', sort: true }
+            , { field: 'JAmtyl2', width: 200, title: '借记卡非封顶交易额(稳B)', sort: true }
+            , { field: 'JfAmtyl2', width: 200, title: '借记卡封顶交易额(稳B)', sort: true }
+            , { field: 'JCountyl2', width: 200, title: '借记卡交易笔数(稳B)', sort: true }
+            , { field: 'YAmtyl2', width: 200, title: '云闪付小额交易额(稳B)', sort: true }
 
             , { field: 'TBCount', width: 200, title: '团队机具绑定总数', sort: true }
             , { field: 'TACount', width: 200, title: '团队机具激活总数', sort: true }
@@ -157,6 +165,13 @@ layui.config({
             $("#JCountyl").text(res.other.JCountyl);
             $("#YAmtyl").text(res.other.YAmtyl);
 
+            $("#TotalAmtyls").text(res.other.TotalAmtyls);
+            $("#DAmtyls").text(res.other.DAmtyls);
+            $("#JAmtyls").text(res.other.JAmtyls);
+            $("#JfAmtyls").text(res.other.JfAmtyls);
+            $("#JCountyls").text(res.other.JCountyls);
+            $("#YAmtyls").text(res.other.YAmtyls);
+
             $("#TotalAmtfc1").text(res.other.TotalAmtfc1);
             $("#DAmtfc1").text(res.other.DAmtfc1);
             $("#JAmtfc1").text(res.other.JAmtfc1);
@@ -178,6 +193,16 @@ layui.config({
             $("#JCountyl1").text(res.other.JCountyl1);
             $("#YAmtyl1").text(res.other.YAmtyl1);
 
+            $("#TotalAmtyl1s").text(res.other.TotalAmtyl1s);
+            $("#DAmtyl1s").text(res.other.DAmtyl1s);
+            $("#JAmtyl1s").text(res.other.JAmtyl1s);
+            $("#JfAmtyl1s").text(res.other.JfAmtyl1s);
+            $("#JCountyl1s").text(res.other.JCountyl1s);
+            $("#YAmtyl1s").text(res.other.YAmtyl1s);
+
+            $("#TotalPosAmount").text(res.other.TotalPosAmount);
+            $("#TotalPosAmount1").text(res.other.TotalPosAmount1);
+
             $("#BCount").text(res.other.BCount);
             $("#ACount").text(res.other.ACount);
             $("#PBCount").text(res.other.PBCount);