DuGuYang 2 лет назад
Родитель
Сommit
ad97688ee6

+ 1 - 1
AppStart/Helper/SIMPosMerchantTradeService.cs

@@ -309,7 +309,7 @@ namespace MySystem
                                         {
                                             spdb.TradeRecord.Add(new SpModels.TradeRecord()
                                             {
-                                                CreateDate = DateTime.Now.AddMonths(-1), //创建时间
+                                                CreateDate = DateTime.Parse(DateTime.Now.AddMonths(-1).ToString("yyyy-MM-20 HH:mm:ss")), //创建时间
                                                 TradeSerialNo = OrderNo, //订单编号
                                                 AgentNo = WorkName + WorkNo, //一级服务商编号
                                                 MerNo = Mobile, //商户编

+ 55 - 55
Areas/Admin/Controllers/MainServer/TradeRecordController.cs

@@ -423,61 +423,61 @@ namespace MySystem.Areas.Admin.Controllers
                 // PosMerchantInfo checkMer = db.PosMerchantInfo.FirstOrDefault(m => m.KqMerNo == PhoneNumber && m.Field5 == ActStatus);
                 // if (checkMer == null)
                 // {
-                    string json = "{";
-                    json += "\"OrderNo\":\"" + OrderNo + "\",";
-                    json += "\"CreateDate\":\"" + CreateDate + "\",";
-                    json += "\"PhoneNumber\":\"" + PhoneNumber + "\",";
-                    json += "\"HasFirstCharge\":\"" + HasFirstCharge + "\",";
-                    json += "\"FirstChargeAmount\":\"" + FirstChargeAmount + "\",";
-                    json += "\"Province\":\"" + Province + "\",";
-                    json += "\"City\":\"" + City + "\",";
-                    json += "\"ProductName\":\"" + ProductName + "\",";
-                    json += "\"ActiveName\":\"" + ActiveName + "\",";
-                    json += "\"ProductType\":\"" + ProductType + "\",";
-                    json += "\"ActualAmount\":\"" + ActualAmount + "\",";
-                    json += "\"OrderStatus\":\"" + OrderStatus + "\",";
-                    json += "\"ActStatus\":\"" + ActStatus + "\",";
-                    json += "\"ActDate\":\"" + ActDate + "\",";
-                    json += "\"WorkNo\":\"" + WorkNo + "\",";
-                    json += "\"AccountName\":\"" + AccountName + "\",";
-                    json += "\"SimNo\":\"" + SimNo + "\"";
-                    json += "}";
-
-                    spdb.BindRecord.Add(new SpModels.BindRecord()
-                    {
-                        CreateDate = DateTime.Parse(CreateDate),
-                        UpdateTime = DateTime.Parse(CreateDate), //机具绑定、解绑时间
-                        CreateTime = DateTime.Parse(CreateDate), //商户操作时间
-                        MerNewSnNo = PhoneNumber, //商户手机号
-                        MerSnNo = SimNo, //序列号
-                        MerName = AccountName, //商户名称
-                        MerNo = PhoneNumber, //商户编号
-                        Remark = ProductType,
-                        Field1 = Province,
-                        Field2 = ActiveName,
-                        Field3 = ProductName,
-                        Field4 = WorkNo,
-                        Field5 = ActStatus,
-                        SeoTitle = ActualAmount,
-                        SeoKeyword = ActDate,
-                        SeoDescription = json,
-                        ProductType = "14",
-                        Status = 1,
-                    });
+                string json = "{";
+                json += "\"OrderNo\":\"" + OrderNo + "\",";
+                json += "\"CreateDate\":\"" + CreateDate + "\",";
+                json += "\"PhoneNumber\":\"" + PhoneNumber + "\",";
+                json += "\"HasFirstCharge\":\"" + HasFirstCharge + "\",";
+                json += "\"FirstChargeAmount\":\"" + FirstChargeAmount + "\",";
+                json += "\"Province\":\"" + Province + "\",";
+                json += "\"City\":\"" + City + "\",";
+                json += "\"ProductName\":\"" + ProductName + "\",";
+                json += "\"ActiveName\":\"" + ActiveName + "\",";
+                json += "\"ProductType\":\"" + ProductType + "\",";
+                json += "\"ActualAmount\":\"" + ActualAmount + "\",";
+                json += "\"OrderStatus\":\"" + OrderStatus + "\",";
+                json += "\"ActStatus\":\"" + ActStatus + "\",";
+                json += "\"ActDate\":\"" + ActDate + "\",";
+                json += "\"WorkNo\":\"" + WorkNo + "\",";
+                json += "\"AccountName\":\"" + AccountName + "\",";
+                json += "\"SimNo\":\"" + SimNo + "\"";
+                json += "}";
 
-                    spdb.Merchants.Add(new SpModels.Merchants()
-                    {
-                        SnNo = SimNo,
-                        CreateTime = DateTime.Parse(CreateDate),
-                        UpdateTime = DateTime.Parse(CreateDate),
-                        AgentName = AccountName,
-                        MerRealName = AccountName,
-                        MerMobile = PhoneNumber,
-                        MerNo = PhoneNumber,
-                        MerName = AccountName,
-                        ProductType = "14",
-                        Status = 1,
-                    });
+                spdb.BindRecord.Add(new SpModels.BindRecord()
+                {
+                    CreateDate = DateTime.Parse(CreateDate),
+                    UpdateTime = DateTime.Parse(CreateDate), //机具绑定、解绑时间
+                    CreateTime = DateTime.Parse(CreateDate), //商户操作时间
+                    MerNewSnNo = PhoneNumber, //商户手机号
+                    MerSnNo = SimNo, //序列号
+                    MerName = AccountName, //商户名称
+                    MerNo = PhoneNumber, //商户编号
+                    Remark = ProductType,
+                    Field1 = Province,
+                    Field2 = ActiveName,
+                    Field3 = ProductName,
+                    Field4 = WorkNo,
+                    Field5 = ActStatus,
+                    SeoTitle = ActualAmount,
+                    SeoKeyword = ActDate,
+                    SeoDescription = json,
+                    ProductType = "14",
+                    Status = 1,
+                });
+
+                spdb.Merchants.Add(new SpModels.Merchants()
+                {
+                    SnNo = SimNo,
+                    CreateTime = DateTime.Parse(CreateDate),
+                    UpdateTime = DateTime.Parse(CreateDate),
+                    AgentName = AccountName,
+                    MerRealName = AccountName,
+                    MerMobile = PhoneNumber,
+                    MerNo = PhoneNumber,
+                    MerName = AccountName,
+                    ProductType = "14",
+                    Status = 1,
+                });
                 // }
 
                 // spdb.TradeRecord.Add(new SpModels.TradeRecord()
@@ -658,7 +658,7 @@ namespace MySystem.Areas.Admin.Controllers
                 {
                     spdb.TradeRecord.Add(new SpModels.TradeRecord()
                     {
-                        CreateDate = DateTime.Now.AddMonths(-1), //创建时间
+                        CreateDate = DateTime.Parse(DateTime.Now.AddMonths(-1).ToString("yyyy-MM-20 HH:mm:ss")), //创建时间
                         TradeSerialNo = OrderNo, //订单编号
                         AgentNo = WorkName + WorkNo, //一级服务商编号
                         MerNo = Mobile, //商户编