|
@@ -207,6 +207,7 @@ namespace MySystem.Areas.Admin.Controllers
|
|
|
mer.ActiveStatus = 1;
|
|
mer.ActiveStatus = 1;
|
|
|
mer.MerStandardDate = DateTime.Now;
|
|
mer.MerStandardDate = DateTime.Now;
|
|
|
}
|
|
}
|
|
|
|
|
+ SendActData(pos);
|
|
|
}
|
|
}
|
|
|
else if (pos.CreditTrade >= CheckMoney && pos.ActivationState == 1)
|
|
else if (pos.CreditTrade >= CheckMoney && pos.ActivationState == 1)
|
|
|
{
|
|
{
|
|
@@ -240,6 +241,7 @@ namespace MySystem.Areas.Admin.Controllers
|
|
|
{
|
|
{
|
|
|
pos.ActivationState = 1;
|
|
pos.ActivationState = 1;
|
|
|
pos.ActivationTime = DateTime.Now;
|
|
pos.ActivationTime = DateTime.Now;
|
|
|
|
|
+ SendActData(pos);
|
|
|
}
|
|
}
|
|
|
PosMerchantInfo merchant = new PosMerchantInfo();
|
|
PosMerchantInfo merchant = new PosMerchantInfo();
|
|
|
|
|
|
|
@@ -522,6 +524,25 @@ namespace MySystem.Areas.Admin.Controllers
|
|
|
return "success";
|
|
return "success";
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|
|
+ #region 推送激活数据信息
|
|
|
|
|
+
|
|
|
|
|
+ public void SendActData(PosMachinesTwo pos)
|
|
|
|
|
+ {
|
|
|
|
|
+ int actType = pos.BrandId != 14 ? 1 : 2;
|
|
|
|
|
+ string data = "{";
|
|
|
|
|
+ data += "\"userId\":\"" + pos.BuyUserId + "\",";
|
|
|
|
|
+ data += "\"brandId\":\"" + pos.BrandId + "\",";
|
|
|
|
|
+ data += "\"actTime\":\"" + pos.ActivationTime.Value.ToString("yyyy-MM-ddTHH:mm:ss") + "\",";
|
|
|
|
|
+ data += "\"bindTime\":\"" + pos.BindingTime.Value.ToString("yyyy-MM-ddTHH:mm:ss") + "\",";
|
|
|
|
|
+ data += "\"sn\":\"" + pos.PosSn + "\",";
|
|
|
|
|
+ data += "\"actType\":\"" + actType + "\"";
|
|
|
|
|
+ data += "}";
|
|
|
|
|
+ function.WriteLog(DateTime.Now.ToString() + "\n" + data, "订单推送MQ日志");
|
|
|
|
|
+ RedisDbconn.Instance.AddList("KxsActQueue", data);
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
|
|
+ #endregion
|
|
|
|
|
+
|
|
|
|
|
|
|
|
public IActionResult CheckMachineForTeam1(string right)//直营团队机具补录
|
|
public IActionResult CheckMachineForTeam1(string right)//直营团队机具补录
|
|
|
{
|
|
{
|