Browse Source

调整数据推送问题

lcl 6 months ago
parent
commit
f593397e5a

BIN
.DS_Store


+ 0 - 3
AppStart/Helper/SycnSpServer/SycnSpActiveService.cs

@@ -69,9 +69,6 @@ namespace MySystem
                                 {
                                     StatService.Instance.PreActPrize(db, pos, merchant, act.SeoTitle);
                                 }
-
-                                //推送数据给java
-                                PosPushDataHelper.Deposit(merchant, Deposit);
                             }
 
                             if(pos.BrandId == 7 || pos.BrandId == 12 || pos.BrandId == 13 || pos.BrandId == 15 || pos.BrandId == 16 || pos.BrandId == 22)

+ 0 - 3
AppStart/Helper/SycnSpServer/SycnSpChangeBindService.cs

@@ -135,9 +135,6 @@ namespace MySystem
                             add.ChangeSnExpand = ChangeSnExpand; //机具SN
                             db.SaveChanges();
 
-                            //推送数据给java
-                            PosPushDataHelper.ChangeBind(merchant, oldpos, newpos);
-
                             ChangeBindRecord edit = spdb.ChangeBindRecord.FirstOrDefault(m => m.Id == Bind.Id);
                             if (edit != null)
                             {

+ 0 - 3
AppStart/Helper/SycnSpServer/SycnSpMerchantRecordService.cs

@@ -49,9 +49,6 @@ namespace MySystem
                                 merinfo.MgrNo = Mer.AgentNo; //代理商号
                                 merinfo.MgrName = Mer.Field2; //终端类型
                                 db.SaveChanges();
-
-                                //推送数据给java
-                                PosPushDataHelper.Bind(merinfo);
                             }
                             int IsFirst = 1;
                             if(!string.IsNullOrEmpty(Mer.LegalIdCard))

+ 0 - 9
AppStart/Helper/SycnSpServer/SycnSpMerchantService.cs

@@ -244,9 +244,6 @@ namespace MySystem
                                         PrizeSetHelper.Do("6", pos.PosSn);
                                     }
 
-                                    //推送激活数据
-                                    PosPushDataHelper.Bind(add);
-
                                     //推送激活数据给MQ
                                     Utils.Instance.SendActData(pos);
 
@@ -254,12 +251,6 @@ namespace MySystem
                                     RedisDbconn.Instance.AddList("WifiWithholdBackQueue", "{\"UserId\":\"" + pos.BuyUserId + "\",\"SnNo\":\"" + pos.PosSn + "\"}");
                                 }
 
-                                //推送数据给java
-                                if(pos.BrandId != 12 && pos.BrandId != 13)
-                                {
-                                    PosPushDataHelper.Bind(add);
-                                }
-
                                 Merchants edit = spdb.Merchants.FirstOrDefault(m => m.Id == Mer.Id);
                                 if (edit != null)
                                 {

+ 0 - 15
AppStart/Helper/SycnSpServer/SycnSpTradeService.cs

@@ -621,9 +621,6 @@ namespace MySystem
                                             //统计商户交易额
                                             string TradeDate = trade.CreateDate == null ? DateTime.Now.ToString("yyyyMMdd") : trade.CreateDate.Value.ToString("yyyyMMdd");
                                             RedisDbconn.Instance.AddList("StatMerTradeAmountQueue", "{\"TradeDate\":\"" + TradeDate + "\",\"TradeAmount\":\"" + TradeAmount + "\",\"MerchantId\":\"" + pos.BindMerchantId + "\",\"BrandId\":\"" + BrandId + "\"}");
-
-                                            //推送数据给java
-                                            PosPushDataHelper.Trade(add);
                                         }
                                         db.SpOrderNos.Add(new PxcModels.SpOrderNos()
                                         {
@@ -675,11 +672,6 @@ namespace MySystem
                             PxcModels.PosMerchantInfo merchant = db.PosMerchantInfo.FirstOrDefault(m => m.Id == pos.BindMerchantId) ?? new PxcModels.PosMerchantInfo();
                             function.WriteLog("PosMerchantInfo:" + merchant.KqMerNo, "服务费奖励发放日志");
                             StatService.Instance.PreActPrize(db, pos, merchant, pos.SeoKeyword);
-
-                            //推送数据给java
-                            decimal Deposit = decimal.Parse(function.CheckNum(pos.SeoKeyword));
-                            if(Deposit > 1000) Deposit = Deposit / 100;
-                            PosPushDataHelper.Deposit(merchant, Deposit);
                         }
                     }
                     spdb.Dispose();
@@ -797,9 +789,6 @@ namespace MySystem
                                             //统计商户交易额
                                             string TradeDate = trade.CreateDate == null ? DateTime.Now.ToString("yyyyMMdd") : trade.CreateDate.Value.ToString("yyyyMMdd");
                                             RedisDbconn.Instance.AddList("StatMerTradeAmountQueue", "{\"TradeDate\":\"" + TradeDate + "\",\"TradeAmount\":\"" + TradeAmount + "\",\"MerchantId\":\"" + pos.BindMerchantId + "\",\"BrandId\":\"" + BrandId + "\"}");
-
-                                            //推送数据给java
-                                            PosPushDataHelper.Trade(add);
                                         }
                                         db.SpOrderNos.Add(new PxcModels.SpOrderNos()
                                         {
@@ -1028,10 +1017,6 @@ namespace MySystem
 
                 //推送激活数据
                 if(Deposit == 0) Utils.Instance.SendActData(pos);
-                if(pos.BrandId == 14 && merchant != null)
-                {
-                    PosPushDataHelper.Bind(merchant);
-                }
             }
             else if (pos.ActivationState == 1 && pos.BrandId == 14)
             {

+ 1 - 20
AppStart/Helper/SycnSpServer/SycnSpTradeWifiService.cs

@@ -36,26 +36,7 @@ namespace MySystem
                     foreach (TradeRecord trade in trades.ToList())
                     {
                         //推送数据给java
-                        PosPushDataHelper.Trade(new PxcModels.TradeRecord()
-                        {
-                            CreateDate = trade.CreateDate,
-                            UpdateDate = trade.UpdateDate,
-                            RecordNo = trade.TradeSerialNo, //单号
-                            MerNo = trade.MerNo, //渠道商户编号
-                            MerHelpFlag = 1,
-                            HelpMonthCount = 0, //扶持第几个月
-                            SnNo = trade.TradeSnNo, //渠道SN号
-                            TradeSerialNo = trade.ChannelSerial, //交易流水号
-                            TradeAmount = trade.TradeAmount, //交易金额
-                            BrandId = int.Parse(trade.ProductType), //品牌
-                            Remark = trade.Remark, //备注
-                            ActStatus = 1,
-                            CreateMan = trade.AgentNo,
-                            UpdateMan = trade.BankCardType,
-                            SeoKeyword = trade.SerEntryMode,
-                            SeoDescription = trade.TradeType,
-                            TradeDate = trade.CreateDate,
-                        });
+                        PosPushDataNewHelper.Trade(trade);
                         bool check = db.SpOrderNos.Any(m => m.OrderNo == trade.TradeSerialNo);
                         if (!check && trade.SerEntryMode != "1")
                         {

+ 0 - 3
AppStart/Helper/SycnSpServer/SycnSpTradeZkbService.cs

@@ -92,9 +92,6 @@ namespace MySystem
                                             TradeDate = pos.BindingTime,
                                         }).Entity;
                                         db.SaveChanges();
-
-                                        //推送数据给java
-                                        PosPushDataHelper.Trade(add);
                                     }
                                     db.SpOrderNos.Add(new PxcModels.SpOrderNos()
                                     {

+ 0 - 3
AppStart/Helper/SycnSpServer/SycnSpUnBindService.cs

@@ -58,9 +58,6 @@ namespace MySystem
                                     PxcModels.PosMerchantInfo merchant = db.PosMerchantInfo.FirstOrDefault(m => m.Id == EditPos.BindMerchantId);
                                     if(merchant != null)
                                     {
-                                        //推送数据给java
-                                        PosPushDataHelper.UnBind(merchant);
-
                                         pos.BindMerchantId = 0;
                                         pos.BindingState = 0;
                                         pos.BindingTime = null;