|
@@ -294,17 +294,20 @@ namespace MySystem.Areas.Api.Controllers.v1.Main1
|
|
|
if (string.IsNullOrEmpty(query.AlipayPid))
|
|
if (string.IsNullOrEmpty(query.AlipayPid))
|
|
|
{
|
|
{
|
|
|
fields.Add("AlipayPid", AliPPID); //支付宝PID
|
|
fields.Add("AlipayPid", AliPPID); //支付宝PID
|
|
|
|
|
+ query.AlipayPid = AliPPID;
|
|
|
}
|
|
}
|
|
|
if (!string.IsNullOrEmpty(AliPayToken))
|
|
if (!string.IsNullOrEmpty(AliPayToken))
|
|
|
{
|
|
{
|
|
|
fields.Add("AlipayAuthToken", AliPayToken); //支付宝token
|
|
fields.Add("AlipayAuthToken", AliPayToken); //支付宝token
|
|
|
|
|
+ query.AlipayAuthToken = AliPayToken;
|
|
|
}
|
|
}
|
|
|
if (string.IsNullOrEmpty(query.SubMchid))
|
|
if (string.IsNullOrEmpty(query.SubMchid))
|
|
|
{
|
|
{
|
|
|
fields.Add("SubMchid", WeChatNo); //微信商户号
|
|
fields.Add("SubMchid", WeChatNo); //微信商户号
|
|
|
|
|
+ query.SubMchid = WeChatNo;
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
- AppResultJson resultJson = MerchantAddInfoService.Edit(fields, int.Parse(MerchantId), false);
|
|
|
|
|
|
|
+ // AppResultJson resultJson = MerchantAddInfoService.Edit(fields, int.Parse(MerchantId), false);
|
|
|
|
|
|
|
|
return new AppResultJson() { Status = "1", Info = "添加成功", Data = Obj };
|
|
return new AppResultJson() { Status = "1", Info = "添加成功", Data = Obj };
|
|
|
}
|
|
}
|