DuGuYang 3 gadi atpakaļ
vecāks
revīzija
ef8f713cf6

+ 1 - 3
AppStart/Helper/TimeOutPosChargeService.cs

@@ -39,10 +39,8 @@ namespace MySystem
                             WebCMSEntities db = new WebCMSEntities();
                             var date = DateTime.Now.AddDays(-15).ToString("yyyy-MM-dd 00:00:00");//过期限制时间
                             var time = DateTime.Parse(date);//过期限制时间
-                            // DataTable dt = CustomerSqlConn.dtable("SELECT BuyUserId FROM PosMachinesTwo WHERE `Status`>-1 AND BuyUserId>0 AND BindingState=0 AND ActivationState=0 AND RecycEndDate <'" + date + "' GROUP BY BuyUserId", MysqlConn.connstr);//扣费创客
-                            // var query = db.PosMachinesTwo.Where(m => m.Status > -1 && m.BuyUserId > 0 && m.BindingState == 0 && m.ActivationState == 0 && m.RecycEndDate < time).ToList();//循环过期超过15天机具
 
-                            DataTable dt = CustomerSqlConn.dtable("SELECT BuyUserId FROM PosMachinesTwo WHERE `Status`>-1 AND BuyUserId>0 AND BuyUserId IN(126,153,190,200,276) AND BindingState=0 AND ActivationState=0 AND RecycEndDate <'" + date + "' GROUP BY BuyUserId", MysqlConn.connstr);//扣费创客
+                            DataTable dt = CustomerSqlConn.dtable("SELECT BuyUserId FROM PosMachinesTwo WHERE `Status`>-1 AND BuyUserId>0 AND BindingState=0 AND ActivationState=0 AND RecycEndDate <'" + date + "' GROUP BY BuyUserId", MysqlConn.connstr);//扣费创客
                             var query = db.PosMachinesTwo.Where(m => m.Status > -1 && m.BuyUserId > 0 && m.BindingState == 0 && m.ActivationState == 0 && m.RecycEndDate < time).ToList();//循环过期超过15天机具
                             var brandInfo = db.KqProducts.ToList();
                             foreach (DataRow item in dt.Rows)

+ 1 - 3
AppStart/Helper/TimeOutPosSendMessageService.cs

@@ -39,10 +39,8 @@ namespace MySystem
                             WebCMSEntities db = new WebCMSEntities();
                             var date = DateTime.Now.AddDays(-10).ToString("yyyy-MM-dd 00:00:00");//过期限制时间
                             var time = DateTime.Parse(date);//过期限制时间
-                            // DataTable dt = CustomerSqlConn.dtable("SELECT BuyUserId FROM PosMachinesTwo WHERE `Status`>-1 AND BuyUserId>0 AND BindingState=0 AND ActivationState=0 AND RecycEndDate <'" + date + "' GROUP BY BuyUserId", MysqlConn.connstr);//消息推送创客
-                            // var query = db.PosMachinesTwo.Where(m => m.Status > -1 && m.BuyUserId > 0 && m.BindingState == 0 && m.ActivationState == 0 && m.RecycEndDate < time).ToList();//循环过期超过10天机具
 
-                            DataTable dt = CustomerSqlConn.dtable("SELECT BuyUserId FROM PosMachinesTwo WHERE `Status`>-1 AND BuyUserId>0 AND BuyUserId IN(126,153,190,200,276) AND BindingState=0 AND ActivationState=0 AND RecycEndDate <'" + date + "' GROUP BY BuyUserId", MysqlConn.connstr);//消息推送创客
+                            DataTable dt = CustomerSqlConn.dtable("SELECT BuyUserId FROM PosMachinesTwo WHERE `Status`>-1 AND BuyUserId>0 AND BindingState=0 AND ActivationState=0 AND RecycEndDate <'" + date + "' GROUP BY BuyUserId", MysqlConn.connstr);//消息推送创客
                             var query = db.PosMachinesTwo.Where(m => m.Status > -1 && m.BuyUserId > 0 && m.BindingState == 0 && m.ActivationState == 0 && m.RecycEndDate < time).ToList();//循环过期超过10天机具
                             var brandInfo = db.KqProducts.ToList();
                             foreach (DataRow item in dt.Rows)

+ 1 - 1
Areas/Admin/Controllers/MainServer/PosMachinesTwoController.cs

@@ -772,7 +772,7 @@ namespace MySystem.Areas.Admin.Controllers
             decimal AmountYks = 0;//已扣
             decimal AmountDks = 0;//待扣
             var time = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
-            string condition = " and Status>-1 and RecycEndDate<" + time + " and ScanQrTrade>0 and ScanQrTrade<999 and BindingState=0";
+            string condition = " and Status>-1 and RecycEndDate<'" + time + "' and ScanQrTrade>0 and ScanQrTrade<999 and BindingState=0";
 
             //所属创客编号
             if (!string.IsNullOrEmpty(UserIdMakerCode))

+ 9 - 2
Areas/Admin/Controllers/MainServer/ToChargeBackRecordController.cs

@@ -51,15 +51,22 @@ namespace MySystem.Areas.Admin.Controllers
         /// 待扣款明细列表
         /// </summary>
         /// <returns></returns>
-        public JsonResult IndexData(ToChargeBackRecord data, string UserIdMakerCode, string ChargeTypeSelect, string StatusSelect, int page = 1, int limit = 30)
+        public JsonResult IndexData(ToChargeBackRecord data, string UserIdMakerCode, string CreateDateData, string ChargeTypeSelect, string StatusSelect, int page = 1, int limit = 30)
         {
 
             Dictionary<string, string> Fields = new Dictionary<string, string>();
 
-            Fields.Add("CreateDate", "3"); //时间
+            // Fields.Add("CreateDate", "3"); //时间
 
 
             string condition = " and Status>-1";
+            if (!string.IsNullOrEmpty(CreateDateData))
+            {
+                string[] datelist = CreateDateData.Split(new string[] { " - " }, StringSplitOptions.None);
+                string start = datelist[0];
+                string end = datelist[1];
+                condition += " and CreateDate>='" + start + " 00:00:00' and CreateDate<='" + end + " 23:59:59'";
+            }
             //创客编号
             if (!string.IsNullOrEmpty(UserIdMakerCode))
             {

+ 2 - 2
Startup.cs

@@ -142,8 +142,8 @@ namespace MySystem
             OpExcelHelper.Instance.Start();
             TestHelper.Instance.Start();
             
-            // TimeOutPosSendMessageService.Instance.Start();//过期机具循环截止时间超过10天预扣费消息推送
-            // TimeOutPosChargeService.Instance.Start();//过期机具循环截止时间超过15天执行扣费
+            TimeOutPosSendMessageService.Instance.Start();//过期机具循环截止时间超过10天预扣费消息推送
+            TimeOutPosChargeService.Instance.Start();//过期机具循环截止时间超过15天执行扣费
             // TimeOutPosChargeReturnService.Instance.Start();//过期购买机具循环截止时间超过15天激活扣费退还
         }