Merge branch 'feature-dgy-收支明细区分未使用额度和可提现额度' into feature-dgy-后台测试

Areas/Admin/Controllers/MainServer/PosMachinesTwoChangeController.cs

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

Areas/Admin/Controllers/MainServer/PosMachinesTwoController.cs

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

Areas/Admin/Controllers/MainServer/StoreHouseController.cs

@@ -558,6 +558,7 @@ namespace MySystem.Areas.Admin.Controllers
                         {
                             var amoutRecord = opdb.AmountRecord.Add(new OpModels.AmountRecord
                             {
+                                Version = 3,//1 未使用额度 2 可提现额度 3 关联分仓额度
                                 CreateDate = DateTime.Now,
                                 UserId = sto.OpId,
                                 SeoDescription = "分仓押金变更",
@@ -574,6 +575,7 @@ namespace MySystem.Areas.Admin.Controllers
                         {
                             var amoutRecord = opdb.AmountRecord.Add(new OpModels.AmountRecord
                             {
+                                Version = 3,//1 未使用额度 2 可提现额度 3 关联分仓额度
                                 CreateDate = DateTime.Now,
                                 UserId = sto.OpId,
                                 SeoDescription = "分仓押金变更",
@@ -631,6 +633,7 @@ namespace MySystem.Areas.Admin.Controllers
                     {
                         var amoutRecord = opdb.AmountRecord.Add(new OpModels.AmountRecord
                         {
+                            Version = 3,//1 未使用额度 2 可提现额度 3 关联分仓额度
                             CreateDate = DateTime.Now,
                             UserId = sto.OpId,
                             SeoDescription = "分仓押金变更",
@@ -647,6 +650,7 @@ namespace MySystem.Areas.Admin.Controllers
                     {
                         var amoutRecord = opdb.AmountRecord.Add(new OpModels.AmountRecord
                         {
+                            Version = 3,//1 未使用额度 2 可提现额度 3 关联分仓额度
                             CreateDate = DateTime.Now,
                             UserId = sto.OpId,
                             SeoDescription = "分仓押金变更",

Areas/Admin/Controllers/MainServer/SysToolsController.cs

@@ -5152,8 +5152,8 @@ namespace MySystem.Areas.Admin.Controllers
                 {
                     var info = "";
                     var IsFirst = "";//是否首台机具
-                    IsFirst += pos.IsFirst == 1 ? "首台(服务费领取)" + "\n" : "非首台(服务费领取)" + "\n";
-                    IsFirst += pos.FirstFlag == 1 ? "首台(机具奖励发放)" + "\n" : "非首台(机具奖励发放)" + "\n";
+                    IsFirst += pos.FirstFlag == 1 ? "首台(服务费领取)" + "\n" : "非首台(服务费领取)" + "\n";
+                    IsFirst += pos.IsFirst == 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 + "所对应的商户未认证";

Areas/Admin/Controllers/MainServer/UsersController.cs

@@ -467,6 +467,19 @@ namespace MySystem.Areas.Admin.Controllers
 
         #endregion
 
+        #region 清除登陆TOKEN
+        public string ClearToken(string Id)
+        {
+            var UserId = int.Parse(Id);
+            var utoken = RedisDbconn.Instance.GetKeys("utoken:*" + UserId);
+            var apptoken = RedisDbconn.Instance.GetKeys("apptoken:*" + UserId);
+            RedisDbconn.Instance.Clear("utoken:*" + UserId);
+            RedisDbconn.Instance.Clear("apptoken:*" + UserId);
+            return "success";
+        }
+
+        #endregion
+
         #region 修改结算金额
 
         public IActionResult EditSettleAmount(string right, int Id = 0)

Areas/Admin/Controllers/OperateServer/SysAdminOperateController.cs

@@ -621,6 +621,7 @@ namespace MySystem.Areas.Admin.Controllers
 
             AmountRecord amountRecord = opdb.AmountRecord.Add(new AmountRecord()
             {
+                Version = 1,//1 未使用额度 2 可提现额度 3 关联分仓额度
                 CreateDate = DateTime.Now,
                 SeoKeyword = Note,
                 SeoDescription = description,
@@ -689,6 +690,7 @@ namespace MySystem.Areas.Admin.Controllers
             decimal AfterAmount = account.TotalAmt + account.ValidAmount + account.ValidForGetAmount; //变更后总金额
             AmountRecord amountRecord = opdb.AmountRecord.Add(new AmountRecord()
             {
+                Version = 2,//1 未使用额度 2 可提现额度 3 关联分仓额度
                 CreateDate = DateTime.Now,
                 SeoKeyword = Note,
                 SeoDescription = description,

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

@@ -309,6 +309,7 @@
                     {
                         <a class="layui-btn layui-btn-normal layui-btn-xs" lay-event="resetsmallposcount"><i class="layui-icon layui-icon-edit"></i>重置小分仓机具数</a>
                     }
+                    <a class="layui-btn layui-btn-normal layui-btn-xs" lay-event="cleartoken"><i class="layui-icon layui-icon-edit"></i>清除登陆TOKEN</a>
                     <a class="layui-btn layui-btn-normal layui-btn-xs" lay-href="/Admin/Users/Index?right=@right&SelfId=@("{{d.Id}}")"><i class="layui-icon layui-icon-edit"></i>上级创客</a>
                     <a class="layui-btn layui-btn-normal layui-btn-xs" lay-href="/Admin/Users/Index?right=@right&ParentId=@("{{d.Id}}")"><i class="layui-icon layui-icon-edit"></i>直属创客</a>
                     <a class="layui-btn layui-btn-normal layui-btn-xs" lay-href="/Admin/Users/Children?right=@right&ParentId=@("{{d.Id}}")"><i class="layui-icon layui-icon-edit"></i>直属创客交易额</a>

wwwroot/layuiadmin/modules_main/Users_Admin.js

@@ -743,6 +743,28 @@ layui.config({
                     }
                 });
             });
+        } else if (obj.event === 'cleartoken') {
+            var index = layer.confirm('确定要清除该创客的登陆TOKEN吗？', function (index) {
+                layer.close(index);
+                var loadindex = layer.load(1, {
+                    shade: [0.5, '#000']
+                });
+                $.ajax({
+                    type: "POST",
+                    url: "/Admin/Users/ClearToken?r=" + Math.random(1),
+                    data: "Id=" + data.Id,
+                    dataType: "text",
+                    success: function (data) {
+                        layer.close(loadindex);
+                        if (data == "success") {
+                            layer.msg('清除成功');
+                            table.reload('LAY-list-manage');
+                        } else {
+                            layer.msg(data);
+                        }
+                    }
+                });
+            });
         } else if (obj.event === 'sycntrade') {
             var tr = $(obj.tr);
             var perContent = layer.open({