调整

AppStart/Helper/PosPushDataNewHelper.cs

@@ -33,7 +33,7 @@ namespace MySystem
                 function.WriteLog(DateTime.Now.ToString() + "\n" + ex.ToString() + "\n\n", "推送绑定数据异常");
             }
         }
-        public static void Bind(MerchantRecord mer)
+        public static void Bind2(MerchantRecord mer)
         {
             try
             {

AppStart/Helper/SycnSpServer/SycnSpBindService.cs

@@ -98,7 +98,7 @@ namespace MySystem
                                 if(Bind.ProductType == "12" || Bind.ProductType == "30")
                                 {
                                     RedisDbconn.Instance.Set("sppos:" + Bind.MerNo, Bind.MerSnNo);
-                                    RedisDbconn.Instance.SetExpire("sppos:" + Bind.MerNo, 600);
+                                    RedisDbconn.Instance.SetExpire("sppos:" + Bind.MerNo, 1800);
                                 }
                                 PxcModels.MachineForSnNo posFor = db.MachineForSnNo.FirstOrDefault(m => m.SnNo == Bind.MerSnNo) ?? new PxcModels.MachineForSnNo();
                                 PxcModels.PosMachinesTwo pos = db.PosMachinesTwo.FirstOrDefault(m => m.Id == posFor.SnId && m.BindingState == 0);

AppStart/Helper/SycnSpServer/SycnSpMerchantRecordService.cs

@@ -38,8 +38,20 @@ namespace MySystem
                         try
                         {
                             if(Mer.ProductType == "12") Mer.MerSnNo = RedisDbconn.Instance.Get<string>("sppos:" + Mer.MerNo);
-                            if(Mer.ProductType == "30") Mer.MerSnNo = RedisDbconn.Instance.Get<string>("sppos:" + Mer.Field3);
-                            PosPushDataNewHelper.Bind(Mer);
+                            if(Mer.ProductType == "30") 
+                            {
+                                Mer.MerSnNo = RedisDbconn.Instance.Get<string>("sppos:" + Mer.Field3);
+                                if(!db.LklMerNo.Any(m => m.ExtMerNo == Mer.Field3))
+                                {
+                                    db.LklMerNo.Add(new PxcModels.LklMerNo()
+                                    {
+                                        ExtMerNo = Mer.Field3,
+                                        MerNo = Mer.MerNo,
+                                    });
+                                    db.SaveChanges();
+                                }
+                            }
+                            PosPushDataNewHelper.Bind2(Mer);
                             int PosId = 0;
                             PxcModels.MachineForMerNo machineForMerNo = new PxcModels.MachineForMerNo();
                             if(Mer.ProductType == "12")

AppStart/Helper/SycnSpServer/SycnSpTradeService.cs

@@ -234,6 +234,14 @@ namespace MySystem
                                 }
                                 spdb.SaveChanges();
 
+                                if(trade.ProductType == "30")
+                                {
+                                    PxcModels.LklMerNo mer = db.LklMerNo.FirstOrDefault(m => m.ExtMerNo == trade.MerNo);
+                                    if(mer != null)
+                                    {
+                                        trade.MerNo = mer.MerNo;
+                                    }
+                                }
                                 PosPushDataNewHelper.Deposit(trade);
                             }
                         }
@@ -262,6 +270,10 @@ namespace MySystem
                             bool check = db.SpOrderNos.Any(m => m.OrderNo == trade.TradeSerialNo);
                             if (!check)
                             {
+                                if(trade.ProductType == "30")
+                                {
+                                    trade.MerNo = trade.Field2;
+                                }
                                 PosPushDataNewHelper.Trade(trade);
                             }
                             PxcModels.PosMachinesTwo pos = db.PosMachinesTwo.FirstOrDefault(m => m.PosSn == TradeSnNo);

AppStart/Helper/SycnSpServer/SycnSpTradeWifiService.cs

@@ -172,6 +172,14 @@ namespace MySystem
                         }
                         if(trade.SerEntryMode == "1")
                         {
+                            PosPushDataNewHelper.Deposit(new ActivateRecord()
+                            {
+                                SeoTitle = trade.TradeAmount.ToString(),
+                                ProductType = trade.ProductType,
+                                SnNo = trade.TradeSnNo,
+                                MerNo = trade.TradeSnNo,
+                                Id = trade.Id,
+                            });
                             PxcModels.PosMachinesTwo pos = db.PosMachinesTwo.FirstOrDefault(m => m.PosSn == trade.TradeSnNo);
                             if (pos != null)
                             {

AppStart/WifiTradeHelper.cs

@@ -172,7 +172,7 @@ public class WifiTradeHelper
                 PosPushDataNewHelper.Trade(new MySystem.SpModels.TradeRecord()
                 {
                     TradeSnNo = edit.SnNo,
-                    MerNo = edit.Remark,
+                    MerNo = edit.SnNo,
                     TradeAmount = TradeAmt,
                     TradeSerialNo = Guid.NewGuid().ToString(),
                     CreateDate = DateTime.Parse(Month + "-01 00:00:00"),

PxcModels/KxsLeader.cs

@@ -0,0 +1,24 @@
+using System;
+using System.Collections.Generic;
+
+namespace MySystem.PxcModels
+{
+    public partial class KxsLeader
+    {
+        public int Id { get; set; }
+        public int LeaderLevel { get; set; }
+        public DateTime? LastBuyDate { get; set; }
+        public DateTime? ExpiredDate { get; set; }
+        public int LeaderType { get; set; }
+        public int UserId { get; set; }
+        public int Version { get; set; }
+        public int DelFlag { get; set; }
+        public DateTime? UpdateTime { get; set; }
+        public DateTime? CreateTime { get; set; }
+        public string CreateBy { get; set; }
+        public string UpdateBy { get; set; }
+        public string Remark { get; set; }
+        public int Status { get; set; }
+        public int ComFlag { get; set; }
+    }
+}

PxcModels/KxsLeaderAccountLog.cs

@@ -0,0 +1,27 @@
+using System;
+using System.Collections.Generic;
+
+namespace MySystem.PxcModels
+{
+    public partial class KxsLeaderAccountLog
+    {
+        public int Id { get; set; }
+        public int TradeDate { get; set; }
+        public int TradeMonth { get; set; }
+        public int DataId { get; set; }
+        public int ChangeType { get; set; }
+        public int SourceUserId { get; set; }
+        public string Remark { get; set; }
+        public string Kind { get; set; }
+        public string VariationCause { get; set; }
+        public int VariationType { get; set; }
+        public decimal Amount { get; set; }
+        public decimal AfterAmount { get; set; }
+        public decimal BeforeAmount { get; set; }
+        public int UserId { get; set; }
+        public int Version { get; set; }
+        public int DelFlag { get; set; }
+        public DateTime? UpdateTime { get; set; }
+        public DateTime? CreateTime { get; set; }
+    }
+}

PxcModels/KxsLeaderByOrder.cs

@@ -0,0 +1,18 @@
+using System;
+using System.Collections.Generic;
+
+namespace MySystem.PxcModels
+{
+    public partial class KxsLeaderByOrder
+    {
+        public int Id { get; set; }
+        public int UserId { get; set; }
+        public string ByData { get; set; }
+        public int ByNum { get; set; }
+        public string OrderSn { get; set; }
+        public int Version { get; set; }
+        public string DelFlag { get; set; }
+        public DateTime? UpdateTime { get; set; }
+        public DateTime? CreateTime { get; set; }
+    }
+}

PxcModels/KxsLeaderByOrderInfo.cs

@@ -0,0 +1,18 @@
+using System;
+using System.Collections.Generic;
+
+namespace MySystem.PxcModels
+{
+    public partial class KxsLeaderByOrderInfo
+    {
+        public int Id { get; set; }
+        public int OrderId { get; set; }
+        public int BrandType { get; set; }
+        public string TicketCode { get; set; }
+        public int UserId { get; set; }
+        public int Version { get; set; }
+        public string DelFlag { get; set; }
+        public DateTime? UpdateTime { get; set; }
+        public DateTime? CreateTime { get; set; }
+    }
+}

PxcModels/LklMerNo.cs

@@ -0,0 +1,11 @@
+using System;
+using System.Collections.Generic;
+
+namespace MySystem.PxcModels
+{
+    public partial class LklMerNo
+    {
+        public string ExtMerNo { get; set; }
+        public string MerNo { get; set; }
+    }
+}

PxcModels/MpProfitRecord.cs

@@ -0,0 +1,38 @@
+using System;
+using System.Collections.Generic;
+
+namespace MySystem.PxcModels
+{
+    public partial class MpProfitRecord
+    {
+        public int Id { get; set; }
+        public int Sort { get; set; }
+        public int QueryCount { get; set; }
+        public int Status { get; set; }
+        public int Version { get; set; }
+        public DateTime? CreateDate { get; set; }
+        public DateTime? UpdateDate { get; set; }
+        public string CreateMan { get; set; }
+        public string UpdateMan { get; set; }
+        public string SeoTitle { get; set; }
+        public string SeoKeyword { get; set; }
+        public string SeoDescription { get; set; }
+        public int TradeId { get; set; }
+        public string ParentNav { get; set; }
+        public string Remark { get; set; }
+        public int BrandId { get; set; }
+        public ulong DirectFlag { get; set; }
+        public int CapFlag { get; set; }
+        public int QrPayFlag { get; set; }
+        public decimal ProfitAmount { get; set; }
+        public DateTime? ClearDate { get; set; }
+        public DateTime? TradeDate { get; set; }
+        public string SnNo { get; set; }
+        public int MerBuddyType { get; set; }
+        public int HelpMonthCount { get; set; }
+        public ulong MerHelpFlag { get; set; }
+        public string MerNo { get; set; }
+        public int MerchantId { get; set; }
+        public int UserId { get; set; }
+    }
+}

PxcModels/PosFeeWarningRecord.cs

@@ -7,6 +7,7 @@ namespace MySystem.PxcModels
     {
         public int Id { get; set; }
         public int Sort { get; set; }
+        public int QueryCount { get; set; }
         public int Status { get; set; }
         public int Version { get; set; }
         public DateTime? CreateDate { get; set; }
@@ -22,7 +23,6 @@ namespace MySystem.PxcModels
         public string PosSn { get; set; }
         public int BrandId { get; set; }
         public int PosId { get; set; }
-        public int QueryCount { get; set; }
         public DateTime? DoDate { get; set; }
     }
 }

PxcModels/PosMachineOtherTmp.cs

@@ -0,0 +1,15 @@
+using System;
+using System.Collections.Generic;
+
+namespace MySystem.PxcModels
+{
+    public partial class PosMachineOtherTmp
+    {
+        public int Id { get; set; }
+        public string CustomerNo { get; set; }
+        public string LeMerNo { get; set; }
+        public string LeMerNo4 { get; set; }
+        public string SnNo { get; set; }
+        public int MerId { get; set; }
+    }
+}

PxcModels/PosMachineOtherTmp2.cs

@@ -0,0 +1,14 @@
+using System;
+using System.Collections.Generic;
+
+namespace MySystem.PxcModels
+{
+    public partial class PosMachineOtherTmp2
+    {
+        public int Id { get; set; }
+        public string CustomerNo { get; set; }
+        public string LeMerNo { get; set; }
+        public string LeMerNo4 { get; set; }
+        public string LmerNo { get; set; }
+    }
+}

PxcModels/UserRankWhiteSetRecord.cs

@@ -11,6 +11,8 @@ namespace MySystem.PxcModels
         public int Version { get; set; }
         public DateTime? CreateDate { get; set; }
         public DateTime? UpdateDate { get; set; }
+        public string Remark { get; set; }
+        public int UserType { get; set; }
         public int BeforeLevel { get; set; }
         public DateTime? ExpireDate { get; set; }
         public DateTime? PresetDate { get; set; }
@@ -18,7 +20,5 @@ namespace MySystem.PxcModels
         public int Level { get; set; }
         public int SetType { get; set; }
         public int UserId { get; set; }
-        public int UserType { get; set; }
-        public string Remark { get; set; }
     }
 }

appsettings.json

@@ -42,4 +42,4 @@
     "MqPassword": "skb@rabbitmq",
     "MqHostName": "192.168.0.121:5672,192.168.0.122:5672"
   }
-}
+}