|
|
@@ -41,6 +41,11 @@ namespace MySystem
|
|
|
{
|
|
|
if (Mer.Field2 != "解绑" && Mer.Field2 != "UNBIND")
|
|
|
{
|
|
|
+ string rnd = "";
|
|
|
+ if (!Utils.Instance.IsWifi(int.Parse(Mer.ProductType)) && !Utils.Instance.IsHaoDa(int.Parse(Mer.ProductType)) && Mer.ProductType != "14")
|
|
|
+ {
|
|
|
+ rnd = GetRandom(spdb, Mer.SnNo, Mer.MerNo);
|
|
|
+ }
|
|
|
if (Utils.Instance.IsWifi(int.Parse(Mer.ProductType)))
|
|
|
{
|
|
|
Mer.MerNo = Mer.SnNo;
|
|
|
@@ -75,12 +80,12 @@ namespace MySystem
|
|
|
{
|
|
|
Mer.MerMobile = merInfo.Field2;
|
|
|
}
|
|
|
- PosPushDataNewHelper.Bind(Mer);
|
|
|
+ PosPushDataNewHelper.Bind(Mer, rnd);
|
|
|
}
|
|
|
}
|
|
|
else if (!Utils.Instance.IsHaoDa(int.Parse(Mer.ProductType)))
|
|
|
{
|
|
|
- PosPushDataNewHelper.Bind(Mer);
|
|
|
+ PosPushDataNewHelper.Bind(Mer, rnd);
|
|
|
}
|
|
|
}
|
|
|
Merchants edit = spdb.Merchants.FirstOrDefault(m => m.Id == Mer.Id);
|
|
|
@@ -111,6 +116,16 @@ namespace MySystem
|
|
|
}
|
|
|
}
|
|
|
|
|
|
+ public string GetRandom(WebCMSEntities spdb, string sn, string merno)
|
|
|
+ {
|
|
|
+ var list = spdb.BindRecord.Select(m => new { m.MerSnNo, m.MerNo, m.CreateTime }).Where(m => m.MerSnNo == sn && m.MerNo == merno).ToList().Select(m => m.CreateTime).Distinct().ToList();
|
|
|
+ if(list.Count > 1)
|
|
|
+ {
|
|
|
+ return function.get_Random(5);
|
|
|
+ }
|
|
|
+ return "";
|
|
|
+ }
|
|
|
+
|
|
|
public void WifiSendPrize(PxcModels.WebCMSEntities db, PxcModels.PosMachinesTwo pos, PxcModels.PosMerchantInfo add)
|
|
|
{
|
|
|
PxcModels.WifiTradeRecord trade = db.WifiTradeRecord.FirstOrDefault(m => m.SnNo == pos.PosSn && m.Status == 0);
|