Merge branch 'sdzq-ld' of http://gitlab.oytour.com/Kui2/mall.oytour.com into sdzq

Mall.Module.Product/GuideCarModule.cs

@@ -816,6 +816,7 @@ namespace Mall.Module.Product
                          { nameof(RB_Goods.IntegralComment),demodel.IntegralComment },
                          { nameof(RB_Goods.IntegralCommentType),demodel.IntegralCommentType },
                          { nameof(RB_Goods.GoodsType),demodel.GoodsType },
+                         { nameof(RB_Goods.GoodsPageType),demodel.GoodsPageType },
                     };
                     List<WhereHelper> wheres = new List<WhereHelper>() {
                         new WhereHelper(){

Mall.Module.User/UserModule.cs

@@ -4439,8 +4439,17 @@ namespace Mall.Module.User
         #endregion
 
         #region 个人中心
-
-
+        /// <summary>
+        /// 获取用户类型
+        /// </summary>
+        /// <param name="userInfo"></param>
+        /// <returns></returns>
+        public ApiResult GetAppletUserPageType(AppletUserInfo userInfo)
+        {
+            var mmodel = miniProgramRepository.GetMiniProgramRepository(new RB_MiniProgram_Extend() { MallBaseId = userInfo.MallBaseId });
+            var umodel = member_UserRepository.GetEntity(userInfo.UserId);
+            return ApiResult.Success("", new { mmodel.IsOpenSchool, UserPageType = mmodel.IsOpenSchool == 1 ? umodel.UserPageType : Common.Enum.Goods.GoodsPageTypeEnum.All });
+        }
 
         /// <summary>
         /// 获取个人中心统计

Mall.WebApi/Controllers/Product/GuideCarController.cs

@@ -378,6 +378,8 @@ namespace Mall.WebApi.Controllers.MallBase
                 model?.TargetDateList,
                 model?.IntegralComment,
                 model?.IntegralCommentType,
+                model?.GoodsPageType,
+                GoodsPageTypeName = model?.GoodsPageType.GetEnumName() ?? "",
             });
         }
 
@@ -818,6 +820,7 @@ namespace Mall.WebApi.Controllers.MallBase
             demodel.GoodsClassify = 1;
             demodel.IntegralComment ??= 0;//评论反积分
             demodel.IntegralCommentType ??= 1;
+            demodel.GoodsPageType ??= GoodsPageTypeEnum.All;
 
             bool flag = guideCarModule.SetProductGoodsInfo(demodel);
             if (flag)

Mall.WebApi/Controllers/Product/ProductController.cs

@@ -2121,6 +2121,7 @@ namespace Mall.WebApi.Controllers.MallBase
             demodel.GoodsClassify = 0;
             demodel.IntegralComment ??= 0;//评论反积分
             demodel.IntegralCommentType ??= 1;
+            demodel.GoodsPageType ??= Common.Enum.Goods.GoodsPageTypeEnum.All;
             if (demodel.IsProxy == 1 && demodel.CostPrice > 0)
             {
                 decimal ProxyMoney = 0;

Mall.WebApi/Controllers/User/AppletUserController.cs

@@ -1037,6 +1037,16 @@ namespace Mall.WebApi.Controllers.User
         //    return userModule.GetAppletUserCenterStatistics(userInfo.UserId, userInfo.TenantId, userInfo.MallBaseId);
         //}
 
+        /// <summary>
+        /// 获取用户类型
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        public ApiResult GetAppletUserPageType() {
+            var userInfo = AppletUserInfo;
+
+            return userModule.GetAppletUserPageType(userInfo);
+        }
         #endregion        
 
         #region 优惠券