|
|
@@ -208,6 +208,14 @@ namespace MySystem
|
|
|
string MerKind = deposit.MerKind; //商户类型
|
|
|
string DepositActCode = deposit.DepositActCode; //商户类型
|
|
|
|
|
|
+ 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";
|
|
|
+ if (PosKind == "好哒语音王Y518") ProductType = "36";
|
|
|
+
|
|
|
if (!db.ActivateRecord.Any(m => m.SnNo == SnNo && m.MerNo == MerNo))
|
|
|
{
|
|
|
MpMainModels2.MerchantAddInfo meradd = mpdb2.MerchantAddInfo.FirstOrDefault(m => m.MchtNo == MerNo) ?? new MpMainModels2.MerchantAddInfo();
|
|
|
@@ -217,13 +225,6 @@ namespace MySystem
|
|
|
|
|
|
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,
|
|
|
@@ -299,6 +300,28 @@ namespace MySystem
|
|
|
// PosPushDataNewHelper.Deposit(act);
|
|
|
}
|
|
|
}
|
|
|
+ else if (PosKind == "好哒语音王Y518")
|
|
|
+ {
|
|
|
+ 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 = PrizeAmt,
|
|
|
+ Field4 = DepositActCode,
|
|
|
+ }).Entity;
|
|
|
+ db.SaveChanges();
|
|
|
+ }
|
|
|
|
|
|
MpMainModels2.HdDepositTmp edit = mpdb2.HdDepositTmp.FirstOrDefault(m => m.SnNo == SnNo);
|
|
|
if (edit != null)
|
