提交代码

Mall.CacheManager/User/UserReidsCache.cs

@@ -6,6 +6,7 @@ using Mall.Common.Plugin;
 using Mall.Model.Extend.User;
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using System.Text;
 
 namespace Mall.CacheManager.User
@@ -338,5 +339,109 @@ namespace Mall.CacheManager.User
             return transactionPriceInfo;
         }
         #endregion
+
+
+
+
+        /// <summary>
+        /// 添加用户发送验证码时间记录
+        /// </summary>
+        /// <param name="mobileNumber">手机号码</param>
+        public static bool AddUserSendCodeHistory(string mobileNumber)
+        {
+            string key = string.Concat(CacheKey.UserModuleCacheKeyConfig.User_Send_Code_List, mobileNumber);
+            List<DateTime> codeTimeList = redis.StringGet<List<DateTime>>(key);
+            if (codeTimeList == null)
+            {
+                codeTimeList = new List<DateTime>();
+            }
+            codeTimeList.Add(DateTime.Now);
+            TimeSpan ts = GetExpirTime(Common.Config.JwtExpirTime);
+            return redis.StringSet<List<DateTime>>(key, codeTimeList, ts);
+        }
+
+
+
+        /// <summary>
+        /// 设置缓存
+        /// </summary>
+        /// <param name="cacheKey"></param>
+        /// <param name="Data"></param>
+        /// <param name="JwtExpirTime"></param>
+        public static void SetSendCode(string cacheKey, object Data, int JwtExpirTime)
+        {
+            try
+            {
+                TimeSpan ts = GetExpirTime(JwtExpirTime);
+                redis.StringSet(cacheKey, Data, ts);
+            }
+            catch (Exception)
+            {
+            }
+        }
+
+        /// <summary>
+        /// 获取短信验证码
+        /// </summary>
+        /// <param name="Id">账号Id</param>
+        /// <param name="apiRequestFromEnum">请求来源</param>
+        /// <returns></returns>
+        public static string GetUserCode(object Id)
+        {
+            string code = string.Empty;
+            if (Id != null)
+            {
+                string cacheKey = Id.ToString();
+                try
+                {
+                    code = redis.StringGet<string>(cacheKey);
+                }
+                catch (Exception ex)
+                {
+                    Common.Plugin.LogHelper.Write(ex, "GetUserCode");
+                }
+            }
+            return code;
+        }
+        /// <summary>
+        /// 验证是否可以发送验证码
+        /// </summary>
+        /// <param name="mobileNumber">手机号码</param>
+        /// <param name="message">返回消息</param>
+        public static bool CheckCanSendCode(string mobileNumber, out string message)
+        {
+            message = "";
+            //Monitor.Enter和Monitor.Exit
+            string key = string.Concat(CacheKey.UserModuleCacheKeyConfig.User_Send_Code_List, mobileNumber);
+            List<DateTime> codeTimeList = redis.StringGet<List<DateTime>>(key);
+            if (codeTimeList != null)
+            {
+                //计算阿里短信业务限流
+                codeTimeList = codeTimeList.Where(t => t >= DateTime.Now.AddDays(-1)).ToList();
+                //去除一天以外的记录
+                TimeSpan ts = GetExpirTime(Common.Config.JwtExpirTime);
+                redis.StringSet(key, codeTimeList, ts);
+                if (codeTimeList.Count() >= 10)
+                {
+                    message = "24小时内不能发送超过10条验证码";
+                    return false;
+                }
+                if (codeTimeList.Where(t => t >= DateTime.Now.AddHours(-1)).Count() >= 5)
+                {
+                    message = "1小时内不能发送超过5条验证码";
+                    return false;
+                }
+                if (codeTimeList.Where(t => t >= DateTime.Now.AddMinutes(-1)).Count() >= 1)
+                {
+                    message = "1分钟内只能发送1条验证码";
+                    return false;
+                }
+                return true;
+            }
+            else
+            {
+                return true;
+            }
+        }
     }
 }

Mall.CacheManager/keyManager/UserModuleCacheKeyConfig.cs

@@ -56,5 +56,14 @@ namespace Mall.CacheKey
         {
             get { return "Transaction_Price_"; }
         }
+
+        public static string User_Send_Code_List
+        {
+            get { return "User_Send_Code_List_"; }
+        }
+        public static string User_Send_Code
+        {
+            get { return "User_Send_Code_"; }
+        }
     }
 }

Mall.Common/Config.cs

@@ -469,6 +469,16 @@ namespace Mall.Common
             }
         }
 
+        /// <summary>
+        /// 赞羊教育活动报名支付成功接口处理地址
+        /// </summary>
+        public static string sTenpayActivityNotify
+        {
+            get
+            {
+                return ReadConfigKey("sTenpayActivityNotify");
+            }
+        }
 
 
         /// <summary>

Mall.Common/Enum/Goods/OrderPaymentTypeEnum.cs

@@ -43,6 +43,12 @@ namespace Mall.Common.Enum.Goods
         /// 储值卡支付
         /// </summary>
         [EnumField("储值卡支付")]
-        PayCards = 6
+        PayCards = 6,
+
+        /// <summary>
+        /// 点数支付
+        /// </summary>
+        [EnumField("点数支付")]
+        PayPoint = 6,
     }
 }

Mall.Common/Enum/MobileCodeTypeEnum.cs

@@ -91,6 +91,11 @@ namespace Mall.Common.Enum
         /// 司导客人通知
         /// </summary>
         [EnumField("SMS_203186595")]
-        SDClientMsg = 16
+        SDClientMsg = 16,
+        /// <summary>
+        /// 赞羊教育绑定教育学生发送验证码
+        /// </summary>
+        [EnumField("SMS_147435886")]
+        StudentMsg = 17
     }
 }

Mall.Common/Enum/Point/EduUserExportEnum.cs

+using System;
+using System.Collections.Generic;
+using System.Text;
+using Mall.Common.Plugin;
+
+namespace Mall.Common.Enum.Point
+{
+    /// <summary>
+    /// 用户导出选项枚举
+    /// </summary>
+    public enum EduUserExportEnum
+    {
+        /// <summary>
+        /// 所属平台
+        /// </summary>
+        [EnumField("所属平台")]
+        SSPT = 1,
+        /// <summary>
+        /// 用户ID
+        /// </summary>
+        [EnumField("用户ID")]
+        YHID = 2,
+        /// <summary>
+        /// 平台标识ID
+        /// </summary>
+        [EnumField("平台标识ID")]
+        PTBSID = 3,
+        /// <summary>
+        /// 昵称
+        /// </summary>
+        [EnumField("昵称")]
+        NC = 4,
+        /// <summary>
+        /// 绑定手机号
+        /// </summary>
+        [EnumField("绑定手机号")]
+        BDSJH = 5,
+        /// <summary>
+        /// 联系方式
+        /// </summary>
+        [EnumField("联系方式")]
+        LXFS = 6,
+        /// <summary>
+        /// 备注
+        /// </summary>
+        [EnumField("备注")]
+        BZ = 7,
+        /// <summary>
+        /// 加入时间
+        /// </summary>
+        [EnumField("加入时间")]
+        JRSJ = 8,
+        /// <summary>
+        /// 会员等级
+        /// </summary>
+        [EnumField("会员等级")]
+        HYDJ = 9,
+        /// <summary>
+        /// 订单数
+        /// </summary>
+        [EnumField("订单数")]
+        DDS = 10,
+        /// <summary>
+        /// 优惠卷总数
+        /// </summary>
+        [EnumField("优惠卷总数")]
+        YHJZS = 11,
+        /// <summary>
+        /// 卡卷总数
+        /// </summary>
+        [EnumField("卡卷总数")]
+        KJZS = 12,
+        /// <summary>
+        /// 积分
+        /// </summary>
+        [EnumField("积分")]
+        JF = 13,
+        /// <summary>
+        /// 余额
+        /// </summary>
+        [EnumField("余额")]
+        YE = 14,
+        /// <summary>
+        /// 总消费
+        /// </summary>
+        [EnumField("总消费")]
+        ZXF = 15,
+        /// <summary>
+        /// 点数
+        /// </summary>
+        [EnumField("点数")]
+        DS = 16,
+        /// <summary>
+        /// 学员信息
+        /// </summary>
+        [EnumField("学员信息")]
+        Stu = 17
+    }
+}

Mall.Model/Entity/Education/RB_Education_Activity.cs

+using VT.FW.DB;
+using Mall.Common.Enum.User;
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Mall.Model.Entity.Education
+{
+    /// <summary>
+    /// 活动表实体
+    /// </summary>
+    [Serializable]
+    [DB(ConnectionName = "DefaultConnection")]
+    public class RB_Education_Activity
+    {
+        /// <summary>
+        /// 活动编号(主键)
+        /// </summary>
+        public int Id { get; set; }
+
+        /// <summary>
+        /// 活动名称
+        /// </summary>
+        public string ActivityName { get; set; }
+
+        /// <summary>
+        /// 开始时间
+        /// </summary>
+        public DateTime StartTime { get; set; }
+
+        /// <summary>
+        /// 结束时间
+        /// </summary>
+        public DateTime EndTime { get; set; }
+
+        /// <summary>
+        /// 封面图
+        /// </summary>
+        public string CoverImg { get; set; }
+
+        /// <summary>
+        /// 活动类型(rb_commerce_activitytype表Id)
+        /// </summary>
+        public int? ActivityType { get; set; }
+
+        /// <summary>
+        /// 活动详情
+        /// </summary>
+        public string ActivityInfo { get; set; }
+
+        /// <summary>
+        /// 商户号id
+        /// </summary>
+        public int TenantId { get; set; }
+
+        /// <summary>
+        /// 小程序id
+        /// </summary>
+        public int MallBaseId { get; set; }
+
+        /// <summary>
+        /// 创建人
+        /// </summary>
+        public int CreateBy { get; set; }
+
+        /// <summary>
+        /// 创建时间
+        /// </summary>
+        public DateTime CreateDate { get; set; }
+
+        /// <summary>
+        /// 修改人
+        /// </summary>
+        public int UpdateBy { get; set; }
+
+        /// <summary>
+        /// 修改时间
+        /// </summary>
+        public DateTime UpdateDate { get; set; }
+
+        /// <summary>
+        /// 删除状态
+        /// </summary>
+        public Common.Enum.DateStateEnum Status { get; set; }
+
+        /// <summary>
+        /// 报名开始时间
+        /// </summary>
+        public DateTime? SignStartTime { get; set; }
+
+        /// <summary>
+        /// 报名截止时间
+        /// </summary>
+        public DateTime? SignEndTime { get; set; }
+
+        /// <summary>
+        /// 是否免费   1是  2否
+        /// </summary>
+        public int IsFree { get; set; }
+
+        /// <summary>
+        /// 报名点数
+        /// </summary>
+        public int PointNum { get; set; }
+
+        /// <summary>
+        /// 报名价格
+        /// </summary>
+        public decimal Price { get; set; }
+
+        /// <summary>
+        /// 是否需取消确认   1是  2否
+        /// </summary>
+        public int IsCancelConfirm { get; set; }
+
+        /// <summary>
+        /// 标签
+        /// </summary>
+      //  public string Label { get; set; }
+
+
+
+        /// <summary>
+        /// 男数量
+        /// </summary>
+        public int ManNum { get; set; }
+
+        /// <summary>
+        /// 女数量
+        /// </summary>
+        public int WoManNum { get; set; }
+
+
+        /// <summary>
+        /// 0-区分，1-不区分报名性别
+        /// </summary>
+        public int Distinguish { get; set; }
+
+        /// <summary>
+        /// 年龄限制 0-区分，1-不区分报名
+        /// </summary>
+        public int AgeLimit { get; set; }
+
+        /// <summary>
+        /// 最小年龄
+        /// </summary>
+        public int StartAge { get; set; }
+
+        /// <summary>
+        /// 最大年龄
+        /// </summary>
+        public int EndAge { get; set; }
+        /// <summary>
+        /// 经纬度（逗号分隔）
+        /// </summary>
+        public string LonLat { get; set; }
+
+        /// <summary>
+        /// 位置名称
+        /// </summary>
+        public string LocationName { get; set; }
+
+        /// <summary>
+        /// 内部限制0-否，1-是
+        /// </summary>
+        public int LnsideLimit { get; set; }
+    }
+}

Mall.Model/Entity/Education/RB_Education_ActivityType.cs

+using System;
+using System.Collections.Generic;
+using System.Text;
+using Mall.Common.Enum;
+using VT.FW.DB;
+
+namespace Mall.Model.Entity.Education
+{
+    /// <summary>
+    /// 活动类型表实体类
+    /// </summary>
+    [Serializable]
+    [DB(ConnectionName = "DefaultConnection")]
+    public class RB_Education_ActivityType
+    {
+
+        /// <summary>
+        /// 活动类型编号(主键)
+        /// </summary>
+        public int Id { get; set; }
+
+        /// <summary>
+        /// 类型名称
+        /// </summary>
+        public string TypeName { get; set; }
+
+        /// <summary>
+        /// 封面图
+        /// </summary>
+        public string CoverImage { get; set; }
+
+        /// <summary>
+        /// 商户号id
+        /// </summary>
+        public int TenantId { get; set; }
+
+        /// <summary>
+        /// 小程序id
+        /// </summary>
+        public int MallBaseId { get; set; }
+
+        /// <summary>
+        /// 创建人
+        /// </summary>
+        public int CreateBy { get; set; }
+
+        /// <summary>
+        /// 创建时间
+        /// </summary>
+        public DateTime CreateDate { get; set; }
+
+        /// <summary>
+        /// 修改人
+        /// </summary>
+        public int UpdateBy { get; set; }
+
+        /// <summary>
+        /// 修改时间
+        /// </summary>
+        public DateTime UpdateDate { get; set; }
+
+        /// <summary>
+        /// 删除状态
+        /// </summary>
+        public DateStateEnum Status { get; set; }
+
+
+        /// <summary>
+        /// 描述
+        /// </summary>
+        public string TypeContent { get; set; }
+
+        /// <summary>
+        /// 标签
+        /// </summary>
+        public string LableName { get; set; }
+    }
+}

Mall.Model/Entity/Education/RB_Education_BaseInfo.cs

+using System;
+using System.Collections.Generic;
+using System.Text;
+using VT.FW.DB;
+
+namespace Mall.Model.Entity.Education
+{
+
+    /// <summary>
+    /// 教育用户的基础信息
+    /// </summary>
+    [Serializable]
+    [DB(ConnectionName = "DefaultConnection")]
+    public class RB_Education_BaseInfo
+    {
+        /// <summary>
+        /// 
+        /// </summary>
+        public int Id { get; set; }
+
+        /// <summary>
+        /// 会员id
+        /// </summary>
+        public int UserId { get; set; }
+
+
+        /// <summary>
+        /// 学生id（对应教育那边的rb_student的id）
+        /// </summary>
+        public int StudentId { get; set; }
+        /// <summary>
+        /// 性别1-男，2-女
+        /// </summary>
+        public int Sex { get; set; }
+
+
+        /// <summary>
+        /// 生日
+        /// </summary>
+        public string Birthday { get; set; }
+        /// <summary>
+        /// 商户号Id
+        /// </summary>        
+        public int? TenantId
+        {
+            get;
+            set;
+        }
+
+        /// <summary>
+        /// 小程序Id
+        /// </summary>        
+        public int? MallBaseId
+        {
+            get;
+            set;
+        }
+
+
+        /// <summary>
+        /// 创建时间
+        /// </summary>        
+        public DateTime? CreateDate
+        {
+            get;
+            set;
+        }
+
+        /// <summary>
+        /// 删除状态
+        /// </summary>        
+        public int? Status
+        {
+            get;
+            set;
+        }
+
+    }
+}

Mall.Model/Entity/Education/RB_Education_Consult.cs

+using System;
+using System.Collections.Generic;
+using System.Text;
+using Mall.Common.Enum;
+using Mall.Common.Enum.Goods;
+using Mall.Common.Enum.User;
+using VT.FW.DB;
+
+namespace Mall.Model.Entity.Education
+{
+    /// <summary>
+    /// 商会活动报名实体类
+    /// </summary>
+    [Serializable]
+    [DB(ConnectionName = "DefaultConnection")]
+    public class RB_Education_Consult
+    {
+        /// <summary>
+        /// 主键编号
+        /// </summary>
+        public int Id { get; set; }
+
+        /// <summary>
+        /// 活动编号
+        /// </summary>
+        public int ActivityId { get; set; }
+
+        /// <summary>
+        /// 用户编号
+        /// </summary>
+        public int UserId { get; set; }
+
+        /// <summary>
+        /// 联系人
+        /// </summary>
+        public string LinkMan { get; set; }
+
+        /// <summary>
+        /// 联系电话
+        /// </summary>
+        public string LinkTel { get; set; }
+
+        /// <summary>
+        /// 商户号id
+        /// </summary>
+        public int TenantId { get; set; }
+
+        /// <summary>
+        /// 小程序id
+        /// </summary>
+        public int MallBaseId { get; set; }
+
+        /// <summary>
+        /// 报名时间
+        /// </summary>
+        public DateTime CreateTime { get; set; }
+
+        /// <summary>
+        /// 删除状态
+        /// </summary>
+        public DateStateEnum Status { get; set; }
+
+        /// <summary>
+        /// 报名人数
+        /// </summary>
+        public int PeopleNum { get; set; }
+
+        /// <summary>
+        /// 性别
+        /// </summary>
+
+        public int Sex { get; set; }
+
+        /// <summary>
+        /// 单价
+        /// </summary>
+        public decimal UnitPrice { get; set; }
+
+        /// <summary>
+        /// 支付金额
+        /// </summary>
+        public decimal Money { get; set; }
+
+
+        /// <summary>
+        /// 备注
+        /// </summary>
+        public string Remark { get; set; }
+
+        /// <summary>
+        /// 是否申请取消  1是  2否
+        /// </summary>
+        public int IsApplyForCancel { get; set; }
+
+        /// <summary>
+        /// 取消备注
+        /// </summary>
+        public string CancelRemark { get; set; }
+
+        /// <summary>
+        /// 申请取消审核状态  1同意  2拒绝
+        /// </summary>
+        public int ApplyForCancelStatus { get; set; }
+
+        /// <summary>
+        /// 拒绝备注
+        /// </summary>
+        public string RejectRemark { get; set; }
+
+
+        /// <summary>
+        /// 点数（单价）
+        /// </summary>
+        public int UnitPoint { get; set; }
+
+        /// <summary>
+        /// 总点数
+        /// </summary>
+        public int TotalPoint { get; set; }
+
+        /// <summary>
+        /// 0-未支付，1-已支付
+        /// </summary>
+        public int OrderStatus { get; set; }
+
+        /// <summary>
+        /// 现金支付时间
+        /// </summary>
+        public DateTime? PaymentTime { get; set; }
+
+        /// <summary>
+        /// 退款单号
+        /// </summary>
+        public string RefundOrderNo { get; set; }
+
+        /// <summary>
+        /// 退款时间
+        /// </summary>
+        public DateTime? RefundTime { get; set; }
+
+        /// <summary>
+        /// 订单来源（平台）  枚举
+        /// </summary>        
+        public UserSourceEnum? OrderSource
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 支付方式   枚举
+        /// </summary>        
+        public OrderPaymentTypeEnum? PaymentWay
+        {
+            get;
+            set;
+        }
+
+        public Common.Enum.Goods.OrderPayTypeEnum? PayWay {get;set;}
+        /// <summary>
+        /// 订单号
+        /// </summary>        
+        public string OrderNo
+        {
+            get;
+
+            set;
+        }
+        /// <summary>
+        /// 商户单号
+        /// </summary>        
+        public string MerchantsNo
+        {
+            get;
+            set;
+        }
+
+        /// <summary>
+        /// 是否需取消确认   1是  2否
+        /// </summary>
+        public int IsCancelConfirm { get; set; }
+    }
+}

Mall.Model/Extend/Education/RB_Education_ActivityType_Extend.cs

+using System;
+using System.Collections.Generic;
+using System.Text;
+using Mall.Model.Entity.Education;
+
+namespace Mall.Model.Extend.Education
+{
+    public class RB_Education_ActivityType_Extend : RB_Education_ActivityType
+    {
+        public string Ids { get; set; }
+
+
+        public List<string> LableNameList { get; set; }
+    }
+}

Mall.Model/Extend/Education/RB_Education_Activity_Extend.cs

+using System;
+using System.Collections.Generic;
+using System.Text;
+using Mall.Model.Entity.Education;
+using VT.FW.DB;
+
+namespace Mall.Model.Extend.Education
+{
+    /// <summary>
+    /// 活动表扩展实体
+    /// </summary>
+    [Serializable]
+    [DB(ConnectionName = "DefaultConnection")]
+    public class RB_Education_Activity_Extend : RB_Education_Activity
+    {
+        /// <summary>
+        /// 用户名称
+        /// </summary>
+        public string UserName { get; set; }
+
+        /// <summary>
+        /// 头像
+        /// </summary>
+        public string Photo { get; set; }
+
+        /// <summary>
+        /// 性别  1男  2女
+        /// </summary>
+        public int Sex { get; set; }
+
+        /// <summary>
+        /// 图片列表
+        /// </summary>
+        public List<string> ImageList { get; set; }
+
+        /// <summary>
+        /// 回复数量
+        /// </summary>
+        public int ReplyNum { get; set; }
+
+        /// <summary>
+        /// 报名数量
+        /// </summary>
+        public int EnrollNum { get; set; }
+
+        /// <summary>
+        /// 活动名称
+        /// </summary>
+        public string ActivityTypeName { get; set; }
+
+        /// <summary>
+        /// 活动ids
+        /// </summary>
+        public string ActivityIds { get; set; }
+
+        /// <summary>
+        /// 开始时间字符串
+        /// </summary>
+        public string StartTimeStr { get { return Common.ConvertHelper.FormatDate(this.StartTime); } }
+
+
+        /// <summary>
+        /// 结束时间字符串
+        /// </summary>
+        public string EndTimeStr { get { return Common.ConvertHelper.FormatDate(this.EndTime); } }
+
+
+        /// <summary>
+        /// 商会活动详情列表
+        /// </summary>
+       // public List<RB_Commerce_Details_Extend> CommerceDetailsList { get; set; }
+
+        /// <summary>
+        /// 报名列表
+        /// </summary>
+        public List<RB_Education_Consult_Extend> EducationConsultList { get; set; }
+
+        /// <summary>
+        /// 活动状态
+        /// </summary>
+        public int ActivityStatus
+        {
+            get
+            {
+                int status = 0;//未开始
+                DateTime currentDay = Convert.ToDateTime(Common.ConvertHelper.FormatDate(DateTime.Now));
+                if (currentDay >= this.StartTime && currentDay <= this.EndTime)
+                {
+                    status = 1;//进行中
+                }
+                else if (currentDay > this.EndTime)
+                {
+                    status = 2;//已结束
+                }
+                return status;
+            }
+        }
+
+        /// <summary>
+        /// 是否可报名
+        /// </summary>
+        public int IsSignUp
+        {
+            get
+            {
+                int isSign = 0;
+                if (this.SignStartTime != null && this.SignEndTime != null)
+                {
+                    DateTime currentDay = Convert.ToDateTime(Common.ConvertHelper.FormatDate(DateTime.Now));
+                    if (currentDay >= this.SignStartTime && currentDay <= this.SignEndTime)
+                    {
+                        isSign = 1;//可报名
+                    }
+                }
+                return isSign;
+            }
+        }
+
+        /// <summary>
+        /// 报名开始时间
+        /// </summary>
+        public string SignStartTimeStr { get { return Common.ConvertHelper.FormatTime(this.SignStartTime); } }
+
+        /// <summary>
+        /// 报名截止时间
+        /// </summary>
+        public string SignEndTimeStr { get { return Common.ConvertHelper.FormatTime(this.SignEndTime); } }
+
+        /// <summary>
+        /// 活动状态字符串
+        /// </summary>
+        public string ActivityStatusStr
+        {
+            get
+            {
+                string str = "未开始";
+                switch (this.ActivityStatus)
+                {
+                    case 0:
+                        str = "未开始";
+                        break;
+                    case 1:
+                        str = "进行中";
+                        break;
+                    case 2:
+                        str = "已结束";
+                        break;
+                }
+                return str;
+            }
+        }
+
+        /// <summary>
+        /// 报名人数
+        /// </summary>
+        public int JoinNum { get; set; }
+
+        /// <summary>
+        /// 创建人
+        /// </summary>
+        public string CreateByName { get; set; }
+
+        /// <summary>
+        /// 是否报名(0-未报名，1-已报名)
+        /// </summary>
+        public int IsJoinActivity { get; set; }
+
+
+
+        #region 查询时间字段
+        /// <summary>
+        /// 报名开始时间
+        /// </summary>
+        public string SelectStartTimeStr { get; set; }
+
+        /// <summary>
+        /// 报名截止时间
+        /// </summary>
+        public string SelectEndTimeStr { get; set; }
+
+        public string OrderByStr { get; set; }
+        #endregion
+    }
+}

Mall.Model/Extend/Education/RB_Education_BaseInfo_Extend.cs

+using System;
+using System.Collections.Generic;
+using System.Text;
+using Mall.Model.Entity.Education;
+
+namespace Mall.Model.Extend.Education
+{
+    public class RB_Education_BaseInfo_Extend: RB_Education_BaseInfo
+    {
+        public string Ids { get; set; }
+
+        public string PhoneNum { get; set; }
+    }
+}

Mall.Model/Extend/Education/RB_Education_Consult_Extend.cs

+using System;
+using System.Collections.Generic;
+using System.Text;
+using Mall.Model.Entity.Education;
+
+namespace Mall.Model.Extend.Education
+{
+  public  class RB_Education_Consult_Extend: RB_Education_Consult
+    {
+        /// <summary>
+        /// 活动编号【查询使用】
+        /// </summary>
+        public string QActivityIds { get; set; }
+
+        /// <summary>
+        /// 用户编号【查询使用】
+        /// </summary>
+        public string QUserIds { get; set; }
+
+        /// <summary>
+        /// 报名时间
+        /// </summary>
+        public string CreateTimeStr { get { return Common.ConvertHelper.FormatTime(this.CreateTime); } }
+
+        /// <summary>
+        /// 报名状态   1正常  2取消  3查询所有
+        /// </summary>
+        public int EnrollState { get; set; }
+
+        /// <summary>
+        /// 活动名称
+        /// </summary>
+        public string ActivityName { get; set; }
+
+        /// <summary>
+        /// 活动封面图
+        /// </summary>
+        public string CoverImg { get; set; }
+        /// <summary>
+        /// 活动开始时间
+        /// </summary>
+        public DateTime? StartTime { get; set; }
+        /// <summary>
+        /// 活动结束时间
+        /// </summary>
+        public DateTime? EndTime { get; set; }
+
+        /// <summary>
+        /// 类型名称
+        /// </summary>
+        public string TypeName { get; set; }
+    }
+}

Mall.Model/Extend/Education/RB_Student.cs

+using System;
+using System.Collections.Generic;
+using System.Text;
+using VT.FW.DB;
+
+namespace Mall.Model.Extend.Education
+{
+    /// <summary>
+    /// 学生实体类
+    /// </summary>
+    [Serializable]
+    [DB(ConnectionName = "EduConnection")]
+    public class RB_Student
+    {
+        /// <summary>
+        /// 主键(学生编号)
+        /// </summary>
+
+        public int StuId { get; set; }
+
+        /// <summary>
+        /// 学生昵称
+        /// </summary>
+        public string StuName { get; set; }
+
+        /// <summary>
+        /// 学生电话
+        /// </summary>
+        public string StuTel { get; set; }
+
+        /// <summary>
+        /// 学生头像
+        /// </summary>
+        public string StuIcon { get; set; }
+
+        /// <summary>
+        /// 学生性别 (0-男,1-女)
+        /// </summary>
+        public int StuSex { get; set; }
+
+        /// <summary>
+        /// 学生出生日期
+        /// </summary>
+        public DateTime? StuBirth { get; set; }
+
+        /// <summary>
+        /// 省份Id
+        /// </summary>
+        public int ProviceId { get; set; }
+
+        /// <summary>
+        /// 城市Id
+        /// </summary>
+        public int CityId { get; set; }
+
+        /// <summary>
+        /// 区县Id
+        /// </summary>
+        public int AreaId { get; set; }
+
+        /// <summary>
+        /// 集团编号
+        /// </summary>
+        public int Group_Id { get; set; }
+
+        /// <summary>
+        /// 学校编号
+        /// </summary>
+        public int School_Id { get; set; }
+
+        /// <summary>
+        /// 删除状态
+        /// </summary>
+        public int Status { get; set; }
+
+        /// <summary>
+        /// 创建人
+        /// </summary>
+        public int CreateBy { get; set; }
+
+        /// <summary>
+        /// 创建时间
+        /// </summary>
+        public DateTime CreateTime { get; set; }
+
+        /// <summary>
+        /// 修改人
+        /// </summary>
+        public int UpdateBy { get; set; }
+
+        /// <summary>
+        /// 更新时间
+        /// </summary>
+        public DateTime UpdateTime { get; set; }
+
+        /// <summary>
+        /// 是否禁用(0-禁用,1-启用)
+        /// </summary>
+        public int IsDisable { get; set; }
+
+
+        /// <summary>
+        /// 学生状态，1-未学习，2-已退课，3-学习中
+        /// </summary>
+        public int StuStatus { get; set; }
+
+
+        /// <summary>
+        /// 兴趣爱好
+        /// </summary>
+        public int Interest { get; set; }
+
+
+        /// <summary>
+        /// 日语基础信息
+        /// </summary>
+        public int JapanBaseInfo { get; set; }
+
+    }
+}

Mall.Model/Extend/User/RB_Member_User_Extend.cs

@@ -179,6 +179,16 @@ namespace Mall.Model.Extend.User
         /// </summary>
         public string KeyWord { get; set; }
 
+        /// <summary>
+        /// 2021-05-08 Add By:W 针对教育是否绑定学员信息
+        /// </summary>
+        public int StudentId { get; set; }
+
+        /// <summary>
+        /// 性别0-保密，1-男，2-女
+        /// </summary>
+        public int Gender { get; set; }
+
     }
 
 

Mall.Module.Miai/MiaiModule.cs

@@ -700,7 +700,7 @@ namespace Mall.Module.Miai
                 if (demodel.Distinguish == 0)
                 {
                     if (demodel.ManNum < ManPeopleNum) { msg = "男已报名" + ManPeopleNum + "人、不能低于此数量"; return false; }
-                    if (demodel.WoManNum < WoManPeopleNum) { msg = "女已报名" + ManPeopleNum + "人、不能低于此数量"; return false; }
+                    if (demodel.WoManNum < WoManPeopleNum) { msg = "女已报名" + WoManPeopleNum + "人、不能低于此数量"; return false; }
 
                 }
                 else

Mall.Module.TradePavilion/CommerceConsultModule.cs

@@ -268,15 +268,15 @@ namespace Mall.Module.TradePavilion
                     {
                         Id = 0,
                         UserId = umodel.Id,
-                        Type = Common.Enum.MarketingCenter.RecordTypeEnum.Expend,
+                        Type = Common.Enum.MarketingCenter.RecordTypeEnum.Income,
                         TenantId = umodel.TenantId,
                         OrderId = 0,
                         PlatformType = Common.Enum.User.UserSourceEnum.WeiXin,
                         MallBaseId = umodel.MallBaseId,
                         PonitNum = cmodel.Money,
                         CreateDate = DateTime.Now,
-                        Description = "取消活动报名，退回使用点数：" + cmodel.Money,
-                        Remarks = "取消活动报名，退回使用点数：" + cmodel.Money,
+                        Description = "取消活动报名，退回使用星星：" + cmodel.Money,
+                        Remarks = "取消活动报名，退回使用星星：" + cmodel.Money,
                     });
                 }
                 if (flag) {
@@ -344,15 +344,15 @@ namespace Mall.Module.TradePavilion
                     {
                         Id = 0,
                         UserId = umodel.Id,
-                        Type = Common.Enum.MarketingCenter.RecordTypeEnum.Expend,
+                        Type = Common.Enum.MarketingCenter.RecordTypeEnum.Income,
                         TenantId = umodel.TenantId,
                         OrderId = 0,
                         PlatformType = Common.Enum.User.UserSourceEnum.WeiXin,
                         MallBaseId = umodel.MallBaseId,
                         PonitNum = model.Money,
                         CreateDate = DateTime.Now,
-                        Description = "取消活动报名，退回使用点数：" + model.Money,
-                        Remarks = "取消活动报名，退回使用点数：" + model.Money,
+                        Description = "取消活动报名，退回使用星星：" + model.Money,
+                        Remarks = "取消活动报名，退回使用星星：" + model.Money,
                     });
                 }
                 if (Status == 1) {

Mall.Module.User/UserModule.cs

@@ -207,7 +207,7 @@ namespace Mall.Module.User
         private readonly RB_MiAi_FollowMemberRepository miai_FollowMemberRepository = new RB_MiAi_FollowMemberRepository();
 
         private readonly Repository.TradePavilion.RB_CompanyRepository companyRepository = new Repository.TradePavilion.RB_CompanyRepository();
-
+        private readonly Repository.Education.RB_Education_BaseInfoRepository education_BaseInfoRepository = new Repository.Education.RB_Education_BaseInfoRepository();
 
         #region 基础配置
 
@@ -4791,6 +4791,10 @@ namespace Mall.Module.User
                 //消息数量
                 int MessageNum = miai_MessageRepository.GetMessageNum(new Model.Extend.Miai.RB_Miai_Message_Extend() { TenantId = umodel.TenantId, MallBaseId = umodel.MallBaseId, UserId = umodel.Id });
 
+                //2021-05-08 add by :w
+                var eduBaseInfo = education_BaseInfoRepository.GetEducationBaseInfo(new Model.Extend.Education.RB_Education_BaseInfo_Extend { UserId = umodel.Id, TenantId = umodel.TenantId, MallBaseId = umodel.MallBaseId }).FirstOrDefault();
+
+
 
                 #region 2021-03-24 add by:W
                 var company = companyRepository.GetCompanyRepository(new Model.Extend.TradePavilion.RB_Company_Extend { TenantId = umodel.TenantId, MallBaseId = umodel.MallBaseId, CreateBy = umodel.Id });
@@ -4867,7 +4871,9 @@ namespace Mall.Module.User
                     myFollowNum = (oldBaseInfo != null && oldBaseInfo.Id > 0) ? oldBaseInfo.FollowNum : 0,//关注我的
                     followNum = (myFollowList != null && myFollowList.Any()) ? myFollowList.Count : 0,//我的关注
                     messageNum = MessageNum,
-                    openOfflineEarnings = OpenOfflineEarnings
+                    openOfflineEarnings = OpenOfflineEarnings,
+                    isAttestationEdu = (eduBaseInfo != null && eduBaseInfo.StudentId > 0) ? 1 : 0,
+                    Sexedu= (eduBaseInfo != null && eduBaseInfo.Id > 0) ? eduBaseInfo .Sex: 0,
                 };
             }
             return objData;

Mall.Repository/Education/RB_Education_ActivityRepository.cs

+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using Mall.Common.Enum;
+using Mall.Model.Entity.Education;
+using Mall.Model.Extend.Education;
+using VT.FW.DB.Dapper;
+
+namespace Mall.Repository.Education
+{
+    public class RB_Education_ActivityRepository : BaseRepository<RB_Education_Activity>
+    {
+        /// <summary>
+        /// 获取商会活动分页列表
+        /// </summary>
+        /// <param name="pageIndex"></param>
+        /// <param name="pageSize"></param>
+        /// <param name="rowsCount"></param>
+        /// <param name="query"></param>
+        /// <returns></returns>
+        public List<RB_Education_Activity_Extend> GetCommerceActivityPageListRepository(int pageIndex, int pageSize, out long rowsCount, RB_Education_Activity_Extend query)
+        {
+            rowsCount = 0;
+            DynamicParameters parameters = new DynamicParameters();
+            StringBuilder builder = new StringBuilder();
+            builder.AppendFormat(@"
+SELECT A.*,IFNULL(B.TypeName,'') AS ActivityTypeName,IFNULL(C.JoinNum,0) AS JoinNum
+FROM RB_Education_Activity AS A LEFT JOIN RB_Education_Activitytype AS B ON A.ActivityType=B.Id
+     LEFT JOIN (SELECT ActivityId,COUNT(1) AS JoinNum  FROM rb_education_consult WHERE `Status`=0 GROUP BY ActivityId) AS C ON A.Id=C.ActivityId
+WHERE 1=1
+");
+            builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Education_Activity_Extend.Status), (int)DateStateEnum.Normal);
+            if (query == null)
+            {
+                return new List<RB_Education_Activity_Extend>();
+            }
+            else
+            {
+                if (query.TenantId > 0)
+                {
+                    builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Education_Activity_Extend.TenantId), query.TenantId);
+                }
+                if (query.MallBaseId > 0)
+                {
+                    builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Education_Activity_Extend.MallBaseId), query.MallBaseId);
+                }
+
+                if (!string.IsNullOrEmpty(query.ActivityName))
+                {
+                    builder.AppendFormat(" AND A.{0} LIKE @Name ", nameof(RB_Education_Activity_Extend.ActivityName));
+                    parameters.Add("Name", "%" + query.ActivityName.Trim() + "%");
+                }
+                if (query.ActivityType > 0)
+                {
+                    builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Education_Activity_Extend.ActivityType), query.ActivityType);
+                }
+
+                if (!string.IsNullOrWhiteSpace(query.SelectStartTimeStr))
+                {
+                    builder.AppendFormat($" and  DATE_FORMAT(a.{ nameof(RB_Education_Activity_Extend.EndTime)},'%Y-%m-%d' )>=DATE_FORMAT('{query.SelectStartTimeStr}','%Y-%m-%d' ) ");
+                }
+                if (!string.IsNullOrWhiteSpace(query.SelectEndTimeStr))
+                {
+                    builder.AppendFormat($" and  DATE_FORMAT(a.{nameof(RB_Education_Activity_Extend.EndTime)},'%Y-%m-%d' )<= DATE_FORMAT('{query.SelectEndTimeStr}','%Y-%m-%d' ) ");
+                }
+
+                if (!string.IsNullOrWhiteSpace(query.OrderByStr))
+                {
+                    builder.AppendFormat($" ORDER BY A.{query.OrderByStr}  asc");
+                }
+                else
+                {
+                    builder.AppendFormat(" ORDER BY A.{0} DESC ", nameof(RB_Education_Activity_Extend.Id));
+                }
+            }
+            return GetPage<RB_Education_Activity_Extend>(pageIndex, pageSize, out rowsCount, builder.ToString(), parameters).ToList();
+        }
+
+        /// <summary>
+        /// 获取当前用户参加商会活动分页列表
+        /// </summary>
+        /// <param name="pageIndex"></param>
+        /// <param name="pageSize"></param>
+        /// <param name="rowsCount"></param>
+        /// <param name="query"></param>
+        /// <returns></returns>
+        public List<RB_Education_Activity_Extend> GetUserCommerceActivityPageRepository(int pageIndex, int pageSize, out long rowsCount, RB_Education_Activity_Extend query)
+        {
+            rowsCount = 0;
+            DynamicParameters parameters = new DynamicParameters();
+            StringBuilder builder = new StringBuilder();
+            builder.AppendFormat(@"
+SELECT A.*,IFNULL(B.TypeName,'') AS ActivityTypeName,IFNULL(C.JoinNum,0) AS JoinNum
+FROM RB_Education_Activity AS A LEFT JOIN RB_Education_Activitytype AS B ON A.ActivityType=B.Id
+     LEFT JOIN (SELECT ActivityId,COUNT(1) AS JoinNum  FROM rb_education_consult WHERE `Status`=0 GROUP BY ActivityId) AS C ON A.Id=C.ActivityId
+     INNER JOIN rb_education_consult AS D ON A.Id=D.ActivityId
+WHERE 1=1
+");
+            builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Education_Activity_Extend.Status), (int)DateStateEnum.Normal);
+            builder.AppendFormat(" AND D.{0}={1} ", nameof(RB_Education_Consult_Extend.Status), (int)DateStateEnum.Normal);
+            builder.AppendFormat(" AND D.{0}={1} ", nameof(RB_Education_Consult_Extend.OrderStatus), 1);
+            if (query == null)
+            {
+                return new List<RB_Education_Activity_Extend>();
+            }
+            else
+            {
+                if (query.TenantId > 0)
+                {
+                    builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Education_Activity_Extend.TenantId), query.TenantId);
+                }
+                if (query.MallBaseId > 0)
+                {
+                    builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Education_Activity_Extend.MallBaseId), query.MallBaseId);
+                }
+                if (!string.IsNullOrEmpty(query.ActivityName))
+                {
+                    builder.AppendFormat(" AND A.{0} LIKE @Name ", nameof(RB_Education_Activity_Extend.ActivityName));
+                    parameters.Add("Name", "%" + query.ActivityName.Trim() + "%");
+                }
+                if (query.ActivityType > 0)
+                {
+                    builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Education_Activity_Extend.ActivityType), query.ActivityType);
+                }
+                //当前用户参加的活动
+                if (query.CreateBy > 0)
+                {
+                    builder.AppendFormat(" AND D.{0}={1} ", nameof(RB_Education_Consult_Extend.UserId), query.CreateBy);
+                }
+            }
+            builder.AppendFormat(" ORDER BY A.{0} DESC ", nameof(RB_Education_Activity_Extend.Id));
+            return GetPage<RB_Education_Activity_Extend>(pageIndex, pageSize, out rowsCount, builder.ToString(), parameters).ToList();
+        }
+
+        /// <summary>
+        /// 获取列表
+        /// </summary>
+        /// <param name="dmodel"></param>
+        /// <returns></returns>
+        public List<RB_Education_Activity_Extend> GetList(RB_Education_Activity_Extend query)
+        {
+            StringBuilder builder = new StringBuilder();
+            builder.AppendFormat(@"
+SELECT A.* FROM RB_Education_Activity AS A 
+WHERE 1=1
+");
+            builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Education_Activity_Extend.Status), (int)DateStateEnum.Normal);
+            if (query == null)
+            {
+                return new List<RB_Education_Activity_Extend>();
+            }
+            else
+            {
+                if (query.TenantId > 0)
+                {
+                    builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Education_Activity_Extend.TenantId), query.TenantId);
+                }
+                if (query.MallBaseId > 0)
+                {
+                    builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Education_Activity_Extend.MallBaseId), query.MallBaseId);
+                }
+                if (query.ActivityType > 0)
+                {
+                    builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Education_Activity_Extend.ActivityType), query.ActivityType);
+                }
+                if (!string.IsNullOrEmpty(query.ActivityIds))
+                {
+                    builder.AppendFormat(" AND A.{0} in({1}) ", nameof(RB_Education_Activity_Extend.Id), query.ActivityIds);
+                }
+            }
+            return Get<RB_Education_Activity_Extend>(builder.ToString()).ToList();
+        }
+    }
+}

Mall.Repository/Education/RB_Education_ActivityTypeRepository.cs

+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using Mall.Common.Enum;
+using Mall.Model.Entity.Education;
+using Mall.Model.Extend.Education;
+using VT.FW.DB.Dapper;
+
+namespace Mall.Repository.Education
+{
+   public class RB_Education_ActivityTypeRepository:BaseRepository<RB_Education_ActivityType>
+    {
+        /// <summary>
+        /// 获取商会活动类型分页列表
+        /// </summary>
+        /// <param name="pageIndex"></param>
+        /// <param name="pageSize"></param>
+        /// <param name="rowsCount"></param>
+        /// <param name="query"></param>
+        /// <returns></returns>
+        public List<RB_Education_ActivityType_Extend> GetActivityTypePageListRepository(int pageIndex, int pageSize, out long rowsCount, RB_Education_ActivityType_Extend query)
+        {
+            rowsCount = 0;
+            DynamicParameters parameters = new DynamicParameters();
+            StringBuilder builder = new StringBuilder();
+            builder.AppendFormat(@"
+SELECT * 
+FROM RB_Education_ActivityType
+WHERE 1=1
+");
+            builder.AppendFormat(" AND {0}={1} ", nameof(RB_Education_ActivityType_Extend.Status), (int)DateStateEnum.Normal);
+            if (query == null)
+            {
+                return new List<RB_Education_ActivityType_Extend>();
+            }
+            else
+            {
+                if (query.TenantId > 0)
+                {
+                    builder.AppendFormat(" AND {0}={1} ", nameof(RB_Education_ActivityType_Extend.TenantId), query.TenantId);
+                }
+                if (query.MallBaseId > 0)
+                {
+                    builder.AppendFormat(" AND {0}={1} ", nameof(RB_Education_ActivityType_Extend.MallBaseId), query.MallBaseId);
+                }
+                if (!string.IsNullOrEmpty(query.TypeName))
+                {
+                    builder.AppendFormat(" AND {0} LIKE @Name ", nameof(RB_Education_ActivityType_Extend.TypeName));
+                    parameters.Add("Name", "%" + query.TypeName.Trim() + "%");
+                }
+            }
+            return GetPage<RB_Education_ActivityType_Extend>(pageIndex, pageSize, out rowsCount, builder.ToString(), parameters).ToList();
+        }
+
+        /// <summary>
+        /// 获取商会活动类型列表
+        /// </summary>
+        /// <param name="query"></param>
+        /// <returns></returns>
+        public List<RB_Education_ActivityType_Extend> GetActivityTypeListRepository(RB_Education_ActivityType_Extend query)
+        {
+            DynamicParameters parameters = new DynamicParameters();
+            StringBuilder builder = new StringBuilder();
+            builder.AppendFormat(@"
+SELECT * 
+FROM RB_Education_ActivityType
+WHERE 1=1
+");
+            builder.AppendFormat(" AND {0}={1} ", nameof(RB_Education_ActivityType_Extend.Status), (int)DateStateEnum.Normal);
+            if (query == null)
+            {
+                return new List<RB_Education_ActivityType_Extend>();
+            }
+            else
+            {
+                if (query.TenantId > 0)
+                {
+                    builder.AppendFormat(" AND {0}={1} ", nameof(RB_Education_ActivityType_Extend.TenantId), query.TenantId);
+                }
+                if (query.MallBaseId > 0)
+                {
+                    builder.AppendFormat(" AND {0}={1} ", nameof(RB_Education_ActivityType_Extend.MallBaseId), query.MallBaseId);
+                }
+                if (!string.IsNullOrEmpty(query.TypeName))
+                {
+                    builder.AppendFormat(" AND {0} LIKE @Name ", nameof(RB_Education_ActivityType_Extend.TypeName));
+                    parameters.Add("Name", "%" + query.TypeName.Trim() + "%");
+                }
+                if (!string.IsNullOrWhiteSpace(query.Ids))
+                {
+                    builder.AppendFormat($@" AND { nameof(RB_Education_ActivityType_Extend.Id)} in ({query.Ids}) ");
+                }
+            }
+            return Get<RB_Education_ActivityType_Extend>(builder.ToString(), parameters).ToList();
+        }
+    }
+}

Mall.Repository/Education/RB_Education_BaseInfoRepository.cs

+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using Mall.Common.Enum;
+using Mall.Model.Entity.Education;
+using Mall.Model.Extend.Education;
+
+namespace Mall.Repository.Education
+{
+    public class RB_Education_BaseInfoRepository : BaseRepository<RB_Education_BaseInfo>
+    {
+        /// <summary>
+        /// 获取教育用户的基础信息
+        /// </summary>
+        /// <param name="query"></param>
+        /// <returns></returns>
+        public List<RB_Education_BaseInfo_Extend> GetEducationBaseInfo(RB_Education_BaseInfo_Extend query)
+        {
+
+            StringBuilder builder = new StringBuilder();
+            builder.AppendFormat(@"
+SELECT * 
+FROM RB_Education_BaseInfo
+WHERE 1=1
+");
+            builder.AppendFormat(" AND {0}={1} ", nameof(RB_Education_BaseInfo_Extend.Status), (int)DateStateEnum.Normal);
+            if (query == null)
+            {
+                return new List<RB_Education_BaseInfo_Extend>();
+            }
+            else
+            {
+                if (query.TenantId > 0)
+                {
+                    builder.AppendFormat(" AND {0}={1} ", nameof(RB_Education_BaseInfo_Extend.TenantId), query.TenantId);
+                }
+                if (query.MallBaseId > 0)
+                {
+                    builder.AppendFormat(" AND {0}={1} ", nameof(RB_Education_BaseInfo_Extend.MallBaseId), query.MallBaseId);
+                }
+                if (query.UserId > 0)
+                {
+                    builder.AppendFormat(" AND {0}={1} ", nameof(RB_Education_BaseInfo_Extend.UserId), query.UserId);
+                }
+                if (query.StudentId > 0)
+                {
+                    builder.AppendFormat(" AND {0}={1} ", nameof(RB_Education_BaseInfo_Extend.StudentId), query.StudentId);
+                }
+                if (!string.IsNullOrWhiteSpace(query.Ids))
+                {
+                    builder.AppendFormat($@" AND { nameof(RB_Education_BaseInfo_Extend.UserId)} in ({query.Ids}) ");
+                }
+            }
+            return Get<RB_Education_BaseInfo_Extend>(builder.ToString()).ToList();
+        }
+    }
+}

Mall.Repository/Education/RB_Education_ConsultRepository.cs

+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using Mall.Common.Enum;
+using Mall.Model.Entity.Education;
+using Mall.Model.Extend.Education;
+using VT.FW.DB.Dapper;
+
+namespace Mall.Repository.Education
+{
+    public class RB_Education_ConsultRepository : BaseRepository<RB_Education_Consult>
+    {
+        /// <summary>
+        /// 获取商会活动报名分页列表
+        /// </summary>
+        /// <param name="query"></param>
+        /// <returns></returns>
+        public List<RB_Education_Consult_Extend> GetCommerceConsultListRepository(RB_Education_Consult_Extend query)
+        {
+            DynamicParameters parameters = new DynamicParameters();
+            StringBuilder builder = new StringBuilder();
+            builder.AppendFormat(@"
+SELECT * 
+FROM RB_Education_Consult
+WHERE 1=1
+");
+            if (query == null)
+            {
+                return new List<RB_Education_Consult_Extend>();
+            }
+            else
+            {
+                if (query.EnrollState > 0)
+                {
+                    if (query.EnrollState == 1)
+                    {
+                        builder.AppendFormat(" AND {0}={1} ", nameof(RB_Education_Consult_Extend.Status), (int)DateStateEnum.Normal);
+                    }
+                    else if (query.EnrollState == 2)
+                    {
+                        builder.AppendFormat(" AND {0}={1} ", nameof(RB_Education_Consult_Extend.Status), (int)DateStateEnum.Delete);
+                    }
+                }
+                else
+                {
+                    builder.AppendFormat(" AND {0}={1} ", nameof(RB_Education_Consult_Extend.Status), (int)DateStateEnum.Normal);
+                }
+                if (query.TenantId > 0)
+                {
+                    builder.AppendFormat(" AND {0}={1} ", nameof(RB_Education_Consult_Extend.TenantId), query.TenantId);
+                }
+                if (query.OrderStatus > -1)
+                {
+                    builder.AppendFormat(" AND {0}={1} ", nameof(RB_Education_Consult_Extend.OrderStatus), query.OrderStatus);
+                }
+                if (query.MallBaseId > 0)
+                {
+                    builder.AppendFormat(" AND {0}={1} ", nameof(RB_Education_Consult_Extend.MallBaseId), query.MallBaseId);
+                }
+                if (!string.IsNullOrEmpty(query.LinkMan))
+                {
+                    builder.AppendFormat(" AND {0} LIKE @Name ", nameof(RB_Education_Consult_Extend.LinkMan));
+                    parameters.Add("Name", "%" + query.LinkMan.Trim() + "%");
+                }
+                if (query.ActivityId > 0)
+                {
+                    builder.AppendFormat(" AND {0}={1} ", nameof(RB_Education_Consult_Extend.ActivityId), query.ActivityId);
+                }
+                if (!string.IsNullOrEmpty(query.QActivityIds))
+                {
+                    builder.AppendFormat(" AND {0} IN({1}) ", nameof(RB_Education_Consult_Extend.ActivityId), query.QActivityIds);
+                }
+                if (!string.IsNullOrEmpty(query.QUserIds))
+                {
+                    builder.AppendFormat(" AND {0} IN({1}) ", nameof(RB_Education_Consult_Extend.UserId), query.QUserIds);
+                }
+                if (query.UserId > 0)
+                {
+                    builder.AppendFormat(" AND {0}={1} ", nameof(RB_Education_Consult_Extend.UserId), query.UserId);
+                }
+                if (query.Id > 0)
+                {
+                    builder.AppendFormat(" AND {0}={1} ", nameof(RB_Education_Consult_Extend.Id), query.Id);
+                }
+            }
+            return Get<RB_Education_Consult_Extend>(builder.ToString(), parameters).ToList();
+        }
+
+        /// <summary>
+        /// 获取用户的报名列表
+        /// </summary>
+        /// <param name="pageIndex"></param>
+        /// <param name="pageSize"></param>
+        /// <param name="rowsCount"></param>
+        /// <param name="query"></param>
+        /// <returns></returns>
+        public List<RB_Education_Consult_Extend> GetUserJoinActivityPageList(int pageIndex, int pageSize, out long rowsCount, RB_Education_Consult_Extend query)
+        {
+            DynamicParameters parameters = new DynamicParameters();
+            StringBuilder builder = new StringBuilder();
+            builder.AppendFormat(@"
+SELECT c.*,a.ActivityName,a.CoverImg,a.StartTime,a.EndTime,t.TypeName
+FROM RB_Education_Consult c
+left join rb_education_activity a on c.ActivityId = a.Id
+left join rb_education_activitytype t on t.Id = a.ActivityType
+WHERE 1=1
+");
+            if (query == null)
+            {
+                rowsCount = 0;
+                return new List<RB_Education_Consult_Extend>();
+            }
+            else
+            {
+                if (query.EnrollState > 0)
+                {
+                    if (query.EnrollState == 1)
+                    {
+                        builder.AppendFormat(" AND c.{0}={1} ", nameof(RB_Education_Consult_Extend.Status), (int)DateStateEnum.Normal);
+                    }
+                    else if (query.EnrollState == 2)
+                    {
+                        builder.AppendFormat(" AND c.{0}={1} ", nameof(RB_Education_Consult_Extend.Status), (int)DateStateEnum.Delete);
+                    }
+                }
+                else
+                {
+                    builder.AppendFormat(" AND c.{0}={1} ", nameof(RB_Education_Consult_Extend.Status), (int)DateStateEnum.Normal);
+                }
+
+                if (query.OrderStatus > -1)
+                {
+                    builder.AppendFormat(" AND {0}={1} ", nameof(RB_Education_Consult_Extend.OrderStatus), query.OrderStatus);
+                }
+                if (query.TenantId > 0)
+                {
+                    builder.AppendFormat(" AND c.{0}={1} ", nameof(RB_Education_Consult_Extend.TenantId), query.TenantId);
+                }
+                if (query.MallBaseId > 0)
+                {
+                    builder.AppendFormat(" AND c.{0}={1} ", nameof(RB_Education_Consult_Extend.MallBaseId), query.MallBaseId);
+                }
+                if (!string.IsNullOrEmpty(query.LinkMan))
+                {
+                    builder.AppendFormat(" AND c.{0} LIKE @Name ", nameof(RB_Education_Consult_Extend.LinkMan));
+                    parameters.Add("Name", "%" + query.LinkMan.Trim() + "%");
+                }
+                if (query.ActivityId > 0)
+                {
+                    builder.AppendFormat(" AND c.{0}={1} ", nameof(RB_Education_Consult_Extend.ActivityId), query.ActivityId);
+                }
+                if (!string.IsNullOrEmpty(query.QActivityIds))
+                {
+                    builder.AppendFormat(" AND c.{0} IN({1}) ", nameof(RB_Education_Consult_Extend.ActivityId), query.QActivityIds);
+                }
+                if (!string.IsNullOrEmpty(query.QUserIds))
+                {
+                    builder.AppendFormat(" AND c.{0} IN({1}) ", nameof(RB_Education_Consult_Extend.UserId), query.QUserIds);
+                }
+                if (query.UserId > 0)
+                {
+                    builder.AppendFormat(" AND c.{0}={1} ", nameof(RB_Education_Consult_Extend.UserId), query.UserId);
+                }
+            }
+            builder.AppendFormat(" order by c.Id desc");
+            return GetPage<RB_Education_Consult_Extend>(pageIndex, pageSize, out rowsCount, builder.ToString(), parameters).ToList();
+        }
+
+        /// <summary>
+        /// 获取活动报名人数
+        /// </summary>
+        /// <param name="activityId"></param>
+        /// <returns></returns>
+        public int GetActivityEnrollNum(int activityId, int sex = 0)
+        {
+            string sql = $@" select count(0) from RB_Education_Consult where Status =0 and OrderStatus=1 and ActivityId ={activityId}";
+            if (sex > 0)
+            {
+                sql += $@" and Sex ={sex}";
+            }
+            var obj = ExecuteScalar(sql);
+            return obj == null ? 0 : Convert.ToInt32(obj);
+        }
+
+    }
+}

Mall.Repository/Education/RB_StudentRepository.cs

+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using Mall.Common.Enum;
+using Mall.Model.Extend.Education;
+
+namespace Mall.Repository.Education
+{
+   public class RB_StudentRepository:BaseRepository<RB_Student>
+    {
+        /// <summary>
+        /// 获取学生列表
+        /// </summary>
+        /// <param name="query"></param>
+        /// <returns></returns>
+        public List<RB_Student> GetStudentList(RB_Student query)
+        {
+            
+            StringBuilder builder = new StringBuilder();
+            builder.AppendFormat(@"SELECT t.* FROM rb_student AS t WHERE 1=1 ");
+            builder.AppendFormat(" AND t.{0}={1} ", nameof(RB_Student.Status), (int)DateStateEnum.Normal);
+            if (query != null)
+            {
+                if (query.Group_Id > 0)
+                {
+                    builder.AppendFormat(" AND t.{0}={1} ", nameof(RB_Student.Group_Id), query.Group_Id);
+                }
+                if (query.School_Id > -1)
+                {
+                    builder.AppendFormat(" AND t.{0}={1} ", nameof(RB_Student.School_Id), query.School_Id);
+                }
+              
+                if (!string.IsNullOrWhiteSpace(query.StuTel))
+                {
+                    builder.AppendFormat(" AND t.{0}='{1}' ", nameof(RB_Student.StuTel),query.StuTel);
+                   // parameters.Add("StuTel", "%" + query.StuTel.Trim() + "%");
+                }
+                if (query.ProviceId > 0)
+                {
+                    builder.AppendFormat(" AND t.{0}={1} ", nameof(RB_Student.ProviceId), query.ProviceId);
+                }
+                if (query.CityId > 0)
+                {
+                    builder.AppendFormat(" AND t.{0}={1} ", nameof(RB_Student.CityId), query.CityId);
+                }
+                if (query.AreaId > 0)
+                {
+                    builder.AppendFormat(" AND t.{0}={1} ", nameof(RB_Student.AreaId), query.AreaId);
+                }
+                
+            }
+            return Get<RB_Student>(builder.ToString()).ToList();
+        }
+    }
+}

Mall.Repository/User/RB_Member_UserRepository.cs

@@ -1535,6 +1535,169 @@ FROM RB_Member_User AS a LEFT JOIN rb_miai_baseinfo AS b ON a.Id = b.UserId) as
 
 
 
+        /// <summary>
+        /// 分页列表
+        /// </summary>
+        /// <param name="pageIndex">页码</param>
+        /// <param name="pageSize">每页显示条数</param>
+        /// <param name="rowCount">总条数</param>
+        /// <param name="dmodel">查询条件</param>
+        /// <returns></returns>
+        public List<RB_Member_User_Extend> GetEduPageList(int pageIndex, int pageSize, out long rowCount, RB_Member_User_Extend dmodel)
+        {
+            string where = " 1=1 ";
+            if (dmodel.TenantId > 0)
+            {
+                where += $@" and a.{nameof(RB_Member_User.TenantId)}={dmodel.TenantId}";
+            }
+            if (dmodel.MallBaseId > 0)
+            {
+                where += $@" and a.{nameof(RB_Member_User.MallBaseId)}={dmodel.MallBaseId}";
+            }
+            if (dmodel.Id > 0)
+            {
+                where += $@" and a.{nameof(RB_Member_User.Id)}={dmodel.Id}";
+            }
+            if (!string.IsNullOrEmpty(dmodel.Name))
+            {
+                where += $@" and a.{nameof(RB_Member_User.Name)} like '%{dmodel.Name}%'";
+            }
+            if (!string.IsNullOrEmpty(dmodel.AliasName))
+            {
+                where += $@" and a.{nameof(RB_Member_User.AliasName)} like '%{dmodel.AliasName}%'";
+            }
+            if (dmodel.Source > 0)
+            {
+                where += $@" and a.{nameof(RB_Member_User.Source)} ={(int)dmodel.Source}";
+            }
+            if (!string.IsNullOrEmpty(dmodel.Moblie))
+            {
+                where += $@" and a.{nameof(RB_Member_User.Moblie)} like '%{dmodel.Moblie}%'";
+            }
+            if (dmodel.MemberGrade > 0)
+            {
+                where += $@" and a.{nameof(RB_Member_User.MemberGrade)}={dmodel.MemberGrade}";
+            }
+            if (dmodel.SuperiorId > 0)
+            {
+                where += $@" and a.{nameof(RB_Member_User.SuperiorId)}={dmodel.SuperiorId}";
+            }
+            if (dmodel.IsDistributor > 0)
+            {
+                where += $@" and a.{nameof(RB_Member_User.IsDistributor)}={dmodel.IsDistributor}";
+            }
+            if (!string.IsNullOrEmpty(dmodel.StartTime))
+            {
+                where += $@" and a.{nameof(RB_Member_User.CreateDate)} >='{dmodel.StartTime}'";
+            }
+            if (!string.IsNullOrEmpty(dmodel.EndTime))
+            {
+                where += $@" and a.{nameof(RB_Member_User.CreateDate)} <='{dmodel.EndTime} 23:59:59'";
+            }
+            if (dmodel.IsEmptyUserPhoto == 1)
+            {
+                where += $@" and IFNULL(a.{nameof(RB_Member_User.Photo)},'')=''";
+            }
+            //HK06-01新增查询条件
+            if (dmodel.OpenId != null && !string.IsNullOrWhiteSpace(dmodel.OpenId))
+            {
+                where += $@" and a.{nameof(RB_Member_User.OpenId)} = '%{dmodel.OpenId}%'";
+            }
+            if (dmodel.IsSelectCommpany == 1)
+            {
+                where += $@" and a.{nameof(RB_Member_User.Id)} between 5 and 100 ";
+            }
+            string orderBy = " a.CreateDate desc";
+            if (dmodel.MinUserId > 0)
+            {
+                where += $@" and a.{nameof(RB_Member_User.Id)}>{dmodel.MinUserId}";
+                orderBy = " a.Id asc";
+            }
+
+            string sql = $@"select a.*,b.StudentId  from RB_Member_User  as a LEFT JOIN rb_education_baseinfo as b on a.Id=b.UserId and b.`Status`=0 where {where} order by {orderBy} ";
+            return GetPage<RB_Member_User_Extend>(pageIndex, pageSize, out rowCount, sql).ToList();
+        }
+
+        /// <summary>
+        /// 分页列表
+        /// </summary>
+        /// <param name="dmodel">查询条件</param>
+        /// <returns></returns>
+        public List<RB_Member_User_Extend> GetEduList( RB_Member_User_Extend dmodel)
+        {
+            string where = " 1=1 ";
+            if (dmodel.TenantId > 0)
+            {
+                where += $@" and a.{nameof(RB_Member_User.TenantId)}={dmodel.TenantId}";
+            }
+            if (dmodel.MallBaseId > 0)
+            {
+                where += $@" and a.{nameof(RB_Member_User.MallBaseId)}={dmodel.MallBaseId}";
+            }
+            if (dmodel.Id > 0)
+            {
+                where += $@" and a.{nameof(RB_Member_User.Id)}={dmodel.Id}";
+            }
+            if (!string.IsNullOrEmpty(dmodel.Name))
+            {
+                where += $@" and a.{nameof(RB_Member_User.Name)} like '%{dmodel.Name}%'";
+            }
+            if (!string.IsNullOrEmpty(dmodel.AliasName))
+            {
+                where += $@" and a.{nameof(RB_Member_User.AliasName)} like '%{dmodel.AliasName}%'";
+            }
+            if (dmodel.Source > 0)
+            {
+                where += $@" and a.{nameof(RB_Member_User.Source)} ={(int)dmodel.Source}";
+            }
+            if (!string.IsNullOrEmpty(dmodel.Moblie))
+            {
+                where += $@" and a.{nameof(RB_Member_User.Moblie)} like '%{dmodel.Moblie}%'";
+            }
+            if (dmodel.MemberGrade > 0)
+            {
+                where += $@" and a.{nameof(RB_Member_User.MemberGrade)}={dmodel.MemberGrade}";
+            }
+            if (dmodel.SuperiorId > 0)
+            {
+                where += $@" and a.{nameof(RB_Member_User.SuperiorId)}={dmodel.SuperiorId}";
+            }
+            if (dmodel.IsDistributor > 0)
+            {
+                where += $@" and a.{nameof(RB_Member_User.IsDistributor)}={dmodel.IsDistributor}";
+            }
+            if (!string.IsNullOrEmpty(dmodel.StartTime))
+            {
+                where += $@" and a.{nameof(RB_Member_User.CreateDate)} >='{dmodel.StartTime}'";
+            }
+            if (!string.IsNullOrEmpty(dmodel.EndTime))
+            {
+                where += $@" and a.{nameof(RB_Member_User.CreateDate)} <='{dmodel.EndTime} 23:59:59'";
+            }
+            if (dmodel.IsEmptyUserPhoto == 1)
+            {
+                where += $@" and IFNULL(a.{nameof(RB_Member_User.Photo)},'')=''";
+            }
+            //HK06-01新增查询条件
+            if (dmodel.OpenId != null && !string.IsNullOrWhiteSpace(dmodel.OpenId))
+            {
+                where += $@" and a.{nameof(RB_Member_User.OpenId)} = '%{dmodel.OpenId}%'";
+            }
+            if (dmodel.IsSelectCommpany == 1)
+            {
+                where += $@" and a.{nameof(RB_Member_User.Id)} between 5 and 100 ";
+            }
+            string orderBy = " a.CreateDate desc";
+            if (dmodel.MinUserId > 0)
+            {
+                where += $@" and a.{nameof(RB_Member_User.Id)}>{dmodel.MinUserId}";
+                orderBy = " a.Id asc";
+            }
+
+            string sql = $@"select a.*,b.StudentId  from RB_Member_User  as a LEFT JOIN rb_education_baseinfo as b on a.Id=b.UserId and b.`Status`=0 where {where} order by {orderBy} ";
+            return Get<RB_Member_User_Extend>( sql).ToList();
+        }
+
 
     }
 }

Mall.WebApi/Controllers/AppletWeChat/WeChatNotifyController.cs

@@ -29,6 +29,7 @@ namespace Mall.WebApi.Controllers.AppletWeChat
         private readonly Module.MarketingCenter.RechargeModule rechargeModule = new Module.MarketingCenter.RechargeModule();
         private readonly Module.MarketingCenter.CouponModule couponModule = new Module.MarketingCenter.CouponModule();
         private readonly Module.Education.PointModule pointModule = new Module.Education.PointModule();
+        private readonly Module.Education.ActivityModule activityModule = new Module.Education.ActivityModule();
         private readonly IHttpContextAccessor _accessor;
 
         /// <summary>
@@ -473,5 +474,56 @@ namespace Mall.WebApi.Controllers.AppletWeChat
             }
         }
 
+
+
+
+        /// <summary>
+        /// 赞羊教育活动报名支付回调
+        /// </summary>
+        /// <returns></returns>
+        [HttpGet]
+        [HttpPost]
+        public string ActivityNotify(int MallBaseId, int TenantId)
+        {
+            var req = new RequestHandler();
+            App_Code.PayUtil PayUtil = new App_Code.PayUtil();
+            var result = PayUtil.AllNotify(_accessor, MallBaseId, TenantId);
+            if (result.IsSuccess)
+            {
+                var dic = ((Dictionary<string, string>)result.Data);
+                //开始回写订单状态
+                lock (_lock)
+                {
+                    string sOrderNo = dic["sOrderNo"];//订单号 时间挫+OrderId
+                    int OrderId = Convert.ToInt32(sOrderNo[17..]);
+
+                    decimal dPaid = Convert.ToDecimal(dic["dPrice"]) / 100;
+                    string sPayerOpenID = dic["sPayerOpenID"];
+                    int UserId = Convert.ToInt32(dic["bIsRecharge"]);
+                    string TransactionId = dic["sTradeNo"];
+                    string PayType = dic["OrderPayType"];
+                    DateTime PayDate = DateTime.ParseExact(dic["PayDate"], "yyyyMMddHHmmss", System.Globalization.CultureInfo.CurrentCulture);//转换时间
+
+                    #region 修改会员购买支付信息
+                    activityModule.UpdateActivityEnroll(UserId, OrderId, sOrderNo, TransactionId, Common.Enum.Goods.OrderPayTypeEnum.WeChatPay, dPaid, PayDate);
+                    #endregion
+                }
+                //告诉微信我们已经处理成功，不需要再调用我们的接口了
+                req.SetParameter("return_code", "SUCCESS");
+                req.SetParameter("return_msg", "OK");
+                var reqXml = req.ParseXml();
+                return reqXml;
+                //  return ApiResult.Success("", reqXml);
+            }
+            else
+            {
+                req.SetParameter("return_code", "FAIL");
+                req.SetParameter("return_msg", "订单失败");
+                var reqXmlFAIL = req.ParseXml();
+                LogHelper.Write(null, "Notify返回信息：" + reqXmlFAIL);
+                return reqXmlFAIL;
+                // return ApiResult.Failed("", reqXmlFAIL);
+            }
+        }
     }
 }
\ No newline at end of file

Mall.WebApi/Controllers/AppletWeChat/WeChatPayController.cs

@@ -54,6 +54,8 @@ namespace Mall.WebApi.Controllers.AppletWeChat
         private readonly PointModule pointModule = new PointModule();
         private readonly UserCommonModule userCommonModule = new UserCommonModule();
         private readonly CouponModule couponModule = new CouponModule();
+        private readonly ActivityModule activityModule = new ActivityModule();
+
         #region 商品支付
         /// <summary>
         /// 微信支付
@@ -108,7 +110,6 @@ namespace Mall.WebApi.Controllers.AppletWeChat
         }
         #endregion
 
-
         #region 余额充值
         /// <summary>
         /// 微信支付
@@ -199,10 +200,6 @@ namespace Mall.WebApi.Controllers.AppletWeChat
         }
         #endregion
 
-
-
-
-
         #region 点数充值（教育线上约课）
         /// <summary>
         /// 微信支付
@@ -393,9 +390,6 @@ namespace Mall.WebApi.Controllers.AppletWeChat
 
         #endregion
 
-
-
-
         #region 会员vip购买
         /// <summary>
         /// 微信支付
@@ -505,8 +499,6 @@ namespace Mall.WebApi.Controllers.AppletWeChat
         }
         #endregion
 
-
-
         #region 测试接口
 
 
@@ -627,7 +619,6 @@ namespace Mall.WebApi.Controllers.AppletWeChat
         }
         #endregion
 
-
         #region 星星充值（相亲）
         /// <summary>
         /// 微信支付
@@ -718,7 +709,6 @@ namespace Mall.WebApi.Controllers.AppletWeChat
         }
         #endregion
 
-
         #region 储值卡购买（赞羊）
         /// <summary>
         /// 微信支付
@@ -811,5 +801,177 @@ namespace Mall.WebApi.Controllers.AppletWeChat
         }
 
         #endregion
+
+
+        #region 赞羊教育活动报名
+        //GetMemberUserInfo
+
+        /// <summary>
+        /// 活动报名
+        /// </summary>
+        /// <param name="demodel"></param>
+        /// <returns></returns>
+        public ApiResult SetActivityEnrollInfo()
+        {
+            bool flag = false;
+            var request = RequestParm;
+            var userInfo = AppletUserInfo;
+            if (userInfo == null)
+            {
+                return ApiResult.Failed("请登录");
+            }
+            Model.Extend.Education.RB_Education_Consult_Extend demodel = JsonConvert.DeserializeObject<Model.Extend.Education.RB_Education_Consult_Extend>(request.msg.ToString());
+            var model = activityModule.GetActivityModule(demodel.ActivityId);
+            var list = activityModule.GetCommerceConsultListRepository(new Model.Extend.Education.RB_Education_Consult_Extend() { TenantId = model.TenantId, MallBaseId = model.MallBaseId, ActivityId = demodel.ActivityId, EnrollState = 1, UserId = userInfo.UserId, OrderStatus = 1 });
+            if (list.Any()) { return ApiResult.Failed("已存在报名信息"); }
+
+            if (model == null || model.Status == Common.Enum.DateStateEnum.Delete) { return ApiResult.Failed("活动不存在"); }
+            if (model.SignStartTime >= DateTime.Now)
+            {
+                return ApiResult.Failed("报名还未开始，无法报名");
+            }
+            if (model.SignEndTime <= DateTime.Now)
+            {
+                return ApiResult.Failed("已过了报名时间，无法报名");
+            }
+
+            var bmodel = activityModule.GetEducationBaseInfo(new Model.Extend.Education.RB_Education_BaseInfo_Extend() { MallBaseId = model.MallBaseId, TenantId = model.TenantId, UserId = userInfo.UserId }).FirstOrDefault();
+
+            if (model.Distinguish == 0)
+            {
+                if (bmodel == null || bmodel.Sex == 0)
+                {
+                    return ApiResult.Failed("您的性别保密，无法报名");
+                }
+                if (bmodel.Sex == 1)
+                {
+                    int ManPeopleNum = activityModule.GetActivityEnrollNum(demodel.ActivityId, 1);
+                    if (model.ManNum <= ManPeopleNum) { return ApiResult.Failed("已报满，无法报名"); }
+                }
+                else if (bmodel.Sex == 2)
+                {
+                    int WoManPeopleNum = activityModule.GetActivityEnrollNum(demodel.ActivityId, 2);
+                    if (model.WoManNum <= WoManPeopleNum) { return ApiResult.Failed("已报满，无法报名"); }
+                }
+                else
+                {
+                    return ApiResult.Failed("性别未维护，无法报名");
+                }
+            }
+            else
+            {
+                int ManPeopleNum = activityModule.GetActivityEnrollNum(demodel.ActivityId, 0);
+                if (model.ManNum <= ManPeopleNum) { return ApiResult.Failed("已报满，无法报名"); }
+            }
+            if (model.AgeLimit == 0)
+            {
+                if (bmodel == null || string.IsNullOrWhiteSpace(bmodel.Birthday))
+                {
+                    return ApiResult.Failed("您未绑定学员信息无法获取到年龄，无法报名");
+                }
+                int Age = Convert.ToInt32(Common.Plugin.StringHelper.GetAge(bmodel.Birthday));
+                if (model.StartAge > 0 && model.EndAge > 0)
+                {
+                    if (Age < model.StartAge || Age > model.EndAge)
+                    {
+                        return ApiResult.Failed($"年龄限制在{model.StartAge}-{model.EndAge}岁，无法报名");
+                    }
+                }
+                else if (model.StartAge > 0 && model.EndAge == 0)
+                {
+                    if (Age < model.StartAge)
+                    {
+                        return ApiResult.Failed($"年龄必须大于{model.StartAge}岁，无法报名");
+                    }
+                }
+                else if (model.StartAge == 0 && model.EndAge > 0)
+                {
+                    if (Age > model.EndAge)
+                    {
+                        return ApiResult.Failed($"年龄必须小于{model.EndAge}岁，无法报名");
+                    }
+
+                }
+            }
+            if (model.LnsideLimit == 1)
+            {
+                if (bmodel == null || bmodel.StudentId == 0)
+                {
+                    return ApiResult.Failed("您未绑定学员信息，无法报名");
+                }
+            }
+            demodel.Sex = bmodel?.Sex ?? 0;
+            Random R = new Random();
+            int Rstr = R.Next(111, 999);
+            demodel.OrderNo = DateTime.Now.ToString("yyyyMMddHHmmssfff") + Rstr;
+            demodel.UserId = userInfo.UserId;
+            demodel.MallBaseId = userInfo.MallBaseId;
+            demodel.TenantId = userInfo.TenantId;
+            demodel.Status = 0;
+            demodel.IsCancelConfirm = model.IsCancelConfirm;
+            demodel.CreateTime = System.DateTime.Now;
+            var umodel = userModule.GetMemberUserInfo(demodel.UserId);
+            demodel.OrderSource = umodel.Source;
+            //判断当前人的点数
+            if (demodel.PaymentWay == Common.Enum.Goods.OrderPaymentTypeEnum.PayPoint)
+            {
+                if (umodel == null || umodel.Id == 0)
+                {
+                    return ApiResult.Failed("用户信息不存在");
+                }
+                if (model.PointNum == demodel.TotalPoint)
+                {
+                    if (umodel.PointNum < model.PointNum)
+                    {
+                        return ApiResult.Failed("您的点数不足，请充值后再试");
+                    }
+                }
+                else
+                {
+                    return ApiResult.Failed("支付点数不正确");
+                }
+                demodel.PaymentTime = System.DateTime.Now;
+                demodel.OrderStatus = 1;
+                flag = activityModule.SetActivityEnrollInfo(demodel, umodel) > 0;
+
+                return flag ? ApiResult.Success("报名成功") : ApiResult.Failed("出错了，请联系管理员");
+            }
+            else if (demodel.PaymentWay == Common.Enum.Goods.OrderPaymentTypeEnum.OnlinePayment)
+            {
+                string sPayInfo = string.Empty;
+                if (!demodel.PayWay.HasValue)
+                {
+                    return ApiResult.Failed("请选择支付方式");
+                }
+
+                if (model.Price != demodel.Money)
+                {
+                    return ApiResult.Failed("支付金额不正确");
+                }
+                demodel.OrderStatus = 0;
+                int id = activityModule.SetActivityEnrollInfo(demodel, umodel);
+                if (id == 0)
+                {
+                    return ApiResult.Failed("出错了，请联系管理员");
+                }
+                string sOrderNo = (System.DateTime.Now.ToString("yyyyMMddHHmmssfff")) + id;
+                //根据订单号获取微信支付配置信息
+                RB_MiniProgram_Extend miniProgram = new RB_MiniProgram_Extend();  //2020年5月26号新增
+                miniProgram = programModule.GetMiniProgramModule(new RB_MiniProgram_Extend { MallBaseId = userInfo.MallBaseId, TenantId = userInfo.TenantId });
+                App_Code.PayUtil payUtil = new App_Code.PayUtil();
+                switch ((int)demodel.PayWay)
+                {
+                    case 1://微信支付     
+                        sPayInfo = App_Code.PayUtil.GetMinUnifiedOrder(sOrderNo, (model.ActivityName.Length > 50 ? model.ActivityName.Substring(0, 50) : model.ActivityName), Convert.ToDecimal(demodel.Money), userInfo.UserId.ToString(), umodel.OpenId, (Config.sTenpayActivityNotify + "/" + demodel.MallBaseId + "/" + demodel.TenantId), miniProgram, _accessor, System.Net.Dns.GetHostEntry(System.Net.Dns.GetHostName()).AddressList.FirstOrDefault(address => address.AddressFamily == System.Net.Sockets.AddressFamily.InterNetwork)?.ToString());
+                        break;
+                    default:
+                        break;
+                }
+                return ApiResult.Success("", sPayInfo);
+            }
+            return ApiResult.Failed("支付方式错误");
+        }
+
+        #endregion
     }
 }
\ No newline at end of file

Mall.WebApi/Controllers/User/AppletLoginController.cs

@@ -41,6 +41,7 @@ namespace Mall.WebApi.Controllers.User
         /// </summary>
         private readonly MiniProgramModule programModule = new MiniProgramModule();
         private readonly Module.Education.EducationModule educationModule = new Module.Education.EducationModule();
+        private readonly Module.Education.ActivityModule activityModule = new Module.Education.ActivityModule();
 
         private readonly Module.Reserve.ReserveModule reserveModule = new Module.Reserve.ReserveModule();
         #region 小程序登录
@@ -62,6 +63,7 @@ namespace Mall.WebApi.Controllers.User
                 Photo = parms.GetStringValue("Photo"),
                 Moblie = parms.GetStringValue("Moblie"),
                 SuperiorId = parms.GetInt("SuperiorId"),
+                Gender = parms.GetInt("Gender"),
                 SmallShopId = parms.GetInt("SmallShopId"),
                 UserPageType = (Common.Enum.Goods.GoodsPageTypeEnum)parms.GetInt("UserPageType", 0),
                 CounponPassword = parms.GetInt("CounponPassword", 3),
@@ -156,6 +158,23 @@ namespace Mall.WebApi.Controllers.User
                 bool flag = UserId > 0;
                 if (flag)
                 {
+                    var mmodel = programModule.GetMiniProgramModule(new RB_MiniProgram_Extend() { MallBaseId = demodel.MallBaseId });
+                    //赞羊教育保存性别 2021-05-08 Add by:W
+                    if (mmodel.MallBaseId == 5 && demodel.Gender > 0)
+                    {
+                        var eduBaseInfo = new Model.Extend.Education.RB_Education_BaseInfo_Extend
+                        {
+                            Id = 0,
+                            UserId = UserId,
+                            TenantId = demodel.TenantId,
+                            MallBaseId = demodel.MallBaseId,
+                            Sex = demodel.Gender,
+                            Status = 0,
+                            CreateDate = System.DateTime.Now
+                        };
+                        activityModule.SetEduBaseInfo(eduBaseInfo);
+                    }
+
 
                     //自动发放新人优惠券 2020-08-04 Add By:W
                     couponResult = couponModule.AutoCoupon(new Model.Extend.MarketingCenter.RB_DiscountCoupon_Extend { UserId = UserId, TenantId = demodel.TenantId, MallBaseId = demodel.MallBaseId, TriggerType = 3 });
@@ -211,7 +230,7 @@ namespace Mall.WebApi.Controllers.User
                     string secret = Config.JwtSecretKey;
                     string token = encoder.Encode(payload, secret);
                     #endregion
-                    var mmodel = programModule.GetMiniProgramModule(new RB_MiniProgram_Extend() { MallBaseId = demodel.MallBaseId });
+
                     AppletUserInfo appletUserInfo = new AppletUserInfo()
                     {
                         MallBaseId = demodel.MallBaseId,
@@ -322,11 +341,44 @@ namespace Mall.WebApi.Controllers.User
                     IsAddBaseInfo = 0,
                     IsOpenMiAi = mmodel.IsOpenMiAi,
                 };
+                if (mmodel.IsOpenMiAi == 1)
+                {
                     var oldBaseInfo = miaiModule.GetBaseInfoList(new Model.Extend.Miai.RB_MiAi_BaseInfo_Extend { UserId = umodel.Id, TenantId = mmodel.TenantId, MallBaseId = mmodel.MallBaseId }).FirstOrDefault();
                     if (oldBaseInfo != null && oldBaseInfo.Id > 0)
                     {
                         appletUserInfo.IsAddBaseInfo = 1;
                     }
+                }
+                else if (mmodel.MallBaseId == 5)
+                {
+                    var oldBaseInfo = activityModule.GetEducationBaseInfo(new Model.Extend.Education.RB_Education_BaseInfo_Extend { UserId = umodel.Id, TenantId = mmodel.TenantId, MallBaseId = mmodel.MallBaseId }).FirstOrDefault();
+                    if (oldBaseInfo != null && oldBaseInfo.Id > 0 && oldBaseInfo.StudentId > 0)
+                    {
+                        appletUserInfo.IsAddBaseInfo = 1;
+                        if (demodel.Gender > 0 )
+                        {
+                            oldBaseInfo.Sex = demodel.Gender;
+                            activityModule.UpdateEduBaseInfoSex(oldBaseInfo);
+                        }
+                    }
+                    //赞羊教育保存性别 2021-05-08 Add by:W
+                    if ((oldBaseInfo == null && oldBaseInfo.Id == 0) &&demodel.Gender > 0)
+                    {
+                        var eduBaseInfo = new Model.Extend.Education.RB_Education_BaseInfo_Extend
+                        {
+                            Id = 0,
+                            UserId = umodel.Id,
+                            TenantId = demodel.TenantId,
+                            MallBaseId = demodel.MallBaseId,
+                            Sex = demodel.Gender,
+                            Status = 0,
+                            CreateDate = System.DateTime.Now
+                        };
+                        activityModule.SetEduBaseInfo(eduBaseInfo);
+                    }
+
+                }
+
                 UserReidsCache.AppletUserInfoSet(UserModuleCacheKeyConfig.Applet_Login_Info + umodel.Id, appletUserInfo, Config.JwtExpirTime);
                 if (isGiveCoupon)
                 {

Mall.WebApi/appsettings.json

 {
     "ConnectionStrings": {
-    "DefaultConnection": "server=192.168.20.214;user id=reborn;password=Reborn@2018;database=reborn_mall;CharSet=utf8mb4; Convert Zero Datetime=true; ",
+        "DefaultConnection": "server=192.168.20.214;user id=reborn;password=Reborn@2018;database=test_reborn_mall;CharSet=utf8mb4; Convert Zero Datetime=true; ",
         "DefaultConnectionPName": "MySql.Data.MySqlClient",
         "FinanceConnection": "server=192.168.20.214;user id=reborn;password=Reborn@2018;database=reborn_finance;CharSet=utf8mb4; Convert Zero Datetime=true; ",
         "FinanceConnectionPName": "MySql.Data.MySqlClient",
         "UserConnection": "server=192.168.20.214;user id=reborn;password=Reborn@2018;database=reborn_user;CharSet=utf8mb4; Convert Zero Datetime=true; ",
         "UserConnectionPName": "MySql.Data.MySqlClient",
         "PropertyConnection": "server=192.168.20.214;user id=reborn;password=Reborn@2018;database=test_property;CharSet=utf8mb4; Convert Zero Datetime=true; ",
-    "PropertyConnectionPName": "MySql.Data.MySqlClient"
+        "PropertyConnectionPName": "MySql.Data.MySqlClient",
+        "EduConnection": "server=192.168.20.214;user id=reborn;password=Reborn@2018;database=reborn_edu;CharSet=utf8mb4; Convert Zero Datetime=true; ",
+        "EduConnectionPName": "MySql.Data.MySqlClient"
     },
     "Logging": {
         "LogLevel": {
@@ -41,6 +43,7 @@
     "sTenpayRechargeNotify": "http://mallapi.oytour.com/api/WeChatNotify/RechargeNotify", //微信充值回调地址
     "sTenpayMemberBuyNotify": "http://mallapi.oytour.com/api/WeChatNotify/MemberBuyNotify", //微信充值回调地址
     "sTenpayVipBuyNotify": "http://mallapi.oytour.com/api/WeChatNotify/VipBuyNotify", //微信购买VIP回调地址
+    "sTenpayActivityNotify": "http://mallapi.oytour.com/api/WeChatNotify/ActivityNotify",//赞羊教育活动在线支付回调地址
     "NetworkDirector": 1756, //网络主管的id，用于新建供应商账户的时候的创建人
     "RB_Branch_Id": 49, //所属公司id
     "IncomeDirector": 1756, //财务收入创建人