Merge branch 'master' of http://gitlab.oytour.com/Kui2/mall.oytour.com into sdzq-ld

Mall.Module.Education/PointModule.cs

@@ -617,24 +617,57 @@ namespace Mall.Module.Education
             {
                 orderId = model.ID;
             }
-            RB_Member_PointBalance_Extend memberBalanceModel = new RB_Member_PointBalance_Extend
+            if (model.OrderStaus == Common.Enum.Point.OrderStausEnum.Paid && model.TotalPointNum > 0)
             {
-                UserId = model.UserId,
-                Type = Common.Enum.MarketingCenter.RecordTypeEnum.Income,
-                PonitNum = model.TotalPointNum,
-                Description = "购买直播课程消费" + model.TotalPointNum + "点",
-                CreateDate = System.DateTime.Now,
-                TenantId = model.TenantId,
-                MallBaseId = model.MallBaseId,
-                Remarks = "上课时间：" + model.StudyDate.ToString("yyyy-MM-dd HH:mm") + "时长" + model.TotalStudyDuration.ToString("f2") + Common.Plugin.EnumHelper.GetEnumName(model.DurationUnit) ,
-                PlatformType = umodel.Source
-            };
-            memberPointBalanceRepository.Insert(memberBalanceModel, trans);
+                RB_Member_PointBalance_Extend memberBalanceModel = new RB_Member_PointBalance_Extend
+                {
+                    OrderId = orderId,
+                    UserId = model.UserId,
+                    Type = Common.Enum.MarketingCenter.RecordTypeEnum.Expend,
+                    PonitNum = model.TotalPointNum,
+                    Description = "购买直播课程消费" + model.TotalPointNum + "点",
+                    CreateDate = System.DateTime.Now,
+                    TenantId = model.TenantId,
+                    MallBaseId = model.MallBaseId,
+                    Remarks = "上课时间：" + model.StudyDate.ToString("yyyy-MM-dd HH:mm") + "时长" + model.TotalStudyDuration.ToString("f2") + Common.Plugin.EnumHelper.GetEnumName(model.DurationUnit),
+                    PlatformType = umodel.Source
+                };
+                memberPointBalanceRepository.Insert(memberBalanceModel, trans);
 
+                IDictionary<string, object> filedsUser = new Dictionary<string, object>
+                {
+                    { nameof(Model.Entity.User.RB_Member_User.PointNum), umodel.PointNum-model.TotalPointNum }
+                };
+                IList<WhereHelper> userWhereHelpers = new List<WhereHelper>
+                    {
+                        new WhereHelper()
+                        {
+                            FiledName = nameof(Model.Entity.User.RB_Member_User.Id),
+                            FiledValue = umodel.Id,
+                            OperatorEnum = OperatorEnum.Equal
+                        },
+                         new WhereHelper()
+                        {
+                            FiledName = nameof(Model.Entity.User.RB_Member_User.TenantId),
+                            FiledValue = umodel.TenantId,
+                            OperatorEnum = OperatorEnum.Equal
+                        },
+                          new WhereHelper()
+                        {
+                            FiledName = nameof(Model.Entity.User.RB_Member_User.MallBaseId),
+                            FiledValue = umodel.MallBaseId,
+                            OperatorEnum = OperatorEnum.Equal
+                        }
+                    };
+                member_UserRepository.Update(filedsUser, userWhereHelpers, trans);
+            }
             return flag;
-
         }
 
+
+
+
+
         #endregion
     }
 }