lcl 3 сар өмнө
parent
commit
3ce837049f

BIN
.DS_Store


+ 8 - 1
AppStart/Helper/PosPushDataNewHelper.cs

@@ -141,7 +141,14 @@ namespace MySystem
                 Dictionary<string, object> dataContent = new Dictionary<string, object>();
                 dataContent.Add("pos_sn", act.SnNo); //机具sn
                 dataContent.Add("mer_no", act.MerNo); //商户号
-                dataContent.Add("request_id", getRequestId(act.Id, "deposit")); //流水号
+                if(Utils.Instance.IsWifi(int.Parse(act.ProductType)))
+                {
+                    dataContent.Add("request_id", getRequestId(act.SnNo + act.MerMobile, "deposit")); //流水号
+                }
+                else
+                {
+                    dataContent.Add("request_id", getRequestId(act.Id, "deposit")); //流水号
+                }
                 if(act.ProductType == "14")
                 {
                     dataContent.Add("deposit_amount", 0); //押金金额

+ 1 - 1
AppStart/Helper/SycnSpServer/SycnSpBindService.cs

@@ -32,7 +32,7 @@ namespace MySystem
                     BrandIds.Add("17");
                     WebCMSEntities spdb = new WebCMSEntities();
                     PxcModels.WebCMSEntities db = new PxcModels.WebCMSEntities();
-                    DateTime start = DateTime.Now.AddDays(-30);
+                    DateTime start = DateTime.Now.AddDays(-60);
                     int StartId = int.Parse(function.CheckInt(function.ReadInstance("/SycnSp/BindRecordId.txt")));
                     var Binds = spdb.BindRecord.Where(m => m.Id >= StartId && m.CreateTime >= start && !BrandIds.Contains(m.ProductType) && m.Status == 1).OrderByDescending(m => m.Id).Take(20).ToList();
                     foreach (var Bind in Binds)