暂存

Areas/Admin/Controllers/MainServer/OrdersController.cs

@@ -244,7 +244,6 @@ namespace MySystem.Areas.Admin.Controllers
                 {
                     dic["TopUserInfo"] = "";
                 }
-                dic.Remove("UserId");
 
                 //订单状态
                 int Status = int.Parse(dic["Status"].ToString());
@@ -1519,7 +1518,7 @@ namespace MySystem.Areas.Admin.Controllers
                 string end = datelist[1];
                 SqlString += " and a.SendDate>='" + start + " 00:00:00' and a.SendDate<='" + end + " 23:59:59'";
             }
-            var Sql = "SELECT aa.*,bb.RealName FROM(SELECT b.MakerCode '创客编号',b.RealName '创客真实姓名',a.OrderNo '订单号',SUBSTRING_INDEX(SUBSTRING_INDEX(b.ParentNav,',',4),',',-1) TopId,a.Mobile '手机号',a.RealName '姓名',a.TotalPrice '总价',a.Areas '所在地区',a.Address '详细地址',a.ErpName '物流名称',a.ErpCode '运单号',DATE_FORMAT(a.SendDate,'%Y-%m-%d %H:%i:%s') '发货时间',(CASE WHEN a.PayMode=1 THEN '支付宝' WHEN a.PayMode=2 THEN '微信' WHEN a.PayMode=3 THEN '账户余额' ELSE '' end) '支付方式',DATE_FORMAT(a.PayDate,'%Y-%m-%d %H:%i:%s') '支付时间',a.TradeNo '支付交易号',c.StoreNo '仓库编号',c.StoreName '仓库名称',(CASE WHEN a.RefundStatus=0 THEN '未退款' WHEN a.RefundStatus=1 THEN '已退款' end) '退款状态',(CASE WHEN a.DeliveryType=1 THEN '邮寄到付' WHEN a.DeliveryType=2 THEN '上门自提' ELSE '' end) '提货类型',(CASE WHEN a.SendStatus=0 THEN '未发货' WHEN a.SendStatus=1 THEN '已发货' WHEN a.SendStatus=2 THEN '已退货' ELSE '' end) '发货状态',d.ProductName '商品名称',a.BuyCount '下单数量',d.TotalPrice '商品单价',d.NormDetail '商品规格',a.StoreContact '仓库联系人',(CASE WHEN a.StoreType=0 THEN '总仓' WHEN a.StoreType=1 THEN '分仓' ELSE '' end) '仓库类型',e.MakerCode '仓库归属创客编号',e.RealName '仓库归属创客姓名',(CASE WHEN a.PayStatus=0 THEN '未支付' WHEN a.PayStatus=1 THEN '支付成功' WHEN a.PayStatus=2 THEN '支付失败' WHEN a.PayStatus=3 THEN '支付锁定中' WHEN a.PayStatus=4 THEN '支付处理中' ELSE '' end) '支付状态',a.Remark '订单备注' FROM Orders a LEFT JOIN Users b ON a.UserId=b.Id LEFT JOIN StoreHouse c ON a.StoreId=c.Id LEFT JOIN OrderProduct d ON a.Id=d.OrderId LEFT JOIN Users e ON a.StoreUserId=e.Id" + SqlString + ")aa LEFT JOIN Users bb ON aa.TopId = bb.Id";
+            var Sql = "SELECT aa.*,bb.MakerCode '顶级创客编号',bb.RealName '顶级创客姓名' FROM(SELECT b.Id '创客Id',b.MakerCode '创客编号',b.RealName '创客真实姓名',a.OrderNo '订单号',SUBSTRING_INDEX(SUBSTRING_INDEX(b.ParentNav,',',4),',',-1) TopId,a.Mobile '手机号',a.RealName '姓名',a.TotalPrice '总价',a.Areas '所在地区',a.Address '详细地址',a.ErpName '物流名称',a.ErpCode '运单号',DATE_FORMAT(a.SendDate,'%Y-%m-%d %H:%i:%s') '发货时间',(CASE WHEN a.PayMode=1 THEN '支付宝' WHEN a.PayMode=2 THEN '微信' WHEN a.PayMode=3 THEN '账户余额' ELSE '' end) '支付方式',DATE_FORMAT(a.PayDate,'%Y-%m-%d %H:%i:%s') '支付时间',a.TradeNo '支付交易号',c.StoreNo '仓库编号',c.StoreName '仓库名称',(CASE WHEN a.RefundStatus=0 THEN '未退款' WHEN a.RefundStatus=1 THEN '已退款' end) '退款状态',(CASE WHEN a.DeliveryType=1 THEN '邮寄到付' WHEN a.DeliveryType=2 THEN '上门自提' ELSE '' end) '提货类型',(CASE WHEN a.SendStatus=0 THEN '未发货' WHEN a.SendStatus=1 THEN '已发货' WHEN a.SendStatus=2 THEN '已退货' ELSE '' end) '发货状态',d.ProductName '商品名称',a.BuyCount '下单数量',d.TotalPrice '商品单价',d.NormDetail '商品规格',a.StoreContact '仓库联系人',(CASE WHEN a.StoreType=0 THEN '总仓' WHEN a.StoreType=1 THEN '分仓' ELSE '' end) '仓库类型',e.MakerCode '仓库归属创客编号',e.RealName '仓库归属创客姓名',(CASE WHEN a.PayStatus=0 THEN '未支付' WHEN a.PayStatus=1 THEN '支付成功' WHEN a.PayStatus=2 THEN '支付失败' WHEN a.PayStatus=3 THEN '支付锁定中' WHEN a.PayStatus=4 THEN '支付处理中' ELSE '' end) '支付状态',a.Remark '订单备注' FROM Orders a LEFT JOIN Users b ON a.UserId=b.Id LEFT JOIN StoreHouse c ON a.StoreId=c.Id LEFT JOIN OrderProduct d ON a.Id=d.OrderId LEFT JOIN Users e ON a.StoreUserId=e.Id" + SqlString + ")aa LEFT JOIN Users bb ON aa.TopId = bb.Id";
             var sysAdmin = bsdb.SysAdmin.FirstOrDefault(m => m.AdminName == SysUserName && m.Status > -1);
             var FileName = "商城订单记录" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
             string SendData = "{\"Operater\":\"" + sysAdmin.Id + "\",\"SqlString\":\"" + Sql + "\",\"FileName\":\"" + FileName + "\",\"MaxCount\":\"0\"}";

Areas/Admin/Controllers/MainServer/PreSendStockDetailController.cs

@@ -399,6 +399,85 @@ namespace MySystem.Areas.Admin.Controllers
         }
         #endregion
 
+
+        #region 快捷导出Excel
+        public IActionResult QuickExportExcel(string right)
+        {
+            ViewBag.RightInfo = RightInfo;
+            ViewBag.right = right;
+
+            return View();
+        }
+
+        [HttpPost]
+        public string QuickExportExcelDo(string SnNo, string CreateDateData, string ApplyDateData, string BrandIdSelect, string ToUserIdMakerCode, string ToUserIdRealName, string FromUserIdMakerCode, string FromUserIdRealName, string FromStoreIdStoreNo, string FromStoreIdStoreName)
+        {
+
+            string SqlString = " and Status>-1";
+            //机具SN
+            if (!string.IsNullOrEmpty(SnNo))
+            {
+                SqlString += " and SnNo='" + SnNo + "'";
+            }
+            if (!string.IsNullOrEmpty(CreateDateData))
+            {
+                string[] datelist = CreateDateData.Split(new string[] { " - " }, StringSplitOptions.None);
+                string start = datelist[0];
+                string end = datelist[1];
+                SqlString += " and CreateDate>='" + start + " 00:00:00' and CreateDate<='" + end + " 23:59:59'";
+            }
+            if (!string.IsNullOrEmpty(ApplyDateData))
+            {
+                string[] datelist = ApplyDateData.Split(new string[] { " - " }, StringSplitOptions.None);
+                string start = datelist[0];
+                string end = datelist[1];
+                SqlString += " and ApplyDate>='" + start + " 00:00:00' and ApplyDate<='" + end + " 23:59:59'";
+            }
+            //产品类型
+            if (!string.IsNullOrEmpty(BrandIdSelect))
+            {
+                SqlString += " and BrandId=" + BrandIdSelect;
+            }
+            //收货人创客编号
+            if (!string.IsNullOrEmpty(ToUserIdMakerCode))
+            {
+                SqlString += " and ToUserId in (select UserId from UserForMakerCode where MakerCode='" + ToUserIdMakerCode + "')";
+            }
+            //收货人真实姓名
+            if (!string.IsNullOrEmpty(ToUserIdRealName))
+            {
+                SqlString += " and ToUserId in (select UserId from UserForRealName where RealName='" + ToUserIdRealName + "')";
+            }
+            //出货创客编号
+            if (!string.IsNullOrEmpty(FromUserIdMakerCode))
+            {
+                SqlString += " and FromUserId in (select UserId from UserForMakerCode where MakerCode='" + FromUserIdMakerCode + "')";
+            }
+            //出货创客真实姓名
+            if (!string.IsNullOrEmpty(FromUserIdRealName))
+            {
+                SqlString += " and FromUserId in (select UserId from UserForRealName where RealName='" + FromUserIdRealName + "')";
+            }
+            //出货仓库编号
+            if (!string.IsNullOrEmpty(FromStoreIdStoreNo))
+            {
+                SqlString += " and FromStoreId in (select StoreId from StoreForCode where Code='" + FromStoreIdStoreNo + "')";
+            }
+            //出货仓库名称
+            if (!string.IsNullOrEmpty(FromStoreIdStoreName))
+            {
+                SqlString += " and FromStoreId in (select StoreId from StoreForName where Name='" + FromStoreIdStoreName + "')";
+            }
+            var Sql = "SELECT a.CreateDate '创建时间',b.`Name` '产品类型',a.SnNo 'SN编号',c.MakerCode '收货创客编号',c.RealName '收货创客姓名',(CASE WHEN a.ApplyFlag=1 THEN '是' ELSE '否' END) '申请标记',a.ApplyDate '申请时间',d.MakerCode '出货创客编号',d.RealName '出货创客姓名',e.StoreNo '出货仓库编号',e.StoreName '收货仓库名称',(CASE WHEN a.CancelFlag=1 THEN '是' ELSE '否' END) '撤回标记',a.CancelDate '撤回时间',(CASE WHEN a.WithholdFlag=1 THEN '是' ELSE '否' END) '预扣标记' FROM(SELECT * FROM PreSendStockDetail WHERE 1=1 " + SqlString + ")a LEFT JOIN(SELECT Id,`Name` from KqProducts)b ON a.BrandId=b.Id LEFT JOIN(SELECT Id,MakerCode,RealName FROM Users)c ON a.ToUserId=c.Id LEFT JOIN(SELECT Id,MakerCode,RealName FROM Users)d ON a.FromUserId=d.Id LEFT JOIN(SELECT Id,StoreNo,StoreName FROM StoreHouse)e ON a.FromStoreId=e.Id" + SqlString;
+            var sysAdmin = bsdb.SysAdmin.FirstOrDefault(m => m.AdminName == SysUserName && m.Status > -1);
+            var FileName = "小分仓记录" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
+            string SendData = "{\"Operater\":\"" + sysAdmin.Id + "\",\"SqlString\":\"" + Sql + "\",\"FileName\":\"" + FileName + "\",\"MaxCount\":\"0\"}";
+            RedisDbconn.Instance.AddList("ExportQueue", SendData);
+            return "success";
+        }
+        #endregion
+
+
         #region 导入数据
         /// <summary>
         /// 导入数据
@@ -678,7 +757,7 @@ namespace MySystem.Areas.Admin.Controllers
                                 userAccount.ValidAmount -= amount;//扣减分仓可用额度
                             }
                         }
-                        
+
                         RedisDbconn.Instance.AddList("PreWithholdQueue", "{\"UserId\":\"" + query.ToUserId + "\",\"SnNo\":\"" + query.SnNo + "\"}");
 
                         string text = string.Format("创客-首页-仓库管理-小分仓-撤回，UserId: '" + query.FromUserId + "'，ToUserId: '" + smallStoreHouse.UserId + "'，LaveNum：'" + smallStoreHouse.LaveNum + "'，TotalNum：'" + smallStoreHouse.TotalNum + "'，ChangeCount：'" + 1 + "'，Time'" + DateTime.Now + "'");

Areas/Admin/Controllers/OperateServer/SysAdminOperateController.cs

@@ -623,7 +623,7 @@ namespace MySystem.Areas.Admin.Controllers
         #region 修改运营中心未使用额度
 
         [HttpPost]
-        public string EditAmt(SysAdmin data, string OperationAmount, string Note, int Kind)
+        public string EditAmt(SysAdmin data, string OperationAmount, string Note, int Kind, int ReturnFlag)
         {
             var sysAdmin = opdb.SysAdmin.FirstOrDefault(m => m.Id == data.Id);
             var account = opdb.UserAccount.FirstOrDefault(m => m.UserId == sysAdmin.UserId);
@@ -641,6 +641,7 @@ namespace MySystem.Areas.Admin.Controllers
             //增加
             else if (Kind == 2)
             {
+                sysAdmin.ReturnAmount = decimal.Parse(OperationAmount);
                 account.TotalAmt += decimal.Parse(OperationAmount);
                 OperateType = 1;//系统增加
                 description = "系统增加";
@@ -665,6 +666,10 @@ namespace MySystem.Areas.Admin.Controllers
             opdb.SaveChanges();
             AddSysLog(data.Id.ToString(), "SysAdmin", "EditAmt");
             opdb.SaveChanges();
+            if (Kind == 2 && ReturnFlag == 1)
+            {
+                RedisDbconn.Instance.AddList("OperateAddServiceQueue", sysAdmin.Id.ToString());
+            }
             return "success";
         }
 
@@ -687,7 +692,7 @@ namespace MySystem.Areas.Admin.Controllers
         #region 修改运营中心可提现额度
 
         [HttpPost]
-        public string EditBalance(SysAdmin data, string OperationAmount, string Note, int Kind, int ReturnFlag)
+        public string EditBalance(SysAdmin data, string OperationAmount, string Note, int Kind)
         {
             var sysAdmin = opdb.SysAdmin.FirstOrDefault(m => m.Id == data.Id);
             var account = opdb.UserAccount.FirstOrDefault(m => m.UserId == sysAdmin.UserId);
@@ -710,7 +715,6 @@ namespace MySystem.Areas.Admin.Controllers
             }
             else if (Kind == 2)
             {
-                sysAdmin.ReturnAmount = decimal.Parse(OperationAmount);
                 account.ValidForGetAmount += decimal.Parse(OperationAmount);
                 OperateType = 1;
                 description = "系统增加";
@@ -732,11 +736,6 @@ namespace MySystem.Areas.Admin.Controllers
                 OperateType = OperateType,//操作类别
             }).Entity;
             opdb.SaveChanges();
-            // if(Kind == 2 && ReturnFlag == "1")
-            if (Kind == 2 && ReturnFlag == 1)
-            {
-                RedisDbconn.Instance.AddList("OperateAddServiceQueue", sysAdmin.Id.ToString());
-            }
             AddSysLog(data.Id.ToString(), "SysAdmin", "EditBalance");
             opdb.SaveChanges();
             return "success";

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

@@ -158,6 +158,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 + "_export,"))
+                        {
+                            <button class="layui-btn" data-type="ExportExcel"><i
+                                    class="layui-icon layui-icon-export layuiadmin-button-btn"></i>导出</button>
+                        }
                     </div>
                 </div>
             </div>
@@ -174,12 +179,6 @@
                         <button class="layui-btn" data-type="batchdel"><i
                             class="layui-icon layui-icon-delete layuiadmin-button-btn"></i>删除</button>
                     }
-                    @if (RightInfo.Contains("," + right + "_edit,"))
-                    {
-                        <button class="layui-btn" data-type="ExportExcel"><i
-                            class="layui-icon layui-icon-export layuiadmin-button-btn"></i>导出</button>
-
-                    }
                 </div>
 
                 <table id="LAY-list-manage" lay-filter="LAY-list-manage"></table>

Areas/Admin/Views/OperateServer/SysAdminOperate/EditAmt.cshtml

@@ -48,6 +48,13 @@
                             </div>
                         </div>
                     </div>
+                    <div class="layui-form-item" id="ReturnInfo" style="display: none;>
+                        <label class="layui-form-label">向上返额度</label>
+                        <div class="layui-input-block">
+                            <input type="checkbox" id="ReturnFlag" name="ReturnFlag" value="1"
+                                lay-skin="switch" lay-filter="ReturnFlag" title="开关">
+                        </div>
+                    </div>
                     <div class="layui-form-item">
                         <label class="layui-form-label">*金额</label>
                         <div class="layui-input-inline">
@@ -97,6 +104,17 @@
                 location.hash = 'test=' + $(this).attr('lay-id');
             });
 
+            form.on('select(Kind)', function (data) {
+                if(data.value == '2') {
+                    $('#ReturnInfo').show();
+                }
+                else
+                {
+                    $('#ReturnInfo').hide();
+                }
+                form.render();
+            });
+
             //日期
 
             //上传文件

Areas/Admin/Views/OperateServer/SysAdminOperate/EditBalance.cshtml

@@ -46,13 +46,6 @@
                             </select>
                         </div>
                     </div>
-                    <div class="layui-form-item" id="ReturnInfo" style="display: none;>
-                        <label class="layui-form-label">向上返额度</label>
-                        <div class="layui-input-block">
-                            <input type="checkbox" id="ReturnFlag" name="ReturnFlag" value="1"
-                                lay-skin="switch" lay-filter="ReturnFlag" title="开关">
-                        </div>
-                    </div>
                     <div class="layui-form-item">
                         <label class="layui-form-label">*金额</label>
                         <div class="layui-input-inline">
@@ -102,19 +95,6 @@
                 location.hash = 'test=' + $(this).attr('lay-id');
             });
 
-            
-            form.on('select(Kind)', function (data) {
-                if(data.value == '2') {
-                    $('#ReturnInfo').show();
-                    $('#ContentDiv').hide();
-                }
-                else
-                {
-                    $('#ReturnInfo').hide();
-                }
-                form.render();
-            });
-
             //日期
 
             //上传文件

wwwroot/layuiadmin/modules_main/LeaderReserveRecord_Admin.js

@@ -102,8 +102,8 @@ layui.config({
             , { field: 'SeoKeyword', width: 200, title: '订单编号', sort: true }
             , { field: 'dPosCoupons', width: 150, title: '电签兑换券', sort: true }
             , { field: 'bPosCoupons', width: 150, title: '大POS兑换券', sort: true }
-            , { field: 'LeaderBalanceAmount', width: 130, title: '当前可提现余额', sort: true }
-            , { field: 'AfterBalanceAmount', width: 130, title: '变化后可提现余额', sort: true }
+            , { field: 'LeaderBalanceAmount', width: 150, title: '当前可提现余额', sort: true }
+            , { field: 'AfterBalanceAmount', width: 200, title: '变化后可提现余额', sort: true }
             , { field: 'ChangeAmt', width: 130, title: '使用额度', sort: true }
             , { field: 'BeforeAmt', width: 180, title: '使用前剩余额度', sort: true }
             , { field: 'AfterAmt', width: 180, title: '使用后剩余额度', sort: true }

wwwroot/layuiadmin/modules_main/Orders_Admin.js

@@ -154,6 +154,7 @@ layui.config({
             , { field: 'TotalPrice', width: 200, title: '订单金额', sort: true }
             , { field: 'BuyCount', width: 200, title: '购买数量', sort: true }
             , { field: 'UserInfo', width: 200, title: '创客信息', sort: true }
+            , { field: 'UserId', width: 100, title: '创客Id', sort: true }
             , { field: 'Store', width: 200, title: '发货仓库信息', sort: true }
             , { field: 'StoreContact', width: 200, title: '仓库联系人信息', sort: true }
             , { field: 'StoreFrom', width: 200, title: '仓库归属信息', sort: true }

wwwroot/layuiadmin/modules_main/PreSendStockDetail_Admin.js

@@ -390,15 +390,34 @@ layui.config({
             $(".layuiadmin-card-header-auto select").each(function (i) {
                 userdata += $(this).attr('name') + '=' + encodeURIComponent($(this).val()) + '&';
             });
-            $.ajax({
-                type: "GET",
-                url: "/Admin/PreSendStockDetail/ExportExcel?r=" + Math.random(1),
-                data: userdata,
-                dataType: "json",
-                success: function (data) {
-                    data.Obj.unshift(data.Fields);
-                    excel.exportExcel(data.Obj, data.Info, 'xlsx');
-                }
+            var index = layer.confirm('确定导出吗？', function (index) {
+                var indexs = layer.load(1, {
+                    shade: [0.5, '#000']
+                });
+                $.ajax({
+                    // type: "GET",
+                    // url: "/Admin/PreSendStockDetail/ExportExcel?r=" + Math.random(1),
+                    type: "POST",
+                    url: "/Admin/PreSendStockDetail/QuickExportExcelDo?r=" + Math.random(1),
+                    data: userdata,
+                    dataType: "text",
+                    success: function (data) {
+                        layer.close(index); //关闭弹层
+                        if (data == "success") {
+                            layer.close(indexs); //关闭弹层
+                            layer.msg('导出成功，请到我的下载中点击下载文件', {
+                                time: 1000
+                            }, function () {
+                                window.location.reload();
+                            });
+                        } else {
+                            layer.close(indexs); //关闭弹层
+                            layer.msg(data);
+                        }
+                        // data.Obj.unshift(data.Fields);
+                        // excel.exportExcel(data.Obj, data.Info, 'xlsx');
+                    }
+                });
             });
         }
         , Open: function () {

wwwroot/layuiadmin/modules_operate/AmountRecord_Admin.js

@@ -100,13 +100,14 @@ layui.config({
             , { field: 'BeforeAmount', width: 130, title: '交易前总金额', sort: true }
             , { field: 'AfterAmount', width: 130, title: '交易后总金额', sort: true }
             , { field: 'CreateDate', width: 180, title: '交易时间', sort: true }
-            , { field: 'SourceInfo', width: 150, title: '来源创客信息', sort: true }
+            , { field: 'SourceInfo', width: 200, title: '来源创客信息', sort: true }
         ]]
         , where: {
         }
         , page: true
         , limit: 30
-        , height: 'full-' + String($('.layui-card-header').height() + 130)
+        , height: 'full-220'
+        // , height: 'full-' + String($('.layui-card-header').height() + 130)
         , text: '对不起，加载出现异常！'
         , done: function (res, curr, count) {
             $(".layui-none").text("无数据");

wwwroot/layuiadmin/modules_operate/SysAdminOperate_Admin.js

@@ -250,6 +250,7 @@ layui.config({
                                             table.reload('LAY-list-manage'); //数据刷新
                                         });
                                     } else {
+                                        layer.close(loadindex); //关闭弹层
                                         layer.msg(data);
                                     }
                                 }
@@ -307,6 +308,7 @@ layui.config({
                                             table.reload('LAY-list-manage'); //数据刷新
                                         });
                                     } else {
+                                        layer.close(loadindex); //关闭弹层
                                         layer.msg(data);
                                     }
                                 }
@@ -366,7 +368,8 @@ layui.config({
                                 if (data == "success") {
                                     table.reload('LAY-list-manage'); //数据刷新
                                 } else {
-                                    layer.msg(data);
+                                        layer.close(loadindex); //关闭弹层
+                                        layer.msg(data);
                                 }
                             }
                         });
@@ -476,7 +479,8 @@ layui.config({
                                         table.reload('LAY-list-manage'); //数据刷新
                                     });
                                 } else {
-                                    layer.msg(data);
+                                        layer.close(loadindex); //关闭弹层
+                                        layer.msg(data);
                                 }
                             }
                         });