提交甲鹤问卷调查

Mall.Common/Enum/MarketingCenter/PrizeTypeEnum.cs

+using System;
+using System.Collections.Generic;
+using System.Text;
+using Mall.Common.Plugin;
+
+namespace Mall.Common.Enum.MarketingCenter
+{
+    public enum PrizeTypeEnum
+    {
+        /// <summary>
+        /// 站内
+        /// </summary>
+        [EnumField("站内")]
+        Station = 1,
+        /// <summary>
+        /// 站外
+        /// </summary>
+        [EnumField("站外")]
+        StationOut = 2
+    }
+}

Mall.Common/Enum/MarketingCenter/TriggerTypeEnum.cs

@@ -6,7 +6,7 @@ using System.Text;
 namespace Mall.Common.Enum.MarketingCenter
 {
     /// <summary>
-    /// 触发事件，1-分享，2-购买并付款，3-新人领券，4-新人购买并付款
+    /// 触发事件，1-分享，2-购买并付款，3-新人领券，5-新人购买并付款
     /// </summary>
     public enum TriggerTypeEnum
     {
@@ -29,7 +29,12 @@ namespace Mall.Common.Enum.MarketingCenter
         /// 新人购买并付款
         /// </summary>
         [EnumField("新人购买并付款")]
-        NewMemerBuyAndPay = 4
+        NewMemerBuyAndPay = 4,
+        /// <summary>
+        /// 口令发放
+        /// </summary>
+        [EnumField("口令发放")]
+        Password = 5
 
     }
 }

Mall.Model/Entity/MarketingCenter/RB_ActivitySurvey.cs

+using System;
+using System.Collections.Generic;
+using System.Text;
+using Mall.Common.Enum;
+using Mall.Common.Enum.MarketingCenter;
+using VT.FW.DB;
+
+namespace Mall.Model.Entity.MarketingCenter
+{
+
+    /// <summary>
+    /// 活动基础配置表
+    /// </summary>
+    [Serializable]
+    [DB(ConnectionName = "DefaultConnection")]
+    public class RB_ActivitySurvey
+    { /// <summary>
+      /// 编号
+      /// </summary>
+        public int ID { get; set; }
+        /// <summary>
+        /// 标题
+        /// </summary>
+
+        public string Title { get; set; }
+
+
+        /// <summary>
+        /// 活动开始时间
+        /// </summary>
+        public DateTime? StartDate { get; set; }
+
+
+        /// <summary>
+        /// 活动结束时间
+        /// </summary>
+        public DateTime? EndDate { get; set; }
+
+
+        /// <summary>
+        /// 份数
+        /// </summary>
+        public int SurveyNum { get; set; }
+
+        /// <summary>
+        /// 活动说明
+        /// </summary>
+        public string Description { get; set; }
+
+
+        /// <summary>
+        /// 奖品地址
+        /// </summary>
+        public string PrizeAddress { get; set; }
+
+        /// <summary>
+        /// 奖品类型
+        /// </summary>
+        public PrizeTypeEnum? PrizeType { get; set; }
+
+        /// <summary>
+        /// 删除
+        /// </summary>
+        public DateStateEnum State { get; set; }
+
+        /// <summary>
+        /// 
+        /// </summary>        
+        public int MallBaseId
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 
+        /// </summary>        
+        public int TenantId
+        {
+            get;
+            set;
+        }
+
+        /// <summary>
+        /// 创建时间
+        /// </summary>        
+        public DateTime? CreateDate
+        {
+            get;
+            set;
+        }
+
+        /// <summary>
+        /// 修改时间
+        /// </summary>        
+        public DateTime? UpdateDate
+        {
+            get;
+            set;
+        }
+    }
+}

Mall.Model/Entity/MarketingCenter/RB_Coupon_SelfMotion.cs

@@ -37,11 +37,14 @@ namespace Mall.Model.Entity.MarketingCenter
         public DateTime? RegisterDate { get; set; }
 
         /// <summary>
-        /// 触发事件，1-分享，2-购买并付款，3-新人领券
+        /// 触发事件，1-分享，2-购买并付款，3-新人领券,5-口令发放
         /// </summary>
         public TriggerTypeEnum TriggerType { get; set; }
 
-
+        /// <summary>
+        /// 口令
+        /// </summary>
+        public string KeyWord { get; set; }
         /// <summary>
         /// 优惠券id
         /// </summary>

Mall.Model/Entity/MarketingCenter/Rb_GuestSurvey.cs

@@ -19,14 +19,17 @@ namespace Mall.Model.Entity.MarketingCenter
         public int ID { get; set; }
 
 
-       
+
 
         /// <summary>
         /// 会员id
         /// </summary>
         public int? UserId { get; set; }
 
-
+        /// <summary>
+        /// 活动id
+        /// </summary>
+        public int ActivitySurveyId { get; set; }
 
         /// <summary>
         /// 
@@ -58,7 +61,7 @@ namespace Mall.Model.Entity.MarketingCenter
         public DateStateEnum State { get; set; }
 
 
-      
+
 
     }
 }

Mall.Model/Entity/MarketingCenter/Rb_Survey.cs

@@ -19,6 +19,12 @@ namespace Mall.Model.Entity.MarketingCenter
         /// 编号
         /// </summary>
         public int ID { get; set; }
+
+
+        /// <summary>
+        /// 活动id
+        /// </summary>
+        public int ActivitySurveyId { get; set; }
         /// <summary>
         ///意见调查类型
         /// </summary>
@@ -87,5 +93,10 @@ namespace Mall.Model.Entity.MarketingCenter
             set;
         }
 
+        /// <summary>
+        /// 是否必填0-不是，1-是
+        /// </summary>
+        public int IsRequired { get; set; }
+
     }
 }

Mall.Model/Entity/User/RB_Member_DiscountCoupon.cs

@@ -147,5 +147,10 @@ namespace Mall.Model.Entity.User
         public string Name { get; set; }
 
 
+        /// <summary>
+        /// 口令 2020-12-31 add By:W
+        /// </summary>
+        public string KeyWord { get; set; }
+
     }
 }

Mall.Model/Extend/MarketingCenter/RB_ActivitySurvey_Extend.cs

+using System;
+using System.Collections.Generic;
+using System.Text;
+using Mall.Model.Entity.MarketingCenter;
+
+namespace Mall.Model.Extend.MarketingCenter
+{
+    public class RB_ActivitySurvey_Extend : RB_ActivitySurvey
+    {
+        public List<Rb_Survey_Extend> SurveyList { get; set; }
+    }
+}

Mall.Model/Extend/MarketingCenter/RB_DiscountCoupon_Extend.cs

@@ -96,5 +96,10 @@ namespace Mall.Model.Extend.MarketingCenter
 
 
         public DateTime? RegisterDate { get; set; }
+
+        /// <summary>
+        /// 针对口令红包，口令关键字
+        /// </summary>
+        public string KeyWord { get; set; }
     }
 }

Mall.Model/Extend/MarketingCenter/Rb_GuestSurvey_Extend.cs

@@ -5,7 +5,7 @@ using Mall.Model.Entity.MarketingCenter;
 
 namespace Mall.Model.Extend.MarketingCenter
 {
-    public class Rb_GuestSurvey_Extend: Rb_GuestSurvey
+    public class Rb_GuestSurvey_Extend : Rb_GuestSurvey
     {
         /// <summary>
         /// 选项详情
@@ -26,11 +26,16 @@ namespace Mall.Model.Extend.MarketingCenter
         /// </summary>
         public int ScoreCount { get; set; }
 
+
+        public string StartDate { get; set; }
+
+        public string EndDate { get; set; }
+
         /// <summary>
         /// 昵称
         /// </summary>
 
-        public string NickName
+        public string AliasName
         {
             get;
             set;
@@ -40,11 +45,16 @@ namespace Mall.Model.Extend.MarketingCenter
         /// 头像
         /// </summary>
 
-        public string HeadPic
+        public string Photo
         {
             get;
             set;
         }
 
+        /// <summary>
+        /// 活动名称
+        /// </summary>
+        public string ActiveSurveyName { get; set; }
+
     }
 }

Mall.Model/Extend/MarketingCenter/Rb_SurveyOptions_Extend.cs

@@ -11,5 +11,9 @@ namespace Mall.Model.Extend.MarketingCenter
         /// 单选多选（多选和单选(1)）
         /// </summary>
         public string IsCheck { get; set; }
+
+        public string SurveyIDs { get; set; }
+
+
     }
 }

Mall.Model/Extend/MarketingCenter/Rb_Survey_Extend.cs

@@ -17,7 +17,10 @@ namespace Mall.Model.Extend.MarketingCenter
 
         public string SurveyIDs { get; set; }
 
-
+        /// <summary>
+        /// 活动名称
+        /// </summary>
+        public string ActivitySurveyStr { get; set; }
 
 
 

Mall.Model/Extend/User/RB_Member_User_Extend.cs

@@ -166,6 +166,18 @@ namespace Mall.Model.Extend.User
         /// 实收金额
         /// </summary>
         public decimal Income { get; set; }
+
+
+        /// <summary>
+        /// 口令优惠券=5其他都等于0
+        /// </summary>
+        public int CounponPassword { get; set; }
+
+        /// <summary>
+        /// 口令
+        /// </summary>
+        public string KeyWord { get; set; }
+
     }
 
 

Mall.Module.BaseSetUp/MallBaseModule.cs

@@ -1460,7 +1460,7 @@ namespace Mall.Module.BaseSetUp
                          new WhereHelper(){ FiledName=nameof(RB_Video_Store.MallBaseId),FiledValue=model.MallBaseId, OperatorEnum=OperatorEnum.Equal },
                          new WhereHelper(){ FiledName=nameof(RB_Video_Store.ID),FiledValue=id, OperatorEnum=OperatorEnum.NotEqual },
                     };
-                storeRepository.Update(fileds, whereHelpers);
+                videoStoreRepository.Update(fileds, whereHelpers);
             }
             return result;
         }

Mall.Module.MarketingCenter/CouponModule.cs

@@ -889,7 +889,7 @@ namespace Mall.Module.MarketingCenter
             }
             //根据发放类型获取对应的优惠券信息
             model.SmallShopId = memberUserModel.SmallShopId;
-            if (model.TriggerType == 4)
+            if (model.TriggerType == 4|| model.TriggerType==5)
             {
                 model.RegisterDate = memberUserModel.CreateDate;
             }
@@ -898,7 +898,7 @@ namespace Mall.Module.MarketingCenter
             {
                 bool isReceive = false;
                 //查询已发放的优惠券信息
-                var memberCouponList = memberCouponRepository.GetAutoMemberCouponPageList(new RB_Member_DiscountCoupon_Extend { UserId = model.UserId, GetType = model.TriggerType, TenantId = model.TenantId, MallBaseId = model.MallBaseId });
+                var memberCouponList = memberCouponRepository.GetAutoMemberCouponPageList(new RB_Member_DiscountCoupon_Extend { UserId = model.UserId, GetType = model.TriggerType,KeyWord= model.KeyWord, TenantId = model.TenantId, MallBaseId = model.MallBaseId });
                 foreach (var item in couponList.Where(x => x.TotalNum == -1 || x.TotalNum > 0))//判断当前优惠券是否已超过领取数
                 {
                     int membercouponCoun = memberCouponList.Where(x => x.CouponId == item.ID).Count();
@@ -915,8 +915,8 @@ namespace Mall.Module.MarketingCenter
                                 Status = 0,
                                 CreateDate = System.DateTime.Now,
                                 UserId = model.UserId,
-                                Description = item.TriggerType == 1 ? "分享自动发放优惠券" : (item.TriggerType == 2 ? "购买并付款自动发放优惠券" :(item.TriggerType == 3 ? "新人领劵自动发放优惠券": "新人购买并付款自动发放优惠券")),
-                                Remarks = item.TriggerType == 1 ? "分享" : (item.TriggerType == 2 ? "购买并付款" : (item.TriggerType == 3? "新人领劵": "新人购买并付款")),
+                                Description = item.TriggerType == 1 ? "分享自动发放优惠券" : (item.TriggerType == 2 ? "购买并付款自动发放优惠券" : (item.TriggerType == 3 ? "新人领劵自动发放优惠券" : (item.TriggerType == 4 ? "新人购买并付款自动发放优惠券" : "口令发放"))),
+                                Remarks = item.TriggerType == 1 ? "分享" : (item.TriggerType == 2 ? "购买并付款" : (item.TriggerType == 3 ? "新人领劵" : (item.TriggerType == 4 ? "新人购买并付款" : "口令发放"))),
                                 UseState = 0,
                                 CouponId = item.ID,
                                 StartDate = item.IndateType == Common.Enum.MarketingCenter.IndateTypeEnum.DayHorizon ? System.DateTime.Now : item.StartDate,

Mall.Repository/MarketingCenter/RB_ActivitySurveyRepository.cs

+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using Mall.Model.Entity.MarketingCenter;
+using Mall.Model.Extend.MarketingCenter;
+
+namespace Mall.Repository.MarketingCenter
+{
+    public class RB_ActivitySurveyRepository : BaseRepository<RB_ActivitySurvey>
+    {
+        /// <summary>
+        /// 表名称
+        /// </summary>
+        public string TableName { get { return nameof(RB_ActivitySurvey); } }
+
+        /// <summary>
+        /// 获取列表
+        /// </summary>
+        /// <param name="where"></param>
+        /// <returns></returns>
+        public List<RB_ActivitySurvey_Extend> GetList(RB_ActivitySurvey_Extend where)
+        {
+            StringBuilder sb = new StringBuilder();
+            sb.Append($@"SELECT * from RB_ActivitySurvey  where state=0");
+            if (where != null)
+            {
+                if (where.TenantId > 0)
+                {
+                    sb.AppendFormat(" and TenantId={0}", where.TenantId);
+                }
+                if (where.MallBaseId > 0)
+                {
+                    sb.AppendFormat(" and MallBaseId={0}", where.MallBaseId);
+                }
+                if (where.ID > 0)
+                {
+                    sb.AppendFormat(" and ID={0}", where.ID);
+                }
+
+                if (string.IsNullOrWhiteSpace(where.Title))
+                {
+                    sb.AppendFormat(" and Title like'%{0}%'", where.Title);
+                }
+                if (where.PrizeType.HasValue && (int)where.PrizeType > 0)
+                {
+                    sb.AppendFormat(" and PrizeType={0}", (int)where.PrizeType);
+                }
+            }
+            return Get<RB_ActivitySurvey_Extend>(sb.ToString()).ToList();
+        }
+
+
+
+
+        /// <summary>
+        /// 分页列表
+        /// </summary>
+        /// <param name="pageIndex"></param>
+        /// <param name="pageSize"></param>
+        /// <param name="rowsCount"></param>
+        /// <param name="where"></param>
+        /// <returns></returns>
+        public List<RB_ActivitySurvey_Extend> GetPageList(int pageIndex, int pageSize, out long rowsCount, RB_ActivitySurvey_Extend where)
+        {
+            StringBuilder sb = new StringBuilder();
+            sb.Append($@"SELECT * from RB_ActivitySurvey  where state=0");
+            if (where != null)
+            {
+                if (where.TenantId > 0)
+                {
+                    sb.AppendFormat(" and TenantId={0}", where.TenantId);
+                }
+                if (where.MallBaseId > 0)
+                {
+                    sb.AppendFormat(" and MallBaseId={0}", where.MallBaseId);
+                }
+                if (where.PrizeType.HasValue && (int)where.PrizeType > 0)
+                {
+                    sb.AppendFormat(" and PrizeType={0}", (int)where.PrizeType);
+                }
+                if (!string.IsNullOrWhiteSpace(where.Title))
+                {
+                    sb.AppendFormat(" and Title like'%{0}%'", where.Title);
+                }
+            }
+            return GetPage<RB_ActivitySurvey_Extend>(pageIndex, pageSize, out rowsCount, sb.ToString()).ToList();
+        }
+    }
+}

Mall.Repository/MarketingCenter/RB_DiscountCouponRepository.cs

@@ -332,11 +332,15 @@ on a.CouponId=b.ID {where} ";
                 if (query.TriggerType > 0)
                 {
                     builder.Append($" AND b.{nameof(RB_DiscountCoupon_Extend.TriggerType)}={query.TriggerType}");
-                    if (query.TriggerType == 4 && query.RegisterDate.HasValue)
+                    if ((query.TriggerType == 4 || query.TriggerType == 5) && query.RegisterDate.HasValue)
                     {
                         builder.Append($" AND DATE_FORMAT(b.{nameof(RB_DiscountCoupon_Extend.RegisterDate)},'%Y-%m-%d' )<= DATE_FORMAT('{query.RegisterDate}','%Y-%m-%d' )");
                     }
                 }
+                if (!string.IsNullOrWhiteSpace(query.KeyWord))
+                {
+                    builder.Append($" AND b.{nameof(RB_DiscountCoupon_Extend.KeyWord)}= '{query.KeyWord}'");
+                }
                 if (query.UserId > 0)
                 {
                     userWhere += $"and c.UserId={query.UserId}";

Mall.Repository/MarketingCenter/Rb_GuestSurveyRepository.cs

@@ -38,6 +38,10 @@ namespace Mall.Repository.MarketingCenter
                 {
                     sb.AppendFormat(" and UserId={0}", where.UserId);
                 }
+                if (where.ActivitySurveyId > 0)
+                {
+                    sb.AppendFormat(" and ActivitySurveyId={0}", where.ActivitySurveyId);
+                }
             }
             return Get<Rb_GuestSurvey_Extend>(sb.ToString()).ToList();
         }
@@ -69,11 +73,17 @@ LEFT JOIN (SELECT GuestSurveyId , SUM(ScoreNum) as ScoreNum,COUNT(GuestSurveyId)
                 {
                     sb.AppendFormat(" and a.UserId={0}", where.UserId);
                 }
+                if (where.ActivitySurveyId > 0)
+                {
+                    sb.AppendFormat(" and a.ActivitySurveyId={0}", where.ActivitySurveyId);
+                }
             }
             return Get<Rb_GuestSurvey_Extend>(sb.ToString()).ToList();
         }
 
 
+       
+
         /// <summary>
         /// 分页列表
         /// </summary>
@@ -82,10 +92,11 @@ LEFT JOIN (SELECT GuestSurveyId , SUM(ScoreNum) as ScoreNum,COUNT(GuestSurveyId)
         /// <param name="rowsCount"></param>
         /// <param name="where"></param>
         /// <returns></returns>
-        public List<Rb_GuestSurvey_Extend> GetPageList(int pageIndex, int pageSize, out long rowsCount, Rb_GuestSurvey where)
+        public List<Rb_GuestSurvey_Extend> GetResultPageList(int pageIndex, int pageSize, out long rowsCount, Rb_GuestSurvey_Extend where)
         {
             StringBuilder sb = new StringBuilder();
-            sb.Append($@"SELECT * from Rb_GuestSurvey  where state=0");
+            sb.Append($@"SELECT a.*,b.Name as AliasName,b.Photo,c.Title as ActiveSurveyName  from Rb_GuestSurvey as a LEFT JOIN rb_member_user as b on a.UserId=b.Id
+LEFT JOIN rb_activitysurvey as c on c.ID=a.ActivitySurveyId  where a.state=0");
             if (where != null)
             {
                 if (where.MallBaseId > 0)
@@ -100,6 +111,22 @@ LEFT JOIN (SELECT GuestSurveyId , SUM(ScoreNum) as ScoreNum,COUNT(GuestSurveyId)
                 {
                     sb.AppendFormat(" and a.UserId={0}", where.UserId);
                 }
+                if (where.ActivitySurveyId > 0)
+                {
+                    sb.AppendFormat(" and a.ActivitySurveyId={0}", where.ActivitySurveyId);
+                }
+                if (!string.IsNullOrWhiteSpace(where.AliasName))
+                {
+                    sb.AppendFormat("  and  b.Name like'%{0}%' ", where.AliasName);
+                }
+                if (!string.IsNullOrWhiteSpace(where.StartDate))
+                {
+                    sb.AppendFormat("  and  DATE_FORMAT(a.CreateDate,'%Y-%m-%d' )>=DATE_FORMAT('{0}','%Y-%m-%d' ) ", where.StartDate);
+                }
+                if (!string.IsNullOrWhiteSpace(where.EndDate))
+                {
+                    sb.AppendFormat(" and  DATE_FORMAT(a.CreateDate,'%Y-%m-%d' )<= DATE_FORMAT('{0}','%Y-%m-%d' )  ", where.EndDate);
+                }
             }
             return GetPage<Rb_GuestSurvey_Extend>(pageIndex, pageSize, out rowsCount, sb.ToString()).ToList();
         }

Mall.Repository/MarketingCenter/Rb_SurveyOptionsRepository.cs

@@ -19,7 +19,7 @@ namespace Mall.Repository.MarketingCenter
         /// </summary>
         /// <param name="where"></param>
         /// <returns></returns>
-        public List<Rb_SurveyOptions_Extend> GetList(Rb_SurveyOptions where)
+        public List<Rb_SurveyOptions_Extend> GetList(Rb_SurveyOptions_Extend where)
         {
             StringBuilder sb = new StringBuilder();
             sb.Append($@"SELECT * from Rb_SurveyOptions  where state=0");
@@ -29,6 +29,11 @@ namespace Mall.Repository.MarketingCenter
                 {
                     sb.AppendFormat(" and SurveyID={0}", where.SurveyID);
                 }
+
+                if (!string.IsNullOrWhiteSpace(where.SurveyIDs))
+                {
+                    sb.AppendFormat(" and SurveyID in({0})", where.SurveyIDs);
+                }
             }
             sb.Append($" ORDER BY {nameof(Rb_SurveyOptions.Sort)} ASC");
             return Get<Rb_SurveyOptions_Extend>(sb.ToString()).ToList();

Mall.Repository/MarketingCenter/Rb_SurveyRepository.cs

@@ -33,11 +33,15 @@ namespace Mall.Repository.MarketingCenter
                 {
                     sb.AppendFormat(" and MallBaseId={0}", where.MallBaseId);
                 }
+                if (where.ActivitySurveyId > 0)
+                {
+                    sb.AppendFormat(" and ActivitySurveyId={0}", where.ActivitySurveyId);
+                }
                 if (where.IsShow > 0)
                 {
                     sb.AppendFormat(" and IsShow={0}", where.IsShow);
                 }
-                if (string.IsNullOrWhiteSpace(where.Title))
+                if (!string.IsNullOrWhiteSpace(where.Title))
                 {
                     sb.AppendFormat(" and Title like'%{0}%'", where.Title);
                 }
@@ -71,7 +75,7 @@ namespace Mall.Repository.MarketingCenter
             sb.Append($@"SELECT * from Rb_Survey  where state=0");
             if (where != null)
             {
-                if (where.IsShow > 0)
+                if (where.IsShow > -1)
                 {
                     sb.AppendFormat(" and IsShow={0}", where.IsShow);
                 }
@@ -79,6 +83,10 @@ namespace Mall.Repository.MarketingCenter
                 {
                     sb.AppendFormat(" and TenantId={0}", where.TenantId);
                 }
+                if (where.ActivitySurveyId > 0)
+                {
+                    sb.AppendFormat(" and ActivitySurveyId={0}", where.ActivitySurveyId);
+                }
                 if (where.MallBaseId > 0)
                 {
                     sb.AppendFormat(" and MallBaseId={0}", where.MallBaseId);
@@ -87,7 +95,7 @@ namespace Mall.Repository.MarketingCenter
                 {
                     sb.AppendFormat(" and SurveyType={0}", (int)where.SurveyType);
                 }
-                if (string.IsNullOrWhiteSpace(where.Title))
+                if (!string.IsNullOrWhiteSpace(where.Title))
                 {
                     sb.AppendFormat(" and Title like'%{0}%'", where.Title);
                 }

Mall.Repository/User/RB_Member_CouponRepository.cs

@@ -476,6 +476,10 @@ LEFT JOIN rb_member_user as d on d.AliasName=a.UserId   where a.UseState=1 {buil
                 {
                     where += $" AND a.{nameof(RB_Member_DiscountCoupon_Extend.MallBaseId)}={query.MallBaseId}";
                 }
+                if (!string.IsNullOrWhiteSpace(query.KeyWord))
+                {
+                    where += $" AND a.{nameof(RB_Member_DiscountCoupon_Extend.KeyWord)}='{query.KeyWord}'";
+                }
                 if (query.UserId > 0)
                 {
                     where += $" AND a.{nameof(RB_Member_DiscountCoupon_Extend.UserId)}={query.UserId}";

Mall.WebApi/Controllers/Education/AppletEducationController.cs

@@ -1066,11 +1066,42 @@ namespace Mall.WebApi.Controllers.Education
             var req = RequestParm;
             var userInfo = AppletUserInfo;
             List<Rb_Survey_Extend> modelSurvey = JsonConvert.DeserializeObject<List<Rb_Survey_Extend>>(req.msg.ToString());
+
+            if (modelSurvey == null || !modelSurvey.Any())
+            {
+                return ApiResult.Failed("选项信息不能空");
+            }
             Rb_GuestSurvey_Extend model = new Rb_GuestSurvey_Extend();
+            if ((modelSurvey.FirstOrDefault()?.ActivitySurveyId ?? 0) == 0)
+            {
+                return ApiResult.Failed("请选择活动对应的问卷信息");
+            }
+
+            var activeSurueyModel = surveyModule.GetActivitySurveyList(new RB_ActivitySurvey_Extend { TenantId = userInfo.TenantId, MallBaseId = userInfo.MallBaseId, ID = modelSurvey.FirstOrDefault()?.ActivitySurveyId ?? 0 }).FirstOrDefault();
+            if (activeSurueyModel == null || activeSurueyModel.ID == 0)
+            {
+                return ApiResult.Failed("请选择活动对应的问卷信息");
+            }
 
             //先判断是否已添加
-            var GuestSurvey = surveyModule.GetGuestSurveyList(new Rb_GuestSurvey_Extend { UserId = userInfo.UserId, TenantId = userInfo.TenantId, MallBaseId = userInfo.MallBaseId });
-            if (GuestSurvey.Count > 0)
+            var GuestSurvey = surveyModule.GetGuestSurveyList(new Rb_GuestSurvey_Extend { ActivitySurveyId = modelSurvey.FirstOrDefault()?.ActivitySurveyId ?? 0, TenantId = userInfo.TenantId, MallBaseId = userInfo.MallBaseId });
+
+            if (activeSurueyModel.StartDate.HasValue && activeSurueyModel.EndDate.HasValue)
+            {
+                if (activeSurueyModel.StartDate.Value > System.DateTime.Now)
+                {
+                    return ApiResult.Failed("问卷调查活动还未开始");
+                }
+                if (activeSurueyModel.EndDate.Value < System.DateTime.Now)
+                {
+                    return ApiResult.Failed("问卷调查活动已结束");
+                }
+            }
+            //if (activeSurueyModel.SurveyNum != -1 && activeSurueyModel.SurveyNum <= GuestSurvey.Count())
+            //{
+            //    return ApiResult.Failed(activeSurueyModel.SurveyNum + "份问卷调查已填写完");
+            //}
+            if (GuestSurvey.Where(x => x.UserId == userInfo.UserId).Count() > 0)
             {
                 return ApiResult.Failed("请勿重复参与问卷调查");
             }
@@ -1081,6 +1112,7 @@ namespace Mall.WebApi.Controllers.Education
             model.CreateDate = System.DateTime.Now;
             model.ID = 0;
             model.State = DateStateEnum.Normal;
+            model.ActivitySurveyId = modelSurvey.FirstOrDefault()?.ActivitySurveyId ?? 0;
             var scoreList = modelSurvey.Where(x => x.SurveyType == SurveyTypeEnum.Score);
             if (scoreList != null && scoreList.Any())
             {
@@ -1102,22 +1134,25 @@ namespace Mall.WebApi.Controllers.Education
                 {
                     modelSurveyOptions.ScoreNum = 0;
                     var surveyDetailsList = item.SurveyOptionsList.Where(x => x.IsCheck == "1");
-                    if (surveyDetailsList == null || !surveyDetailsList.Any())
+                    if ((surveyDetailsList == null || !surveyDetailsList.Any()) && item.IsRequired == 1)
                     {
                         return ApiResult.Failed(item.Title + "您还未选择");
                     }
-                    modelSurveyOptions.SurveyOptionIds = string.Join(",", surveyDetailsList.Select(x => x.ID));
-
+                    modelSurveyOptions.SurveyOptionIds = (surveyDetailsList == null || !surveyDetailsList.Any()) ? "" : string.Join(",", surveyDetailsList.Select(x => x.ID));
                 }
                 else if (item.SurveyType == SurveyTypeEnum.Score)
                 {
+                    if (item.IsRequired == 1 && item.ScoreNum == 0)
+                    {
+                        return ApiResult.Failed(item.Title + "您还未打分");
+                    }
                     modelSurveyOptions.ScoreNum = item.ScoreNum;
                 }
                 else if (item.SurveyType == SurveyTypeEnum.TheRadio)
                 {
                     modelSurveyOptions.ScoreNum = 0;
                     var surveyDetailsList = item.SurveyOptionsList.Where(x => x.IsCheck == "1");
-                    if (surveyDetailsList == null || !surveyDetailsList.Any())
+                    if ((surveyDetailsList == null || !surveyDetailsList.Any()) && item.IsRequired == 1)
                     {
                         return ApiResult.Failed(item.Title + "您还未选择");
                     }
@@ -1125,10 +1160,14 @@ namespace Mall.WebApi.Controllers.Education
                     {
                         return ApiResult.Failed(item.Title + "请勿多选");
                     }
-                    modelSurveyOptions.SurveyOptionIds = string.Join(",", surveyDetailsList.Select(x => x.ID));
+                    modelSurveyOptions.SurveyOptionIds = (surveyDetailsList == null || !surveyDetailsList.Any()) ? "" : string.Join(",", surveyDetailsList.Select(x => x.ID));
                 }
-                else
+                else if (item.SurveyType == SurveyTypeEnum.TheText)
                 {
+                    if (item.IsRequired == 1 && string.IsNullOrWhiteSpace(item.TextContent))
+                    {
+                        return ApiResult.Failed(item.Title + "必填填写");
+                    }
                     modelSurveyOptions.TextContent = item.TextContent;
                     modelSurveyOptions.ScoreNum = 0;
                 }
@@ -1144,6 +1183,64 @@ namespace Mall.WebApi.Controllers.Education
             else
                 return ApiResult.Failed("问卷调查提交失败");
         }
+
+
+
+        /// <summary>
+        /// 获取会员调查问题列表
+        /// </summary>
+        /// <param name="request"></param>
+        /// <returns></returns>
+        public ApiResult GetSurveyShowList()
+        {
+            var req = RequestParm;
+            var userInfo = AppletUserInfo;
+            Rb_Survey_Extend model = JsonConvert.DeserializeObject<Rb_Survey_Extend>(req.msg.ToString());
+            var activeSurueyModel = surveyModule.GetActivitySurveyList(new RB_ActivitySurvey_Extend { TenantId = userInfo.TenantId, MallBaseId = userInfo.MallBaseId, ID = model.ActivitySurveyId }).FirstOrDefault();
+            if (activeSurueyModel == null || activeSurueyModel.ID == 0)
+            {
+                return ApiResult.Failed("问卷调查活动不存在");
+            }
+            //先判断是否已添加
+            var GuestSurvey = surveyModule.GetGuestSurveyList(new Rb_GuestSurvey_Extend { ActivitySurveyId = model.ActivitySurveyId, TenantId = userInfo.TenantId, MallBaseId = userInfo.MallBaseId });
+
+            int isEnd = 0;
+            if (activeSurueyModel.StartDate.HasValue && activeSurueyModel.EndDate.HasValue)
+            {
+                if (activeSurueyModel.StartDate.Value < System.DateTime.Now && activeSurueyModel.EndDate.Value > System.DateTime.Now)
+                {
+                    isEnd = 1;
+                }
+                else if (activeSurueyModel.StartDate.Value > System.DateTime.Now)
+                {
+                    isEnd = 0;
+                }
+                else if (activeSurueyModel.EndDate.Value < System.DateTime.Now)
+                {
+                    isEnd = 2;
+                }
+            }
+            var list = surveyModule.GetAllList(model);
+            var result = new
+            {
+                isEnd,
+                activeSurueyModel.SurveyNum,
+                GuestSurveyNum = GuestSurvey.Count(),
+                Surplus = activeSurueyModel.SurveyNum - GuestSurvey.Count(),
+                StartDate = activeSurueyModel.StartDate.HasValue ? activeSurueyModel.StartDate.Value.ToString("yyyy-MM-dd HH:mm:ss") : "",
+                EndDate = activeSurueyModel.EndDate.HasValue ? activeSurueyModel.EndDate.Value.ToString("yyyy-MM-dd HH:mm:ss") : "",
+                activeSurueyModel.Title,
+                activeSurueyModel.Description,
+                activeSurueyModel.PrizeAddress,
+                activeSurueyModel.PrizeType,
+                activeSurueyModel.ID,
+                FillInNum = GuestSurvey.Where(x => x.UserId == userInfo.UserId).Count(),
+                BaseList = list.Where(x => x.FormType == FormTypeEnum.Base).OrderBy(x => x.Sort).Select(x => new { x.ID, x.IsRequired,x.ActivitySurveyId, SurveyType = (int)x.SurveyType, x.FormType, x.Title, x.Sort, SurveyTypeStr = EnumHelper.GetEnumName(x.SurveyType), FormTypeStr = EnumHelper.GetEnumName(x.FormType), x.SurveyOptionsList, ScoreNum = (x.SurveyType.HasValue&& x.SurveyType == SurveyTypeEnum.Score) ? 5 : 0, TextContent = "" }).ToList(),
+                SurveyList = list.Where(x => x.FormType == FormTypeEnum.Survey).OrderBy(x => x.Sort).Select(x => new { x.ID, x.IsRequired, x.ActivitySurveyId, SurveyType = (int)x.SurveyType, x.FormType, x.Title, x.Sort, SurveyTypeStr = EnumHelper.GetEnumName(x.SurveyType), FormTypeStr = EnumHelper.GetEnumName(x.FormType), x.SurveyOptionsList, ScoreNum = (x.SurveyType.HasValue && x.SurveyType == SurveyTypeEnum.Score) ? 5 : 0, TextContent = "" }).ToList()
+            };
+            return ApiResult.Success("", result);
+        }
+
         #endregion
     }
 }
\ No newline at end of file

Mall.WebApi/Controllers/Education/AppletSchoolController.cs

@@ -510,5 +510,7 @@ namespace Mall.WebApi.Controllers.Education
             return ApiResult.Success("", oldLogisticsModel);
         }
         #endregion
+
+
     }
 }
\ No newline at end of file

Mall.WebApi/Controllers/Education/EducationController.cs

@@ -867,6 +867,10 @@ namespace Mall.WebApi.Controllers.Education
                 {
                     query.LableName = JsonConvert.SerializeObject(query.LableNameList);
                 }
+                else
+                {
+                    query.LableName = "";
+                }
                 bool result = educationModule.AddOrUpdateTeacher(query);
                 if (result)
                 {

Mall.WebApi/Controllers/User/AppletLoginController.cs

@@ -62,6 +62,8 @@ namespace Mall.WebApi.Controllers.User
                 SuperiorId = parms.GetInt("SuperiorId"),
                 SmallShopId = parms.GetInt("SmallShopId"),
                 UserPageType = (Common.Enum.Goods.GoodsPageTypeEnum)parms.GetInt("UserPageType", 0),
+                CounponPassword = parms.GetInt("CounponPassword", 3),
+                KeyWord = parms.GetStringValue("KeyWord"),
             };
             if (requestParm.TenantId <= 0)
             {
@@ -85,6 +87,8 @@ namespace Mall.WebApi.Controllers.User
             Model.Extend.Education.RB_Education_Coupon_Extend educationCouponResult = new Model.Extend.Education.RB_Education_Coupon_Extend();
 
             Model.Extend.Reserve.RB_Reserve_Coupon_Extend reserveCouponResult = new Model.Extend.Reserve.RB_Reserve_Coupon_Extend();
+            string couponName = string.Empty;
+            bool isGiveCoupon = false;
             //验证是否新用户
             if (!userModule.ValidateUserOpenId(demodel.OpenId, demodel.Source, requestParm.TenantId, requestParm.MallBaseId))
             {
@@ -154,9 +158,23 @@ namespace Mall.WebApi.Controllers.User
                     //自动发放新人优惠券 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 });
                     educationCouponResult = educationModule.AutoEducationCoupon(new Model.Extend.Education.RB_Education_Coupon_Extend { UserId = UserId, TenantId = demodel.TenantId, MallBaseId = demodel.MallBaseId, TriggerType = 3 });
-                    reserveCouponResult= reserveModule.AutoEducationCoupon(new Model.Extend.Reserve.RB_Reserve_Coupon_Extend { UserId = UserId, TenantId = demodel.TenantId, MallBaseId = demodel.MallBaseId, TriggerType = 3 });
-
+                    reserveCouponResult = reserveModule.AutoEducationCoupon(new Model.Extend.Reserve.RB_Reserve_Coupon_Extend { UserId = UserId, TenantId = demodel.TenantId, MallBaseId = demodel.MallBaseId, TriggerType = 3 });
+                    if (couponResult != null && couponResult.ID > 0)
+                    {
+                        couponName = couponResult.Name;
+                        isGiveCoupon = true;
+                    }
+                    //自动发放新人优惠券 2020-12-31 Add By:W
+                    if (demodel.CounponPassword == 5 && !string.IsNullOrWhiteSpace(demodel.KeyWord))
+                    {
+                        couponResult = couponModule.AutoCoupon(new Model.Extend.MarketingCenter.RB_DiscountCoupon_Extend { UserId = UserId, TenantId = demodel.TenantId, MallBaseId = demodel.MallBaseId, TriggerType = 5, KeyWord = demodel.KeyWord });
 
+                        if (couponResult != null && couponResult.ID > 0)
+                        {
+                            couponName = couponName + "," + couponResult.Name ;
+                            isGiveCoupon = true;
+                        }
+                    }
                     #region 粉象返佣  自动注册分销商 普通会员等级
                     if ((basicsModel?.IsEnableFXGrade ?? 2) == 1)
                     {
@@ -212,9 +230,9 @@ namespace Mall.WebApi.Controllers.User
                         UserPageType = mmodel.IsOpenSchool == 1 ? demodel.UserPageType : Common.Enum.Goods.GoodsPageTypeEnum.All
                     };
                     UserReidsCache.AppletUserInfoSet(UserModuleCacheKeyConfig.Applet_Login_Info + UserId, appletUserInfo, Config.JwtExpirTime);
-                    if (couponResult != null && couponResult.ID > 0)
+                    if (isGiveCoupon)
                     {
-                        return ApiResult.CouponSuccess(ResultCode.Success, 1, "", couponResult.Name, appletUserInfo);
+                        return ApiResult.CouponSuccess(ResultCode.Success, 1, "", couponName, appletUserInfo);
 
                     }
                     else
@@ -240,6 +258,18 @@ namespace Mall.WebApi.Controllers.User
                 {
                     return ApiResult.Failed("账号已被冻结，请联系运营商");
                 }
+                //自动发放新人优惠券 2020-12-31 Add By:W
+                if (demodel.CounponPassword == 5 && !string.IsNullOrWhiteSpace(demodel.KeyWord))
+                {
+                    couponResult = couponModule.AutoCoupon(new Model.Extend.MarketingCenter.RB_DiscountCoupon_Extend { UserId = umodel.Id, TenantId = demodel.TenantId, MallBaseId = demodel.MallBaseId, TriggerType = 5, KeyWord = demodel.KeyWord });
+
+                    if (couponResult != null && couponResult.ID > 0)
+                    {
+                        couponName = couponResult.Name;
+                        isGiveCoupon = true;
+                    }
+                }
+
                 TokenUserInfo userInfo = new TokenUserInfo { uid = umodel.Id.ToString(), requestFrom = ApiRequestFromEnum.MiniProgram };
                 #region JWT
                 IDateTimeProvider provider = new UtcDateTimeProvider();
@@ -283,7 +313,17 @@ namespace Mall.WebApi.Controllers.User
                     UserPageType = mmodel.IsOpenSchool == 1 ? umodel.UserPageType : Common.Enum.Goods.GoodsPageTypeEnum.All
                 };
                 UserReidsCache.AppletUserInfoSet(UserModuleCacheKeyConfig.Applet_Login_Info + umodel.Id, appletUserInfo, Config.JwtExpirTime);
-                return ApiResult.CouponSuccess(ResultCode.Fail, 1, "", "", appletUserInfo);
+                if (isGiveCoupon)
+                {
+                    return ApiResult.CouponSuccess(ResultCode.Success, 1, "", couponName, appletUserInfo);
+
+
+                }
+                else {
+                    return ApiResult.CouponSuccess(ResultCode.Fail, 1, "", "", appletUserInfo);
+                }
+
+               // return ApiResult.CouponSuccess(ResultCode.Fail, 1, "", "", appletUserInfo);
                 //return ApiResult.Success("", appletUserInfo);
             }
         }
@@ -343,7 +383,7 @@ namespace Mall.WebApi.Controllers.User
         /// </summary>
         /// <param name="request"></param>
         /// <returns></returns>
-        public  ApiResult GetGuestWeiXinMobile(object requestMsg)
+        public ApiResult GetGuestWeiXinMobile(object requestMsg)
         {
             var requestParm = JsonConvert.DeserializeObject<RequestParm>(requestMsg.ToString());
             JObject parms = JObject.Parse(requestParm.msg.ToString());