提交代码

Mall.WebApi/Controllers/Mall/MallController.cs

@@ -180,7 +180,7 @@ namespace Mall.WebApi.Controllers.MallBase
                         {
                             foreach (var subItem in templateModel.ComponentDataList)
                             {
-                                templateData.data.Add(MallHelper.PlusDataToObject(subItem, (miniProgram?.TenantId ?? 0), miniProgram.MallBaseId, RequestParm.SmallShopsId, isOpenSchool,  storeId,userId));
+                                templateData.data.Add(MallHelper.PlusDataToObject(subItem, (miniProgram?.TenantId ?? 0), miniProgram.MallBaseId, RequestParm.SmallShopsId, isOpenSchool, storeId, userId));
                             }
                         }
                         var tempObj = new
@@ -237,7 +237,7 @@ namespace Mall.WebApi.Controllers.MallBase
                             MallBaseId = miniProgram.MallBaseId,
                             TenantId = miniProgram.TenantId,
                             QIds = templateIds
-                        }, IsAnalyzePlus: true);
+                        }, (miniProgram.TenantId ?? 0), miniProgram.MallBaseId, userId, IsAnalyzePlus: true);
                         //解析模板
                         int index = 0;
                         foreach (var item in selfHomePage.DetailsList)

Mall.WebApi/Controllers/Mall/MallHelper.cs

@@ -153,7 +153,7 @@ namespace Mall.WebApi.Controllers
                             List<RB_Miniprogram_Template_Extend> tempList = new List<RB_Miniprogram_Template_Extend>();
                             if (!string.IsNullOrEmpty(tempIds))
                             {
-                                tempList = miniprogramTemplateModule.GetMiniprogramTemplateListModule(new RB_Miniprogram_Template_Extend() { QIds = tempIds }, IsAnalyzePlus: true);
+                                tempList = miniprogramTemplateModule.GetMiniprogramTemplateListModule(new RB_Miniprogram_Template_Extend() { QIds = tempIds }, TenantId, MallBaseId, UserId, IsAnalyzePlus: true);
                             }
                             foreach (var item in navPageData.navs)
                             {
@@ -1392,10 +1392,10 @@ namespace Mall.WebApi.Controllers
                                 Sex = Sex
                             }, miAiUserItem.goodsLength);
                             List<miaiUserDetail> newGoodsList = new List<miaiUserDetail>();
-                            foreach (var goodItem in miAiUserItem.list)
+                            foreach (var tempGood in tempGoodsList)
                             {
                                 var lastItem = new miaiUserDetail();
-                                var tempGood = tempGoodsList?.Where(qitem => qitem.UserId == goodItem.id)?.FirstOrDefault();
+                               // var tempGood = tempGoodsList?.Where(qitem => qitem.UserId == goodItem.id)?.FirstOrDefault();
                                 if (tempGood != null && tempGood.Id > 0)
                                 {
                                     lastItem.id = tempGood.UserId;
@@ -1455,10 +1455,10 @@ namespace Mall.WebApi.Controllers
                                 BrowseRate = miAiUserItem.BrowseRate == 0 ? 1 : miAiUserItem.BrowseRate,
                             });
                             List<miaiUserDetail> newGoodsList = new List<miaiUserDetail>();
-                            foreach (var goodItem in miAiUserItem.list)
+                            foreach (var tempGood in tempGoodsList)
                             {
                                 var lastItem = new miaiUserDetail();
-                                var tempGood = tempGoodsList?.Where(qitem => qitem.UserId == goodItem.id)?.FirstOrDefault();
+                              //  var tempGood = tempGoodsList?.Where(qitem => qitem.UserId == goodItem.id)?.FirstOrDefault();
                                 if (tempGood != null && tempGood.Id > 0)
                                 {
                                     lastItem.id = tempGood.UserId;
@@ -1518,10 +1518,10 @@ namespace Mall.WebApi.Controllers
                                 UserId = UserId
                             });
                             List<miaiUserDetail> newGoodsList = new List<miaiUserDetail>();
-                            foreach (var goodItem in miAiUserItem.list)
+                            foreach (var tempGood in tempGoodsList)
                             {
                                 var lastItem = new miaiUserDetail();
-                                var tempGood = tempGoodsList?.Where(qitem => qitem.UserId == goodItem.id)?.FirstOrDefault();
+                               // var tempGood = tempGoodsList?.Where(qitem => qitem.UserId == goodItem.id)?.FirstOrDefault();
                                 if (tempGood != null && tempGood.Id > 0)
                                 {
                                     lastItem.id = tempGood.UserId;