1登录接口调整

Mall.WebApi/Controllers/Product/AppletOrderController.cs

@@ -1317,15 +1317,16 @@ namespace Mall.WebApi.Controllers.MallBase
         /// </summary>
         /// <returns></returns>
         [HttpPost]
+        [AllowAnonymous]
         public ApiResult GetAppletGoodsCommentPageList()
         {
             var parms = RequestParm;
-            var userInfo = AppletUserInfo;
+            //var userInfo = AppletUserInfo;
             ResultPageModel pagelist = JsonConvert.DeserializeObject<ResultPageModel>(parms.msg.ToString());
             RB_Goods_Comment_Extend demodel = JsonConvert.DeserializeObject<RB_Goods_Comment_Extend>(parms.msg.ToString());
 
-            demodel.TenantId = userInfo.TenantId;
-            demodel.MallBaseId = userInfo.MallBaseId;
+            demodel.TenantId = parms.TenantId;
+            demodel.MallBaseId = parms.MallBaseId;
             demodel.Is_Show = 1;
             var list = orderModule.GetAppletGoodsCommentPageList(pagelist.pageIndex, pagelist.pageSize, out long count, demodel);
             pagelist.count = Convert.ToInt32(count);

Mall.WebApi/Controllers/User/AppletLoginController.cs

@@ -95,7 +95,8 @@ namespace Mall.WebApi.Controllers.User
                 return ApiResult.ParamIsNull("请传递唯一码");
             }
 
-            int LoginUserId = 0;
+            //int LoginUserId = 0;
+            bool IsLogin = false;
             var opcache = UserReidsCache.GetMiniAppUsetOpenId(demodel.OpenId);
             if (opcache != null && !string.IsNullOrEmpty(opcache.UserOpenId))
             {
@@ -104,24 +105,25 @@ namespace Mall.WebApi.Controllers.User
             }
             else
             {
-                if (string.IsNullOrEmpty(requestParm.token))
-                {
-                    return ApiResult.ParamIsNull("请传递唯一码");
-                }
-                else
-                {
-                    LoginUserId = JWTValidatGetUserId(requestParm.token);
-                    if (LoginUserId <= 0)
-                    {
-                        return ApiResult.ParamIsNull("请传递唯一码");
-                    }
-                    var loginModel = UserReidsCache.GetAppletUserLoginInfo(LoginUserId);
-                    demodel.OpenId = loginModel?.OpenId ?? "";
-                    if (string.IsNullOrEmpty(demodel.OpenId))
-                    {
-                        return ApiResult.ParamIsNull("请传递唯一码");
-                    }
-                }
+                IsLogin = true;
+                //if (string.IsNullOrEmpty(requestParm.token))
+                //{
+                //    return ApiResult.ParamIsNull("请传递唯一码");
+                //}
+                //else
+                //{
+                //    LoginUserId = JWTValidatGetUserId(requestParm.token);
+                //    if (LoginUserId <= 0)
+                //    {
+                //        return ApiResult.ParamIsNull("请传递唯一码");
+                //    }
+                //    var loginModel = UserReidsCache.GetAppletUserLoginInfo(LoginUserId);
+                //    demodel.OpenId = loginModel?.OpenId ?? "";
+                //    if (string.IsNullOrEmpty(demodel.OpenId))
+                //    {
+                //        return ApiResult.ParamIsNull("请传递唯一码");
+                //    }
+                //}
             }
 
             Model.Extend.MarketingCenter.RB_DiscountCoupon_Extend couponResult = new Model.Extend.MarketingCenter.RB_DiscountCoupon_Extend();
@@ -134,6 +136,7 @@ namespace Mall.WebApi.Controllers.User
             //验证是否新用户
             if (!userModule.ValidateUserOpenId(demodel.OpenId, demodel.Source, requestParm.TenantId, requestParm.MallBaseId))
             {
+                if (IsLogin) { return ApiResult.ParamIsNull("请传递唯一码"); }
                 LogHelper.WriteInfo(demodel.OpenId + "，SuperiorId:" + (demodel.SuperiorId ?? 0) + ",EduSchoolId:" + demodel.EduSchoolId);
                 //注册新用户
                 if (string.IsNullOrEmpty(demodel.Name))