添加返回openId

添加商户简称

Areas/Api/Controllers/v1/MainServer/ConsumersController.cs

@@ -67,6 +67,7 @@ namespace MySystem.Areas.Api.Controllers.v1
             Obj.Add("HeadPhoto", HeadPhoto); //头像
             Obj.Add("NickName", NickName); //昵称
             Obj.Add("Token", token); //token
+            Obj.Add("OpenId", OpenId);
             Obj.Add("ConsumerId", consumer.Id); //用户Id
 
             return Obj;

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

@@ -73,6 +73,7 @@ namespace MySystem.Areas.Api.Controllers.v1
                 curData.Add("Id", int.Parse(dr["Id"].ToString())); //商户Id
                 curData.Add("Kind", Kind); //商户类型(1 直连 2 银联)
                 curData.Add("MerchantName", dr["Name"].ToString()); //商户名称
+                curData.Add("MerchantShortName", dr["MerchantShortname"].ToString()); //商户简称
                 curData.Add("BusinessName", dr["BusinessName"].ToString()); //经营类型
                 curData.Add("StoreEntrancePic", StoreEntrancePic[0]); //门店门头照片
                 curData.Add("BizStoreAddress", dr["Areas"].ToString() + dr["Address"].ToString()); //门店地址
@@ -119,6 +120,7 @@ namespace MySystem.Areas.Api.Controllers.v1
                 }
                 Obj.Add("Atlas", Atlas); //图集
                 Obj.Add("MerchantName", merInfo.Name); //商户名称
+                Obj.Add("MerchantShortName", merAddInfo.MerchantShortname); //商户简称
                 Obj.Add("Popularity", merInfo.Popularity); //人气值
                 Obj.Add("BusinessName", BusinessName); //经营类型
                 Obj.Add("BusinessHours", merInfo.BusinessHours == null ? "周一至周五 09:00-22:00" : "周一至周五 09:00 - 22:00"); //营业时间
@@ -136,7 +138,7 @@ namespace MySystem.Areas.Api.Controllers.v1
                 var info = maindb2.MerchantInfo.FirstOrDefault(m => m.Id == Id) ?? new MainModels2.MerchantInfo();
                 info.Popularity += 1;
                 maindb2.SaveChanges();
-                BusinessName = Services.Main2.BusinessScopeService.Query(merAddInfo.BusinessId).Name;
+                BusinessName = Services.Main2.BusinessScopeService.Query(int.Parse(merAddInfo.BusinessId)).Name;
 
                 string[] Atlas = new string[0];
                 if (!string.IsNullOrEmpty(merAddInfo.StoreEntrancePic))
@@ -145,6 +147,7 @@ namespace MySystem.Areas.Api.Controllers.v1
                 }
                 Obj.Add("Atlas", Atlas); //图集
                 Obj.Add("MerchantName", merInfo.Name); //商户名称
+                Obj.Add("MerchantShortName", merAddInfo.MerchantShortname); //商户简称
                 Obj.Add("Popularity", merInfo.Popularity); //人气值
                 Obj.Add("BusinessName", BusinessName); //经营类型
                 Obj.Add("BusinessHours", merInfo.BusinessHours == null ? "周一至周五 09:00-22:00" : "周一至周五 09:00 - 22:00"); //营业时间