提交代码

Mall.WebApi/Controllers/TradePavilion/AppletTradeController.cs

@@ -973,12 +973,13 @@ namespace Mall.WebApi.Controllers.TradePavilion
         /// <returns></returns>
         public ApiResult GetActivityList()
         {
+            var userInfo = AppletUserInfo;
             JObject jObj = JObject.Parse(RequestParm.msg.ToString());
             var extModel = new RB_Commerce_Activity_Extend()
             {
                 ActivityIds = jObj.GetStringValue("ActivityIds"),
                 MallBaseId = RequestParm.MallBaseId,
-                TenantId = RequestParm.TenantId
+                TenantId = userInfo?.TenantId ?? 0
             };
 
             var list = activityModule.GetActivityList(extModel);
@@ -1025,7 +1026,7 @@ namespace Mall.WebApi.Controllers.TradePavilion
                     demodel.Post = item.Post;
                     demodel.CompanyName = firstShopModel.CompanyName;
                     demodel.ActivityIds = firstShopModel.ActivityIds;
-                    demodel.CompanyName = firstShopModel.CompanyName;
+                    demodel.CountryInfo = item.CountryInfo;
                     demodel.Nature = firstShopModel.Nature;
                     Random R = new Random();
                     int Rstr = R.Next(111, 999);