入库吱码交易

AppStart/Helper/SycnSpServer/SycnSpTradeService.cs

@@ -42,14 +42,25 @@ namespace MySystem
                     IQueryable<TradeRecord> trades = spdb.TradeRecord.Where(m => m.Id >= StartId && !BrandIds.Contains(m.ProductType) && m.CreateDate >= start && m.Status == 1).OrderBy(m => m.CreateDate).Take(20);
                     foreach (TradeRecord trade in trades.ToList())
                     {
+                        string TradeSnNo = trade.TradeSnNo;
+
                         bool op = true;
                         bool isDeposit = false;
+                        //判断盒易付吱码交易
+                        // if(trade.ProductType == "12" && trade.TradeType == "2")
+                        // {
+                        //     PxcModels.PosMerchantInfo merchant = db.PosMerchantInfo.FirstOrDefault(m => m.KqMerNo == trade.MerNo);
+                        //     if(merchant != null)
+                        //     {
+                        //         TradeSnNo = merchant.KqSnNo;
+                        //     }
+                        // }
                         if (trade.SerEntryMode == "N" && trade.ProductType == "1") //金控押金获取
                         {
                             if (trade.TradeAmount == 9900 || trade.TradeAmount == 19900 || trade.TradeAmount == 29900)
                             {
                                 op = false;
-                                PxcModels.MachineForSnNo posFor = db.MachineForSnNo.FirstOrDefault(m => m.SnNo == trade.TradeSnNo) ?? new PxcModels.MachineForSnNo();
+                                PxcModels.MachineForSnNo posFor = db.MachineForSnNo.FirstOrDefault(m => m.SnNo == TradeSnNo) ?? new PxcModels.MachineForSnNo();
                                 PxcModels.PosMachinesTwo pos = db.PosMachinesTwo.FirstOrDefault(m => m.Id == posFor.SnId);
                                 if (pos != null)
                                 {
@@ -82,7 +93,7 @@ namespace MySystem
                             if (trade.TradeAmount == 99 || trade.TradeAmount == 199 || trade.TradeAmount == 299)
                             {
                                 op = false;
-                                PxcModels.MachineForSnNo posFor = db.MachineForSnNo.FirstOrDefault(m => m.SnNo == trade.TradeSnNo) ?? new PxcModels.MachineForSnNo();
+                                PxcModels.MachineForSnNo posFor = db.MachineForSnNo.FirstOrDefault(m => m.SnNo == TradeSnNo) ?? new PxcModels.MachineForSnNo();
                                 PxcModels.PosMachinesTwo pos = db.PosMachinesTwo.FirstOrDefault(m => m.Id == posFor.SnId);
                                 if (pos != null)
                                 {
@@ -105,7 +116,7 @@ namespace MySystem
                             if (trade.TradeAmount == 99 || trade.TradeAmount == 199 || trade.TradeAmount == 299)
                             {
                                 op = false;
-                                PxcModels.MachineForSnNo posFor = db.MachineForSnNo.FirstOrDefault(m => m.SnNo == trade.TradeSnNo) ?? new PxcModels.MachineForSnNo();
+                                PxcModels.MachineForSnNo posFor = db.MachineForSnNo.FirstOrDefault(m => m.SnNo == TradeSnNo) ?? new PxcModels.MachineForSnNo();
                                 PxcModels.PosMachinesTwo pos = db.PosMachinesTwo.FirstOrDefault(m => m.Id == posFor.SnId);
                                 if (pos != null)
                                 {
@@ -139,7 +150,7 @@ namespace MySystem
                             if (trade.TradeAmount == 99 || trade.TradeAmount == 199 || trade.TradeAmount == 299)
                             {
                                 op = false;
-                                PxcModels.MachineForSnNo posFor = db.MachineForSnNo.FirstOrDefault(m => m.SnNo == trade.TradeSnNo) ?? new PxcModels.MachineForSnNo();
+                                PxcModels.MachineForSnNo posFor = db.MachineForSnNo.FirstOrDefault(m => m.SnNo == TradeSnNo) ?? new PxcModels.MachineForSnNo();
                                 PxcModels.PosMachinesTwo pos = db.PosMachinesTwo.FirstOrDefault(m => m.Id == posFor.SnId);
                                 if (pos != null)
                                 {
@@ -190,7 +201,7 @@ namespace MySystem
                         }
                         if (op)
                         {
-                            PxcModels.PosMachinesTwo pos = db.PosMachinesTwo.FirstOrDefault(m => m.PosSn == trade.TradeSnNo);
+                            PxcModels.PosMachinesTwo pos = db.PosMachinesTwo.FirstOrDefault(m => m.PosSn == TradeSnNo);
                             if (pos != null)
                             {
                                 PxcModels.KqProducts brand = db.KqProducts.FirstOrDefault(m => m.Id == pos.BrandId) ?? new PxcModels.KqProducts();
@@ -527,7 +538,7 @@ namespace MySystem
                                                 MerHelpFlag = MerHelpFlag >= 2 ? 1 : MerHelpFlag, //1扶持周,0稳定期,2盈利期
                                                 HelpMonthCount = 0, //扶持第几个月
                                                 MerBuddyType = user.MerchantType, //商户创客类型
-                                                SnNo = trade.TradeSnNo, //渠道SN号
+                                                SnNo = TradeSnNo, //渠道SN号
                                                 TradeSerialNo = trade.ChannelSerial, //交易流水号
                                                 TradeAmount = TradeAmount, //交易金额
                                                 BankCardType = BankCardType, //银行卡类型
@@ -536,7 +547,7 @@ namespace MySystem
                                                 VipFlag = VipFlag, //会员标记
                                                 PayType = PayType, //支付方式
                                                 BrandId = BrandId, //品牌
-                                                Remark = trade.Remark, //备注
+                                                Remark = trade.TradeType == "2" ? "吱码SN:" + trade.TradeSnNo : trade.Remark, //备注
                                                 TopUserId = TopUserId, //顶级创客
                                                 MerUserId = pos.UserId, //商户直属创客M
                                                 SeoTitle = HelpProfitFlag,
@@ -602,7 +613,7 @@ namespace MySystem
                             // function.WriteLog("押金收到:" + trade.MerNo, "服务费奖励发放日志");
                             // PxcModels.MachineForMerNo posFor = db.MachineForMerNo.FirstOrDefault(m => m.MerNo == trade.MerNo) ?? new PxcModels.MachineForMerNo();
                             // function.WriteLog("MachineForMerNo:" + posFor.MerNo, "服务费奖励发放日志");
-                            PxcModels.PosMachinesTwo pos = db.PosMachinesTwo.FirstOrDefault(m => m.PosSn == trade.TradeSnNo) ?? new PxcModels.PosMachinesTwo();
+                            PxcModels.PosMachinesTwo pos = db.PosMachinesTwo.FirstOrDefault(m => m.PosSn == TradeSnNo) ?? new PxcModels.PosMachinesTwo();
                             function.WriteLog("PosMachinesTwo:" + pos.PosSn, "服务费奖励发放日志");
                             PxcModels.PosMerchantInfo merchant = db.PosMerchantInfo.FirstOrDefault(m => m.Id == pos.BindMerchantId) ?? new PxcModels.PosMerchantInfo();
                             function.WriteLog("PosMerchantInfo:" + merchant.KqMerNo, "服务费奖励发放日志");