|
@@ -59,7 +59,7 @@ namespace MySystem
|
|
|
PxcModels.PosMerchantInfo add = db.PosMerchantInfo.FirstOrDefault(m => m.KqMerNo == Mer.MerNo);
|
|
|
if (add == null)
|
|
|
{
|
|
|
- int IsFirst = 0;
|
|
|
+ int IsFirst = 1;
|
|
|
if(!string.IsNullOrEmpty(Mer.MerIdcardNo))
|
|
|
{
|
|
|
string startNo = Mer.MerIdcardNo.Substring(0, 6);
|
|
@@ -83,12 +83,12 @@ namespace MySystem
|
|
|
Name = Name.Replace("个体户", "");
|
|
|
Name = Name.Replace("个体商户", "");
|
|
|
bool check = db.PosMerchantInfo.Any(m => m.MerIdcardNo.StartsWith(startNo) && m.MerIdcardNo.EndsWith(endNo) && m.MerRealName.Contains(Name));
|
|
|
- if(!check)
|
|
|
+ if(check)
|
|
|
{
|
|
|
- IsFirst = 1;
|
|
|
+ IsFirst = 0;
|
|
|
}
|
|
|
- pos.IsFirst = IsFirst;
|
|
|
}
|
|
|
+ pos.IsFirst = IsFirst;
|
|
|
add = db.PosMerchantInfo.Add(new PxcModels.PosMerchantInfo()
|
|
|
{
|
|
|
CreateDate = Mer.CreateTime,
|