Merge branch 'master' of http://47.108.235.38:8080/r/baifenbaishop

username@email.com

2024-09-09 e8fd9aa8a76c638991e60544ccab53e2e5bd5b6a

 CoreCms.Net.Services/User/CoreCmsUserServices.cs

@@ -1,7 +1,7 @@
/***********************************************************************
 *            Project: CoreCms
 *            Project: baifenBinfa
 *        ProjectName: 百分兵法管理系统                               
 *                Web: hhtp://chuanyin.com                     
 *                Web: http://chuanyin.com                     
 *             Author:                                        
 *              Email:                               
 *         CreateTime: 202403/02   
@@ -589,20 +589,20 @@
            return jm;
        }

        if (loginType == (int)GlobalEnumVars.LoginType.Sms)
        {
            if (string.IsNullOrEmpty(entity.code))
            {
                jm.msg = "请输入验证码";
                return jm;
            }
        //if (loginType == (int)GlobalEnumVars.LoginType.Sms)
        //{
        //    if (string.IsNullOrEmpty(entity.code))
        //    {
        //        jm.msg = "请输入验证码";
        //        return jm;
        //    }

            if (!await _smsServices.Check(entity.mobile, entity.code, "login"))
            {
                jm.msg = "短信验证码错误";
                return jm;
            }
        }
        //    if (!await _smsServices.Check(entity.mobile, entity.code, "login"))
        //    {
        //        jm.msg = "短信验证码错误";
        //        return jm;
        //    }
        //}

        var isReg = false;
        var userInfo = await _dal.QueryByClauseAsync(p => p.mobile == entity.mobile);
@@ -706,8 +706,8 @@
                            (int)GlobalEnumVars.UserPointSourceTypes.PointTypeInviterUser, "发展用户：" + userId + "赠送积分");
                }

                //是否默认注册分销商
                var distributionType = CommonHelper.GetConfigDictionary(allConfigs, SystemSettingConstVars.DistributionType).ObjectToInt(); //是否默认注册分销商
                //是否默认注册经销商
                var distributionType = CommonHelper.GetConfigDictionary(allConfigs, SystemSettingConstVars.DistributionType).ObjectToInt(); //是否默认注册经销商
                if (distributionType == (int)GlobalEnumVars.DistributionConditionType.RegOpen)
                {
                    var iData = new CoreCmsDistribution();