修改返回商户状态

修改返回商户名称

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

@@ -110,7 +110,7 @@ namespace MySystem.Areas.Api.Controllers.v1.Main1
                 if (status == 2) MerStatus = 21; //微信已签约
                 if (queryCount == 1) MerStatus = 10; //支付宝待签约
                 if (queryCount == 2) MerStatus = 11; //支付宝已签约
-                curData.Add("MerStatus", MerStatus); //所属创客姓名
+                curData.Add("Status", MerStatus); //商户状态
                 //审核平台
                 var AuditInfo = 0;
                 if (status < 0 && queryCount >= 1) AuditInfo = 2;

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

@@ -112,7 +112,7 @@ namespace MySystem.Areas.Api.Controllers.v1.Main2
                 if (status == 2) MerStatus = 21; //微信已签约
                 if (queryCount == 1) MerStatus = 10; //支付宝待签约
                 if (queryCount == 2) MerStatus = 11; //支付宝已签约
-                curData.Add("MerStatus", MerStatus); //所属创客姓名
+                curData.Add("Status", MerStatus); //商户状态
                 //审核平台
                 var AuditInfo = 0;
                 if (status < 0 && queryCount >= 1) AuditInfo = 2;

Util/Main1/MerchantAddInfoUtil.cs

@@ -208,11 +208,10 @@ namespace MySystem.Service.Main1
             {
                 if (SubjectType == "1") SubjectType = "SUBJECT_TYPE_ENTERPRISE"; //企业公司
                 if (SubjectType == "2") SubjectType = "SUBJECT_TYPE_INDIVIDUAL"; //个体工商户
-                if (SubjectType == "3") SubjectType = "SUBJECT_TYPE_SMALL"; //小微
                 condition += " and SubjectType='" + SubjectType + "'";
             }
             var query = MerchantAddInfoService.Query(condition);
-            Obj.Add("MerchantName", query); //商户名称
+            Obj.Add("MerchantName", query.CertMerchantName); //商户名称
             Obj.Add("Mobile", query.MobilePhone); //手机号码
             Obj.Add("MakerCode", query.MobilePhone); //所属创客
             var subjectType = 0;

Util/Main2/MerchantAddInfoUtil.cs

@@ -196,7 +196,7 @@ namespace MySystem.Service.Main2
                 condition += " and SubjectType='" + SubjectType + "'";
             }
             var query = MerchantAddInfoService.Query(condition);
-            Obj.Add("MerchantName", query); //商户名称
+            Obj.Add("MerchantName", query.CertMerchantName); //商户名称
             Obj.Add("Mobile", query.MobilePhone); //手机号码
             Obj.Add("MakerCode", query.MobilePhone); //所属创客
             var subjectType = 0;