|
@@ -244,6 +244,7 @@ namespace MySystem.Areas.Api.Controllers.v1
|
|
int Id = int.Parse(function.CheckInt(data["Id"].ToString()));
|
|
int Id = int.Parse(function.CheckInt(data["Id"].ToString()));
|
|
MerchantInfo merchant = MerchantInfoDbconn.Instance.Get(Id) ?? new MerchantInfo();
|
|
MerchantInfo merchant = MerchantInfoDbconn.Instance.Get(Id) ?? new MerchantInfo();
|
|
MerchantAddInfo addinfo = MerchantAddInfoDbconn.Instance.Get(Id) ?? new MerchantAddInfo();
|
|
MerchantAddInfo addinfo = MerchantAddInfoDbconn.Instance.Get(Id) ?? new MerchantAddInfo();
|
|
|
|
+ Obj.Add("Kind", 1); //通道(1 直连 2 银联)
|
|
Obj.Add("MerchantName", merchant.Name); //商户名称
|
|
Obj.Add("MerchantName", merchant.Name); //商户名称
|
|
Obj.Add("LegalName", addinfo.CertLegalPerson); //企业法人
|
|
Obj.Add("LegalName", addinfo.CertLegalPerson); //企业法人
|
|
Obj.Add("MerchantMobile", addinfo.MobilePhone); //商户手机号
|
|
Obj.Add("MerchantMobile", addinfo.MobilePhone); //商户手机号
|
|
@@ -543,6 +544,7 @@ namespace MySystem.Areas.Api.Controllers.v1
|
|
int Id = int.Parse(function.CheckInt(data["Id"].ToString()));
|
|
int Id = int.Parse(function.CheckInt(data["Id"].ToString()));
|
|
MerchantInfo query = MerchantInfoDbconn.Instance.Get(Id) ?? new MerchantInfo();
|
|
MerchantInfo query = MerchantInfoDbconn.Instance.Get(Id) ?? new MerchantInfo();
|
|
MerchantAddInfo addInfo = MerchantAddInfoDbconn.Instance.Get(Id) ?? new MerchantAddInfo();
|
|
MerchantAddInfo addInfo = MerchantAddInfoDbconn.Instance.Get(Id) ?? new MerchantAddInfo();
|
|
|
|
+ Obj.Add("MerchantChannel", 1); //商户进件渠道(1 直连 2 银联)
|
|
Obj.Add("Name", query.Name); //名称
|
|
Obj.Add("Name", query.Name); //名称
|
|
Obj.Add("CreateDate", query.CreateDate == null ? "" : query.CreateDate.Value.ToString("yyyy-MM-dd HH:mm:ss")); //提交时间
|
|
Obj.Add("CreateDate", query.CreateDate == null ? "" : query.CreateDate.Value.ToString("yyyy-MM-dd HH:mm:ss")); //提交时间
|
|
List<Dictionary<string, object>> AuditResult = new List<Dictionary<string, object>>();
|
|
List<Dictionary<string, object>> AuditResult = new List<Dictionary<string, object>>();
|
|
@@ -695,6 +697,7 @@ namespace MySystem.Areas.Api.Controllers.v1
|
|
TotalActual += decimal.Parse(dic["TotalActual"]);
|
|
TotalActual += decimal.Parse(dic["TotalActual"]);
|
|
Start = Start.AddDays(1);
|
|
Start = Start.AddDays(1);
|
|
}
|
|
}
|
|
|
|
+ Obj.Add("MerchantChannel", 1); //商户进件渠道(1 直连 2 银联)
|
|
Obj.Add("TotalAmount", TotalAmount); //营总收益
|
|
Obj.Add("TotalAmount", TotalAmount); //营总收益
|
|
Obj.Add("TotalOrder", TotalOrder); //累计订单
|
|
Obj.Add("TotalOrder", TotalOrder); //累计订单
|
|
Obj.Add("TotalUser", TotalUser); //会员数
|
|
Obj.Add("TotalUser", TotalUser); //会员数
|
|
@@ -800,6 +803,7 @@ namespace MySystem.Areas.Api.Controllers.v1
|
|
int Id = int.Parse(function.CheckInt(data["Id"].ToString()));
|
|
int Id = int.Parse(function.CheckInt(data["Id"].ToString()));
|
|
MerchantInfo query = MerchantInfoDbconn.Instance.Get(Id) ?? new MerchantInfo();
|
|
MerchantInfo query = MerchantInfoDbconn.Instance.Get(Id) ?? new MerchantInfo();
|
|
MerchantAddInfo merchantAddInfo = maindb.MerchantAddInfo.FirstOrDefault(m => m.Id == Id) ?? new MerchantAddInfo();
|
|
MerchantAddInfo merchantAddInfo = maindb.MerchantAddInfo.FirstOrDefault(m => m.Id == Id) ?? new MerchantAddInfo();
|
|
|
|
+ Obj.Add("Kind", 1); //通道(1 直连 2 银联)
|
|
Obj.Add("Name", query.Name); //名称
|
|
Obj.Add("Name", query.Name); //名称
|
|
Obj.Add("Mobile", query.Mobile); //手机号
|
|
Obj.Add("Mobile", query.Mobile); //手机号
|
|
Obj.Add("IsAuth", query.IsAuth); //是否认证
|
|
Obj.Add("IsAuth", query.IsAuth); //是否认证
|
|
@@ -891,6 +895,7 @@ namespace MySystem.Areas.Api.Controllers.v1
|
|
MerchantQrCode code = new MerchantQrCodeService().Query(Sn);
|
|
MerchantQrCode code = new MerchantQrCodeService().Query(Sn);
|
|
MerchantInfo query = new MerchantInfoService().Query(code.MerchantId);
|
|
MerchantInfo query = new MerchantInfoService().Query(code.MerchantId);
|
|
MerchantParamSet set = new MerchantParamSetService().Query(code.MerchantId);
|
|
MerchantParamSet set = new MerchantParamSetService().Query(code.MerchantId);
|
|
|
|
+ Obj.Add("Kind", 1); //通道(1 直连 2 银联)
|
|
Obj.Add("Name", query.Name); //名称
|
|
Obj.Add("Name", query.Name); //名称
|
|
Obj.Add("Mobile", query.Mobile); //手机号
|
|
Obj.Add("Mobile", query.Mobile); //手机号
|
|
Obj.Add("IsAuth", query.IsAuth); //是否认证
|
|
Obj.Add("IsAuth", query.IsAuth); //是否认证
|