Merge branch 'feature-dgy-广电卡激活' into feature-dgy-后台测试

AppStart/Helper/GetRadioCardInfoService.cs

@@ -74,24 +74,24 @@ public class GetRadioCardInfoService
                     var data = jsonObj["data"]["records"];
                     for (int i = 0; i < data.Count; i++)
                     {
-                        var IdNo = data["idNo"].ToString();
+                        var IdNo = data[i]["idNo"].ToString();
                         var radioCardInfo = db.RadioCardInfo.FirstOrDefault(m => m.IdNo == IdNo) ?? new RadioCardInfo();
                         if (string.IsNullOrEmpty(radioCardInfo.JobId))
                         {
-                            radioCardInfo.JobId = data["jobId"].ToString(); //行销宝工号
-                            radioCardInfo.JobStatus = data["status"].ToString(); //工号状态
-                            radioCardInfo.OprName = data["oprName"].ToString(); //人员姓名
-                            radioCardInfo.Mobile = data["mobile"].ToString(); //广电手机号
-                            radioCardInfo.IdNo = data["idNo"].ToString(); //身份证号
-                            radioCardInfo.Gender = data["gender"].ToString(); //性别
-                            radioCardInfo.Role = data["role"].ToString(); //角色
-                            radioCardInfo.ChannelCode = data["channelCode"].ToString(); //归属社招渠道编码
-                            radioCardInfo.ChannelName = data["channelName"].ToString(); //归属社招渠道名称
-                            radioCardInfo.ProvincialCompany = data["provincialCompany"].ToString(); //归属省公司
-                            radioCardInfo.OprInviteCode = data["oprInviteCode"].ToString(); //邀请码
-                            radioCardInfo.OpenTime = data["openTime"].ToString(); //开通时间
-                            radioCardInfo.BrhName = data["brhName"].ToString(); //机构名称
-                            radioCardInfo.BrhUserId = data["brhUserId"].ToString(); //机构用户编码
+                            radioCardInfo.JobId = function.CheckNull(data[i]["jobId"].ToString()); //行销宝工号
+                            radioCardInfo.JobStatus = function.CheckNull(data[i]["status"].ToString()); //工号状态
+                            radioCardInfo.OprName = function.CheckNull(data[i]["oprName"].ToString()); //人员姓名
+                            radioCardInfo.Mobile = function.CheckNull(data[i]["mobile"].ToString()); //广电手机号
+                            radioCardInfo.IdNo = function.CheckNull(data[i]["idNo"].ToString()); //身份证号
+                            radioCardInfo.Gender = function.CheckNull(data[i]["gender"].ToString()); //性别
+                            radioCardInfo.Role = function.CheckNull(data[i]["role"].ToString()); //角色
+                            radioCardInfo.ChannelCode = function.CheckNull(data[i]["channelCode"].ToString()); //归属社招渠道编码
+                            radioCardInfo.ChannelName = function.CheckNull(data[i]["channelName"].ToString()); //归属社招渠道名称
+                            radioCardInfo.ProvincialCompany = function.CheckNull(data[i]["provincialCompany"].ToString()); //归属省公司
+                            radioCardInfo.OprInviteCode = function.CheckNull(data[i]["oprInviteCode"].ToString()); //邀请码
+                            radioCardInfo.OpenTime = function.CheckNull(data[i]["openTime"].ToString()); //开通时间
+                            radioCardInfo.BrhName = function.CheckNull(data[i]["brhName"].ToString()); //机构名称
+                            radioCardInfo.BrhUserId = function.CheckNull(data[i]["brhUserId"].ToString()); //机构用户编码
                             radioCardInfo.UpdateDate = DateTime.Now; //更新时间
                         }
                     }

AppStart/Helper/SIMPosMerchantTradeService.cs

@@ -213,7 +213,7 @@ namespace MySystem
         {
             while (true)
             {
-                if (DateTime.Now.Hour > 2 && DateTime.Now.Hour < 19)
+                if (DateTime.Now.Hour > 16 && DateTime.Now.Hour < 18)
                 {
                     try
                     {
@@ -221,7 +221,7 @@ namespace MySystem
                         string check = function.ReadInstance("/GetSIMActInfo/check" + time + ".txt");
                         if (string.IsNullOrEmpty(check))
                         {
-                            function.WritePage("/InstallmentDeduction/", "check" + DateTime.Now.ToString("yyyy-MM-20") + ".txt", DateTime.Now.ToString("HH:mm:ss"));
+                            // function.WritePage("/GetSIMActInfo/", "check" + time + ".txt", DateTime.Now.ToString("HH:mm:ss"));
                             var result = RadioCardHelper.Instance.QueryCardOrderInfo(time, time, "1", "99999");
                             JsonData jsonObj = JsonMapper.ToObject(result);
                             if (jsonObj["resultCode"].ToString() == "1")
@@ -231,35 +231,57 @@ namespace MySystem
                                 var data = jsonObj["data"]["records"];
                                 for (int i = 0; i < data.Count; i++)
                                 {
-                                    var iccId = data["iccId"].ToString();
+                                    var iccId = data[i]["iccId"].ToString();
                                     var bindRecord = spdb.BindRecord.FirstOrDefault(m => m.MerSnNo == iccId) ?? new SpModels.BindRecord();
                                     var merchants = spdb.Merchants.FirstOrDefault(m => m.SnNo == iccId) ?? new SpModels.Merchants();
                                     if (bindRecord.Id == 0 && merchants.Id == 0)
                                     {
-                                        // {"orderNo":"B20240311214052744568","orderCreateTime":"03/11/2024 21:40:53","phoneNo":"19288438825","firstCharge":"否","initialChargeAmount":"0.00","province":"贵州省","city":"毕节市","productName":"双百套餐","promotionName":null,"productTypeName":"基础套餐","paidInAmount":"100.00","orderStatus":"已完成","activationStatusName":"已激活","activationTime":"03/11/2024 21:51:47","jobId":"VCH010198795","iccId":"89861500232320197354"}
+                                        // {"orderNo":"B20240319215437195664","orderCreateTime":"03/19/2024 21:54:37","phoneNo":"19238664877","firstCharge":"否","initialChargeAmount":"0.00","province":"贵州省","city":"遵义市","productName":"双百套餐","promotionName":null,"productTypeName":"基础套餐","paidInAmount":"100.00","orderStatus":"已完成","activationStatusName":"已激活","activationTime":"03/19/2024 21:58:23","jobId":"VCH010131087","iccId":"89861500232320195477"}
 
                                         SIMActInfo sIMActInfo = new SIMActInfo
                                         {
-                                            OrderNo = data["orderNo"].ToString(), //订单编码
-                                            CreateDate = data["orderCreateTime"].ToString(), //订单创建时间
-                                            PhoneNumber = data["phoneNo"].ToString(), //选择号码
-                                            HasFirstCharge = data["firstCharge"].ToString(), //是否有首充
-                                            FirstChargeAmount = data["initialChargeAmount"].ToString(), //首充金额（元）
-                                            Province = data["province"].ToString(), //号码归属省份
-                                            City = data["city"].ToString(), //号码归属地市
-                                            ProductName = data["productName"].ToString(), //商品名称
-                                            ActiveName = data["promotionName"].ToString(), //促销活动名称
-                                            ProductType = data["productTypeName"].ToString(), //商品类型名称
-                                            ActualAmount = data["paidInAmount"].ToString(), //实付金额(元)
-                                            OrderStatus = data["orderStatus"].ToString(), //订单状态
-                                            ActStatus = data["activationStatusName"].ToString(), //激活状态名称
-                                            ActDate = data["activationTime"].ToString(), //激活时间
-                                            WorkNo = data["jobId"].ToString(), //BOSS员工工号
-                                                                               // sIMActInfo.AccountName = data[""].ToString(); //账号姓名
+                                            OrderNo = function.CheckNull(data[i]["orderNo"].ToString()), //订单编码
+                                            CreateDate = function.CheckNull(data[i]["orderCreateTime"].ToString()), //订单创建时间
+                                            PhoneNumber = function.CheckNull(data[i]["phoneNo"].ToString()), //选择号码
+                                            HasFirstCharge = function.CheckNull(data[i]["firstCharge"].ToString()), //是否有首充
+                                            FirstChargeAmount = function.CheckNull(data[i]["initialChargeAmount"].ToString()), //首充金额（元）
+                                            Province = function.CheckNull(data[i]["province"].ToString()), //号码归属省份
+                                            City = function.CheckNull(data[i]["city"].ToString()), //号码归属地市
+                                            ProductName = function.CheckNull(data[i]["productName"].ToString()), //商品名称
+                                            ActiveName = function.CheckNull(data[i]["promotionName"].ToString()), //促销活动名称
+                                            ProductType = function.CheckNull(data[i]["productTypeName"].ToString()), //商品类型名称
+                                            ActualAmount = function.CheckNull(data[i]["paidInAmount"].ToString()), //实付金额(元)
+                                            OrderStatus = function.CheckNull(data[i]["orderStatus"].ToString()), //订单状态
+                                            ActStatus = function.CheckNull(data[i]["activationStatusName"].ToString()), //激活状态名称
+                                            ActDate = function.CheckNull(data[i]["activationTime"].ToString()), //激活时间
+                                            WorkNo = function.CheckNull(data[i]["jobId"].ToString()), //BOSS员工工号
+                                            // sIMActInfo.AccountName = data[""].ToString(); //账号姓名
                                             AccountName = "", //账号姓名
                                             SimNo = iccId //SIM卡号
                                         };
 
+                                        // SIMActInfo sIMActInfo = new SIMActInfo();
+                                        // sIMActInfo.OrderNo = function.CheckNull(data[i]["orderNo"].ToString()); //订单编码
+                                        // sIMActInfo.CreateDate = function.CheckNull(data[i]["orderCreateTime"].ToString()); //订单创建时间
+                                        // sIMActInfo.PhoneNumber = function.CheckNull(data[i]["phoneNo"].ToString()); //选择号码
+                                        // sIMActInfo.HasFirstCharge = function.CheckNull(data[i]["firstCharge"].ToString()); //是否有首充
+                                        // sIMActInfo.FirstChargeAmount = function.CheckNull(data[i]["initialChargeAmount"].ToString()); //首充金额（元）
+                                        // sIMActInfo.Province = function.CheckNull(data[i]["province"].ToString()); //号码归属省份
+                                        // sIMActInfo.City = function.CheckNull(data[i]["city"].ToString()); //号码归属地市
+                                        // sIMActInfo.ProductName = function.CheckNull(data[i]["productName"].ToString()); //商品名称
+                                        // sIMActInfo.ActiveName = function.CheckNull(data[i]["promotionName"].ToString()); //促销活动名称
+
+                                        // sIMActInfo.ProductType = function.CheckNull(data[i]["productTypeName"].ToString()); //商品类型名称
+
+                                        // sIMActInfo.ActualAmount = function.CheckNull(data[i]["paidInAmount"].ToString()); //实付金额(元)
+                                        // sIMActInfo.OrderStatus = function.CheckNull(data[i]["orderStatus"].ToString()); //订单状态
+                                        // sIMActInfo.ActStatus = function.CheckNull(data[i]["activationStatusName"].ToString()); //激活状态名称
+                                        // sIMActInfo.ActDate = function.CheckNull(data[i]["activationTime"].ToString()); //激活时间
+                                        // sIMActInfo.WorkNo = function.CheckNull(data[i]["jobId"].ToString()); //BOSS员工工号
+                                        // // sIMActInfo.AccountName = data[""].ToString(); //账号姓名
+                                        // sIMActInfo.AccountName = ""; //账号姓名
+                                        // sIMActInfo.SimNo = iccId; //SIM卡号
+
                                         AddSIMActInfo(sIMActInfo);
                                     }
                                 }