|
@@ -768,10 +768,12 @@ namespace MySystem.Areas.Api.Controllers.v1
|
|
|
string Sn = data["Sn"].ToString();
|
|
|
MerchantQrCode code = MerchantQrCodeDbconn.Instance.Get(Sn) ?? new MerchantQrCode();
|
|
|
MerchantInfo query = MerchantInfoDbconn.Instance.Get(code.MerchantId) ?? new MerchantInfo();
|
|
|
+ MerchantParamSet set = maindb.MerchantParamSet.FirstOrDefault(m => m.Id == code.MerchantId) ?? new MerchantParamSet();
|
|
|
Obj.Add("Name", query.Name); //名称
|
|
|
Obj.Add("Mobile", query.Mobile); //手机号
|
|
|
Obj.Add("IsAuth", query.IsAuth); //是否认证
|
|
|
Obj.Add("Logo", DefaultPic(query.Logo)); //Logo图片
|
|
|
+ Obj.Add("DiviPercent", set.IsAll == 1 ? 0M : set.DiviPercent);
|
|
|
return Obj;
|
|
|
}
|
|
|
#endregion
|