|
@@ -247,93 +247,96 @@ namespace MySystem
|
|
|
string MerKind = deposit.MerKind; //商户类型
|
|
|
string DepositActCode = deposit.DepositActCode; //商户类型
|
|
|
|
|
|
- MpMainModels2.MerchantAddInfo meradd = mpdb2.MerchantAddInfo.FirstOrDefault(m => m.MchtNo == MerNo) ?? new MpMainModels2.MerchantAddInfo();
|
|
|
- MpMainModels2.MerchantInfo merchant = mpdb2.MerchantInfo.FirstOrDefault(m => m.Id == meradd.Id) ?? new MpMainModels2.MerchantInfo();
|
|
|
+ if(!db.ActivateRecord.Any(m => m.SnNo == SnNo && m.MerNo == MerNo))
|
|
|
+ {
|
|
|
+ MpMainModels2.MerchantAddInfo meradd = mpdb2.MerchantAddInfo.FirstOrDefault(m => m.MchtNo == MerNo) ?? new MpMainModels2.MerchantAddInfo();
|
|
|
+ MpMainModels2.MerchantInfo merchant = mpdb2.MerchantInfo.FirstOrDefault(m => m.Id == meradd.Id) ?? new MpMainModels2.MerchantInfo();
|
|
|
|
|
|
- if(!string.IsNullOrEmpty(meradd.CertMerchantName)) MerName = meradd.CertMerchantName;
|
|
|
+ if(!string.IsNullOrEmpty(meradd.CertMerchantName)) MerName = meradd.CertMerchantName;
|
|
|
|
|
|
- string ActDateString = ActDate.Substring(0, 4) + "-" + ActDate.Substring(4, 2) + "-" + ActDate.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";
|
|
|
- if(PosKind == "好哒扫码通M837") ProductType = "29";
|
|
|
+ string ActDateString = ActDate.Substring(0, 4) + "-" + ActDate.Substring(4, 2) + "-" + ActDate.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";
|
|
|
+ if(PosKind == "好哒扫码通M837") ProductType = "29";
|
|
|
+
|
|
|
+ BindRecord mer = db.BindRecord.Add(new BindRecord()
|
|
|
+ {
|
|
|
+ CreateDate = DateTime.Now,
|
|
|
+ UpdateTime = DateTime.Now, //机具绑定、解绑时间
|
|
|
+ CreateTime = DateTime.Now, //商户操作时间
|
|
|
+ MerSnNo = SnNo, //序列号
|
|
|
+ MerNo = MerNo, //商户编号
|
|
|
+ MerName = MerName,
|
|
|
+ SeoTitle = PrizeAmt,
|
|
|
+ SeoKeyword = ActDateString,
|
|
|
+ ProductType = ProductType,
|
|
|
+ Field1 = Deposit,
|
|
|
+ Field2 = PrizeDate,
|
|
|
+ Field3 = Name,
|
|
|
+ Field4 = PassDate,
|
|
|
+ Field5 = MerKind,
|
|
|
+ Status = 1,
|
|
|
+ QueryCount = merchant.UserId,
|
|
|
+ }).Entity;
|
|
|
|
|
|
- BindRecord mer = db.BindRecord.Add(new BindRecord()
|
|
|
- {
|
|
|
- CreateDate = DateTime.Now,
|
|
|
- UpdateTime = DateTime.Now, //机具绑定、解绑时间
|
|
|
- CreateTime = DateTime.Now, //商户操作时间
|
|
|
- MerSnNo = SnNo, //序列号
|
|
|
- MerNo = MerNo, //商户编号
|
|
|
- MerName = MerName,
|
|
|
- SeoTitle = PrizeAmt,
|
|
|
- SeoKeyword = ActDateString,
|
|
|
- ProductType = ProductType,
|
|
|
- Field1 = Deposit,
|
|
|
- Field2 = PrizeDate,
|
|
|
- Field3 = Name,
|
|
|
- Field4 = PassDate,
|
|
|
- Field5 = MerKind,
|
|
|
- Status = 1,
|
|
|
- QueryCount = merchant.UserId,
|
|
|
- }).Entity;
|
|
|
-
|
|
|
- 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,
|
|
|
- QueryCount = merchant.UserId,
|
|
|
- });
|
|
|
- db.SaveChanges();
|
|
|
+ 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,
|
|
|
+ QueryCount = merchant.UserId,
|
|
|
+ });
|
|
|
+ db.SaveChanges();
|
|
|
|
|
|
- Thread.Sleep(1000);
|
|
|
+ Thread.Sleep(1000);
|
|
|
|
|
|
- ActivateRecord act = 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,
|
|
|
- Field1 = PassDate,
|
|
|
- Field2 = MerKind,
|
|
|
- Field3 = ActDateString,
|
|
|
- Field4 = DepositActCode,
|
|
|
- QueryCount = merchant.UserId,
|
|
|
- }).Entity;
|
|
|
- db.SaveChanges();
|
|
|
+ ActivateRecord act = 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,
|
|
|
+ Field1 = PassDate,
|
|
|
+ Field2 = MerKind,
|
|
|
+ Field3 = ActDateString,
|
|
|
+ Field4 = DepositActCode,
|
|
|
+ QueryCount = merchant.UserId,
|
|
|
+ }).Entity;
|
|
|
+ db.SaveChanges();
|
|
|
|
|
|
- //推送MQ给创业帮
|
|
|
- var merchantAddInfo = mpdb2.MerchantAddInfo.FirstOrDefault(m => m.MchtNo == MerNo) ?? new MpMainModels2.MerchantAddInfo();
|
|
|
- if (merchantAddInfo.BrandId == 1 && !string.IsNullOrEmpty(merchantAddInfo.CybMakerCode))
|
|
|
- {
|
|
|
- SortedList<string, string> obj = new SortedList<string, string>();
|
|
|
- obj.Add("create_time", ActDateString);
|
|
|
- obj.Add("sn", SnNo);
|
|
|
- obj.Add("deposit", Deposit);
|
|
|
- obj.Add("subject_type", merchantAddInfo.SubjectType);
|
|
|
- obj.Add("merch_no", merchantAddInfo.MchtNo);
|
|
|
- obj.Add("maker_code", merchantAddInfo.CybMakerCode);
|
|
|
- PushHelper.Instance.Do(obj, "cashNotify");
|
|
|
-
|
|
|
- // PosPushDataNewHelper.Bind(mer, PosKind);
|
|
|
- // PosPushDataNewHelper.Deposit(act);
|
|
|
+ //推送MQ给创业帮
|
|
|
+ var merchantAddInfo = mpdb2.MerchantAddInfo.FirstOrDefault(m => m.MchtNo == MerNo) ?? new MpMainModels2.MerchantAddInfo();
|
|
|
+ if (merchantAddInfo.BrandId == 1 && !string.IsNullOrEmpty(merchantAddInfo.CybMakerCode))
|
|
|
+ {
|
|
|
+ SortedList<string, string> obj = new SortedList<string, string>();
|
|
|
+ obj.Add("create_time", ActDateString);
|
|
|
+ obj.Add("sn", SnNo);
|
|
|
+ obj.Add("deposit", Deposit);
|
|
|
+ obj.Add("subject_type", merchantAddInfo.SubjectType);
|
|
|
+ obj.Add("merch_no", merchantAddInfo.MchtNo);
|
|
|
+ obj.Add("maker_code", merchantAddInfo.CybMakerCode);
|
|
|
+ PushHelper.Instance.Do(obj, "cashNotify");
|
|
|
+
|
|
|
+ // PosPushDataNewHelper.Bind(mer, PosKind);
|
|
|
+ // PosPushDataNewHelper.Deposit(act);
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
MpMainModels2.HdDepositTmp edit = mpdb2.HdDepositTmp.FirstOrDefault(m => m.SnNo == SnNo);
|