提交代码

Mall.Module.User/MemberUserModule.cs

@@ -48,6 +48,9 @@ namespace Mall.Module.User
             return member_UserRepository.Update(fileds, new WhereHelper(nameof(RB_Member_User_Extend.Id), extModel.Id));
         }
 
+
+
+
         public bool SetMemberUserPhoneNum(RB_Member_User_Extend extModel)
         {
             Dictionary<string, object> fileds = new Dictionary<string, object>()

Mall.WebApi/Controllers/User/AppletLoginController.cs

@@ -157,14 +157,21 @@ namespace Mall.WebApi.Controllers.User
                 if (IsLogin) { return ApiResult.ParamIsNull("请传递唯一码"); }
                 LogHelper.WriteInfo(demodel.OpenId + "，SuperiorId:" + (demodel.SuperiorId ?? 0) + ",EduSchoolId:" + demodel.EduSchoolId);
                 //注册新用户
+                //if (string.IsNullOrEmpty(demodel.Name))
+                //{
+                //    return ApiResult.ParamIsNull("请传递用户名称");
+                //}
+                //if (string.IsNullOrEmpty(demodel.Photo))
+                //{
+                //    return ApiResult.ParamIsNull("请传递用户头像");
+                //}
+
                 if (string.IsNullOrEmpty(demodel.Name))
                 {
-                    return ApiResult.ParamIsNull("请传递用户名称");
-                }
-                if (string.IsNullOrEmpty(demodel.Photo))
-                {
-                    return ApiResult.ParamIsNull("请传递用户头像");
+                    var existsList = userModule.GetMemberUserList(new RB_Member_User_Extend() { TenantId = demodel.TenantId, MallBaseId = demodel.MallBaseId });
+                    demodel.Name = "微信用户" + DateTime.Now.ToString("yyMMdd") + "_" + (existsList?.Count ?? 0);
                 }
+
                 #region 赋默认值
                 demodel.AliasName ??= "";
                 demodel.Moblie ??= "";

Mall.WebApi/Controllers/User/MemberUserController.cs

@@ -33,22 +33,41 @@ namespace Mall.WebApi.Controllers.User
         [AllowAnonymous]
         public ApiResult SetMemberPhoto()
         {
-            JObject jobj = JObject.Parse(RequestParm.msg.ToString());
-            var extModel = new RB_Member_User_Extend()
+            JObject parms = JObject.Parse(RequestParm.msg.ToString());
+            var flag = true;
+            if (RequestParm.TenantId == 29)
             {
-                Id=jobj.GetInt("Id"),
-                AliasName=jobj.GetStringValue("AliasName"),
-                Photo=jobj.GetStringValue("Photo"),
-            };
-            if (extModel.Name != "微信用户" && extModel.Id>0)
-            {
-                var flag = MemberUserModule.SetMemberUserNameAndPhoto(extModel);
+                var extModel = new RB_Member_User_Extend()
+                {
+                    Name = parms.GetStringValue("Name"),
+                    Id = parms.GetInt("Id"),
+                };
+                if (!string.IsNullOrEmpty(extModel.Name) && extModel.Name.Contains("微信用户"))
+                {
+                    // 获取不到微信头像和昵称，暂不更新用户的头像和昵称
+                    flag = MemberUserModule.SetMemberUserNameAndPhoto(extModel);
+                }
                 return flag ? ApiResult.Success() : ApiResult.Failed();
             }
-            else
-            {
-                return ApiResult.Failed("获取用户信息失败");
+            else {
+                JObject jobj = JObject.Parse(RequestParm.msg.ToString());
+                var extModel = new RB_Member_User_Extend()
+                {
+                    Id = jobj.GetInt("Id"),
+                    AliasName = jobj.GetStringValue("AliasName"),
+                    Photo = jobj.GetStringValue("Photo"),
+                };
+                if (extModel.Name != "微信用户" && extModel.Id > 0)
+                {
+                     flag = MemberUserModule.SetMemberUserNameAndPhoto(extModel);
+                    return flag ? ApiResult.Success() : ApiResult.Failed();
+                }
+                else
+                {
+                    return ApiResult.Failed("获取用户信息失败");
+                }
             }
+
         }
 
         /// <summary>
@@ -69,11 +88,13 @@ namespace Mall.WebApi.Controllers.User
         /// </summary>
         /// <returns></returns>
         [HttpPost]
-        public ApiResult GetAdminMessageNoticePageList() {
+        public ApiResult GetAdminMessageNoticePageList()
+        {
             var parms = base.RequestParm;
             var pmodel = JsonHelper.DeserializeObject<ResultPageModel>(parms.msg.ToString());
             RB_Message_Notice_Extend demodel = JsonHelper.DeserializeObject<RB_Message_Notice_Extend>(parms.msg.ToString());
-            if (demodel.Type <= 0) {
+            if (demodel.Type <= 0)
+            {
                 return ApiResult.ParamIsNull("请选择查询类型");
             }
             demodel.TenantId = Convert.ToInt32(parms.uid);
@@ -103,7 +124,8 @@ namespace Mall.WebApi.Controllers.User
         /// </summary>
         /// <returns></returns>
         [HttpPost]
-        public ApiResult GetAdminMessageNoticeNum() {
+        public ApiResult GetAdminMessageNoticeNum()
+        {
             var parms = base.RequestParm;
             int TenantId = Convert.ToInt32(parms.uid);
             int MallBaseId = parms.MallBaseId;
@@ -117,7 +139,8 @@ namespace Mall.WebApi.Controllers.User
         /// </summary>
         /// <returns></returns>
         [HttpPost]
-        public ApiResult SetAdminMessageLook() {
+        public ApiResult SetAdminMessageLook()
+        {
             var parms = base.RequestParm;
             RB_Message_Notice_Extend demodel = JsonHelper.DeserializeObject<RB_Message_Notice_Extend>(parms.msg.ToString());
             demodel.TenantId = Convert.ToInt32(parms.uid);