调整商城订单状态和功能按钮文字

Areas/Admin/Controllers/MainServer/OrdersController.cs

@@ -223,11 +223,11 @@ namespace MySystem.Areas.Admin.Controllers
 
                 //订单状态
                 int Status = int.Parse(dic["Status"].ToString());
-                if (Status == -1) dic["Status"] = "已取消";
-                if (Status == 1) dic["Status"] = "已支付";
-                if (Status == 2) dic["Status"] = "已完成";
-                if (Status == 3) dic["Status"] = "已发货";
-                if (Status == 4) dic["Status"] = "已退款";
+                if (Status == -1) dic["StatusName"] = "已取消";
+                if (Status == 1) dic["StatusName"] = "待发货";
+                if (Status == 2) dic["StatusName"] = "已完成";
+                if (Status == 3) dic["StatusName"] = "已发货";
+                if (Status == 4) dic["StatusName"] = "已退款";
 
                 //物流名称
                 dic["ErpName"] = RelationClass.GetErpCompanysInfo(dic["ErpName"].ToString());
@@ -288,7 +288,11 @@ namespace MySystem.Areas.Admin.Controllers
 
                 //退款时间
                 var orderRefund = db.OrderRefund.FirstOrDefault(m => m.OrderId == Id) ?? new OrderRefund();
-                dic["RefundDate"] = orderRefund.CreateDate.Value.ToString("yyyy-MM-dd HH:mm:ss");
+                dic["RefundDate"] = "";
+                if (orderRefund.Id > 0)
+                {
+                    dic["RefundDate"] = orderRefund.CreateDate.Value.ToString("yyyy-MM-dd HH:mm:ss");
+                }
 
                 //仓库归属创客
                 int StoreUserId = int.Parse(function.CheckInt(dic["StoreUserId"].ToString()));

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

@@ -166,7 +166,7 @@
                             <select id="StatusSelect" name="StatusSelect" lay-search="">
                                 <option value="">全部...</option>
                                 <option value="-1">已取消</option>
-                                <option value="1">已支付</option>
+                                <option value="1">待发货</option>
                                 <option value="2">已完成</option>
                                 <option value="3">已发货</option>
                                 <option value="4">已退款</option>
@@ -284,14 +284,14 @@
                     <a class="layui-btn layui-btn-warm layui-btn-xs" lay-event="detail"><i class="layui-icon layui-icon-read"></i>详情</a>
                     @if (RightInfo.Contains("," + right + "_send,"))
                     {
-                        @Html.Raw("{{#if (d.SendStatus == 0 && d.RefundStatus == 0 && d.PayStatus == 1 && d.Sort == 0 && d.TotalPrice > 0){ }}")
+                        @Html.Raw("{{#if (d.Status == 1){ }}")
                             <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 && 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="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>*@

wwwroot/layuiadmin/modules_main/Orders_Admin.js

@@ -147,7 +147,7 @@ layui.config({
             { type: 'checkbox', fixed: 'left' }
             , { field: 'Id', fixed: 'left', title: 'ID', width: 80, sort: true, unresize: true }
             // , { field: 'SendInfo', width: 200, title: '发货状态-发货时间', sort: true }
-            , { field: 'Status', width: 200, title: '订单状态', sort: true }
+            , { field: 'StatusName', width: 200, title: '订单状态', sort: true }
             , { field: 'OrderNo', width: 200, title: '平台订单号-渠道订单号', sort: true }
             , { field: 'ProductName', width: 200, title: '商品名称', sort: true }
             , { field: 'ProductKind', width: 200, title: '商品类型', sort: true }