Merge branch 'feature-dgy-订单驳回' into DuGuYang

Areas/Admin/Controllers/MainServer/MachineApplyController.cs

@@ -65,7 +65,7 @@ namespace MySystem.Areas.Admin.Controllers
             Fields.Add("SwapSnExpand", "1"); //兑换SN
             Fields.Add("SendSn", "1"); //发货SN
 
-            string condition = " and Status>-1";
+            string condition = " and Status>=-1";
             //申请单号
             if (!string.IsNullOrEmpty(ApplyNo))
             {
@@ -166,6 +166,7 @@ namespace MySystem.Areas.Admin.Controllers
 
                 //订单状态
                 int Status = int.Parse(dic["Status"].ToString());
+                if(Status == -1) dic["StatusName"] = "已驳回";
                 if(Status == 0) dic["StatusName"] = "待审核";
                 if(Status == 1) dic["StatusName"] = "申请成功";
                 if(Status == 2) dic["StatusName"] = "申请失败";
@@ -178,6 +179,7 @@ namespace MySystem.Areas.Admin.Controllers
 
                 //发货状态
                 int SendStatus = int.Parse(dic["Status"].ToString());
+                if(SendStatus == -1) dic["SendStatus"] = "已驳回";
                 if(SendStatus == 0) dic["SendStatus"] = "未发货";
                 if(SendStatus == 1) dic["SendStatus"] = "已发货";
                 
@@ -187,12 +189,12 @@ namespace MySystem.Areas.Admin.Controllers
             Dictionary<string, object> other = new Dictionary<string, object>();
             int ApplyCount = 0;//申请机具数
             int SendCount = 0;//发货机具数
-            DataTable dt = OtherMySqlConn.dtable("select sum(ApplyDeviceNum) from MachineApply where SendStatus=0" + condition);
+            DataTable dt = OtherMySqlConn.dtable("select sum(ApplyDeviceNum) from MachineApply where 1=1" + condition);
             if (dt.Rows.Count > 0)
             {
                 ApplyCount = int.Parse(function.CheckNum(dt.Rows[0][0].ToString()));
             }
-            dt = OtherMySqlConn.dtable("select sum(ApplyDeviceNum) from MachineApply where SendStatus=1" + condition);
+            dt = OtherMySqlConn.dtable("select sum(ApplyDeviceNum) from MachineApply where Status=1" + condition);
             if (dt.Rows.Count > 0)
             {
                 SendCount = int.Parse(function.CheckNum(dt.Rows[0][0].ToString()));

Areas/Admin/Controllers/MainServer/OrdersController.cs

@@ -70,7 +70,7 @@ namespace MySystem.Areas.Admin.Controllers
             Fields.Add("TopUserId", "0");
 
 
-            string condition = " and Status>-1";
+            string condition = " and Status>=-1";
             //平台订单号
             if (!string.IsNullOrEmpty(OrderNo))
             {
@@ -242,6 +242,7 @@ namespace MySystem.Areas.Admin.Controllers
                 if (DeliveryType == 0) dic["DeliveryType"] = "";
                 //发货状态
                 int SendStatus = int.Parse(dic["SendStatus"].ToString());
+                if (SendStatus == -1) dic["SendStatusName"] = "已驳回";
                 if (SendStatus == 0) dic["SendStatusName"] = "未发货";
                 if (SendStatus == 1) dic["SendStatusName"] = "已发货";
                 if (SendStatus == 2) dic["SendStatusName"] = "已退货";
@@ -283,12 +284,12 @@ namespace MySystem.Areas.Admin.Controllers
             Dictionary<string, object> other = new Dictionary<string, object>();
             string SuccessAmount = "0.00";//支付成功总金额
             string FailAmount = "0.00";//支付失败总金额
-            DataTable dt = OtherMySqlConn.dtable("select sum(TotalPrice) from Orders where PayStatus=1" + condition);
+            DataTable dt = OtherMySqlConn.dtable("select sum(TotalPrice) from Orders where PayStatus=1 and Status>-1" + condition);
             if (dt.Rows.Count > 0)
             {
                 SuccessAmount = decimal.Parse(function.CheckNum(dt.Rows[0][0].ToString())).ToString("f2");
             }
-            dt = OtherMySqlConn.dtable("select sum(TotalPrice) from Orders where PayStatus=2" + condition);
+            dt = OtherMySqlConn.dtable("select sum(TotalPrice) from Orders where PayStatus=2 and Status>-1" + condition);
             if (dt.Rows.Count > 0)
             {
                 FailAmount = decimal.Parse(function.CheckNum(dt.Rows[0][0].ToString())).ToString("f2");

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

@@ -169,6 +169,7 @@
                         <div class="layui-input-inline">
                             <select id="StatusSelect" name="StatusSelect" lay-search="">
                                 <option value="">全部...</option>
+                                <option value="-1">已驳回</option>
                                 <option value="0">待审核</option>
                                 <option value="1">申请成功</option>
                                 <option value="2">申请失败</option>

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

@@ -177,6 +177,7 @@
                         <div class="layui-input-inline">
                             <select id="SendStatusSelect" name="SendStatusSelect" lay-search="">
                                 <option value="">全部...</option>
+                                <option value="-1">已驳回</option>
                                 <option value="0">未发货</option>
                                 <option value="1">已发货</option>
                                 <option value="2">已退货</option>