完成，待测试

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

@@ -45,6 +45,7 @@ namespace MySystem.Areas.Api.Controllers.v1.Main2
             string SubjectType = data["SubjectType"].ToString(); //主体类型(1 企业 2 个体 3 小微)
             string TradePayNo = data["TradePayNo"].ToString(); //第三方交易号
             string DivideFlag = data["DivideFlag"].ToString(); //分账状态(-1无 0 未分账 2 分账中 1 已完成)
+            int BrandId = 0; //品牌(0 银联 1 好哒)
             int pageSize = int.Parse(function.CheckInt(data["page_size"].ToString()));
             int pageNum = int.Parse(function.CheckInt(data["page_num"].ToString()));
             string condition = " and MerchantId>0";
@@ -120,6 +121,11 @@ namespace MySystem.Areas.Api.Controllers.v1.Main2
                     condition += " and IsAct=1 and DivideFlag=2";
                 }
             }
+            if (!string.IsNullOrEmpty(data["BrandId"].ToString()))
+            {
+                BrandId = int.Parse(function.CheckInt(data["BrandId"].ToString())); //品牌(0 银联 1 好哒)
+                condition += " and BrandId=" + BrandId + "";
+            }
             List<RelationData> relationData = new List<RelationData>();
             List<Dictionary<string, object>> dataList = new List<Dictionary<string, object>>();
             Other = new Dictionary<string, object>();
@@ -133,6 +139,7 @@ namespace MySystem.Areas.Api.Controllers.v1.Main2
                 var subjectType = 0;
                 curData.Add("MerchantName", query.CertMerchantName); //交易商户
                 curData.Add("PayMoney", subdata["PayMoney"].ToString()); //交易金额
+                curData.Add("BrandId", query.BrandId); //品牌(0 银联 1 好哒)
                 var status = 0;
                 if (subdata["Status"].ToString() != "0") status = 1;
                 curData.Add("Status", status); //交易状态(0 未支付 1 已支付)

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

@@ -43,6 +43,7 @@ namespace MySystem.Areas.Api.Controllers.v1.Main2
             string HDStatus = data["HDStatus"].ToString(); //好哒状态(-1 审核失败 0 待审核 3 已通过)
             string WeChatStatus = data["WeChatStatus"].ToString(); //微信状态(-1 审核失败 0 待审核 1 待签约 2 已通过)
             string AliPayStatus = data["AliPayStatus"].ToString(); //支付宝状态(-1 审核失败 0 待审核 1 待签约 2 已通过)
+            int BrandId = 0; //品牌(0 银联 1 好哒)
             int pageSize = int.Parse(function.CheckInt(data["page_size"].ToString()));
             int pageNum = int.Parse(function.CheckInt(data["page_num"].ToString()));
             string condition = "";
@@ -88,6 +89,11 @@ namespace MySystem.Areas.Api.Controllers.v1.Main2
             {
                 condition += " and QueryCount=" + AliPayStatus + "";
             }
+            if (!string.IsNullOrEmpty(data["BrandId"].ToString()))
+            {
+                BrandId = int.Parse(function.CheckInt(data["BrandId"].ToString())); //品牌(0 银联 1 好哒)
+                condition += " and BrandId=" + BrandId + "";
+            }
             List<RelationData> relationData = new List<RelationData>();
             List<Dictionary<string, object>> dataList = new List<Dictionary<string, object>>();
             Other = new Dictionary<string, object>();
@@ -113,6 +119,7 @@ namespace MySystem.Areas.Api.Controllers.v1.Main2
                 if (subdata["SubjectType"].ToString() == "SUBJECT_TYPE_SMALL") subjectType = 3; //小微商户
 
                 curData.Add("Id", subdata["Id"].ToString()); //Id
+                curData.Add("BrandId", subdata["BrandId"].ToString()); //品牌(0 银联 1 好哒)
                 curData.Add("SubjectType", subjectType); //主体类型(1 企业 2 个体 3 小微)
                 curData.Add("CertMerchantName", subdata["CertMerchantName"].ToString()); //商户名称
                 curData.Add("ServicePhone", subdata["ServicePhone"].ToString()); //客服电话
@@ -251,6 +258,7 @@ namespace MySystem.Areas.Api.Controllers.v1.Main2
             string SubjectType = data["SubjectType"].ToString(); //主体类型(1 企业 2 个体 3 小微)
             string IsAct = data["IsAct"].ToString(); //激活状态(0 未激活 1 已激活)
             string ActDate = data["ActDate"].ToString(); //激活时间
+            int BrandId = 0; //品牌(0 银联 1 好哒)
             int pageSize = int.Parse(function.CheckInt(data["page_size"].ToString()));
             int pageNum = int.Parse(function.CheckInt(data["page_num"].ToString()));
             string condition = "";
@@ -293,6 +301,11 @@ namespace MySystem.Areas.Api.Controllers.v1.Main2
                 var Ids = MerchantInfoUtil.QueryActDateMerchantId(start, end);
                 condition += " and Id in (" + Ids + ")";
             }
+            if (!string.IsNullOrEmpty(data["BrandId"].ToString()))
+            {
+                BrandId = int.Parse(function.CheckInt(data["BrandId"].ToString())); //品牌(0 银联 1 好哒)
+                condition += " and BrandId=" + BrandId + "";
+            }
             List<RelationData> relationData = new List<RelationData>();
             List<Dictionary<string, object>> dataList = new List<Dictionary<string, object>>();
             Other = new Dictionary<string, object>();
@@ -306,6 +319,7 @@ namespace MySystem.Areas.Api.Controllers.v1.Main2
                 var merInfo = MerchantInfoService.Query(MerchantId);
                 var userInfo = UsersService.Query(merInfo.UserId);
                 curData.Add("MerchantId", subdata["Id"].ToString()); //商户Id
+                curData.Add("BrandId", subdata["BrandId"].ToString()); //品牌(0 银联 1 好哒)
                 curData.Add("IsAct", merInfo.IsAct); //激活状态(0 未激活 1 已激活)
                 var actDate = "";
                 var order = MerchantDepositOrderService.Query(" and Status>0 and MerchantId=" + MerchantId + "");

Models/Main2/MerchantAddInfo.cs

@@ -149,5 +149,6 @@ namespace MySystem.Models.Main2
         public ulong HdBindWeChat { get; set; }
         public string MerchantType { get; set; }
         public int PlaceType { get; set; }
+        public int BrandId { get; set; }
     }
 }

Models/Main2/MerchantInfo.cs

@@ -55,5 +55,6 @@ namespace MySystem.Models.Main2
         public int Popularity { get; set; }
         public decimal Latitude { get; set; }
         public decimal Longitude { get; set; }
+        public int BrandId { get; set; }
     }
 }

Models/Main2/WebCMSEntities.cs

@@ -5602,6 +5602,10 @@ namespace MySystem.Models.Main2
                     .HasCharSet("utf8")
                     .HasCollation("utf8_general_ci");
 
+                entity.Property(e => e.BrandId)
+                    .HasColumnType("int(11)")
+                    .HasComment("品牌");
+
                 entity.Property(e => e.BusinessCode)
                     .HasColumnType("varchar(50)")
                     .HasCharSet("utf8")
@@ -7163,6 +7167,10 @@ namespace MySystem.Models.Main2
 
                 entity.Property(e => e.BindStatus).HasColumnType("int(11)");
 
+                entity.Property(e => e.BrandId)
+                    .HasColumnType("int(11)")
+                    .HasComment("品牌");
+
                 entity.Property(e => e.BriefIntroduction)
                     .HasColumnType("longtext")
                     .HasComment("简介")