|
|
@@ -35,7 +35,12 @@ namespace MySystem.Areas.Api.Controllers.v1
|
|
|
req.Add("PosSnId", pos.Id);
|
|
|
req.Add("BrandId", data["brandId"].ToString());
|
|
|
req.Add("Deposit", data["deposit"].ToString());
|
|
|
- req.Add("CallBackUrl", data["callBackUrl"].ToString());
|
|
|
+ string CallBackUrl = "";
|
|
|
+ if(requestMes.Contains("\"callBackUrl\""))
|
|
|
+ {
|
|
|
+ CallBackUrl = data["callBackUrl"].ToString();
|
|
|
+ }
|
|
|
+ req.Add("CallBackUrl", CallBackUrl);
|
|
|
RedisDbconn.Instance.AddList("ChangePosFeeQueue", Newtonsoft.Json.JsonConvert.SerializeObject(req));
|
|
|
return Json(new AppResultJson() { Status = "1", Info = "" });
|
|
|
}
|
|
|
@@ -58,7 +63,11 @@ namespace MySystem.Areas.Api.Controllers.v1
|
|
|
int BrandId = int.Parse(data["brandId"].ToString());
|
|
|
decimal FeeRate = decimal.Parse(data["feeRate"].ToString());
|
|
|
int FeeExtra = int.Parse(data["feeExtra"].ToString());
|
|
|
- string CallBackUrl = data["callBackUrl"].ToString();
|
|
|
+ string CallBackUrl = "";
|
|
|
+ if(requestMes.Contains("\"callBackUrl\""))
|
|
|
+ {
|
|
|
+ CallBackUrl = data["callBackUrl"].ToString();
|
|
|
+ }
|
|
|
PosMerchantInfo mer = maindb.PosMerchantInfo.FirstOrDefault(m => m.Id == PosId) ?? new PosMerchantInfo();
|
|
|
PosMachinesFeeChangeRecord query = maindb.PosMachinesFeeChangeRecord.FirstOrDefault(m => m.PosId == PosId && m.Status == 0);
|
|
|
if(query == null)
|