添加返回字段Id

修复创客信息读取
修复返回字段数据

Areas/Api/Controllers/v1/Main1/ConsumerOrdersController.cs

@@ -99,6 +99,7 @@ namespace MySystem.Areas.Api.Controllers.v1.Main1
             foreach (Dictionary<string, object> subdata in source)
             {
                 Dictionary<string, object> curData = new Dictionary<string, object>();
+                curData.Add("Id", subdata["Id"].ToString()); //Id
                 curData.Add("MerchantName", subdata["MerchantName"].ToString()); //交易商户
                 curData.Add("PayMoney", subdata["PayMoney"].ToString()); //交易金额
                 curData.Add("Status", subdata["Status"].ToString()); //交易状态(0 未支付 1 已支付)

Areas/Api/Controllers/v1/Main1/MerchantAddInfoController.cs

@@ -92,12 +92,13 @@ namespace MySystem.Areas.Api.Controllers.v1.Main1
                 if (subdata["SubjectType"].ToString() == "SUBJECT_TYPE_ENTERPRISE") subjectType = 1; //企业公司
                 if (subdata["SubjectType"].ToString() == "SUBJECT_TYPE_INDIVIDUAL") subjectType = 2; //个体工商户
 
+                curData.Add("Id", subdata["Id"].ToString()); //Id
                 curData.Add("SubjectType", subjectType); //主体类型(1 企业 2 个体)
                 curData.Add("CertMerchantName", subdata["CertMerchantName"].ToString()); //商户名称
                 curData.Add("ServicePhone", subdata["ServicePhone"].ToString()); //客服电话
-                curData.Add("BizStoreAddress", subdata["CreateDate"].ToString()); //门店地址
+                curData.Add("BizStoreAddress", subdata["BizStoreAddress"].ToString()); //门店地址
                 curData.Add("CreateDate", subdata["CreateDate"].ToString() == null ? "" : DateTime.Parse(subdata["CreateDate"].ToString()).ToString("yyyy-MM-dd HH:mm:ss")); //进件时间
-                var userInfo = UsersService.Query(MerchantId);
+                var userInfo = UsersService.Query(MerchantInfoService.Query(MerchantId).UserId);
                 curData.Add("MakerCode", userInfo.MakerCode); //所属创客编号
                 curData.Add("RealName", userInfo.RealName); //所属创客姓名
                 //审核平台

Areas/Api/Controllers/v1/Main1/MerchantDepositOrderController.cs

@@ -48,6 +48,7 @@ namespace MySystem.Areas.Api.Controllers.v1.Main1
             {
                 Dictionary<string, object> curData = new Dictionary<string, object>();
                 curData.Add("", subdata[""].ToString()); //
+                curData.Add("Id", subdata["Id"].ToString()); //Id
                 curData.Add("MerchantName", ""); //商户名称
                 curData.Add("MctNo", ""); //商户号
                 curData.Add("UpdateDate", ""); //激活时间

Areas/Api/Controllers/v1/Main1/MerchantInfoController.cs

@@ -46,6 +46,7 @@ namespace MySystem.Areas.Api.Controllers.v1.Main1
             {
                 Dictionary<string, object> curData = new Dictionary<string, object>();
                 curData.Add("", subdata[""].ToString()); //
+                curData.Add("Id", subdata["Id"].ToString()); //Id
                 curData.Add("MerchantName", ""); //商户名称
                 curData.Add("MctNo", ""); //商户号
                 curData.Add("UpdateDate", ""); //激活时间

Areas/Api/Controllers/v1/Main2/ConsumerOrdersController.cs

@@ -100,6 +100,7 @@ namespace MySystem.Areas.Api.Controllers.v1.Main2
             foreach (Dictionary<string, object> subdata in source)
             {
                 Dictionary<string, object> curData = new Dictionary<string, object>();
+                curData.Add("Id", subdata["Id"].ToString()); //Id
                 curData.Add("MerchantName", subdata["MerchantName"].ToString()); //交易商户
                 curData.Add("PayMoney", subdata["PayMoney"].ToString()); //交易金额
                 curData.Add("Status", subdata["Status"].ToString()); //交易状态(0 未支付 1 已支付)

Areas/Api/Controllers/v1/Main2/MerchantAddInfoController.cs

@@ -94,12 +94,13 @@ namespace MySystem.Areas.Api.Controllers.v1.Main2
                 if (subdata["SubjectType"].ToString() == "SUBJECT_TYPE_INDIVIDUAL") subjectType = 2; //个体工商户
                 if (subdata["SubjectType"].ToString() == "SUBJECT_TYPE_SMALL") subjectType = 3; //小微商户
 
+                curData.Add("Id", subdata["Id"].ToString()); //Id
                 curData.Add("SubjectType", subjectType); //主体类型(1 企业 2 个体 3 小微)
                 curData.Add("CertMerchantName", subdata["CertMerchantName"].ToString()); //商户名称
                 curData.Add("ServicePhone", subdata["ServicePhone"].ToString()); //客服电话
-                curData.Add("BizStoreAddress", subdata["CreateDate"].ToString()); //门店地址
+                curData.Add("BizStoreAddress", subdata["BizStoreAddress"].ToString()); //门店地址
                 curData.Add("CreateDate", subdata["CreateDate"].ToString() == null ? "" : DateTime.Parse(subdata["CreateDate"].ToString()).ToString("yyyy-MM-dd HH:mm:ss")); //进件时间
-                var userInfo = UsersService.Query(MerchantId);
+                var userInfo = UsersService.Query(MerchantInfoService.Query(MerchantId).UserId);
                 curData.Add("MakerCode", userInfo.MakerCode); //所属创客编号
                 curData.Add("RealName", userInfo.RealName); //所属创客姓名
                 //审核平台

Areas/Api/Controllers/v1/Main2/MerchantDepositBackController.cs

@@ -100,6 +100,7 @@ namespace MySystem.Areas.Api.Controllers.v1.Main2
             foreach (Dictionary<string, object> subdata in source)
             {
                 Dictionary<string, object> curData = new Dictionary<string, object>();
+                curData.Add("Id", subdata["Id"].ToString()); //Id
                 curData.Add("MerchantName", ""); //商户名称
                 curData.Add("MctNo", ""); //商户号
                 curData.Add("CreateDate", ""); //申请时间

Areas/Api/Controllers/v1/Main2/MerchantDepositOrderController.cs

@@ -47,6 +47,7 @@ namespace MySystem.Areas.Api.Controllers.v1.Main2
             foreach (Dictionary<string, object> subdata in source)
             {
                 Dictionary<string, object> curData = new Dictionary<string, object>();
+                curData.Add("Id", subdata["Id"].ToString()); //Id
                 curData.Add("MerchantName", ""); //商户名称
                 curData.Add("MctNo", ""); //商户号
                 curData.Add("UpdateDate", ""); //激活时间

Areas/Api/Controllers/v1/Main2/MerchantInfoController.cs

@@ -45,6 +45,7 @@ namespace MySystem.Areas.Api.Controllers.v1.Main2
             foreach (Dictionary<string, object> subdata in source)
             {
                 Dictionary<string, object> curData = new Dictionary<string, object>();
+                curData.Add("Id", subdata["Id"].ToString()); //Id
                 curData.Add("MerchantName", ""); //商户名称
                 curData.Add("MctNo", ""); //商户号
                 curData.Add("UpdateDate", ""); //激活时间