Merge branch 'master' of http://gitlab.oytour.com/Kui2/education

Edu.Common/Enum/StudyAbroad/StudyAbroadProductTypeEnum.cs

@@ -15,5 +15,35 @@ namespace Edu.Common.Enum.StudyAbroad
         /// </summary>
         [EnumField("同业产品")]
         B2BProduct = 2,
+
+        /// <summary>
+        /// 日本本科常规产品
+        /// </summary>
+        [EnumField("日本本科常规产品")]
+        RBBKCGCP = 3,
+
+        /// <summary>
+        /// 日本硕博常规产品
+        /// </summary>
+        [EnumField("日本硕博常规产品")]
+        RBSBCGCP = 4,
+
+        /// <summary>
+        /// 日本专升硕常规产品
+        /// </summary>
+        [EnumField("日本专升硕常规产品")]
+        ZSS = 5,
+
+        /// <summary>
+        /// 日本大学升学项目
+        /// </summary>
+        [EnumField("日本大学升学项目")]
+        RBDXSXXM = 6,
+
+        /// <summary>
+        /// 日本初高中常规产品
+        /// </summary>
+        [EnumField("日本初高中常规产品")]
+        RBCGZCGCP = 7,
     }
 }

Edu.Model/Entity/Bonus/RB_Personnel_BonusDetail.cs

@@ -21,5 +21,17 @@ namespace Edu.Model.Entity.Bonus
 		/// 奖励主表编号
 		/// </summary>
 		public int BonusId { get; set; }
+
+
+		/// <summary>
+		/// 订单人数
+		/// </summary>
+		public int GuestNum { get; set; }
+
+		/// <summary>
+		/// 订单金额
+		/// </summary>
+		public decimal OrderMoney { get; set; }
+
 	}
 }

Edu.Module.Course/EmployeeBonusModule.cs

@@ -73,7 +73,7 @@ namespace Edu.Module.Course
                         CurOrderMoney= curOrderMoney,
                         Group_Id =GroupId,
                         CurRewardMoney= GetStepAwardAmount(item, curNum),
-                        CreateBy=0,
+                        CreateBy=1,
                         CreateTime=DateTime.Now,
                         UpdateBy=1,
                         UpdateTime=DateTime.Now,
@@ -85,7 +85,9 @@ namespace Edu.Module.Course
                         var detail = new RB_Personnel_BonusDetail()
                         {
                             Id = 0,
-                            BonusId = pModel.Id
+                            BonusId = pModel.Id,
+                            OrderMoney=oItem.OrderMoney,
+                            GuestNum=oItem.GuestNum,
                         };
                     }
                 }