|
|
@@ -1155,7 +1155,7 @@ namespace MySystem.Areas.Admin.Controllers
|
|
|
}
|
|
|
|
|
|
[HttpPost]
|
|
|
- public string CancelMerAgentDo(string MakerCode, string PosSn, int IsSend = 0)
|
|
|
+ public string CancelMerAgentDo(string MakerCode, string PosSn, string MerNo, int IsSend = 0)
|
|
|
{
|
|
|
if (string.IsNullOrEmpty(MakerCode))
|
|
|
{
|
|
|
@@ -1165,6 +1165,10 @@ namespace MySystem.Areas.Admin.Controllers
|
|
|
{
|
|
|
return "请输入机具SN";
|
|
|
}
|
|
|
+ if (string.IsNullOrEmpty(MerNo))
|
|
|
+ {
|
|
|
+ return "请输入商户编号";
|
|
|
+ }
|
|
|
PosMachinesTwo pos = db.PosMachinesTwo.FirstOrDefault(m => m.PosSn == PosSn);
|
|
|
KqProducts kqProducts = db.KqProducts.FirstOrDefault(m => m.Id == pos.BrandId);
|
|
|
if (pos == null)
|
|
|
@@ -1176,30 +1180,59 @@ namespace MySystem.Areas.Admin.Controllers
|
|
|
{
|
|
|
return "创客编号不存在";
|
|
|
}
|
|
|
- PosMerchantInfo merchant = db.PosMerchantInfo.FirstOrDefault(m => m.KqMerNo == PosSn);
|
|
|
- pos.UserId = pos.BuyUserId;
|
|
|
- merchant.UserId = pos.BuyUserId;
|
|
|
- merchant.MerUserType = 0;
|
|
|
- user.MerchantType = 0;
|
|
|
- db.SaveChanges();
|
|
|
- if (pos.BindMerchantId == 0)
|
|
|
+ PosMerchantInfo merchant = db.PosMerchantInfo.FirstOrDefault(m => m.KqMerNo == MerNo);
|
|
|
+ if (merchant == null)
|
|
|
{
|
|
|
- pos.BindMerchantId = merchant.Id;
|
|
|
- if (IsSend == 1)
|
|
|
+ return "商户编号不存在";
|
|
|
+ }
|
|
|
+ else if (merchant.MerUserType == 1 && merchant.UserId == user.Id)
|
|
|
+ {
|
|
|
+ pos.UserId = pos.BuyUserId;
|
|
|
+ merchant.UserId = pos.BuyUserId;
|
|
|
+ merchant.MerUserType = 0;
|
|
|
+ user.MerchantType = 0;
|
|
|
+ db.SetMerchantTypeRecord.Add(new SetMerchantTypeRecord()
|
|
|
{
|
|
|
- RedisDbconn.Instance.AddList("MsgPersonalQueue", Newtonsoft.Json.JsonConvert.SerializeObject(new MsgPersonal()
|
|
|
+ CreateDate = DateTime.Now,
|
|
|
+ SeoTitle = SysUserName + "_" + SysRealName,
|
|
|
+ IsRecyc = (ulong)pos.IsPurchase,
|
|
|
+ CreditAmount = pos.CreditTrade,
|
|
|
+ PosSnType = pos.PosSnType,
|
|
|
+ ActDate = pos.ActivationTime,
|
|
|
+ BindDate = pos.BindingTime,
|
|
|
+ ActStatus = (ulong)pos.ActivationState,
|
|
|
+ BindStatus = (ulong)pos.BindingState,
|
|
|
+ MerNo = MerNo,
|
|
|
+ PosSn = pos.PosSn,
|
|
|
+ Note = "后台取消商户型创客",
|
|
|
+ ToUserId = user.Id,
|
|
|
+ FromUserId = pos.BuyUserId,
|
|
|
+ OperateType = 2,
|
|
|
+ BuyUserId = pos.BuyUserId,
|
|
|
+ });
|
|
|
+ db.SaveChanges();
|
|
|
+ if (pos.BindMerchantId == 0)
|
|
|
+ {
|
|
|
+ pos.BindMerchantId = merchant.Id;
|
|
|
+ if (IsSend == 1)
|
|
|
{
|
|
|
- UserId = pos.BuyUserId, //接收创客
|
|
|
- MsgType = 2,
|
|
|
- Title = "商户型代理取消成功", //标题
|
|
|
- Summary = "您的 " + kqProducts.Name + " SN:" + pos.PosSn + "已给下级代理" + user.RealName + "" + MakerCode + "取消成功",
|
|
|
- CreateDate = DateTime.Now,
|
|
|
- }));
|
|
|
+ RedisDbconn.Instance.AddList("MsgPersonalQueue", Newtonsoft.Json.JsonConvert.SerializeObject(new MsgPersonal()
|
|
|
+ {
|
|
|
+ UserId = pos.BuyUserId, //接收创客
|
|
|
+ MsgType = 2,
|
|
|
+ Title = "商户型代理取消成功", //标题
|
|
|
+ Summary = "您的 " + kqProducts.Name + " SN:" + pos.PosSn + "已给下级代理" + user.RealName + "" + MakerCode + "取消成功",
|
|
|
+ CreateDate = DateTime.Now,
|
|
|
+ }));
|
|
|
+ }
|
|
|
}
|
|
|
+ string text = string.Format("取消商户代理,创客编号: " + user.MakerCode + ",机具SN:" + pos.PosSn + ",操作人:" + SysRealName + ",Time:" + DateTime.Now + "");
|
|
|
+ function.WriteLog(text, "CancelMerAgent");//取消商户型代理日志
|
|
|
+ }
|
|
|
+ else
|
|
|
+ {
|
|
|
+ return "未找到相关信息";
|
|
|
}
|
|
|
- string text = string.Format("取消商户代理,创客编号: " + user.MakerCode + ",机具SN:" + pos.PosSn + ",操作人:" + SysRealName + ",Time:" + DateTime.Now + "");
|
|
|
- function.WriteLog(text, "CancelMerAgent");//取消商户型代理日志
|
|
|
-
|
|
|
return "success";
|
|
|
}
|
|
|
|