|
@@ -114,74 +114,77 @@ namespace MySystem
|
|
|
{
|
|
|
WebCMSEntities db = new WebCMSEntities();
|
|
|
var DataInfo = fileContents.TrimEnd('\n').Split('\n', 2);
|
|
|
- var DataList = DataInfo[1].Split('\n');
|
|
|
- foreach (var DataListItem in DataList)
|
|
|
+ if(DataInfo.Length > 1)
|
|
|
{
|
|
|
- var DataListInfo = DataListItem.Split(',');
|
|
|
-
|
|
|
- string SnNo = DataListInfo[0]; //sn
|
|
|
- string MerNo = DataListInfo[1]; //商户编号
|
|
|
- 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 == "好哒语音王Y512") ProductType = "18";
|
|
|
- if(PosKind == "4G收款王M820") ProductType = "19";
|
|
|
- if(PosKind == "4G收款王M826") ProductType = "20";
|
|
|
- if(PosKind == "好哒S312") ProductType = "21";
|
|
|
-
|
|
|
- db.BindRecord.Add(new BindRecord()
|
|
|
+ var DataList = DataInfo[1].Split('\n');
|
|
|
+ foreach (var DataListItem in DataList)
|
|
|
{
|
|
|
- CreateDate = DateTime.Now,
|
|
|
- UpdateTime = DateTime.Now, //机具绑定、解绑时间
|
|
|
- CreateTime = DateTime.Now, //商户操作时间
|
|
|
- MerSnNo = SnNo, //序列号
|
|
|
- MerNo = MerNo, //商户编号
|
|
|
- MerName = Name,
|
|
|
- SeoTitle = PrizeAmt,
|
|
|
- SeoKeyword = ActDateString,
|
|
|
- ProductType = ProductType,
|
|
|
- Field1 = Deposit,
|
|
|
- Field2 = PrizeDate,
|
|
|
- Status = 1,
|
|
|
- });
|
|
|
-
|
|
|
- db.Merchants.Add(new Merchants()
|
|
|
- {
|
|
|
- SnNo = SnNo,
|
|
|
- CreateTime = DateTime.Now,
|
|
|
- UpdateTime = DateTime.Now,
|
|
|
- AgentName = Name,
|
|
|
- MerRealName = Name,
|
|
|
- MerNo = MerNo,
|
|
|
- MerName = Name,
|
|
|
- ProductType = ProductType,
|
|
|
- Status = 1,
|
|
|
- });
|
|
|
- db.SaveChanges();
|
|
|
-
|
|
|
- db.ActivateRecord.Add(new ActivateRecord()
|
|
|
- {
|
|
|
- SnNo = SnNo,
|
|
|
- CreateDate = DateTime.Now,
|
|
|
- SeoTitle = Deposit,
|
|
|
- ActivateDate = DateTime.Now,
|
|
|
- AgentNo = MerNo,
|
|
|
- MerRealName = Name,
|
|
|
- MerNo = MerNo,
|
|
|
- MerName = Name,
|
|
|
- ProductType = ProductType,
|
|
|
- ChannelSerial = DateTime.Now.ToString("yyyyMMddHHmmssfff") + function.get_Random(8),
|
|
|
- Status = 1,
|
|
|
- });
|
|
|
- db.SaveChanges();
|
|
|
+ var DataListInfo = DataListItem.Split(',');
|
|
|
+
|
|
|
+ string SnNo = DataListInfo[0]; //sn
|
|
|
+ string MerNo = DataListInfo[1]; //商户编号
|
|
|
+ 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 == "好哒语音王Y512") ProductType = "18";
|
|
|
+ if(PosKind == "4G收款王M820") ProductType = "19";
|
|
|
+ if(PosKind == "4G收款王M826") ProductType = "20";
|
|
|
+ if(PosKind == "好哒S312") ProductType = "21";
|
|
|
+
|
|
|
+ db.BindRecord.Add(new BindRecord()
|
|
|
+ {
|
|
|
+ CreateDate = DateTime.Now,
|
|
|
+ UpdateTime = DateTime.Now, //机具绑定、解绑时间
|
|
|
+ CreateTime = DateTime.Now, //商户操作时间
|
|
|
+ MerSnNo = SnNo, //序列号
|
|
|
+ MerNo = MerNo, //商户编号
|
|
|
+ MerName = Name,
|
|
|
+ SeoTitle = PrizeAmt,
|
|
|
+ SeoKeyword = ActDateString,
|
|
|
+ ProductType = ProductType,
|
|
|
+ Field1 = Deposit,
|
|
|
+ Field2 = PrizeDate,
|
|
|
+ Status = 1,
|
|
|
+ });
|
|
|
+
|
|
|
+ db.Merchants.Add(new Merchants()
|
|
|
+ {
|
|
|
+ SnNo = SnNo,
|
|
|
+ CreateTime = DateTime.Now,
|
|
|
+ UpdateTime = DateTime.Now,
|
|
|
+ AgentName = Name,
|
|
|
+ MerRealName = Name,
|
|
|
+ MerNo = MerNo,
|
|
|
+ MerName = Name,
|
|
|
+ ProductType = ProductType,
|
|
|
+ Status = 1,
|
|
|
+ });
|
|
|
+ db.SaveChanges();
|
|
|
+
|
|
|
+ db.ActivateRecord.Add(new ActivateRecord()
|
|
|
+ {
|
|
|
+ SnNo = SnNo,
|
|
|
+ CreateDate = DateTime.Now,
|
|
|
+ SeoTitle = Deposit,
|
|
|
+ ActivateDate = DateTime.Now,
|
|
|
+ AgentNo = MerNo,
|
|
|
+ MerRealName = Name,
|
|
|
+ MerNo = MerNo,
|
|
|
+ MerName = Name,
|
|
|
+ ProductType = ProductType,
|
|
|
+ ChannelSerial = DateTime.Now.ToString("yyyyMMddHHmmssfff") + function.get_Random(8),
|
|
|
+ Status = 1,
|
|
|
+ });
|
|
|
+ db.SaveChanges();
|
|
|
+ }
|
|
|
}
|
|
|
db.Dispose();
|
|
|
}
|
|
@@ -287,68 +290,71 @@ namespace MySystem
|
|
|
{
|
|
|
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)
|
|
|
+ if(DataInfo.Length > 1)
|
|
|
{
|
|
|
- var DataListInfo = DataListItem.Split(',');
|
|
|
-
|
|
|
- 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);
|
|
|
-
|
|
|
- function.WriteLog("OrderNo:" + OrderNo, "获取好哒FTP文件数据异常");
|
|
|
- function.WriteLog("MerchantNo:" + MerchantNo, "获取好哒FTP文件数据异常");
|
|
|
-
|
|
|
- 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)
|
|
|
+ var DataList = DataInfo[1].Split('\n');
|
|
|
+ foreach (var DataListItem in DataList)
|
|
|
{
|
|
|
- function.WriteLog("找到商户", "获取好哒FTP文件数据异常");
|
|
|
- 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)
|
|
|
+ var DataListInfo = DataListItem.Split(',');
|
|
|
+
|
|
|
+ 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);
|
|
|
+
|
|
|
+ function.WriteLog("OrderNo:" + OrderNo, "获取好哒FTP文件数据异常");
|
|
|
+ function.WriteLog("MerchantNo:" + MerchantNo, "获取好哒FTP文件数据异常");
|
|
|
+
|
|
|
+ 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)
|
|
|
{
|
|
|
- function.WriteLog("订单号不存在,开始入库", "获取好哒FTP文件数据异常");
|
|
|
- var query = db.ConsumerOrders.Add(new MpMainModels2.ConsumerOrders()
|
|
|
+ function.WriteLog("找到商户", "获取好哒FTP文件数据异常");
|
|
|
+ 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)
|
|
|
{
|
|
|
- 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();
|
|
|
- function.WriteLog("入库完毕", "获取好哒FTP文件数据异常");
|
|
|
+ function.WriteLog("订单号不存在,开始入库", "获取好哒FTP文件数据异常");
|
|
|
+ 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();
|
|
|
+ function.WriteLog("入库完毕", "获取好哒FTP文件数据异常");
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
}
|