Răsfoiți Sursa

保证金后台功能修改和清除
仓库操作样式调整

DuGuYang 4 ani în urmă
părinte
comite
95312a78ce

+ 44 - 3
Areas/Admin/Controllers/MainServer/StoreHouseAmountPromissController.cs

@@ -133,9 +133,9 @@ namespace MySystem.Areas.Admin.Controllers
             Dictionary<string, object> Fields = new Dictionary<string, object>();
             var FromUserIdInfo = db.Users.FirstOrDefault(m => m.MakerCode == FromUserId);
             var ToUserIdInfo = db.Users.FirstOrDefault(m => m.MakerCode == ToUserId);
-            ToUserIdInfo.ValidAmount += PromissAmount;
+            // ToUserIdInfo.ValidAmount += PromissAmount;//添加担保金
 
-             db.StoreHouseAmountPromiss.Add(new StoreHouseAmountPromiss()
+            db.StoreHouseAmountPromiss.Add(new StoreHouseAmountPromiss()
             {
                 CreateDate = DateTime.Now,
                 FromUserId = FromUserIdInfo.Id,
@@ -144,6 +144,14 @@ namespace MySystem.Areas.Admin.Controllers
                 SeoDescription = SeoDescription
             });
             db.SaveChanges();
+            RedisDbconn.Instance.AddList("MsgPersonalQueue", Newtonsoft.Json.JsonConvert.SerializeObject(new MsgPersonal()
+            {
+                UserId = FromUserIdInfo.Id, //接收创客
+                Title = "仓库担保通知", //标题
+                Content = "<div class='f16'>已经为创客 <br/>" + ToUserIdInfo.RealName + ' ' + ToUserIdInfo.MakerCode + "进行分仓额度担保<br/>担保金额:" + PromissAmount + " </div>", //内容
+                Summary = "已经为创客" + ToUserIdInfo.RealName + ' ' + ToUserIdInfo.MakerCode + "进行分仓额度担保,担保金额:" + PromissAmount,
+                CreateDate = DateTime.Now,
+            }));
 
             return "success";
         }
@@ -199,14 +207,34 @@ namespace MySystem.Areas.Admin.Controllers
 
             Fields.Add("FromUserId", data.FromUserId); //担保人
             Fields.Add("ToUserId", data.ToUserId); //担保对象
-            Fields.Add("PromissAmount", data.PromissAmount); //担保金额
+            StoreHouseAmountPromiss storeHouseAmountPromiss = db.StoreHouseAmountPromiss.FirstOrDefault(m => m.Id == data.Id);
+            if (data.PromissAmount > storeHouseAmountPromiss.PromissAmount)
+            {
+                return "修改保证金不可高于原保证金额度!";
+            }
+            else
+            {
+                Fields.Add("PromissAmount", data.PromissAmount); //担保金额
+            }
 
             Fields.Add("SeoTitle", data.SeoTitle);
             Fields.Add("SeoKeyword", data.SeoKeyword);
             Fields.Add("SeoDescription", data.SeoDescription);
             new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).Edit("StoreHouseAmountPromiss", Fields, data.Id);
             AddSysLog(data.Id.ToString(), "StoreHouseAmountPromiss", "update");
+            UserAccount userAccount = db.UserAccount.FirstOrDefault(m => m.Id == data.ToUserId);
+            userAccount.ValidAmount = userAccount.ValidAmount - (storeHouseAmountPromiss.PromissAmount - data.PromissAmount);//减去担保金调整差额
             db.SaveChanges();
+            var storeA = db.StoreHouseAmountPromiss.FirstOrDefault(m => m.Id == data.Id);
+            var ToUserId = db.Users.FirstOrDefault(m => m.Id == data.ToUserId);
+            RedisDbconn.Instance.AddList("MsgPersonalQueue", Newtonsoft.Json.JsonConvert.SerializeObject(new MsgPersonal()
+            {
+                UserId = data.FromUserId, //接收创客
+                Title = "仓库担保调低", //标题
+                Content = "<div class='f16'>已经为创客 <br/>" + ToUserId.RealName + ' ' + ToUserId.MakerCode + "进行分仓额度担保调低<br/>担保金额:" + storeA.PromissAmount + " </div>", //内容
+                Summary = "已经为创客" + ToUserId.RealName + ' ' + ToUserId.MakerCode + "进行分仓额度担保调低,担保金额:" + storeA.PromissAmount,
+                CreateDate = DateTime.Now,
+            }));
 
             return "success";
         }
@@ -227,10 +255,23 @@ namespace MySystem.Areas.Admin.Controllers
             {
                 int id = int.Parse(subid);
                 Dictionary<string, object> Fields = new Dictionary<string, object>();
+                StoreHouseAmountPromiss storeHouseAmountPromiss = db.StoreHouseAmountPromiss.FirstOrDefault(m => m.Id == id);
                 Fields.Add("Status", -1);
+                var userAccount = db.UserAccount.FirstOrDefault(m => m.Id == storeHouseAmountPromiss.ToUserId);
+                userAccount.ValidAmount -= storeHouseAmountPromiss.PromissAmount;//减除保证金
                 new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).Edit("StoreHouseAmountPromiss", Fields, id);
             }
             db.SaveChanges();
+            StoreHouseAmountPromiss storep = db.StoreHouseAmountPromiss.FirstOrDefault(m => m.Id == Convert.ToInt32(Id));
+            var ToUserInfo = db.Users.FirstOrDefault(m => m.Id == storep.ToUserId);
+            RedisDbconn.Instance.AddList("MsgPersonalQueue", Newtonsoft.Json.JsonConvert.SerializeObject(new MsgPersonal()
+            {
+                UserId = storep.FromUserId, //接收创客
+                Title = "仓库担保重置", //标题
+                Content = "<div class='f16'>已经为创客 <br/>" + ToUserInfo.RealName + ' ' + ToUserInfo.MakerCode + "进行分仓额度担保重制", //内容
+                Summary = "",
+                CreateDate = DateTime.Now,
+            }));
 
             return "success";
         }

+ 2 - 2
Areas/Admin/Views/MainServer/StoreHouseAmountPromiss/Edit.cshtml

@@ -35,7 +35,7 @@
                     </ul>
                     <div class="layui-tab-content mt20">
                         <div class="layui-tab-item layui-show">
-                            <div class="layui-form-item">
+                            @* <div class="layui-form-item">
                                 <label class="layui-form-label">*担保人</label>
                                 <div class="layui-input-inline">
                                     <input class="layui-input" type="text" id="FromUserId" name="FromUserId" value="@editData.FromUserId"
@@ -49,7 +49,7 @@
                                     <input class="layui-input" type="text" id="ToUserId" name="ToUserId" maxlength="30" value="@editData.ToUserId"
                                          lay-verify="required|" autocomplete="off" placeholder="请输入被担保人创客编码">
                                 </div>
-                            </div>
+                            </div> *@
                             <div class="layui-form-item">
                                 <label class="layui-form-label">*担保金额</label>
                                 <div class="layui-input-inline">

+ 1 - 5
Areas/Admin/Views/MainServer/StoreHouseAmountPromiss/Index.cshtml

@@ -115,11 +115,7 @@
                     }
                     @if (RightInfo.Contains("," + right + "_delete,"))
                     {
-                            <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del"><i class="layui-icon layui-icon-delete"></i>删除</a>
-                    }
-                    @if (RightInfo.Contains("," + right + "_edit,"))
-                    {
-
+                            <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del"><i class="layui-icon layui-icon-delete"></i>清空担保额</a>
                     }
                 </script>
             </div>

+ 2 - 2
wwwroot/layuiadmin/modules_main/StoreHouseAmountPromiss_Admin.js

@@ -118,7 +118,7 @@ layui.config({
     table.on('tool(LAY-list-manage)', function (obj) {
         var data = obj.data;
         if (obj.event === 'del') {
-            var index = layer.confirm('确定要删除吗?删除后不能恢复!', function (index) {
+            var index = layer.confirm('确定要清空担保额?清空后不能恢复!', function (index) {
                 $.ajax({
                     type: "POST",
                     url: "/Admin/StoreHouseAmountPromiss/Delete?r=" + Math.random(1),
@@ -156,7 +156,7 @@ layui.config({
                                 submit.click();
                             }
                         });
-                    }, 300);
+                    }, 1000);
 
 
 

+ 1 - 1
wwwroot/layuiadmin/modules_main/StoreHouse_Admin.js

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