添加返回字段商户状态

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

@@ -70,8 +70,8 @@ namespace MySystem.Areas.Api.Controllers.v1.Main1
                 if (Status == "-1") condition += " and Status=-1"; //审核失败
                 if (Status == "20") condition += " and Status=1"; //微信待签约
                 if (Status == "21") condition += " and Status=2"; //微信已签约
-                if (Status == "10") condition += " and Status=1"; //支付宝待签约
-                if (Status == "11") condition += " and Status=2"; //支付宝已签约
+                if (Status == "10") condition += " and QueryCount=1"; //支付宝待签约
+                if (Status == "11") condition += " and QueryCount=2"; //支付宝已签约
                 condition += "";
             }
             List<RelationData> relationData = new List<RelationData>();
@@ -101,6 +101,16 @@ namespace MySystem.Areas.Api.Controllers.v1.Main1
                 var userInfo = UsersService.Query(MerchantInfoService.Query(MerchantId).UserId);
                 curData.Add("MakerCode", userInfo.MakerCode); //所属创客编号
                 curData.Add("RealName", userInfo.RealName); //所属创客姓名
+                //商户状态
+                var MerStatus = 0;
+                // if (status == 0) MerStatus = 0; //审核中
+                if (status == 2 && queryCount == 2) MerStatus = 1; //已通过
+                if (status == -1) MerStatus = -1; //审核失败
+                if (status == 1) MerStatus = 20; //微信待签约
+                if (status == 2) MerStatus = 21; //微信已签约
+                if (queryCount == 1) MerStatus = 10; //支付宝待签约
+                if (queryCount == 2) MerStatus = 11; //支付宝已签约
+                curData.Add("MerStatus", MerStatus); //所属创客姓名
                 //审核平台
                 var AuditInfo = 0;
                 if (status < 0 && queryCount >= 1) AuditInfo = 2;

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

@@ -103,6 +103,16 @@ namespace MySystem.Areas.Api.Controllers.v1.Main2
                 var userInfo = UsersService.Query(MerchantInfoService.Query(MerchantId).UserId);
                 curData.Add("MakerCode", userInfo.MakerCode); //所属创客编号
                 curData.Add("RealName", userInfo.RealName); //所属创客姓名
+                //商户状态
+                var MerStatus = 0;
+                // if (status == 0) MerStatus = 0; //审核中
+                if (status == 2 && queryCount == 2) MerStatus = 1; //已通过
+                if (status == -1) MerStatus = -1; //审核失败
+                if (status == 1) MerStatus = 20; //微信待签约
+                if (status == 2) MerStatus = 21; //微信已签约
+                if (queryCount == 1) MerStatus = 10; //支付宝待签约
+                if (queryCount == 2) MerStatus = 11; //支付宝已签约
+                curData.Add("MerStatus", MerStatus); //所属创客姓名
                 //审核平台
                 var AuditInfo = 0;
                 if (status < 0 && queryCount >= 1) AuditInfo = 2;