调整交易入库到码牌服务器

AppStart/GetHaoDaFTPInfoService.cs

@@ -231,53 +231,65 @@ namespace MySystem
                 string fileContents = reader.ReadToEnd();
                 if (!string.IsNullOrEmpty(fileContents))
                 {
-                    WebCMSEntities db = new WebCMSEntities();
+                    MpMainModels2.WebCMSEntities db = new MpMainModels2.WebCMSEntities();
                     var DataInfo = fileContents.TrimEnd('\n').Split('\n', 2);
                     var DataList = DataInfo[1].Split('\n');
                     foreach (var DataListItem in DataList)
                     {
                         var DataListInfo = DataListItem.Split(',');
 
-                        string MerNo = DataListInfo[0]; // 商户号
-                        string SnNo = DataListInfo[1]; // 设备号
-                        string PosKind = DataListInfo[2];
-                        string OrderNo = DataListInfo[3]; // 订单号
-                        string PayMode = DataListInfo[4]; // 支付方式(微信 支付宝)
-                        string TradeType = DataListInfo[5]; // 交易类型
-                        string TradeAmount = DataListInfo[6]; // 交易金额
-                        string TradeFee = DataListInfo[7]; // 交易手续费
-                        string TradeDate = DataListInfo[8]; // 交易时间
-                        string TradeCycle = DataListInfo[9]; // 结算周期
-
-                        string TradeDateString = TradeDate.Substring(0, 4) + "-" + TradeDate.Substring(4, 2) + "-" + TradeDate.Substring(6, 2) + " " + TradeDate.Substring(8, 2) + ":" + TradeDate.Substring(10, 2) + ":" + TradeDate.Substring(12, 2);
-
-                        string ProductType = "0";
-                        if(PosKind == "好哒语音王Y512") ProductType = "18";
-                        if(PosKind == "4G收款王M820") ProductType = "19";
-                        if(PosKind == "4G收款王M826") ProductType = "20";
-                        if(PosKind == "好哒S312") ProductType = "21";
-
-                        if(ProductType != "0")
+                        var MerchantNo = ""; // 商户号
+                        var BaseNo = ""; // 设备号
+                        var OrderNo = ""; // 订单号
+                        var PayWay = ""; // 支付方式(微信 支付宝)
+                        var TradeType = ""; // 交易类型
+                        var TradeAmount = ""; // 交易金额
+                        var TradeFee = ""; // 交易手续费
+                        var TradeDate = ""; // 交易时间
+                        var TradeCycle = ""; // 结算周期
+
+                        MerchantNo = DataListInfo[0];
+                        BaseNo = DataListInfo[1];
+                        OrderNo = DataListInfo[3];
+                        PayWay = DataListInfo[4];
+                        TradeType = DataListInfo[5];
+                        TradeAmount = DataListInfo[6];
+                        TradeFee = DataListInfo[7];
+                        TradeDate = DataListInfo[8];
+                        TradeCycle = DataListInfo[9];
+
+                        TradeDate = TradeDate.Substring(0, 4) + "-" + TradeDate.Substring(4, 2) + "-" + TradeDate.Substring(6, 2) + " " + TradeDate.Substring(8, 2) + ":" + TradeDate.Substring(10, 2) + ":" + TradeDate.Substring(12, 2);
+
+                        var PayMode = 0;
+                        if (PayWay.Contains("支付宝")) PayMode = 1;
+                        if (PayWay.Contains("微信")) PayMode = 2;
+
+                        var merchantAddInfo = db.MerchantAddInfo.FirstOrDefault(m => m.MchtNo == MerchantNo) ?? new MpMainModels2.MerchantAddInfo();
+                        if (merchantAddInfo.Id > 0)
                         {
-                            db.TradeRecord.Add(new TradeRecord()
+                            var merchantInfo = db.MerchantInfo.FirstOrDefault(m => m.Id == merchantAddInfo.Id) ?? new MpMainModels2.MerchantInfo();
+                            if(merchantInfo.IsAct == 0)
+                            {
+                                merchantInfo.IsAct = 1;
+                            }
+                            var orders = db.ConsumerOrders.FirstOrDefault(m => m.SeoTitle == OrderNo && OrderNo == OrderNo) ?? new MpMainModels2.ConsumerOrders();
+                            if (orders.Id == 0)
                             {
-                                CreateDate = DateTime.Now,
-                                UpdateDate = DateTime.Parse(TradeDateString),
-                                TradeSnNo = SnNo, //序列号
-                                MerNo = MerNo, //商户编号
-                                Remark = "交易成功",
-                                SettleFee = decimal.Parse(function.CheckNum(TradeFee)),
-                                BankCardType = "02",
-                                TradeType = TradeType,
-                                TradeStatus = "00",
-                                TradeAmount = decimal.Parse(function.CheckNum(TradeAmount)),
-                                TradeSerialNo = OrderNo,
-                                ProductType = ProductType,
-                                Field1 = PayMode,
-                                Field2 = TradeCycle,
-                                Status = 1,
-                            });
-                            db.SaveChanges();
+                                var query = db.ConsumerOrders.Add(new MpMainModels2.ConsumerOrders()
+                                {
+                                    Status = 1,
+                                    CreateDate = DateTime.Parse(TradeDate),
+                                    UpdateDate = DateTime.Parse(TradeDate),
+                                    SnNo = BaseNo,
+                                    PayMoney = decimal.Parse(TradeAmount),
+                                    PayMode = PayMode,
+                                    SeoTitle = OrderNo,
+                                    OrderNo = OrderNo,
+                                    MerchantId = merchantAddInfo.Id,
+                                    UserId = merchantInfo.UserId
+                                }).Entity;
+                                db.SaveChanges();
+                            }
                         }
                     }
                     db.Dispose();

Startup.cs

@@ -152,7 +152,7 @@ namespace MySystem
             InitMain();
 
             //必须打开的
-            GetHaoDaFTPInfoService.Instance.Start();
+            // GetHaoDaFTPInfoService.Instance.Start();
             GetHaoDaFTPInfoService.Instance.StartTrade();
         }
 

appsettings.Development.json

@@ -18,8 +18,8 @@
     "MainSqlConnStr": "server=47.108.62.166;port=3306;user=root;password=HDlNs1ZpG5iR9D9I;database=KxsStatServer;charset=utf8;",
     "SpSqlConnStr": "server=47.108.62.166;port=3306;user=root;password=HDlNs1ZpG5iR9D9I;database=KxsSpServer;charset=utf8;",
     "OpSqlConnStr": "server=47.108.62.166;port=3306;user=root;password=HDlNs1ZpG5iR9D9I;database=KxsOpServer;charset=utf8;",
-    "MpSqlConnStr": "server=rm-2vc27k81v217qs1t55o.mysql.cn-chengdu.rds.aliyuncs.com;port=3306;user=QrCodePlateMainServer;password=ll4DFaALMu9YIooM;database=QrCodePlateMainServer;charset=utf8;",
-    "MpSqlConnStr2": "server=rm-2vc27k81v217qs1t55o.mysql.cn-chengdu.rds.aliyuncs.com;port=3306;user=QrCodePlateMainServer;password=ll4DFaALMu9YIooM;database=QrCodePlateMainServer2;charset=utf8;",
+    "MpSqlConnStr": "server=47.109.31.237;port=3306;user=QrCodePlateMainServer;password=ll4DFaALMu9YIooM;database=QrCodePlateMainServer;charset=utf8;",
+    "MpSqlConnStr2": "server=47.109.31.237;port=3306;user=QrCodePlateMainServer;password=ll4DFaALMu9YIooM;database=QrCodePlateMainServer2;charset=utf8;",
     "RdsStatSqlConnStr": "server=47.108.62.166;port=3306;user=root;password=HDlNs1ZpG5iR9D9I;database=KxsStatServer;charset=utf8;",
     "RedisConnStr": "47.108.62.166:6379,password=klm@redis,DefaultDatabase=1,poolsize=500,preheat=50,asyncPipeline=true",
     "IOSAppVersion": "1.0.0",