调整获取押金数据和交易数据逻辑

AppStart/GetHaoDaFTPInfoService.cs

@@ -65,7 +65,7 @@ namespace MySystem
         public void GetDepositData()
         {
             // 要下载的文件路径
-            string filePath = "/haoda-deposit/deposit_" + DateTime.Now.AddDays(-1).ToString("yyyyMMdd") + ".csv";
+            string filePath = "/haoda-deposit/deposit_" + DateTime.Now.AddDays(-2).ToString("yyyyMMdd") + ".csv";
             
             try
             {
@@ -93,27 +93,27 @@ namespace MySystem
 
                         string SnNo = DataListInfo[0]; //sn
                         string MerNo = DataListInfo[1]; //商户编号
-                        string ActDate = DataListInfo[2]; //激活时间
-                        string Deposit = DataListInfo[3]; //押金金额
-                        string PrizeAmt = DataListInfo[4]; //奖励金额
-                        string PrizeDate = DataListInfo[5]; //奖励发放时间
-                        string Name = DataListInfo[6]; //发放人姓名
-                        string PosKind = DataListInfo[7]; //机具型号
+                        string PosKind = DataListInfo[2]; //机具型号
+                        string ActDate = DataListInfo[3]; //激活时间
+                        string Deposit = DataListInfo[4]; //押金金额
+                        string PrizeAmt = DataListInfo[5]; //奖励金额
+                        string PrizeDate = DataListInfo[6]; //奖励发放时间
+                        string Name = DataListInfo[7]; //发放人姓名
 
                         string ActDateString = ActDate.Substring(0, 4) + "-" + ActDate.Substring(4, 2) + "-" + ActDate.Substring(6, 2);
                         string PrizeDateString = PrizeDate.Substring(0, 4) + "-" + PrizeDate.Substring(4, 2) + "-" + PrizeDate.Substring(6, 2);
 
                         string ProductType = "0";
-                        if(PosKind == "1") ProductType = "18";
+                        if(PosKind == "好哒语音王Y512") ProductType = "18";
                         if(PosKind == "4G收款王M820") ProductType = "19";
                         if(PosKind == "4G收款王M826") ProductType = "20";
-                        if(PosKind == "4") ProductType = "21";
+                        if(PosKind == "好哒S312") ProductType = "21";
 
                         db.BindRecord.Add(new BindRecord()
                         {
                             CreateDate = DateTime.Now,
-                            UpdateTime = DateTime.Parse(ActDateString), //机具绑定、解绑时间
-                            CreateTime = DateTime.Parse(ActDateString), //商户操作时间
+                            UpdateTime = DateTime.Now, //机具绑定、解绑时间
+                            CreateTime = DateTime.Now, //商户操作时间
                             MerSnNo = SnNo, //序列号
                             MerNo = MerNo, //商户编号
                             MerName = Name,
@@ -129,7 +129,7 @@ namespace MySystem
                         {
                             SnNo = SnNo,
                             CreateTime = DateTime.Now,
-                            UpdateTime = DateTime.Parse(ActDateString),
+                            UpdateTime = DateTime.Now,
                             AgentName = Name,
                             MerRealName = Name,
                             MerNo = MerNo,
@@ -144,7 +144,7 @@ namespace MySystem
                             SnNo = SnNo,
                             CreateDate = DateTime.Now,
                             SeoTitle = Deposit,
-                            ActivateDate = DateTime.Parse(ActDateString),
+                            ActivateDate = DateTime.Now,
                             AgentNo = MerNo,
                             MerRealName = Name,
                             MerNo = MerNo,
@@ -240,42 +240,45 @@ namespace MySystem
 
                         string MerNo = DataListInfo[0]; // 商户号
                         string SnNo = DataListInfo[1]; // 设备号
-                        string OrderNo = DataListInfo[2]; // 订单号
-                        string PayMode = DataListInfo[3]; // 支付方式(微信 支付宝)
-                        string TradeType = DataListInfo[4]; // 交易类型
-                        string TradeAmount = DataListInfo[5]; // 交易金额
-                        string TradeFee = DataListInfo[6]; // 交易手续费
-                        string TradeDate = DataListInfo[7]; // 交易时间
-                        string TradeCycle = DataListInfo[8]; // 结算周期
-                        string PosKind = DataListInfo[9];
+                        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 == "1") ProductType = "18";
+                        if(PosKind == "好哒语音王Y512") ProductType = "18";
                         if(PosKind == "4G收款王M820") ProductType = "19";
                         if(PosKind == "4G收款王M826") ProductType = "20";
-                        if(PosKind == "4") ProductType = "21";
+                        if(PosKind == "好哒S312") ProductType = "21";
 
-                        db.TradeRecord.Add(new TradeRecord()
+                        if(ProductType != "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();
+                            db.TradeRecord.Add(new TradeRecord()
+                            {
+                                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();
+                        }
                     }
                     db.Dispose();
                 }