Merge branch 'DuGuYang' of http://47.109.31.237:13000/kxs-end/admin-server into feature-dgy-后台优化

Areas/Admin/Controllers/MainServer/PosMachinesFeeChangeRecordController.cs

@@ -125,10 +125,10 @@ namespace MySystem.Areas.Admin.Controllers
                 dic["PosUserIdRealName"] = posuserid_Users.RealName;
                 dic.Remove("PosUserId");
                 //状态
-                int Status = int.Parse(function.CheckInt(dic["Status"].ToString()));
-                if (Status == 0) dic["Status"] = "处理中";
-                if (Status == 1) dic["Status"] = "成功";
-                if (Status == -1) dic["Status"] = "失败";
+                string Status = dic["Status"].ToString();
+                if (Status == "0") dic["Status"] = "处理中";
+                if (Status == "1") dic["Status"] = "成功";
+                if (Status == "-1") dic["Status"] = "失败";
                 //产品类型
                 dic["Sort"] = RelationClass.GetKqProductBrandInfo(int.Parse(dic["Sort"].ToString()));
 
@@ -403,7 +403,7 @@ namespace MySystem.Areas.Admin.Controllers
                         snhtml += "<div class='f16'>机具品牌：" + brand.Name + "</div>";
                         snhtml += "<div class='f16'>SN：" + items.PosSn + "</div>";
                         snhtml += "<div class='f16'>当前费率：0.6%</div>";
-                        snhtml += "<div class='f16'>费率调整时间：" + items.DownFeeDate + "</div></div>";
+                        snhtml += "<div class='f16'>费率调整时间：" + items.DownFeeDate.Value.ToString("yyyy-MM-dd HH:mm:ss") + "</div></div>";
                     }
                     snhtml += "</div>";
                     RedisDbconn.Instance.AddList("MsgPersonalQueue", Newtonsoft.Json.JsonConvert.SerializeObject(new MsgPersonal()
@@ -455,7 +455,7 @@ namespace MySystem.Areas.Admin.Controllers
         /// 导出Excel
         /// </summary>
         /// <returns></returns>
-        public JsonResult ExportExcel(PosMachinesFeeChangeRecord data, string UserIdMakerCode, string UserIdRealName, string PosUserIdMakerCode, string PosUserIdRealName)
+        public JsonResult ExportExcel(PosMachinesFeeChangeRecord data, string UserIdMakerCode, string UserIdRealName, string PosUserIdMakerCode, string PosUserIdRealName, string StatusSelect, string SortSelect)
         {
             Dictionary<string, string> Fields = new Dictionary<string, string>();
             Fields.Add("CreateDate", "3"); //时间
@@ -464,7 +464,7 @@ namespace MySystem.Areas.Admin.Controllers
             Fields.Add("Sort", "0"); //品牌
 
 
-            string condition = " and Status>-1 and Sort = " + data.Sort + "";
+            string condition = "";
             //创客编号
             if (!string.IsNullOrEmpty(UserIdMakerCode))
             {
@@ -485,11 +485,19 @@ namespace MySystem.Areas.Admin.Controllers
             {
                 condition += " and PosUserId in (select PosUserId from UsersForRealName where RealName='" + PosUserIdRealName + "')";
             }
-            if (data.Status > 0)
+            //品牌
+            if (!string.IsNullOrEmpty(SortSelect))
+            {
+                condition += " and Sort = " + Convert.ToInt32(SortSelect);
+            }
+            if (!string.IsNullOrEmpty(StatusSelect))
             {
-                if (data.Status == 2) data.Status = 0;
-                if (data.Status == 3) data.Status = -1;
-                condition += " and Status = " + data.Status;
+                if (Convert.ToInt32(StatusSelect) > 0)
+                {
+                    if (Convert.ToInt32(StatusSelect) == 1) condition += " and Status = 1";
+                    if (Convert.ToInt32(StatusSelect) == 2) condition += " and Status = 0";
+                    if (Convert.ToInt32(StatusSelect) == 3) condition += " and Status = -1";
+                }
             }
 
             Dictionary<string, object> obj = new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).IndexData("PosMachinesFeeChangeRecord", Fields, "Id desc", "0", 1, 20000, condition, "PosSn,ChangeFee", false);

Areas/Admin/Controllers/MainServer/PosMachinesTwoChangeController.cs

@@ -482,7 +482,7 @@ namespace MySystem.Areas.Admin.Controllers
                     userIds += pos.BuyUserId + ",";
                 }
 
-                if (pos.BrandId == 1 || pos.BrandId == 3 || pos.BrandId == 6)
+                if (pos.BrandId == 1 || pos.BrandId == 3 || pos.BrandId == 2 || pos.BrandId == 4 || pos.BrandId == 5 || pos.BrandId == 6)
                 {
                     // PosId:机具Id
                     // Kind:1或2，1为费率0.63，2为费率0.6

Areas/Admin/Controllers/MainServer/StoreHouseController.cs

@@ -179,11 +179,11 @@ namespace MySystem.Areas.Admin.Controllers
                 var ValidAmount = amount.ValidAmount;
                 var FixedAmount = amount.FixedAmount;
                 var TempAmount = amount.TempAmount;
-                var LeaderBalanceAmount = amount.LeaderBalanceAmount;
+                // var LeaderBalanceAmount = amount.LeaderBalanceAmount;
                 dic["ValidAmount"] = ValidAmount.ToString();//可用额度
                 dic["FixedAmount"] = FixedAmount.ToString();//固定额度
                 dic["TempAmount"] = TempAmount.ToString();//临时额度
-                dic["LeaderBalanceAmount"] = LeaderBalanceAmount.ToString();//担保金额
+                // dic["LeaderBalanceAmount"] = LeaderBalanceAmount.ToString();//担保金额
             }
             return Json(obj);
         }

Areas/Admin/Controllers/MainServer/SysRechargeRecordController.cs

@@ -96,7 +96,7 @@ namespace MySystem.Areas.Admin.Controllers
             {
                 condition += " and SyncStatus=" + SyncStatusSelect;
             }
-            if(!string.IsNullOrEmpty(BizTimeData))
+            if (!string.IsNullOrEmpty(BizTimeData))
             {
                 string[] datelist = BizTimeData.Split(new string[] { " - " }, StringSplitOptions.None);
                 string start = datelist[0];
@@ -363,13 +363,13 @@ namespace MySystem.Areas.Admin.Controllers
         /// 导出Excel
         /// </summary>
         /// <returns></returns>
-        public JsonResult ExportExcel(SysRechargeRecord data, string MakerCode, string RealName, string StatusSelect, string SyncStatusSelect)
+        public JsonResult ExportExcel(SysRechargeRecord data, string MakerCode, string RealName, string StatusSelect, string SyncStatusSelect, string BizTimeData)
         {
             Dictionary<string, string> Fields = new Dictionary<string, string>();
             Fields.Add("RechargeRecNo", "1"); //奖励单号
             Fields.Add("BizType", "0"); //业务类型
             Fields.Add("BatchCode", "1"); //批次号
-            Fields.Add("BizTime", "3"); //奖励时间
+            // Fields.Add("BizTime", "3"); //奖励时间
 
             string condition = " and Status>-1";
             //创客编号
@@ -392,6 +392,13 @@ namespace MySystem.Areas.Admin.Controllers
             {
                 condition += " and SyncStatus=" + SyncStatusSelect;
             }
+            if (!string.IsNullOrEmpty(BizTimeData))
+            {
+                string[] datelist = BizTimeData.Split(new string[] { " - " }, StringSplitOptions.None);
+                string start = datelist[0];
+                string end = datelist[1];
+                condition += " and CreateDate>='" + start + " 00:00:00' and CreateDate<='" + end + " 23:59:59'";
+            }
 
             Dictionary<string, object> obj = new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).IndexData("SysRechargeRecord", Fields, "Id desc", "0", 1, 20000, condition, "RechargeRecNo,ProductType,UserId,BizType,BizTime,Amount,SyncStatus,BatchCode,Status,SeoDescription,CreateMan", false);
             List<Dictionary<string, object>> diclist = obj["data"] as List<Dictionary<string, object>>;

Areas/Admin/Controllers/MainServer/SysToolsController.cs

@@ -1065,11 +1065,14 @@ namespace MySystem.Areas.Admin.Controllers
                 Users user = db.Users.FirstOrDefault(m => m.Id == reward.UserId) ?? new Users();
                 DepositGet = "已领取";
                 DepositUser = "创客编号：" + user.MakerCode + "，姓名：" + user.RealName + "，手机号：" + user.Mobile;
-                var fAmount = db.ActiveReward.FirstOrDefault(m => m.KqSnNo == pos.PosSn && m.ActType == 0);
-                var lAmount = db.ActiveReward.FirstOrDefault(m => m.KqSnNo == pos.PosSn && m.ActType == 1);
-                if (fAmount != null && lAmount != null)
+                var fAmount = db.ActiveReward.FirstOrDefault(m => m.KqSnNo == pos.PosSn && m.ActType == 0);                
+                if (fAmount != null)
                 {
                     headAmount = fAmount.RewardAmount;
+                }
+                var lAmount = db.ActiveReward.FirstOrDefault(m => m.KqSnNo == pos.PosSn && m.ActType == 1);
+                if (lAmount != null)
+                {
                     footAmount = lAmount.RewardAmount;
                 }
             }
@@ -2197,12 +2200,30 @@ namespace MySystem.Areas.Admin.Controllers
                     data["RealName"] = user.RealName;
                     if(SnNoList.Length > i)
                     {
+                        string SourceSn = SnNoList[i].Split(':')[0];
                         data["ComeSn"] = SnNoList[i];
-                        data["ComeSnParam"] = SnNoList[i].Split(':')[0];
+                        data["ComeSnParam"] = SourceSn;
+                        MachineForSnNo machineFor = db.MachineForSnNo.FirstOrDefault(m => m.SnNo == SourceSn) ?? new MachineForSnNo();
+                        PosMachinesTwo pos = db.PosMachinesTwo.FirstOrDefault(m => m.Id == machineFor.SnId) ?? new PosMachinesTwo();
+                        if(pos.LeaderUserId > 0)
+                        {
+                            Users leader = db.Users.FirstOrDefault(m => m.Id == pos.LeaderUserId) ?? new Users();
+                            data["ComeSnMakerCode"] = leader.MakerCode;
+                            data["ComeSnRealName"] = leader.RealName;
+                        }
                     }
                     if(OrderSnNo.Length > i)
                     {
+                        string SendSn = OrderSnNo[i];
                         data["SendSn"] = OrderSnNo[i];
+                        MachineForSnNo machineFor = db.MachineForSnNo.FirstOrDefault(m => m.SnNo == SendSn) ?? new MachineForSnNo();
+                        PosMachinesTwo pos = db.PosMachinesTwo.FirstOrDefault(m => m.Id == machineFor.SnId) ?? new PosMachinesTwo();
+                        if(pos.LeaderUserId > 0)
+                        {
+                            Users leader = db.Users.FirstOrDefault(m => m.Id == pos.LeaderUserId) ?? new Users();
+                            data["SendSnMakerCode"] = leader.MakerCode;
+                            data["SendSnRealName"] = leader.RealName;
+                        }
                     }
                     data["CreateDate"] = apply.CreateDate == null ? "" : apply.CreateDate.Value.ToString("yyyy-MM-dd HH:mm:ss");
                     data["Status"] = order.Status == 2 ? "已发货" : "未发货";
@@ -2225,12 +2246,30 @@ namespace MySystem.Areas.Admin.Controllers
                     data["RealName"] = user.RealName;
                     if(SnNoList.Length > i)
                     {
+                        string SourceSn = SnNoList[i].Split(':')[0];
                         data["ComeSn"] = SnNoList[i];
-                        data["ComeSnParam"] = SnNoList[i].Split(':')[0];
+                        data["ComeSnParam"] = SourceSn;
+                        MachineForSnNo machineFor = db.MachineForSnNo.FirstOrDefault(m => m.SnNo == SourceSn) ?? new MachineForSnNo();
+                        PosMachinesTwo pos = db.PosMachinesTwo.FirstOrDefault(m => m.Id == machineFor.SnId) ?? new PosMachinesTwo();
+                        if(pos.LeaderUserId > 0)
+                        {
+                            Users leader = db.Users.FirstOrDefault(m => m.Id == pos.LeaderUserId) ?? new Users();
+                            data["ComeSnMakerCode"] = leader.MakerCode;
+                            data["ComeSnRealName"] = leader.RealName;
+                        }
                     }
                     if(OrderSnNo.Length > i)
                     {
+                        string SendSn = OrderSnNo[i];
                         data["SendSn"] = OrderSnNo[i];
+                        MachineForSnNo machineFor = db.MachineForSnNo.FirstOrDefault(m => m.SnNo == SendSn) ?? new MachineForSnNo();
+                        PosMachinesTwo pos = db.PosMachinesTwo.FirstOrDefault(m => m.Id == machineFor.SnId) ?? new PosMachinesTwo();
+                        if(pos.LeaderUserId > 0)
+                        {
+                            Users leader = db.Users.FirstOrDefault(m => m.Id == pos.LeaderUserId) ?? new Users();
+                            data["SendSnMakerCode"] = leader.MakerCode;
+                            data["SendSnRealName"] = leader.RealName;
+                        }
                     }
                     data["CreateDate"] = apply.CreateDate == null ? "" : apply.CreateDate.Value.ToString("yyyy-MM-dd HH:mm:ss");
                     data["Status"] = order.Status == 2 ? "已发货" : "未发货";

wwwroot/layuiadmin/modules_main/Loop_Admin.js

@@ -135,7 +135,11 @@ layui.config({
             , { field: 'ApplyNo', width: 200, title: '申请订单号', sort: true }
             , { field: 'OrderNo', width: 200, title: '订单号', sort: true }
             , { field: 'ComeSn', width: 300, title: '来源机具SN', sort: true, templet: '#ComeSnLoop' }
+            , { field: 'ComeSnMakerCode', width: 200, title: '来源机具大盟主编号', sort: true }
+            , { field: 'ComeSnRealName', width: 200, title: '来源机具大盟主姓名', sort: true }
             , { field: 'SendSn', width: 300, title: '发货SN', sort: true, templet: '#SendSnLoop' }
+            , { field: 'SendSnMakerCode', width: 200, title: '发货机具大盟主编号', sort: true }
+            , { field: 'SendSnRealName', width: 200, title: '发货机具大盟主姓名', sort: true }
             , { field: 'MakerCode', width: 200, title: '创客编号', sort: true }
             , { field: 'RealName', width: 200, title: '创客姓名', sort: true }
             , { field: 'CreateDate', width: 200, title: '申请时间', sort: true }

wwwroot/layuiadmin/modules_main/StoreHouse_Admin.js

@@ -275,11 +275,6 @@ layui.config({
                 width: 110,
                 title: '临时额度',
                 sort: true
-            }, {
-                field: 'LeaderBalanceAmount',
-                width: 110,
-                title: '担保额度',
-                sort: true
             }, {
                 title: '操作',
                 width: 300,