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

同步获取广电激活信息可重复点击,通过订单号去重

lcl 1 год назад
Родитель
Сommit
d7edd77839

+ 44 - 39
AppStart/Helper/SIMPosMerchantTradeService.cs

@@ -218,10 +218,10 @@ namespace MySystem
                 {
                 {
                     try
                     try
                     {
                     {
-                        string check = function.ReadInstance("/GetSIMActInfo/check" + time + ".txt");
-                        if (string.IsNullOrEmpty(check))
-                        {
-                            function.WritePage("/GetSIMActInfo/", "check" + time + ".txt", DateTime.Now.ToString("HH:mm:ss"));
+                        // string check = function.ReadInstance("/GetSIMActInfo/check" + time + ".txt");
+                        // if (string.IsNullOrEmpty(check))
+                        // {
+                        //     function.WritePage("/GetSIMActInfo/", "check" + time + ".txt", DateTime.Now.ToString("HH:mm:ss"));
                             var result = RadioCardHelper.Instance.QueryCardOrderInfo(time, time, "1", "99999");
                             var result = RadioCardHelper.Instance.QueryCardOrderInfo(time, time, "1", "99999");
                             result = result.Replace("null", "\"\"");
                             result = result.Replace("null", "\"\"");
                             JsonData jsonObj = JsonMapper.ToObject(result);
                             JsonData jsonObj = JsonMapper.ToObject(result);
@@ -264,7 +264,7 @@ namespace MySystem
                                     }
                                     }
                                 }
                                 }
                             }
                             }
-                        }
+                        // }
                     }
                     }
                     catch (Exception ex)
                     catch (Exception ex)
                     {
                     {
@@ -303,43 +303,48 @@ namespace MySystem
             json += "\"SimNo\":\"" + sIMActInfo.SimNo + "\"";
             json += "\"SimNo\":\"" + sIMActInfo.SimNo + "\"";
             json += "}";
             json += "}";
 
 
-            spdb.BindRecord.Add(new SpModels.BindRecord()
+            if(!spdb.BindRecord.Any(m => m.MerSnNo == sIMActInfo.SimNo && m.ChannelSerial == sIMActInfo.OrderNo))
             {
             {
-                CreateDate = DateTime.Parse(sIMActInfo.CreateDate),
-                UpdateTime = DateTime.Parse(sIMActInfo.CreateDate), //机具绑定、解绑时间
-                CreateTime = DateTime.Parse(sIMActInfo.CreateDate), //商户操作时间
-                MerNewSnNo = sIMActInfo.PhoneNumber, //商户手机号
-                MerSnNo = sIMActInfo.SimNo, //序列号
-                MerName = sIMActInfo.AccountName, //商户名称
-                MerNo = sIMActInfo.PhoneNumber, //商户编号
-                Remark = sIMActInfo.ProductType,
-                Field1 = sIMActInfo.Province,
-                Field2 = sIMActInfo.ActiveName,
-                Field3 = sIMActInfo.ProductName,
-                Field4 = sIMActInfo.WorkNo,
-                Field5 = sIMActInfo.ActStatus,
-                SeoTitle = sIMActInfo.ActualAmount,
-                SeoKeyword = sIMActInfo.ActDate,
-                SeoDescription = json,
-                ProductType = "14",
-                Status = 1,
-            });
+                spdb.BindRecord.Add(new SpModels.BindRecord()
+                {
+                    CreateDate = DateTime.Parse(sIMActInfo.CreateDate),
+                    UpdateTime = DateTime.Parse(sIMActInfo.CreateDate), //机具绑定、解绑时间
+                    CreateTime = DateTime.Parse(sIMActInfo.CreateDate), //商户操作时间
+                    MerNewSnNo = sIMActInfo.PhoneNumber, //商户手机号
+                    MerSnNo = sIMActInfo.SimNo, //序列号
+                    MerName = sIMActInfo.AccountName, //商户名称
+                    MerNo = sIMActInfo.PhoneNumber, //商户编号
+                    ChannelSerial = sIMActInfo.OrderNo,
+                    Remark = sIMActInfo.ProductType,
+                    Field1 = sIMActInfo.Province,
+                    Field2 = sIMActInfo.ActiveName,
+                    Field3 = sIMActInfo.ProductName,
+                    Field4 = sIMActInfo.WorkNo,
+                    Field5 = sIMActInfo.ActStatus,
+                    SeoTitle = sIMActInfo.ActualAmount,
+                    SeoKeyword = sIMActInfo.ActDate,
+                    SeoDescription = json,
+                    ProductType = "14",
+                    Status = 1,
+                });
 
 
-            spdb.Merchants.Add(new SpModels.Merchants()
-            {
-                SnNo = sIMActInfo.SimNo,
-                CreateTime = DateTime.Parse(sIMActInfo.CreateDate),
-                UpdateTime = DateTime.Parse(sIMActInfo.CreateDate),
-                AgentName = sIMActInfo.AccountName,
-                MerRealName = sIMActInfo.AccountName,
-                MerMobile = sIMActInfo.PhoneNumber,
-                MerNo = sIMActInfo.PhoneNumber,
-                MerName = sIMActInfo.AccountName,
-                ProductType = "14",
-                Status = 1,
-            });
+                spdb.Merchants.Add(new SpModels.Merchants()
+                {
+                    SnNo = sIMActInfo.SimNo,
+                    CreateTime = DateTime.Parse(sIMActInfo.CreateDate),
+                    UpdateTime = DateTime.Parse(sIMActInfo.CreateDate),
+                    AgentName = sIMActInfo.AccountName,
+                    MerRealName = sIMActInfo.AccountName,
+                    MerMobile = sIMActInfo.PhoneNumber,
+                    MerNo = sIMActInfo.PhoneNumber,
+                    MerName = sIMActInfo.AccountName,
+                    ProductType = "14",
+                    Status = 1,
+                });
 
 
-            spdb.SaveChanges();
+                spdb.SaveChanges();
+            }
+            spdb.Dispose();
         }
         }
 
 
 
 

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

@@ -988,7 +988,7 @@ namespace MySystem.Areas.Admin.Controllers
                 return "请输入早于今天的日期";
                 return "请输入早于今天的日期";
             }
             }
             RedisDbconn.Instance.Set("CheckSIMActInfo:" + SysId, "1");
             RedisDbconn.Instance.Set("CheckSIMActInfo:" + SysId, "1");
-            RedisDbconn.Instance.SetExpire("CheckSIMActInfo:" + SysId, 10);
+            RedisDbconn.Instance.SetExpire("CheckSIMActInfo:" + SysId, 600);
             RedisDbconn.Instance.AddList("SIMActInfo", DateStr);
             RedisDbconn.Instance.AddList("SIMActInfo", DateStr);
             AddSysLog("0", "TradeRecord", "GetSimTrade");
             AddSysLog("0", "TradeRecord", "GetSimTrade");
             return "success";
             return "success";