批量修改金额返回不满足条件

分润记录日期查询添加
驳回功能

Areas/Admin/Controllers/MainServer/ProfitRewardRecordController.cs

@@ -64,7 +64,7 @@ namespace MySystem.Areas.Admin.Controllers
         /// 分润奖励记录列表
         /// </summary>
         /// <returns></returns>
-        public JsonResult IndexData(ProfitRewardRecord data, string right, string BrandId, string MakerCode, string RealName, string ProfitTypeSelect, string CheckStatusSelect, int page = 1, int limit = 30)
+        public JsonResult IndexData(ProfitRewardRecord data, string right, string BrandId, string MakerCode, string RealName, string ProfitTypeSelect, string CheckStatusSelect, string CreateDateData, int page = 1, int limit = 30)
         {
 
             Dictionary<string, string> Fields = new Dictionary<string, string>();
@@ -97,6 +97,14 @@ namespace MySystem.Areas.Admin.Controllers
             {
                 condition += " and CheckStatus=" + CheckStatusSelect;
             }
+            //交易时间
+            if(!string.IsNullOrEmpty(CreateDateData))
+            {
+                string[] datelist = CreateDateData.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("ProfitRewardRecord", Fields, "Id desc", "0", page, limit, condition);
             List<Dictionary<string, object>> diclist = obj["data"] as List<Dictionary<string, object>>;

Areas/Admin/Controllers/MainServer/UserCashRecordController.cs

@@ -83,28 +83,24 @@ namespace MySystem.Areas.Admin.Controllers
                 // condition += " and UserId in (select Id from Users where RealName='" + RealName + "')";
             }
             //提现状态
-            if(!string.IsNullOrEmpty(StatusSelect))
+            if (!string.IsNullOrEmpty(StatusSelect))
             {
                 condition += " and Status=" + StatusSelect;
             }
 
-            if(!string.IsNullOrEmpty(data.CashOrderNo))
+            if (!string.IsNullOrEmpty(data.CashOrderNo))
             {
                 condition += " and CashOrderNo='" + data.CashOrderNo + "'";
             }
             if (data.TradeType > 0)
-            { 
+            {
                 condition += " and TradeType=" + data.TradeType;
             }
             if (!string.IsNullOrEmpty(QueryCountSelect))
-            { 
+            {
                 condition += " and QueryCount=" + QueryCountSelect;
             }
-            if (data.Status > -1)
-            { 
-                condition += " and Status=" + data.Status;
-            }
-            if(!string.IsNullOrEmpty(CreateDateData))
+            if (!string.IsNullOrEmpty(CreateDateData))
             {
                 string[] datelist = CreateDateData.Split(new string[] { " - " }, StringSplitOptions.None);
                 string start = datelist[0];
@@ -122,16 +118,16 @@ namespace MySystem.Areas.Admin.Controllers
                 dic["RealName"] = user.RealName;
                 dic["TradeType"] = RelationClassForConst.GetTradeTypeInfo(int.Parse(dic["TradeType"].ToString()));
                 int Status = int.Parse(dic["Status"].ToString());
-                if(Status == 0) dic["StatusName"] = "处理中";
-                if(Status == 1) dic["StatusName"] = "成功";
-                if(Status == 2) dic["StatusName"] = "失败";
+                if (Status == 0) dic["StatusName"] = "处理中";
+                if (Status == 1) dic["StatusName"] = "成功";
+                if (Status == 2) dic["StatusName"] = "失败";
 
                 int QueryCount = int.Parse(dic["QueryCount"].ToString());
-                if(QueryCount == 0) dic["LockName"] = "待提交";
-                if(QueryCount == 1) dic["LockName"] = "已提交";
+                if (QueryCount == 0) dic["LockName"] = "待提交";
+                if (QueryCount == 1) dic["LockName"] = "已提交";
             }
             Dictionary<string, object> other = new Dictionary<string, object>();
-            
+
             string WaitAmount = "0.00";//待处理总金额
             string SuccessAmount = "0.00";//提现成功总金额
             string FailAmount = "0.00";//提现失败总金额
@@ -493,11 +489,14 @@ namespace MySystem.Areas.Admin.Controllers
         /// 拒绝
         /// </summary>
         /// <returns></returns>
-        public IActionResult Reduce(string right)
+        public IActionResult Reduce(string right, int Id = 0)
         {
             ViewBag.RightInfo = RightInfo;
             ViewBag.right = right;
 
+            UserCashRecord editData = db.UserCashRecord.FirstOrDefault(m => m.Id == Id) ?? new UserCashRecord();
+            ViewBag.data = editData;
+
             return View();
         }
 

Areas/Admin/Controllers/MainServer/UsersController.cs

@@ -353,19 +353,19 @@ namespace MySystem.Areas.Admin.Controllers
             decimal BeforeFreezeAmount = account.FreezeAmount; //变更前冻结金额
             decimal BeforeBalanceAmount = account.BalanceAmount; //变更前余额
             int ChangeType = 0;
-            if (Kind == 1)
+            if (Kind == 1 && data.CashFreezeAmt <= account.BalanceAmount)
             {
                 account.BalanceAmount -= data.CashFreezeAmt;
                 account.FreezeAmount += data.CashFreezeAmt;
                 ChangeType = 61;
             }
-            else if (Kind == 2)
+            else if (Kind == 2 && data.CashFreezeAmt <= account.FreezeAmount)
             {
                 account.BalanceAmount += data.CashFreezeAmt;
                 account.FreezeAmount -= data.CashFreezeAmt;
                 ChangeType = 62;
             }
-            else if (Kind == 3)
+            else if (Kind == 3 && data.CashFreezeAmt <= account.BalanceAmount)
             {
                 account.TotalAmount -= data.CashFreezeAmt;
                 account.BalanceAmount -= data.CashFreezeAmt;
@@ -709,6 +709,7 @@ namespace MySystem.Areas.Admin.Controllers
             }
             else if (Kind == 4)
             {
+                string error = "";
                 for (int i = 1; i < list.Count; i++)
                 {
                     JsonData dr = list[i];
@@ -732,63 +733,67 @@ namespace MySystem.Areas.Admin.Controllers
                         }
                         if (User != null)
                         {
-                            if ((OperationType == "1" || OperationType == "3") && User.CashFreezeAmt > account.BalanceAmount)
-                            {
-                                return "账号余额不足";
-                            }
-                            decimal BeforeTotalAmount = account.TotalAmount; //变更前总金额
-                            decimal BeforeFreezeAmount = account.FreezeAmount; //变更前冻结金额
-                            decimal BeforeBalanceAmount = account.BalanceAmount; //变更前余额
-                            int ChangeType = 0;
-                            if (OperationType == "1")
-                            {
-                                account.BalanceAmount -= Convert.ToDecimal(OperationAmt);
-                                account.FreezeAmount += Convert.ToDecimal(OperationAmt);
-                                ChangeType = 61;
-                            }
-                            else if (OperationType == "2")
+                            if ((OperationType == "1" || OperationType == "3") && Convert.ToDecimal(OperationAmt) > account.BalanceAmount)
                             {
-                                account.BalanceAmount += Convert.ToDecimal(OperationAmt);
-                                account.FreezeAmount -= Convert.ToDecimal(OperationAmt);
-                                ChangeType = 62;
+                                error += "以下操作失败" + User.MakerCode + ',' + User.RealName + '|' + '\n';
                             }
-                            else if (OperationType == "3")
+                            else
                             {
-                                account.TotalAmount -= Convert.ToDecimal(OperationAmt);
-                                account.BalanceAmount -= Convert.ToDecimal(OperationAmt);
-                                ChangeType = 63;
+                                decimal BeforeTotalAmount = account.TotalAmount; //变更前总金额
+                                decimal BeforeFreezeAmount = account.FreezeAmount; //变更前冻结金额
+                                decimal BeforeBalanceAmount = account.BalanceAmount; //变更前余额
+                                int ChangeType = 0;
+                                if (OperationType == "1" && Convert.ToDecimal(OperationAmt) <= account.BalanceAmount)
+                                {
+                                    account.BalanceAmount -= Convert.ToDecimal(OperationAmt);
+                                    account.FreezeAmount += Convert.ToDecimal(OperationAmt);
+                                    ChangeType = 61;
+                                }
+                                else if (OperationType == "2" && Convert.ToDecimal(OperationAmt) <= account.FreezeAmount)
+                                {
+                                    account.BalanceAmount += Convert.ToDecimal(OperationAmt);
+                                    account.FreezeAmount -= Convert.ToDecimal(OperationAmt);
+                                    ChangeType = 62;
+                                }
+                                else if (OperationType == "3" && Convert.ToDecimal(OperationAmt) <= account.BalanceAmount)
+                                {
+                                    account.TotalAmount -= Convert.ToDecimal(OperationAmt);
+                                    account.BalanceAmount -= Convert.ToDecimal(OperationAmt);
+                                    ChangeType = 63;
+                                }
+                                else if (OperationType == "4")
+                                {
+                                    account.TotalAmount += Convert.ToDecimal(OperationAmt);
+                                    account.BalanceAmount += Convert.ToDecimal(OperationAmt);
+                                    ChangeType = 64;
+                                }
+                                decimal AfterTotalAmount = account.TotalAmount; //变更后总金额
+                                decimal AfterFreezeAmount = account.FreezeAmount; //变更后冻结金额
+                                decimal AfterBalanceAmount = account.BalanceAmount; //变更后余额
+                                UserAccountRecord userAccountRecord = db.UserAccountRecord.Add(new UserAccountRecord()
+                                {
+                                    CreateDate = DateTime.Now,
+                                    UpdateDate = DateTime.Now,
+                                    UserId = User.Id, //创客
+                                    ChangeType = ChangeType, //变动类型
+                                    ChangeAmount = Convert.ToDecimal(OperationAmt), //变更金额
+                                    BeforeTotalAmount = BeforeTotalAmount, //变更前总金额
+                                    AfterTotalAmount = AfterTotalAmount, //变更后总金额
+                                    BeforeFreezeAmount = BeforeFreezeAmount, //变更前冻结金额
+                                    AfterFreezeAmount = AfterFreezeAmount, //变更后冻结金额
+                                    BeforeBalanceAmount = BeforeBalanceAmount, //变更前余额
+                                    AfterBalanceAmount = AfterBalanceAmount, //变更后余额
+                                    Remark = dr[4].ToString(),
+                                }).Entity;
+                                db.SaveChanges();
+                                AddSysLog(User.Id.ToString(), "Users", "ChangeCashFreezeAmts");
+                                db.SaveChanges();
                             }
-                            else if (OperationType == "4")
-                            {
-                                account.TotalAmount += Convert.ToDecimal(OperationAmt);
-                                account.BalanceAmount += Convert.ToDecimal(OperationAmt);
-                                ChangeType = 64;
-                            }
-                            decimal AfterTotalAmount = account.TotalAmount; //变更后总金额
-                            decimal AfterFreezeAmount = account.FreezeAmount; //变更后冻结金额
-                            decimal AfterBalanceAmount = account.BalanceAmount; //变更后余额
-                            UserAccountRecord userAccountRecord = db.UserAccountRecord.Add(new UserAccountRecord()
-                            {
-                                CreateDate = DateTime.Now,
-                                UpdateDate = DateTime.Now,
-                                UserId = User.Id, //创客
-                                ChangeType = ChangeType, //变动类型
-                                ChangeAmount = Convert.ToDecimal(OperationAmt), //变更金额
-                                BeforeTotalAmount = BeforeTotalAmount, //变更前总金额
-                                AfterTotalAmount = AfterTotalAmount, //变更后总金额
-                                BeforeFreezeAmount = BeforeFreezeAmount, //变更前冻结金额
-                                AfterFreezeAmount = AfterFreezeAmount, //变更后冻结金额
-                                BeforeBalanceAmount = BeforeBalanceAmount, //变更前余额
-                                AfterBalanceAmount = AfterBalanceAmount, //变更后余额
-                                Remark = dr[4].ToString(),
-                            }).Entity;
-                            db.SaveChanges();
-                            AddSysLog(User.Id.ToString(), "Users", "ChangeCashFreezeAmts");
-                            db.SaveChanges();
                         }
                     }
                 }
                 db.SaveChanges();
+                return "warning" + error;
             }
             AddSysLog("0", "Users", "Import");
             return "success";

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

@@ -73,7 +73,7 @@
                             </select>
                         </div>
                     </div>
-                
+
                     <div class="layui-inline">
                         <label class="layui-form-label">交易类型</label>
                         <div class="layui-input-inline">
@@ -108,6 +108,11 @@
                         <button class="layui-btn" lay-submit lay-filter="LAY-list-front-searchall">
                             <i class="layui-icon layui-icon-list layuiadmin-button-btn"></i>全部
                         </button>
+                        @if (RightInfo.Contains("," + right + "_reduce,"))
+                        {
+                            <a class="layui-btn layui-btn-normal layui-btn-xs" lay-event="reduce"><i
+                                class="layui-icon layui-icon-edit"></i>驳回</a>
+                        }
                         @if (RightInfo.Contains("," + right + "_export,"))
                         {
                             <button class="layui-btn" data-type="ExportExcel"><i

wwwroot/layuiadmin/modules_main/ProfitRewardRecord_Admin.js

@@ -124,6 +124,12 @@ layui.config({
                 title: '顶级创客名称',
                 sort: true
             }, {
+                field: 'CreateDate',
+                width: 200,
+                title: '创建时间',
+                sort: true
+            }
+            , {
                 field: 'TradeMonth',
                 width: 200,
                 title: '交易所在月份',

wwwroot/layuiadmin/modules_main/UserCashRecord_Admin.js

@@ -190,7 +190,7 @@ layui.config({
                     width: 200,
                     title: '创建时间',
                     sort: true
-                }
+                }, { title: '操作', align: 'center', width: 300, fixed: 'right', toolbar: '#table-list-tools' }
 
             ]
         ],

wwwroot/layuiadmin/modules_main/Users_Admin.js

@@ -9,6 +9,11 @@ function ConfirmImport() {
             if (data == "success") {
                 layer.msg("导入成功", { time: 2000 }, function () {
                     window.location.reload();
+                }); 
+            } else if (data.indexOf("warning") == 0) {
+                var datalist = data.split('|');
+                layer.alert(datalist[0], { time: 20000 }, function () {
+                    window.location.reload();
                 });
             } else {
                 layer.msg(data);