|
@@ -420,9 +420,9 @@ namespace MySystem.Areas.Admin.Controllers
|
|
|
string AccountName = dr["账号姓名"].ToString();
|
|
string AccountName = dr["账号姓名"].ToString();
|
|
|
string SimNo = dr["SIM卡号"].ToString();
|
|
string SimNo = dr["SIM卡号"].ToString();
|
|
|
|
|
|
|
|
- bool checkMer = db.PosMerchantInfo.Any(m => m.KqMerNo == PhoneNumber);
|
|
|
|
|
- if (!checkMer)
|
|
|
|
|
- {
|
|
|
|
|
|
|
+ // PosMerchantInfo checkMer = db.PosMerchantInfo.FirstOrDefault(m => m.KqMerNo == PhoneNumber && m.Field5 == ActStatus);
|
|
|
|
|
+ // if (checkMer == null)
|
|
|
|
|
+ // {
|
|
|
string json = "{";
|
|
string json = "{";
|
|
|
json += "\"OrderNo\":\"" + OrderNo + "\",";
|
|
json += "\"OrderNo\":\"" + OrderNo + "\",";
|
|
|
json += "\"CreateDate\":\"" + CreateDate + "\",";
|
|
json += "\"CreateDate\":\"" + CreateDate + "\",";
|
|
@@ -478,7 +478,7 @@ namespace MySystem.Areas.Admin.Controllers
|
|
|
ProductType = "14",
|
|
ProductType = "14",
|
|
|
Status = 1,
|
|
Status = 1,
|
|
|
});
|
|
});
|
|
|
- }
|
|
|
|
|
|
|
+ // }
|
|
|
|
|
|
|
|
// spdb.TradeRecord.Add(new SpModels.TradeRecord()
|
|
// spdb.TradeRecord.Add(new SpModels.TradeRecord()
|
|
|
// {
|
|
// {
|
