Просмотр исходного кода

推送测试数据可编辑时间

lcl 7 месяцев назад
Родитель
Сommit
e2d6ea3464

+ 56 - 39
Areas/Admin/Controllers/MainServer/SysToolsController.cs

@@ -7055,8 +7055,13 @@ namespace MySystem.Areas.Admin.Controllers
         }
         }
 
 
         [HttpPost]
         [HttpPost]
-        public string AddBindData2Do(string PosSn, string MerName, string MerNo, string ProductType)
+        public string AddBindData2Do(string PosSn, string MerName, string MerNo, string ProductType, string CreateDate)
         {
         {
+            DateTime time = DateTime.Now;
+            if(!string.IsNullOrEmpty(CreateDate))
+            {
+                time = DateTime.Parse(CreateDate);
+            }
             string CertId = function.get_Random(6) + "********" + function.get_Random(4);
             string CertId = function.get_Random(6) + "********" + function.get_Random(4);
             string AgentName = function.get_Random(20);
             string AgentName = function.get_Random(20);
             string Field2 = function.get_Random(20);
             string Field2 = function.get_Random(20);
@@ -7069,11 +7074,11 @@ namespace MySystem.Areas.Admin.Controllers
                 spdb.BindRecord.Add(new SpModels.BindRecord()
                 spdb.BindRecord.Add(new SpModels.BindRecord()
                 {
                 {
                     Status = 1,
                     Status = 1,
-                    CreateDate = DateTime.Now,
-                    SeoKeyword = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"),
+                    CreateDate = time,
+                    SeoKeyword = time.ToString("yyyy-MM-dd HH:mm:ss"),
                     ChannelSerial = ChannelSerial,
                     ChannelSerial = ChannelSerial,
-                    UpdateTime = DateTime.Now,
-                    CreateTime = DateTime.Now,
+                    UpdateTime = time,
+                    CreateTime = time,
                     MerNewSnNo = Mobile,
                     MerNewSnNo = Mobile,
                     ProductType = ProductType,
                     ProductType = ProductType,
                     MerSnNo = PosSn,
                     MerSnNo = PosSn,
@@ -7092,11 +7097,11 @@ namespace MySystem.Areas.Admin.Controllers
                 spdb.BindRecord.Add(new SpModels.BindRecord()
                 spdb.BindRecord.Add(new SpModels.BindRecord()
                 {
                 {
                     Status = 1,
                     Status = 1,
-                    CreateDate = DateTime.Now,
+                    CreateDate = time,
                     SeoKeyword = CertId,
                     SeoKeyword = CertId,
                     ChannelSerial = ChannelSerial,
                     ChannelSerial = ChannelSerial,
-                    UpdateTime = DateTime.Now,
-                    CreateTime = DateTime.Now,
+                    UpdateTime = time,
+                    CreateTime = time,
                     MerNewSnNo = Mobile,
                     MerNewSnNo = Mobile,
                     ProductType = ProductType,
                     ProductType = ProductType,
                     MerSnNo = PosSn,
                     MerSnNo = PosSn,
@@ -7111,11 +7116,11 @@ namespace MySystem.Areas.Admin.Controllers
             spdb.Merchants.Add(new SpModels.Merchants()
             spdb.Merchants.Add(new SpModels.Merchants()
             {
             {
                 Status = 1,
                 Status = 1,
-                CreateDate = DateTime.Now,
-                UpdateDate = DateTime.Now,
+                CreateDate = time,
+                UpdateDate = time,
                 SnNo = PosSn,
                 SnNo = PosSn,
-                UpdateTime = DateTime.Now,
-                CreateTime = DateTime.Now,
+                UpdateTime = time,
+                CreateTime = time,
                 Remark = "商户入库",
                 Remark = "商户入库",
                 ProductType = ProductType,
                 ProductType = ProductType,
                 MerIdcardNo = CertId,
                 MerIdcardNo = CertId,
@@ -7130,7 +7135,7 @@ namespace MySystem.Areas.Admin.Controllers
                 spdb.MerchantRecord.Add(new SpModels.MerchantRecord()
                 spdb.MerchantRecord.Add(new SpModels.MerchantRecord()
                 {
                 {
                     Status = 1,
                     Status = 1,
-                    CreateDate = DateTime.Now,
+                    CreateDate = time,
                     LegalIdCard = CertId,
                     LegalIdCard = CertId,
                     LegalName = MerName,
                     LegalName = MerName,
                     ProductType = ProductType,
                     ProductType = ProductType,
@@ -7138,9 +7143,9 @@ namespace MySystem.Areas.Admin.Controllers
                     Field1 = "盒易付H版",
                     Field1 = "盒易付H版",
                     Field2 = function.get_Random(6),
                     Field2 = function.get_Random(6),
                     MerSnNo = PosSn,
                     MerSnNo = PosSn,
-                    CreateTime = DateTime.Now,
+                    CreateTime = time,
                     MerNo = MerNo,
                     MerNo = MerNo,
-                    MerOperateDate = DateTime.Now,
+                    MerOperateDate = time,
                     MerStatus = "正常",
                     MerStatus = "正常",
                     MerName = "成都市美食梦想高档烤鸭店",
                     MerName = "成都市美食梦想高档烤鸭店",
                     AgentName = "成都市聚贤缘信息技术有限公司",
                     AgentName = "成都市聚贤缘信息技术有限公司",
@@ -7164,11 +7169,17 @@ namespace MySystem.Areas.Admin.Controllers
         }
         }
 
 
         [HttpPost]
         [HttpPost]
-        public string AddDepositData2Do(string PosSn, string MerName, string MerNo, decimal Deposit, string ProductType)
+        public string AddDepositData2Do(string PosSn, string MerName, string MerNo, decimal Deposit, string ProductType, string CreateDate)
         {
         {
+            DateTime time = DateTime.Now;
+            if(!string.IsNullOrEmpty(CreateDate))
+            {
+                time = DateTime.Parse(CreateDate);
+            }
+
             string TradeSerialNo = function.get_Random(30);
             string TradeSerialNo = function.get_Random(30);
             string AgentName = function.get_Random(20);
             string AgentName = function.get_Random(20);
-            string ChannelSerial = DateTime.Now.ToString("yyyyMMddHHmmssfff") + function.get_Random(8);
+            string ChannelSerial = time.ToString("yyyyMMddHHmmssfff") + function.get_Random(8);
             string BankCardNo = function.get_Random(6) + "******" + function.get_Random(4);
             string BankCardNo = function.get_Random(6) + "******" + function.get_Random(4);
             if(ProductType == "3") ProductType = "1";
             if(ProductType == "3") ProductType = "1";
             if(ProductType == "5") ProductType = "4";
             if(ProductType == "5") ProductType = "4";
@@ -7180,7 +7191,7 @@ namespace MySystem.Areas.Admin.Controllers
                 spdb.TradeRecord.Add(new SpModels.TradeRecord()
                 spdb.TradeRecord.Add(new SpModels.TradeRecord()
                 {
                 {
                     Status = 1,
                     Status = 1,
-                    CreateDate = DateTime.Now,
+                    CreateDate = time,
                     ChannelSerial = ChannelSerial,
                     ChannelSerial = ChannelSerial,
                     AgentNo = AgentName,
                     AgentNo = AgentName,
                     ProductType = ProductType,
                     ProductType = ProductType,
@@ -7190,7 +7201,7 @@ namespace MySystem.Areas.Admin.Controllers
                     BankCardType = "01",
                     BankCardType = "01",
                     SerEntryMode = "N",
                     SerEntryMode = "N",
                     TradeType = "SK",
                     TradeType = "SK",
-                    TradeTime = DateTime.Now.ToString("yyyyMMdd"),
+                    TradeTime = time.ToString("yyyyMMdd"),
                     TradeStatus = "3",
                     TradeStatus = "3",
                     TradeAmount = Deposit,
                     TradeAmount = Deposit,
                     MerNo = MerNo,
                     MerNo = MerNo,
@@ -7203,7 +7214,7 @@ namespace MySystem.Areas.Admin.Controllers
                 spdb.TradeRecord.Add(new SpModels.TradeRecord()
                 spdb.TradeRecord.Add(new SpModels.TradeRecord()
                 {
                 {
                     Status = 1,
                     Status = 1,
-                    CreateDate = DateTime.Now,
+                    CreateDate = time,
                     ChannelSerial = ChannelSerial,
                     ChannelSerial = ChannelSerial,
                     AgentNo = AgentName,
                     AgentNo = AgentName,
                     ProductType = ProductType,
                     ProductType = ProductType,
@@ -7213,7 +7224,7 @@ namespace MySystem.Areas.Admin.Controllers
                     BankCardType = "01",
                     BankCardType = "01",
                     SerEntryMode = "1",
                     SerEntryMode = "1",
                     TradeType = "M015",
                     TradeType = "M015",
-                    TradeTime = DateTime.Now.ToString("yyyyMMdd"),
+                    TradeTime = time.ToString("yyyyMMdd"),
                     TradeStatus = "3",
                     TradeStatus = "3",
                     TradeAmount = Deposit,
                     TradeAmount = Deposit,
                     MerNo = MerNo,
                     MerNo = MerNo,
@@ -7226,7 +7237,7 @@ namespace MySystem.Areas.Admin.Controllers
                 spdb.TradeRecord.Add(new SpModels.TradeRecord()
                 spdb.TradeRecord.Add(new SpModels.TradeRecord()
                 {
                 {
                     Status = 1,
                     Status = 1,
-                    CreateDate = DateTime.Now,
+                    CreateDate = time,
                     ChannelSerial = ChannelSerial,
                     ChannelSerial = ChannelSerial,
                     AgentNo = AgentName,
                     AgentNo = AgentName,
                     ProductType = ProductType,
                     ProductType = ProductType,
@@ -7236,7 +7247,7 @@ namespace MySystem.Areas.Admin.Controllers
                     BankCardType = "C",
                     BankCardType = "C",
                     SerEntryMode = "40",
                     SerEntryMode = "40",
                     TradeType = "SK",
                     TradeType = "SK",
-                    TradeTime = DateTime.Now.ToString("yyyyMMdd"),
+                    TradeTime = time.ToString("yyyyMMdd"),
                     TradeStatus = "S",
                     TradeStatus = "S",
                     TradeAmount = Deposit,
                     TradeAmount = Deposit,
                     MerNo = MerNo,
                     MerNo = MerNo,
@@ -7249,11 +7260,11 @@ namespace MySystem.Areas.Admin.Controllers
                 spdb.ActivateRecord.Add(new SpModels.ActivateRecord()
                 spdb.ActivateRecord.Add(new SpModels.ActivateRecord()
                 {
                 {
                     Status = 1,
                     Status = 1,
-                    CreateDate = DateTime.Now,
+                    CreateDate = time,
                     SeoTitle = Deposit.ToString(),
                     SeoTitle = Deposit.ToString(),
                     ProductType = ProductType,
                     ProductType = ProductType,
                     AgentNo = AgentName,
                     AgentNo = AgentName,
-                    ActivateDate = DateTime.Now,
+                    ActivateDate = time,
                     ActivateStatus = "00",
                     ActivateStatus = "00",
                     SnNo = PosSn,
                     SnNo = PosSn,
                     MerName = MerName,
                     MerName = MerName,
@@ -7279,11 +7290,17 @@ namespace MySystem.Areas.Admin.Controllers
         }
         }
 
 
         [HttpPost]
         [HttpPost]
-        public string AddTradeData2Do(string PosSn, string MerNo, string MerName, decimal Amount, string ProductType, int IsDeposit = 0)
+        public string AddTradeData2Do(string PosSn, string MerNo, string MerName, decimal Amount, string ProductType, string CreateDate, int IsDeposit = 0)
         {
         {
+            DateTime time = DateTime.Now;
+            if(!string.IsNullOrEmpty(CreateDate))
+            {
+                time = DateTime.Parse(CreateDate);
+            }
+
             string TradeSerialNo = function.get_Random(30);
             string TradeSerialNo = function.get_Random(30);
             string AgentName = function.get_Random(20);
             string AgentName = function.get_Random(20);
-            string ChannelSerial = DateTime.Now.ToString("yyyyMMddHHmmssfff") + function.get_Random(8);
+            string ChannelSerial = time.ToString("yyyyMMddHHmmssfff") + function.get_Random(8);
             string BankCardNo = function.get_Random(6) + "******" + function.get_Random(4);
             string BankCardNo = function.get_Random(6) + "******" + function.get_Random(4);
             if(ProductType == "3") ProductType = "1";
             if(ProductType == "3") ProductType = "1";
             if(ProductType == "5") ProductType = "4";
             if(ProductType == "5") ProductType = "4";
@@ -7296,7 +7313,7 @@ namespace MySystem.Areas.Admin.Controllers
                 spdb.TradeRecord.Add(new SpModels.TradeRecord()
                 spdb.TradeRecord.Add(new SpModels.TradeRecord()
                 {
                 {
                     Status = 1,
                     Status = 1,
-                    CreateDate = DateTime.Now,
+                    CreateDate = time,
                     ChannelSerial = ChannelSerial,
                     ChannelSerial = ChannelSerial,
                     AgentNo = AgentName,
                     AgentNo = AgentName,
                     ProductType = ProductType,
                     ProductType = ProductType,
@@ -7306,7 +7323,7 @@ namespace MySystem.Areas.Admin.Controllers
                     BankCardType = "01",
                     BankCardType = "01",
                     SerEntryMode = IsDeposit == 1 ? "M" : "I",
                     SerEntryMode = IsDeposit == 1 ? "M" : "I",
                     TradeType = "SK",
                     TradeType = "SK",
-                    TradeTime = DateTime.Now.ToString("yyyyMMdd"),
+                    TradeTime = time.ToString("yyyyMMdd"),
                     TradeStatus = "3",
                     TradeStatus = "3",
                     TradeAmount = Amount,
                     TradeAmount = Amount,
                     MerNo = MerNo,
                     MerNo = MerNo,
@@ -7321,7 +7338,7 @@ namespace MySystem.Areas.Admin.Controllers
                 spdb.TradeRecord.Add(new SpModels.TradeRecord()
                 spdb.TradeRecord.Add(new SpModels.TradeRecord()
                 {
                 {
                     Status = 1,
                     Status = 1,
-                    CreateDate = DateTime.Now,
+                    CreateDate = time,
                     ChannelSerial = ChannelSerial,
                     ChannelSerial = ChannelSerial,
                     AgentNo = AgentName,
                     AgentNo = AgentName,
                     ProductType = ProductType,
                     ProductType = ProductType,
@@ -7331,7 +7348,7 @@ namespace MySystem.Areas.Admin.Controllers
                     BankCardType = "01",
                     BankCardType = "01",
                     SerEntryMode = IsDeposit == 1 ? "1" : "0",
                     SerEntryMode = IsDeposit == 1 ? "1" : "0",
                     TradeType = "M015",
                     TradeType = "M015",
-                    TradeTime = DateTime.Now.ToString("yyyyMMdd"),
+                    TradeTime = time.ToString("yyyyMMdd"),
                     TradeStatus = "3",
                     TradeStatus = "3",
                     TradeAmount = Amount,
                     TradeAmount = Amount,
                     MerNo = MerNo,
                     MerNo = MerNo,
@@ -7346,7 +7363,7 @@ namespace MySystem.Areas.Admin.Controllers
                 spdb.TradeRecord.Add(new SpModels.TradeRecord()
                 spdb.TradeRecord.Add(new SpModels.TradeRecord()
                 {
                 {
                     Status = 1,
                     Status = 1,
-                    CreateDate = DateTime.Now,
+                    CreateDate = time,
                     ChannelSerial = ChannelSerial,
                     ChannelSerial = ChannelSerial,
                     AgentNo = AgentName,
                     AgentNo = AgentName,
                     ProductType = ProductType,
                     ProductType = ProductType,
@@ -7356,7 +7373,7 @@ namespace MySystem.Areas.Admin.Controllers
                     BankCardType = "C",
                     BankCardType = "C",
                     SerEntryMode = IsDeposit == 1 ? "40" : "31",
                     SerEntryMode = IsDeposit == 1 ? "40" : "31",
                     TradeType = "0",
                     TradeType = "0",
-                    TradeTime = DateTime.Now.ToString("yyyyMMdd"),
+                    TradeTime = time.ToString("yyyyMMdd"),
                     TradeStatus = "S",
                     TradeStatus = "S",
                     TradeAmount = Amount,
                     TradeAmount = Amount,
                     MerNo = MerNo,
                     MerNo = MerNo,
@@ -7371,7 +7388,7 @@ namespace MySystem.Areas.Admin.Controllers
                 spdb.TradeRecord.Add(new SpModels.TradeRecord()
                 spdb.TradeRecord.Add(new SpModels.TradeRecord()
                 {
                 {
                     Status = 1,
                     Status = 1,
-                    CreateDate = DateTime.Now,
+                    CreateDate = time,
                     ChannelSerial = ChannelSerial,
                     ChannelSerial = ChannelSerial,
                     AgentNo = AgentName,
                     AgentNo = AgentName,
                     ProductType = ProductType,
                     ProductType = ProductType,
@@ -7380,7 +7397,7 @@ namespace MySystem.Areas.Admin.Controllers
                     TradeSnNo = PosSn,
                     TradeSnNo = PosSn,
                     BankCardType = "CC",
                     BankCardType = "CC",
                     TradeType = "PUR",
                     TradeType = "PUR",
-                    TradeTime = DateTime.Now.ToString("yyyyMMdd"),
+                    TradeTime = time.ToString("yyyyMMdd"),
                     TradeStatus = "00",
                     TradeStatus = "00",
                     TradeAmount = Amount,
                     TradeAmount = Amount,
                     MerNo = MerNo,
                     MerNo = MerNo,
@@ -7395,7 +7412,7 @@ namespace MySystem.Areas.Admin.Controllers
                 spdb.TradeRecord.Add(new SpModels.TradeRecord()
                 spdb.TradeRecord.Add(new SpModels.TradeRecord()
                 {
                 {
                     Status = 1,
                     Status = 1,
-                    CreateDate = DateTime.Now,
+                    CreateDate = time,
                     ChannelSerial = ChannelSerial,
                     ChannelSerial = ChannelSerial,
                     AgentNo = AgentName,
                     AgentNo = AgentName,
                     ProductType = ProductType,
                     ProductType = ProductType,
@@ -7404,7 +7421,7 @@ namespace MySystem.Areas.Admin.Controllers
                     TradeSnNo = PosSn,
                     TradeSnNo = PosSn,
                     BankCardType = "02",
                     BankCardType = "02",
                     TradeType = "104",
                     TradeType = "104",
-                    TradeTime = DateTime.Now.ToString("yyyyMMdd"),
+                    TradeTime = time.ToString("yyyyMMdd"),
                     TradeStatus = "00",
                     TradeStatus = "00",
                     TradeAmount = Amount,
                     TradeAmount = Amount,
                     MerNo = MerNo,
                     MerNo = MerNo,
@@ -7419,7 +7436,7 @@ namespace MySystem.Areas.Admin.Controllers
                 spdb.TradeRecord.Add(new SpModels.TradeRecord()
                 spdb.TradeRecord.Add(new SpModels.TradeRecord()
                 {
                 {
                     Status = 1,
                     Status = 1,
-                    CreateDate = DateTime.Now,
+                    CreateDate = time,
                     ChannelSerial = ChannelSerial,
                     ChannelSerial = ChannelSerial,
                     AgentNo = AgentName,
                     AgentNo = AgentName,
                     ProductType = ProductType,
                     ProductType = ProductType,
@@ -7428,7 +7445,7 @@ namespace MySystem.Areas.Admin.Controllers
                     TradeSnNo = PosSn,
                     TradeSnNo = PosSn,
                     BankCardType = "02",
                     BankCardType = "02",
                     TradeType = "104",
                     TradeType = "104",
-                    TradeTime = DateTime.Now.ToString("yyyyMMdd"),
+                    TradeTime = time.ToString("yyyyMMdd"),
                     TradeStatus = "00",
                     TradeStatus = "00",
                     TradeAmount = Amount,
                     TradeAmount = Amount,
                     MerNo = MerNo,
                     MerNo = MerNo,

+ 11 - 0
Areas/Admin/Views/MainServer/SysTools/AddBindData2.cshtml

@@ -55,6 +55,13 @@
                                             name="ProductType" maxlength="50" autocomplete="off" placeholder="请输入品牌ID">
                                             name="ProductType" maxlength="50" autocomplete="off" placeholder="请输入品牌ID">
                                     </div>
                                     </div>
                                 </div>
                                 </div>
+                                <div class="layui-form-item">
+                                    <label class="layui-form-label">时间</label>
+                                    <div class="layui-input-inline">
+                                        <input class="layui-input" type="text" id="CreateDate"
+                                            name="CreateDate" value="@(DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"))" maxlength="30" autocomplete="off" placeholder="请输入时间">
+                                    </div>
+                                </div>
                             </div>
                             </div>
 
 
                         </div>
                         </div>
@@ -125,6 +132,10 @@
             });
             });
     
     
             //日期
             //日期
+            laydate.render({
+                elem: '#CreateDate',
+                type: 'datetime'
+            });
             
             
 
 
             //上传文件
             //上传文件

+ 11 - 0
Areas/Admin/Views/MainServer/SysTools/AddDepositData2.cshtml

@@ -62,6 +62,13 @@
                                             name="Deposit" maxlength="50" autocomplete="off" placeholder="请输入金额">
                                             name="Deposit" maxlength="50" autocomplete="off" placeholder="请输入金额">
                                     </div>
                                     </div>
                                 </div>
                                 </div>
+                                <div class="layui-form-item">
+                                    <label class="layui-form-label">时间</label>
+                                    <div class="layui-input-inline">
+                                        <input class="layui-input" type="text" id="CreateDate"
+                                            name="CreateDate" value="@(DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"))" maxlength="30" autocomplete="off" placeholder="请输入时间">
+                                    </div>
+                                </div>
                             </div>
                             </div>
 
 
                         </div>
                         </div>
@@ -132,6 +139,10 @@
             });
             });
     
     
             //日期
             //日期
+            laydate.render({
+                elem: '#CreateDate',
+                type: 'datetime'
+            });
             
             
 
 
             //上传文件
             //上传文件

+ 11 - 0
Areas/Admin/Views/MainServer/SysTools/AddTradeData2.cshtml

@@ -69,6 +69,13 @@
                                             lay-filter="switchTest" title="开关">
                                             lay-filter="switchTest" title="开关">
                                     </div>
                                     </div>
                                 </div>
                                 </div>
+                                <div class="layui-form-item">
+                                    <label class="layui-form-label">时间</label>
+                                    <div class="layui-input-inline">
+                                        <input class="layui-input" type="text" id="CreateDate"
+                                            name="CreateDate" value="@(DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"))" maxlength="30" autocomplete="off" placeholder="请输入时间">
+                                    </div>
+                                </div>
                             </div>
                             </div>
 
 
                         </div>
                         </div>
@@ -139,6 +146,10 @@
             });
             });
     
     
             //日期
             //日期
+            laydate.render({
+                elem: '#CreateDate',
+                type: 'datetime'
+            });
             
             
 
 
             //上传文件
             //上传文件