|
|
@@ -4500,14 +4500,45 @@ namespace MySystem.Areas.Admin.Controllers
|
|
|
}
|
|
|
if (merchantInfo.Id > 0)
|
|
|
{
|
|
|
- return "机具" + PosSn + "以经绑定了商户";
|
|
|
+ return "机具" + PosSn + "以经存在绑定商户";
|
|
|
}
|
|
|
- PosMerchantInfo posMerchantInfo = db.PosMerchantInfo.Add(new PosMerchantInfo()
|
|
|
+ var spInfo = spdb.BindRecord.FirstOrDefault(m => m.MerNo == MerSn && m.MerSnNo == PosSn) ?? new SpModels.BindRecord();
|
|
|
+ if (spInfo.Id > 0)
|
|
|
{
|
|
|
- CreateDate = DateTime.Now,
|
|
|
- UpdateDate= DateTime.Now,
|
|
|
- }).Entity;
|
|
|
- return "";
|
|
|
+ var MerUserType = 0;
|
|
|
+ var ActiveStatus = 0;
|
|
|
+ if (pos.BuyUserId != pos.UserId)
|
|
|
+ {
|
|
|
+ MerUserType = 1;
|
|
|
+ }
|
|
|
+ if (string.IsNullOrEmpty(pos.ActivationTime.ToString()))
|
|
|
+ {
|
|
|
+ ActiveStatus = 1;
|
|
|
+ }
|
|
|
+ PosMerchantInfo posMerchantInfo = db.PosMerchantInfo.Add(new PosMerchantInfo()
|
|
|
+ {
|
|
|
+ CreateDate = pos.BindingTime,
|
|
|
+ TopUserId = 1,
|
|
|
+ BrandId = pos.BrandId,
|
|
|
+ SnStoreId = pos.StoreId,
|
|
|
+ MerStandardDate = pos.ActivationTime,
|
|
|
+ SnType = pos.PosSnType,
|
|
|
+ MerUserType = MerUserType,
|
|
|
+ UserId = pos.UserId,
|
|
|
+ ActiveStatus = ActiveStatus,
|
|
|
+ MerStatus = 1,
|
|
|
+ KqSnNo = PosSn,
|
|
|
+ KqMerNo = MerSn,
|
|
|
+ MerIdcardNo = spInfo.SeoKeyword,
|
|
|
+ MerchantMobile = spInfo.MerNewSnNo,
|
|
|
+ MerchantName = spInfo.MerName,
|
|
|
+ MerchantNo = spInfo.MerNo,
|
|
|
+ }).Entity;
|
|
|
+ db.SaveChanges();
|
|
|
+ string text = string.Format("设置商户信息,机具Sn: " + PosSn + ",商户编号: " + MerSn + ",操作人:" + SysUserName + "_" + SysRealName + ",时间:" + DateTime.Now + "");
|
|
|
+ function.WriteLog(text, "设置商户信息");
|
|
|
+ }
|
|
|
+ return "success";
|
|
|
}
|
|
|
#endregion
|
|
|
|