|
@@ -762,7 +762,11 @@ namespace MySystem.Areas.Api.Controllers.v1
|
|
|
JsonData data = JsonMapper.ToObject(value);
|
|
|
Dictionary<string, object> Obj = new Dictionary<string, object>();
|
|
|
string Sn = data["Sn"].ToString();
|
|
|
- string Machine = data["Machine"].ToString();
|
|
|
+ string Machine = "";
|
|
|
+ if(value.Contains("\"Machine\""))
|
|
|
+ {
|
|
|
+ Machine = data["Machine"].ToString();
|
|
|
+ }
|
|
|
if(Sn.Length > 20)
|
|
|
{
|
|
|
Sn = System.Web.HttpUtility.UrlDecode(Sn);
|
|
@@ -774,7 +778,7 @@ namespace MySystem.Areas.Api.Controllers.v1
|
|
|
Sn = Sn.TrimEnd('\0');
|
|
|
Sn = Sn.Substring(0, Sn.Length - 8);
|
|
|
}
|
|
|
- if(Machine == Sn)
|
|
|
+ if(Machine == Sn || Machine == "")
|
|
|
{
|
|
|
MerchantQrCode code = new MerchantQrCodeService().Query(Sn);
|
|
|
MerchantInfo query = new MerchantInfoService().Query(code.MerchantId);
|