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

Edu.Module.Course/OrderModule.cs

@@ -1155,6 +1155,21 @@ namespace Edu.Module.Course
                     SaleRemark = demodel.SaleRemark;
                 }
                 #endregion
+
+                if (flag && demodel.GuestNum == 1 && (orderModel.PreferPrice != demodel.PreferPrice || orderModel.DiscountMoney != demodel.DiscountMoney)) {
+                    if (demodel.PreferPrice - demodel.DiscountMoney <= orderModel.Income + orderModel.PlatformTax - orderModel.Refund && orderModel.Income >0) {
+                        //帐平
+                        int guestId = glist.FirstOrDefault().Id;
+                        var studentMapping = student_OrderGuestRepository.GetList(new RB_Student_OrderGuest_ViewModel()
+                        {
+                            GuestId = guestId
+                        });
+                        if (studentMapping.Any())
+                        {
+                            UpdateReturnMoneyStatus(studentMapping.First().Student_Id, demodel.OrderId);
+                        }
+                    }
+                }
             }
             else
             {
@@ -1809,6 +1824,24 @@ namespace Edu.Module.Course
                         LogContent += $"，销售备注由【{orderModel.SaleRemark}】修改为【{demodel.SaleRemark}】";
                         SaleRemark = demodel.SaleRemark;
                     }
+
+                    if (demodel.GuestNum == 1 && (orderModel.PreferPrice != demodel.PreferPrice || orderModel.DiscountMoney != demodel.DiscountMoney))
+                    {
+                        if (demodel.PreferPrice - demodel.DiscountMoney <= orderModel.Income + orderModel.PlatformTax - orderModel.Refund && orderModel.Income >0)
+                        {
+                            //帐平
+                            var glist = order_GuestRepository.GetOrderGuestListRepository(new RB_Order_Guest_ViewModel() { Group_Id = demodel.Group_Id, OrderId = demodel.OrderId, GuestState = GuestStateEnum.Normal });
+                            int guestId = glist.FirstOrDefault().Id;
+                            var studentMapping = student_OrderGuestRepository.GetList(new RB_Student_OrderGuest_ViewModel()
+                            {
+                                GuestId = guestId
+                            });
+                            if (studentMapping.Any())
+                            {
+                                UpdateReturnMoneyStatus(studentMapping.First().Student_Id, demodel.OrderId);
+                            }
+                        }
+                    }
                 }
             }
             else
@@ -3960,6 +3993,10 @@ namespace Edu.Module.Course
         {
             var gmodel = order_GuestRepository.GetEntity(guestId);
             if (gmodel == null) { return false; }
+            var omodel = orderRepository.GetEntity(gmodel.OrderId);
+            if (omodel == null) { return false; }
+            if (omodel.OrderType == OrderTypeEnum.CourseOrder)
+            {
                 var cmodel = education_ContractRepository.GetList(new RB_Education_Contract_ViewModel() { Group_Id = gmodel.Group_Id, GuestId = gmodel.Id, Status = -1 }).Where(x => x.Status != 4).FirstOrDefault();
                 if (cmodel != null)
                 {
@@ -4015,10 +4052,11 @@ namespace Edu.Module.Course
                     }
                 };
                     order_GuestRepository.Update(keyValues, wheres);
-                //如果有效课时与总课时相等代表款已收完，更新佣金为可发放状态
-                if (gmodel.TotalHours <= validClassHours)
-                {
-                    var studentMapping = student_OrderGuestRepository.GetStrOrderGuestListRepository(new RB_Student_OrderGuest_ViewModel()
+                }
+            }
+            //培训/留学订单  直接验证 订单的应收 大于等于实收             
+            if (omodel.PreferPrice - omodel.DiscountMoney <= money && money >0) {
+                var studentMapping = student_OrderGuestRepository.GetList(new RB_Student_OrderGuest_ViewModel()
                 {
                     GuestId = guestId
                 });
@@ -4026,9 +4064,8 @@ namespace Edu.Module.Course
                 {
                     UpdateReturnMoneyStatus(studentMapping.First().Student_Id, gmodel.OrderId);
                 }
-
-                }
             }
+            
             return true;
         }
 

Edu.Repository/User/RB_Student_OrderGuestRepository.cs

@@ -229,6 +229,58 @@ WHERE 1=1
             return GetPage<RB_Student_OrderGuest_ViewModel>(pageIndex, pageSize, out rowsCount, builder.ToString()).ToList();
         }
 
+        /// <summary>
+        /// 获取列表
+        /// </summary>
+        /// <param name="query"></param>
+        /// <returns></returns>
+        public List<RB_Student_OrderGuest_ViewModel> GetList(RB_Student_OrderGuest_ViewModel query)
+        {
+            StringBuilder builder = new StringBuilder();
+            builder.AppendFormat(@" 
+SELECT A.*,IFNULL(C.JoinType,0) AS StuJoinType,IFNULL(D.GuestState,0) AS StuGuestState
+       ,C.OrderState,IFNULL(D.TotalHours,0) AS TotalHours,IFNULL(D.CompleteHours,0) AS CompleteHours,IFNULL(D.RenewState,0) AS RenewState
+FROM RB_Student_OrderGuest AS A 
+     INNER JOIN rb_order AS C  ON A.OrderId=C.OrderId
+	 INNER JOIN rb_order_guest AS D ON A.GuestId=D.Id
+WHERE 1=1 AND C.OrderState<>3 AND D.Status=0
+");
+            builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Student_OrderGuest_ViewModel.Status), (int)DateStateEnum.Normal);
+            if (query != null)
+            {
+                if (query.ClassId > 0)
+                {
+                    builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Student_OrderGuest_ViewModel.ClassId), query.ClassId);
+                }
+                if (query.OrderId > 0)
+                {
+                    builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Student_OrderGuest_ViewModel.OrderId), query.OrderId);
+                }
+                if (!string.IsNullOrEmpty(query.QOrderIds))
+                {
+                    builder.AppendFormat(" AND A.{0} IN({1}) ", nameof(RB_Student_OrderGuest_ViewModel.OrderId), query.QOrderIds);
+                }
+                if (query.GuestId > 0)
+                {
+                    builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Student_OrderGuest_ViewModel.GuestId), query.GuestId);
+                }
+                if (query.Student_Id > 0)
+                {
+                    builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Student_OrderGuest_ViewModel.Student_Id), query.Student_Id);
+                }
+                if (!string.IsNullOrEmpty(query.QStudentIds))
+                {
+                    builder.AppendFormat(" AND A.{0} IN({1}) ", nameof(RB_Student_OrderGuest_ViewModel.Student_Id), query.QStudentIds);
+                }
+
+                if (query.Account_Id > 0)
+                {
+                    builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Student_OrderGuest_ViewModel.Account_Id), query.Account_Id);
+                }
+            }
+            return Get<RB_Student_OrderGuest_ViewModel>(builder.ToString()).ToList();
+        }
+
         /// <summary>
         /// 根据退课编号查询学员信息
         /// </summary>