添加退款功能限制

Areas/Admin/Controllers/MainServer/OrdersController.cs

@@ -561,6 +561,10 @@ namespace MySystem.Areas.Admin.Controllers
                 {
                     return "该订单不符合退货规则！";
                 }
+                else if (order.TotalPrice < decimal.Parse(data.RefundActAmount.ToString()) || decimal.Parse(data.RefundActAmount.ToString()) < 0)
+                {
+                    return "退款金额和订单金额不符！";
+                }
                 else
                 {
                     // order.UpdateDate = DateTime.Now;
@@ -570,7 +574,7 @@ namespace MySystem.Areas.Admin.Controllers
                     order.RefundReason = data.RefundReason;
                     order.RefundActAmount = data.RefundActAmount;
                     db.SaveChanges();
-                    string SendData = "{\"OrderId\":\"" + data.Id + "\"}";
+                    string SendData = "{\"OrderId\":\"" + data.Id + "\",\"Operator\":\"" + SysUserName + "_" + SysRealName + "\",\"Amount\":\"" + data.RefundActAmount + "\"}";
                     RedisDbconn.Instance.AddList("RefundQueue", SendData);
                 }
             }

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

@@ -70,54 +70,54 @@
                                 <option value="购机奖励">购机奖励</option>
                             </select>
                         </div>
-                    <div class="layui-inline">
-                        <label class="layui-form-label">订单编号</label>
-                        <div class="layui-input-inline">
-                            <input class="layui-input" type="text" name="SeoKeyword" autocomplete="off">
+                        <div class="layui-inline">
+                            <label class="layui-form-label">订单编号</label>
+                            <div class="layui-input-inline">
+                                <input class="layui-input" type="text" name="SeoKeyword" autocomplete="off">
+                            </div>
                         </div>
-                    </div>
-                    <div class="layui-inline">
-                        <label class="layui-form-label">创建时间</label>
-                        <div class="layui-input-inline">
-                            <input class="layui-input" type="text" readonly name="CreateDateData" id="CreateDate"
-                                placeholder="" autocomplete="off">
+                        <div class="layui-inline">
+                            <label class="layui-form-label">创建时间</label>
+                            <div class="layui-input-inline">
+                                <input class="layui-input" type="text" readonly name="CreateDateData" id="CreateDate"
+                                    placeholder="" autocomplete="off">
+                            </div>
                         </div>
-                    </div>
 
-                    <div class="layui-inline ml50">
-                        <button class="layui-btn" lay-submit lay-filter="LAY-list-front-search">
-                            <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>查询
-                        </button>
-                        <button class="layui-btn" lay-submit lay-filter="LAY-list-front-searchall">
-                            <i class="layui-icon layui-icon-list layuiadmin-button-btn"></i>全部
-                        </button>
+                        <div class="layui-inline ml50">
+                            <button class="layui-btn" lay-submit lay-filter="LAY-list-front-search">
+                                <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>查询
+                            </button>
+                            <button class="layui-btn" lay-submit lay-filter="LAY-list-front-searchall">
+                                <i class="layui-icon layui-icon-list layuiadmin-button-btn"></i>全部
+                            </button>
+                        </div>
                     </div>
                 </div>
-            </div>
 
-            <div class="layui-card-body">
-                <div style="padding-bottom: 10px;">
-                    @if (RightInfo.Contains("," + right + "_add,"))
-                    {
-                        <button class="layui-btn" data-type="add"><i
-                            class="layui-icon layui-icon-add-1 layuiadmin-button-btn"></i>新增</button>
-                    }
-                    @if (RightInfo.Contains("," + right + "_delete,"))
-                    {
-                        <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 class="layui-card-body">
+                    <div style="padding-bottom: 10px;">
+                        @if (RightInfo.Contains("," + right + "_add,"))
+                        {
+                            <button class="layui-btn" data-type="add"><i
+                                    class="layui-icon layui-icon-add-1 layuiadmin-button-btn"></i>新增</button>
+                        }
+                        @if (RightInfo.Contains("," + right + "_delete,"))
+                        {
+                            <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>
+                        }
+                    </div>
 
-                <table id="LAY-list-manage" lay-filter="LAY-list-manage"></table>
-                <script type="text/html" id="table-list-tools">
-                    @* @if (RightInfo.Contains("," + right + "_edit,"))
+                    <table id="LAY-list-manage" lay-filter="LAY-list-manage"></table>
+                    <script type="text/html" id="table-list-tools">
+                        @* @if (RightInfo.Contains("," + right + "_edit,"))
                     {
                         <a class="layui-btn layui-btn-normal layui-btn-xs" lay-event="edit"><i class="layui-icon layui-icon-edit"></i>编辑</a>
                     }
@@ -130,39 +130,40 @@
 
                     } *@
                 </script>
-            </div>
-        </div>
-    </div>
-    <div id="excelForm" style="display:none; padding:20px;">
-        <div class="layui-tab-item layui-show">
-            <div class="layui-form-item">
-                <label class="layui-form-label">模板下载</label>
-                <div class="layui-form-mid layui-word-aux" id="excelTemp">
                 </div>
             </div>
-            <div class="layui-form-item">
-                <label class="layui-form-label">excel文件</label>
-                <div class="layui-form-mid layui-word-aux">
-                    <div class="layui-upload">
-                        <input type="file" id="ExcelFile" name="ExcelFile" value="">
+        </div>
+        <div id="excelForm" style="display:none; padding:20px;">
+            <div class="layui-tab-item layui-show">
+                <div class="layui-form-item">
+                    <label class="layui-form-label">模板下载</label>
+                    <div class="layui-form-mid layui-word-aux" id="excelTemp">
                     </div>
-                    <div class="mt10" id="ExcelFileList">
+                </div>
+                <div class="layui-form-item">
+                    <label class="layui-form-label">excel文件</label>
+                    <div class="layui-form-mid layui-word-aux">
+                        <div class="layui-upload">
+                            <input type="file" id="ExcelFile" name="ExcelFile" value="">
+                        </div>
+                        <div class="mt10" id="ExcelFileList">
+                        </div>
                     </div>
                 </div>
             </div>
-        </div>
-        <div class="layui-form-item ml10">
-            <div class="layui-input-block">
-                <button type="button" class="layui-btn" onclick="ConfirmImport()">立即导入</button>
+            <div class="layui-form-item ml10">
+                <div class="layui-input-block">
+                    <button type="button" class="layui-btn" onclick="ConfirmImport()">立即导入</button>
+                </div>
             </div>
         </div>
-    </div>
 
-    <script src="/layuiadmin/layui/layui.js"></script>
-    <script src="/layuiadmin/modules_main/LeaderReserveRecord_Admin.js?r=@DateTime.Now.ToString("yyyyMMddHHmmss")"></script>
-    <script>
+        <script src="/layuiadmin/layui/layui.js"></script>
+        <script
+            src="/layuiadmin/modules_main/LeaderReserveRecord_Admin.js?r=@DateTime.Now.ToString("yyyyMMddHHmmss")"></script>
+        <script>
 
-    </script>
+        </script>
 </body>
 
 </html>

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

@@ -1,40 +1,48 @@
 @{
     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">
     <link rel="stylesheet" href="/layuiadmin/style/admin.css" media="all">
     <script src="/admin/js/jquery-1.10.1.min.js"></script>
     <style>
-        .layui-input-inline{
+        .layui-input-inline {
             width: 175px !important;
         }
-        .layui-form-label{
+
+        .layui-form-label {
             width: 115px !important;
         }
-        .layui-inline{
+
+        .layui-inline {
             margin-right: 0px !important;
         }
-        .w100{
+
+        .w100 {
             width: 100px !important;
         }
-        .ml50{
+
+        .ml50 {
             margin-left: 50px !important;
         }
-        tbody .layui-table-cell{
+
+        tbody .layui-table-cell {
             height: 60px !important;
         }
     </style>
 </head>
+
 <body>
     <div class="layui-fluid">
         <div class="layui-card">
@@ -184,7 +192,9 @@
                             </select>
                         </div>
                     </div>
-                    @{Dictionary<string, string> ProductsDic = new MySystem.DictionaryClass().getProductsDic();}
+                    @{
+                        Dictionary<string, string> ProductsDic = new MySystem.DictionaryClass().getProductsDic();
+                    }
                     <div class="layui-inline">
                         <label class="layui-form-label">产品类型</label>
                         <div class="layui-input-inline">
@@ -192,7 +202,7 @@
                                 <option value="">全部...</option>
                                 @foreach (string key in ProductsDic.Keys)
                                 {
-                                <option value="@key">@ProductsDic[key]</option>
+                                    <option value="@key">@ProductsDic[key]</option>
                                 }
                             </select>
                         </div>
@@ -220,7 +230,9 @@
                             </select>
                         </div>
                     </div>
-                    @{Dictionary<string, string> TopUserDic = new MySystem.DictionaryClass().getTopUserDic();}
+                    @{
+                        Dictionary<string, string> TopUserDic = new MySystem.DictionaryClass().getTopUserDic();
+                    }
                     <div class="layui-inline">
                         <label class="layui-form-label">顶级创客</label>
                         <div class="layui-input-inline">
@@ -228,7 +240,7 @@
                                 <option value="">全部...</option>
                                 @foreach (string key in TopUserDic.Keys)
                                 {
-                                <option value="@key">@TopUserDic[key]</option>
+                                    <option value="@key">@TopUserDic[key]</option>
                                 }
                             </select>
                         </div>
@@ -242,7 +254,8 @@
                         </button>
                         @if (RightInfo.Contains("," + right + "_export,"))
                         {
-                        <button class="layui-btn" data-type="ExportsExcel"><i class="layui-icon layui-icon-export layuiadmin-button-btn"></i>导出</button>
+                            <button class="layui-btn" data-type="ExportsExcel"><i
+                                    class="layui-icon layui-icon-export layuiadmin-button-btn"></i>导出</button>
                         }
                     </div>
                 </div>
@@ -250,7 +263,8 @@
 
             <div class="layui-card-body">
                 <blockquote class="layui-elem-quote layui-text">
-                    支付成功总金额(元)：<span style="color: #f00;" id="SuccessAmount">0.00</span>　|　支付失败总金额(元)：<span style="color: #f00;" id="FailAmount">0.00</span>
+                    支付成功总金额(元)：<span style="color: #f00;" id="SuccessAmount">0.00</span>　|　支付失败总金额(元)：<span
+                        style="color: #f00;" id="FailAmount">0.00</span>
                 </blockquote>
                 <table id="LAY-list-manage" lay-filter="LAY-list-manage"></table>
                 <script type="text/html" id="table-list-tools">
@@ -258,13 +272,13 @@
                     @if (RightInfo.Contains("," + right + "_send,"))
                     {
                         @Html.Raw("{{#if (d.SendStatus == 0 && d.RefundStatus == 0 && d.PayStatus == 1 && d.Sort == 0 && d.TotalPrice > 0){ }}")
-                        <a class="layui-btn layui-btn-normal layui-btn-xs" lay-event="send"><i class="layui-icon layui-icon-edit"></i>发货</a>
+                            <a class="layui-btn layui-btn-normal layui-btn-xs" lay-event="send"><i class="layui-icon layui-icon-edit"></i>发货</a>
                         @("{{#} }}")
                     }
                     @if (RightInfo.Contains("," + right + "_return,"))
                     {
-                        @Html.Raw("{{#if (d.RefundStatus == 0 && d.PayStatus == 1){ }}")
-                        <a class="layui-btn layui-btn-normal layui-btn-xs" lay-event="return"><i class="layui-icon layui-icon-edit"></i>退货</a>
+                        @Html.Raw("{{#if (d.RefundStatus == 0 && d.PayStatus == 1 && d.Sort == 0 && d.TotalPrice > 0){ }}")
+                            <a class="layui-btn layui-btn-normal layui-btn-xs" lay-event="return"><i class="layui-icon layui-icon-edit"></i>退货</a>
                         @("{{#} }}")
                     }
                     @*<a class="layui-btn layui-btn-normal layui-btn-xs" lay-event="prize100"><i class="layui-icon layui-icon-edit"></i>查看推荐奖</a>*@
@@ -276,7 +290,8 @@
     <script src="/layuiadmin/layui/layui.js"></script>
     <script src="/layuiadmin/modules_main/Orders_Admin.js?r=@DateTime.Now.ToString("yyyyMMddHHmmss")"></script>
     <script>
-        
+
     </script>
 </body>
+
 </html>