我帮样子交代嘛

Areas/Admin/Controllers/MainServer/StoreHouseController.cs

@@ -1502,13 +1502,16 @@ namespace MySystem.Areas.Admin.Controllers
                         storeInfo.OpId = sysAdmin.Id;
                         db.SaveChanges();
                         opdb.SaveChanges();
-                        var query = opdb.StoreForOperate.FirstOrDefault(m => m.OpId == sysAdmin.Id && m.StoreId == StoreId);
+                        var query = opdb.StoreForOperate.FirstOrDefault(m => m.OpId == sysAdmin.Id && m.StoreId == StoreId && m.Status > -1);
                         if (query == null)
                         {
+                            var user = db.Users.FirstOrDefault( m => m.Id == storeInfo.UserId) ?? new Users();
                             query = opdb.StoreForOperate.Add(new OpModels.StoreForOperate()
                             {
                                 CreateDate = DateTime.Now, //创建时间
-                                OpId = sysAdmin.Id,
+                                SeoTitle = user.MakerCode,
+                                SeoKeyword = storeInfo.StoreNo + "_" + storeInfo.StoreName,
+                                OpId = sysAdmin.UserId,
                                 StoreId = StoreId,
                             }).Entity;
                             opdb.SaveChanges();

Areas/Admin/Controllers/OperateServer/PosCouponsLeaderController.cs

@@ -576,7 +576,7 @@ namespace MySystem.Areas.Admin.Controllers
                 var user = db.Users.FirstOrDefault(m => m.Id == userForMakerCode.UserId) ?? new Users();
                 if (user.Id > 0)
                 {
-                    DataTable dt = OtherMySqlConn.dtable("");
+                    DataTable dt = OtherMySqlConn.dtable("UPDATE PosCoupons SET LeaderUserId=" + user.Id + ",SeoTitle=" + SysUserName + "_" + SysRealName + " WHERE Id IN (" + Id + ")");
                     db.SaveChanges();
                 }
             }
@@ -617,41 +617,11 @@ namespace MySystem.Areas.Admin.Controllers
             var userForMakerCode = db.UserForMakerCode.FirstOrDefault(m => m.MakerCode == MakerCode) ?? new UserForMakerCode();
             if (userForMakerCode.UserId > 0)
             {
-                var sysAdmin = opdb.SysAdmin.FirstOrDefault(m => m.UserId == userForMakerCode.UserId);
-                if (sysAdmin.Id > 0)
+                var user = db.Users.FirstOrDefault(m => m.Id == userForMakerCode.UserId) ?? new Users();
+                if (user.Id > 0)
                 {
-                    DataTable dt = OtherMySqlConn.dtable("UPDATE StoreHouse SET OpId=0 WHERE Id IN (" + Id + ") AND OpId =" + sysAdmin.Id + " AND `Status` >0");
-                    // new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).Edit("StoreHouse", Fields, pos.Id);
+                    DataTable dt = OtherMySqlConn.dtable("UPDATE PosCoupons SET LeaderUserId=0,SeoTitle=" + SysUserName + "_" + SysRealName + " WHERE Id IN (" + Id + ") AND LeaderUserId=" + user.Id + "");
                     db.SaveChanges();
-                    foreach (var item in idlist)
-                    {
-                        int StoreId = int.Parse(item);
-                        var amount = 0;
-                        var tamount = 0;
-                        var storeInfo = db.StoreHouse.FirstOrDefault(m => m.Id == StoreId);
-                        var posCount = db.PosMachinesTwo.Where(m => m.StoreId == StoreId && m.UserId == 0 && m.BuyUserId == 0 && m.PreUserId == 0).Count();
-                        var brandInfo = db.KqProducts.FirstOrDefault(m => m.Id == int.Parse(storeInfo.BrandId));
-                        if (brandInfo.Name.Contains("电签"))
-                        {
-                            amount = 100;
-                        }
-                        if (brandInfo.Name.Contains("大POS"))
-                        {
-                            amount = 150;
-                        }
-                        tamount = amount * posCount;//扣减运营中心该品牌机具额度
-                        var userAmount = opdb.UserAccount.FirstOrDefault(m => m.UserId == sysAdmin.Id) ?? new OpModels.UserAccount();
-                        userAmount.ValidAmount += tamount;
-                        opdb.SaveChanges();
-                        var query = opdb.StoreForOperate.FirstOrDefault(m => m.OpId == sysAdmin.Id && m.StoreId == StoreId);
-                        if (query != null)
-                        {
-                            query.UpdateDate = DateTime.Now;
-                            query.Status = -1;
-                            opdb.SaveChanges();
-                        }
-                    }
-                    sysAdmin.StoreCount -= idlist.Count();//减少关联分仓数
                 }
             }
             return "success";

Areas/Admin/Controllers/OperateServer/StoreHouseOperateController.cs

@@ -88,15 +88,40 @@ namespace MySystem.Areas.Admin.Controllers
             foreach (Dictionary<string, object> dic in diclist)
             {
                 //仓库归属人
+                int UserId = int.Parse(function.CheckInt(dic["UserId"].ToString()));
+                Users userid_Users = db.Users.FirstOrDefault(m => m.Id == UserId) ?? new Users();
+                dic["UserIdMakerCode"] = userid_Users.MakerCode;
+                dic["UserIdRealName"] = userid_Users.RealName;
+
                 int OpId = int.Parse(function.CheckInt(dic["Sort"].ToString()));
                 var sysAdmin = opdb.SysAdmin.FirstOrDefault(m => m.Id == OpId) ?? new OpModels.SysAdmin();
-                dic["MakerCodes"] = sysAdmin.MakerCode;
-                dic["MakerMobiles"] = sysAdmin.MakerMobile;
                 dic["OpCode"] = sysAdmin.OpCode;
-                dic["MakerNames"] = sysAdmin.MakerName;
                 dic["RealNames"] = sysAdmin.RealName;
                 //产品类型
                 dic["BrandId"] = RelationClass.GetKqProductBrandList(dic["BrandId"].ToString());
+                //小分仓
+                int Id = int.Parse(function.CheckInt(dic["Id"].ToString()));
+                int PreCount = db.PreSendStockDetail.Count(m => m.FromStoreId == Id && m.ApplyFlag == 0 && m.Status >= 0 && m.Status <= 1);
+                dic["PreNum"] = PreCount.ToString();
+                //分仓额度
+                var amount = db.UserAccount.FirstOrDefault(m => m.Id == UserId) ?? new UserAccount();
+                var ValidAmount = amount.ValidAmount;
+                var FixedAmount = amount.FixedAmount;
+                var TempAmount = amount.TempAmount + amount.TempAmountForBalance;
+                var check = db.StoreHouseAmountPromiss.Any(m => m.ToUserId == UserId);
+                decimal PromissAmount = 0;
+                var ThisMonthPreAmount = amount.ThisMonthPreAmount;
+                var ValidPreAmount = amount.ValidPreAmount;
+                if (check)
+                {
+                    PromissAmount = db.StoreHouseAmountPromiss.Where(m => m.Status == 1 && m.ToUserId == UserId).Sum(m => m.PromissAmount);
+                }
+                dic["ValidAmount"] = ValidAmount.ToString();//可用额度
+                dic["FixedAmount"] = FixedAmount.ToString();//固定额度
+                dic["TempAmount"] = TempAmount.ToString();//临时额度
+                dic["PromissAmount"] = PromissAmount.ToString();//担保金额
+                dic["ThisMonthPreAmount"] = ThisMonthPreAmount.ToString();//本月小分仓额度
+                dic["ValidPreAmount"] = ValidPreAmount.ToString();//可用小分仓额度
             }
             return Json(obj);
         }

Areas/Admin/Views/MainServer/Consumers/Edit.cshtml

@@ -1,115 +1,139 @@
 @using MySystem.Models;
-@{Consumers editData = ViewBag.data as Consumers;}
+@{
+    Consumers editData = ViewBag.data as Consumers;
+}
 @{
     string RightInfo = ViewBag.RightInfo as string;
     string right = ViewBag.right as string;
-    
+
 }
 <!DOCTYPE html>
 <html>
+
 <head>
     <meta charset="utf-8">
     <title>消费者(修改)</title>
     <meta name="renderer" content="webkit">
     <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
+    <meta name="viewport"
+        content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
     <link rel="stylesheet" href="/layuiadmin/layui/css/layui.css" media="all">
     <script src="/admin/js/jquery-1.10.1.min.js"></script>
     <script src="/admin/js/LAreaData2.js"></script>
 </head>
+
 <body>
 
     <div class="layui-form" lay-filter="layuiadmin-form-useradmin" id="layuiadmin-form-useradmin">
         <input type="hidden" name="Id" value="@editData.Id" />
-        
+
         <div class="layui-card">
-          <div class="layui-card-body">
-            <div class="layui-tab" lay-filter="mytabbar">
-                <ul class="layui-tab-title">
-                    <li class="layui-this" lay-id="1">基本信息</li>
-                </ul>
-                <div class="layui-tab-content mt20">
-                    <div class="layui-tab-item layui-show">
-<div class="layui-form-item">
-<label class="layui-form-label">昵称</label>
-<div class="layui-input-inline">
-<input class="layui-input" type="text" id="NickName" name="NickName" value="@editData.NickName" maxlength="50" lay-verify="required|" autocomplete="off" placeholder="请输入昵称">
-</div>
-</div>
-<div class="layui-form-item">
-<label class="layui-form-label">头像</label>
-<div class="layui-input-block">
-<div class="layui-upload">
-<input type="hidden" id="HeadPhoto" name="HeadPhoto" value="@editData.HeadPhoto">
-<button class="layui-btn" type="button" id="HeadPhotoBtn">选择图片</button>
-<div class="layui-inline layui-word-aux">@(new MySystem.PublicFunction().GetUploadHint("ConsumersHeadPhoto"))</div>
-</div>
-<div style="margin-top:10px;" id="HeadPhotoImage">
-@if (!string.IsNullOrEmpty(editData.HeadPhoto))
-{
-<img src="@(MySystem.OssHelper.Instance.SourceHost)@editData.HeadPhoto" class="layui-upload-img" style="max-width:85px; max-height:85px;" onclick="showBigPic('@(MySystem.OssHelper.Instance.SourceHost)@editData.HeadPhoto')">
-}
-</div>
-</div>
-</div>
-<div class="layui-form-item">
-<label class="layui-form-label">手机号</label>
-<div class="layui-input-inline">
-<input class="layui-input" type="text" id="Mobile" name="Mobile" value="@editData.Mobile" maxlength="11" lay-verify="" autocomplete="off" placeholder="请输入手机号">
-</div>
-</div>
-<div class="layui-form-item">
-<label class="layui-form-label">累计分红</label>
-<div class="layui-input-inline">
-<input class="layui-input" type="text" id="TotalDividend" name="TotalDividend" value="@editData.TotalDividend" maxlength="20" lay-verify="" autocomplete="off" placeholder="请输入累计分红">
-</div>
-</div>
-<div class="layui-form-item">
-<label class="layui-form-label">累计积分</label>
-<div class="layui-input-inline">
-<input class="layui-input" type="text" id="TotalIntegral" name="TotalIntegral" value="@editData.TotalIntegral" maxlength="20" lay-verify="" autocomplete="off" placeholder="请输入累计积分">
-</div>
-</div>
-<div class="layui-form-item">
-<label class="layui-form-label">当前积分</label>
-<div class="layui-input-inline">
-<input class="layui-input" type="text" id="CurIntgegral" name="CurIntgegral" value="@editData.CurIntgegral" maxlength="20" lay-verify="" autocomplete="off" placeholder="请输入当前积分">
-</div>
-</div>
-<div class="layui-form-item">
-<label class="layui-form-label">微信Unionid</label>
-<div class="layui-input-inline">
-<input class="layui-input" type="text" id="WechatUnionid" name="WechatUnionid" value="@editData.WechatUnionid" maxlength="50" lay-verify="" autocomplete="off" placeholder="请输入微信Unionid">
-</div>
-</div>
-<div class="layui-form-item">
-<label class="layui-form-label">支付宝UserId</label>
-<div class="layui-input-inline">
-<input class="layui-input" type="text" id="AlipayUserId" name="AlipayUserId" value="@editData.AlipayUserId" maxlength="50" lay-verify="" autocomplete="off" placeholder="请输入支付宝UserId">
-</div>
-</div>
+            <div class="layui-card-body">
+                <div class="layui-tab" lay-filter="mytabbar">
+                    <ul class="layui-tab-title">
+                        <li class="layui-this" lay-id="1">基本信息</li>
+                    </ul>
+                    <div class="layui-tab-content mt20">
+                        <div class="layui-tab-item layui-show">
+                            <div class="layui-form-item">
+                                <label class="layui-form-label">昵称</label>
+                                <div class="layui-input-inline">
+                                    <input class="layui-input" type="text" id="NickName" name="NickName"
+                                        value="@editData.NickName" maxlength="50" lay-verify="required|"
+                                        autocomplete="off" placeholder="请输入昵称">
+                                </div>
+                            </div>
+                            <div class="layui-form-item">
+                                <label class="layui-form-label">头像</label>
+                                <div class="layui-input-block">
+                                    <div class="layui-upload">
+                                        <input type="hidden" id="HeadPhoto" name="HeadPhoto"
+                                            value="@editData.HeadPhoto">
+                                        <button class="layui-btn" type="button" id="HeadPhotoBtn">选择图片</button>
+                                        <div class="layui-inline layui-word-aux">@(new MySystem.PublicFunction().GetUploadHint("ConsumersHeadPhoto"))</div>
+                                    </div>
+                                    <div style="margin-top:10px;" id="HeadPhotoImage">
+                                        @if (!string.IsNullOrEmpty(editData.HeadPhoto))
+                                        {
+                                            <img src="@(MySystem.OssHelper.Instance.SourceHost)@editData.HeadPhoto"
+                                            class="layui-upload-img" style="max-width:85px; max-height:85px;"
+                                            onclick="showBigPic('@(MySystem.OssHelper.Instance.SourceHost)@editData.HeadPhoto')">
+                                        }
+                                    </div>
+                                </div>
+                            </div>
+                            <div class="layui-form-item">
+                                <label class="layui-form-label">手机号</label>
+                                <div class="layui-input-inline">
+                                    <input class="layui-input" type="text" id="Mobile" name="Mobile"
+                                        value="@editData.Mobile" maxlength="11" lay-verify="" autocomplete="off"
+                                        placeholder="请输入手机号">
+                                </div>
+                            </div>
+                            <div class="layui-form-item">
+                                <label class="layui-form-label">累计分红</label>
+                                <div class="layui-input-inline">
+                                    <input class="layui-input" type="text" id="TotalDividend" name="TotalDividend"
+                                        value="@editData.TotalDividend" maxlength="20" lay-verify="" autocomplete="off"
+                                        placeholder="请输入累计分红">
+                                </div>
+                            </div>
+                            <div class="layui-form-item">
+                                <label class="layui-form-label">累计积分</label>
+                                <div class="layui-input-inline">
+                                    <input class="layui-input" type="text" id="TotalIntegral" name="TotalIntegral"
+                                        value="@editData.TotalIntegral" maxlength="20" lay-verify="" autocomplete="off"
+                                        placeholder="请输入累计积分">
+                                </div>
+                            </div>
+                            <div class="layui-form-item">
+                                <label class="layui-form-label">当前积分</label>
+                                <div class="layui-input-inline">
+                                    <input class="layui-input" type="text" id="CurIntgegral" name="CurIntgegral"
+                                        value="@editData.CurIntgegral" maxlength="20" lay-verify="" autocomplete="off"
+                                        placeholder="请输入当前积分">
+                                </div>
+                            </div>
+                            <div class="layui-form-item">
+                                <label class="layui-form-label">微信Unionid</label>
+                                <div class="layui-input-inline">
+                                    <input class="layui-input" type="text" id="WechatUnionid" name="WechatUnionid"
+                                        value="@editData.WechatUnionid" maxlength="50" lay-verify="" autocomplete="off"
+                                        placeholder="请输入微信Unionid">
+                                </div>
+                            </div>
+                            <div class="layui-form-item">
+                                <label class="layui-form-label">支付宝UserId</label>
+                                <div class="layui-input-inline">
+                                    <input class="layui-input" type="text" id="AlipayUserId" name="AlipayUserId"
+                                        value="@editData.AlipayUserId" maxlength="50" lay-verify="" autocomplete="off"
+                                        placeholder="请输入支付宝UserId">
+                                </div>
+                            </div>
 
-</div>
+                        </div>
 
+                    </div>
+                </div>
+                <div class="layui-form-item layui-hide">
+                    <input type="button" lay-submit lay-filter="LAY-list-front-submit" id="LAY-list-front-submit"
+                        value="确认">
                 </div>
             </div>
-            <div class="layui-form-item layui-hide">
-                <input type="button" lay-submit lay-filter="LAY-list-front-submit" id="LAY-list-front-submit" value="确认">
-            </div>
-          </div>
         </div>
     </div>
 
     <script src="/layuiadmin/layui/layui.js"></script>
-    <script src="/other/oss/upload-min@(MySystem.OssHelper.Instance.OssStatus ? "-oss" : "").js?r=@DateTime.Now.ToString("yyyyMMddHHmmss")"></script>
+    <script
+        src="/other/oss/upload-min@(MySystem.OssHelper.Instance.OssStatus ? "-oss" : "").js?r=@DateTime.Now.ToString("yyyyMMddHHmmss")"></script>
     <script src="/other/mybjq/kindeditor-min.js"></script>
     <script src="/other/mybjq/lang/zh_CN.js"></script>
     <script>
-        
-        
+
+
         //编辑器
         KindEditor.ready(function (K) {
-            
+
         });
 
         var ids = "";
@@ -234,34 +258,35 @@
             tree = layui.tree;
             element = layui.element;
             upload = layui.upload;
-        
+
             //Hash地址的定位
             var layid = location.hash.replace(/^#test=/, '');
             element.tabChange('test', layid);
             element.on('tab(test)', function (elem) {
                 location.hash = 'test=' + $(this).attr('lay-id');
             });
-    
+
             //日期
-            
+
 
             //上传文件
             WebUploadJs('HeadPhotoBtn', '@(Library.ConfigurationManager.AppSettings["Database"].ToString())/upload/v2', @(Html.Raw(new MySystem.PublicFunction().GetUploadParam("ConsumersHeadPhoto"))), function (filename) {
-$('#HeadPhotoImage').html('<img src="' + osshost + filename + '" class="layui-upload-img" style="max-width:85px; max-height:85px;" onclick="showBigPic(\'' + osshost + filename + '\')">')
-$('#HeadPhoto').val(filename);
-});
+                $('#HeadPhotoImage').html('<img src="' + osshost + filename + '" class="layui-upload-img" style="max-width:85px; max-height:85px;" onclick="showBigPic(\'' + osshost + filename + '\')">')
+                $('#HeadPhoto').val(filename);
+            });
 
 
             //穿梭框
-            
+
 
             //TreeView，比如权限管理
-            
+
 
             //省市区
-            
+
         })
 
     </script>
 </body>
+
 </html>

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

@@ -120,8 +120,7 @@
                         </div>
                     </div>
                     @{
-                        Dictionary<string, string> ProfitObjectsActivesDic = new
-            MySystem.DictionaryClass().getKqProductBrandDic();
+                        Dictionary<string, string> ProfitObjectsActivesDic = new MySystem.DictionaryClass().getKqProductBrandDic();
                     }
                     <div class="layui-inline">
                         <label class="layui-form-label">品牌</label>

Startup.cs

@@ -140,6 +140,7 @@ namespace MySystem
             SycnProfitServiceV2.Instance.Start();
             SycnHelpProfitService.Instance.Start();
             ExcelHelper.Instance.Start();
+            OpExcelHelper.Instance.Start();
             TestHelper.Instance.Start();
         }
 

wwwroot/layuiadmin/modules_operate/StoreHouse_Admin.js

@@ -169,12 +169,17 @@ layui.config({
                 title: '仓库名称',
                 sort: true
             }, {
-                field: 'MakerCodes',
+                field: 'UserIdMakerCode',
                 width: 150,
                 title: '仓库所属人编号',
                 sort: true,
             }, {
-                field: 'MakerMobiles',
+                field: 'UserIdRealName',
+                width: 150,
+                title: '仓库所属人姓名',
+                sort: true,
+            }, {
+                field: 'MakerMobile',
                 width: 150,
                 title: '仓库所属人手机号',
                 sort: true,
@@ -188,11 +193,6 @@ layui.config({
                 width: 150,
                 title: '运营中心名称',
                 sort: true,
-            }, {
-                field: 'MakerNames',
-                width: 150,
-                title: '仓库管理员',
-                sort: true
             }, {
                 field: 'BrandId',
                 width: 110,
@@ -228,6 +228,41 @@ layui.config({
                 width: 150,
                 title: '创建时间',
                 sort: true
+            },, {
+                field: 'Deposit',
+                width: 110,
+                title: '押金',
+                sort: true
+            }, {
+                field: 'ValidAmount',
+                width: 110,
+                title: '可用额度',
+                sort: true
+            }, {
+                field: 'FixedAmount',
+                width: 110,
+                title: '固定额度',
+                sort: true
+            }, {
+                field: 'TempAmount',
+                width: 110,
+                title: '临时额度',
+                sort: true
+            }, {
+                field: 'PromissAmount',
+                width: 110,
+                title: '担保额度',
+                sort: true
+            }, {
+                field: 'ThisMonthPreAmount',
+                width: 150,
+                title: '本月小分仓额度',
+                sort: true
+            }, {
+                field: 'ValidPreAmount',
+                width: 150,
+                title: '可用小分仓额度',
+                sort: true
             }, {
                 title: '操作',
                 width: 350,