1

Edu.Module.Customer/CustomerModule.cs

 using Edu.Cache.User;
 using Edu.Common.Enum;
+using Edu.Model.CacheModel;
 using Edu.Model.ViewModel.Customer;
 using Edu.Repository.Customer;
+using Edu.Repository.Log;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using VT.FW.DB;
@@ -17,6 +20,19 @@ namespace Edu.Module.Customer
         /// 同业客户管理仓储层对象
         /// </summary>
         private readonly RB_CustomerRepository customerRepository = new RB_CustomerRepository();
+        /// <summary>
+        /// 同业佣金/幸福存折
+        /// </summary>
+        private readonly RB_Customer_BalanceDetailRepository customer_BalanceDetailRepository = new RB_Customer_BalanceDetailRepository();
+        /// <summary>
+        /// 同业提现
+        /// </summary>
+        private readonly RB_Customer_RemitRepository customer_RemitRepository = new RB_Customer_RemitRepository();
+        /// <summary>
+        /// 用户信息修改日志仓储层对象
+        /// </summary>
+        private readonly RB_User_ChangeLogRepository changeLogRepository = new RB_User_ChangeLogRepository();
+
 
         /// <summary>
         /// 获取客户分页列表..
@@ -65,6 +81,49 @@ namespace Edu.Module.Customer
                     {nameof(RB_Customer_Extend.UpdateTime),model.UpdateTime },
                 };
                 flag = customerRepository.Update(fileds, new WhereHelper(nameof(RB_Customer_Extend.CustomerId), model.CustomerId));
+                if (flag) {
+                    #region 操作记录
+                    string LogContent = "后台修改同业信息：";
+                    var oldModel = customerRepository.GetEntity(model.CustomerId);
+                    if (oldModel.CustomerName != model.CustomerName)
+                    {
+                        LogContent += "名称由'" + oldModel.CustomerName + "'修改为'" + model.CustomerName + "';";
+                    }
+                    if (oldModel.ContactNumber != model.ContactNumber)
+                    {
+                        LogContent += "电话由'" + oldModel.ContactNumber + "'修改为'" + model.ContactNumber + "';";
+                    }
+                    if (oldModel.Address != model.Address)
+                    {
+                        LogContent += "地址由'" + oldModel.Address + "'修改为'" + model.Address + "';";
+                    }
+                    if (oldModel.Sex != model.Sex)
+                    {
+                        LogContent += "性别由'" + (oldModel.Sex == 1 ? "男" : "女") + "'修改为'" + (model.Sex == 1 ? "男" : "女") + "';";
+                    }
+                    if (oldModel.EnterpriseName != model.EnterpriseName)
+                    {
+                        LogContent += "企业/学校名称由'" + oldModel.EnterpriseName + "'修改为'" + model.EnterpriseName + "';";
+                    }
+                    if (oldModel.CustomerType != model.CustomerType)
+                    {
+                        LogContent += "类型由'" + (oldModel.CustomerType == 1 ? "企业" : "学校") + "'修改为'" + (model.CustomerType == 1 ? "企业" : "学校") + "';";
+                    }
+
+                    //记录操作日志
+                    changeLogRepository.Insert(new Model.Entity.Log.RB_User_ChangeLog()
+                    {
+                        Id = 0,
+                        Type = 4,
+                        CreateBy = model.CreateBy,
+                        CreateTime = DateTime.Now,
+                        Group_Id = model.Group_Id,
+                        LogContent = LogContent,
+                        School_Id = 0,
+                        SourceId = model.CustomerId
+                    });
+                    #endregion
+                }
             }
             else
             {
@@ -74,6 +133,20 @@ namespace Edu.Module.Customer
                 var newId = customerRepository.Insert(model);
                 model.CustomerId = newId;
                 flag = newId > 0;
+                if (flag) {
+                    //记录操作日志
+                    changeLogRepository.Insert(new Model.Entity.Log.RB_User_ChangeLog()
+                    {
+                        Id = 0,
+                        Type = 4,
+                        CreateBy = model.CreateBy,
+                        CreateTime = DateTime.Now,
+                        Group_Id = model.Group_Id,
+                        LogContent = "后台录入同业信息",
+                        School_Id = 0,
+                        SourceId = model.CustomerId
+                    });
+                }
             }
             return flag;
         }
@@ -159,5 +232,86 @@ namespace Edu.Module.Customer
             }
             return list;
         }
+
+        /// <summary>
+        /// 获取同业佣金/幸福存折
+        /// </summary>
+        /// <param name="customerId"></param>
+        /// <returns></returns>
+        public object GetCustomerCommissionPassbook(int customerId, int type, int group_Id)
+        {
+            var cmodel = customerRepository.GetEntity(customerId);
+            //获取提现金额
+            decimal RemitMoney = customer_RemitRepository.GetMyWithdrawCommission(customerId, type, group_Id);
+            //获取未结算金额
+            decimal NotSettlementMoney = customer_BalanceDetailRepository.GetMyNoSettlementCommission(customerId, type, group_Id);
+            decimal TotalMoney = cmodel.TotalCommission;
+            decimal SurplusMoney = cmodel.CommissionWithdrawal;
+            if (type == 2) {
+                //幸福存折
+                TotalMoney = cmodel.Client_Balance + RemitMoney;
+                SurplusMoney = cmodel.Client_Balance;
+            }
+
+            return new
+            {
+                TotalMoney,
+                RemitMoney,
+                SurplusMoney,
+                NotSettlementMoney
+            };
+        }
+
+        /// <summary>
+        /// 设置同业转交
+        /// </summary>
+        /// <param name="customerIds"></param>
+        /// <param name="empId"></param>
+        /// <param name="userInfo"></param>
+        /// <returns></returns>
+        public string SetCustomerCareOf(string customerIds, int empId, UserInfo userInfo)
+        {
+            var clist =  customerRepository.GetCustomerListRepository(new RB_Customer_Extend() { Group_Id = userInfo.Group_Id, CustomerIds = customerIds });
+            foreach (var item in clist) {
+                if (item.CreateBy == empId) {
+                    return item.CustomerName + "的原跟进人员与接收人相同，无法转交";
+                }
+            }
+            var empName = UserReidsCache.GetUserLoginInfo(empId)?.AccountName ?? "";
+            foreach (var item in clist) {
+                Dictionary<string, object> keyValues = new Dictionary<string, object>() {
+                    { nameof(RB_Customer_Extend.CreateBy), empId},
+                    { nameof(RB_Customer_Extend.UpdateTime), DateTime.Now},
+                };
+                List<WhereHelper> wheres = new List<WhereHelper>() {
+                    new WhereHelper(){
+                         FiledName = nameof(RB_Customer_Extend.CustomerId),
+                          FiledValue = item.CustomerId,
+                           OperatorEnum =OperatorEnum.Equal
+                    }
+                };
+                bool flag = customerRepository.Update(keyValues, wheres);
+                if (flag)
+                {
+                    string OldName = UserReidsCache.GetUserLoginInfo(item.CreateBy)?.AccountName ?? "";
+                    //记录操作日志
+                    changeLogRepository.Insert(new Model.Entity.Log.RB_User_ChangeLog()
+                    {
+                        Id = 0,
+                        Type = 4,
+                        CreateBy = userInfo.Id,
+                        CreateTime = DateTime.Now,
+                        Group_Id = userInfo.Group_Id,
+                        LogContent = "转交：由" + OldName + "转交给" + empName,
+                        School_Id = 0,
+                        SourceId = item.CustomerId
+                    });
+                }
+                else {
+                    return item.CustomerName + "转交失败，请联系管理员";
+                }
+            }
+            return "";
+        }
     }
 }

Edu.Repository/Customer/RB_Customer_BalanceDetailRepository.cs

@@ -129,5 +129,18 @@ INNER JOIN rb_customer_balancedetail b on o.OrderId = b.OrderId
 WHERE o.Group_Id ={groupId} and o.OrderState =1 and o.OrderSource =9 and o.PayState =1 and b.RebateType =1 and b.BalanceType =1 and b.BalanceState =2 and o.PayDate <='{dateStr} 23:59:59' ";
             return Get<RB_Customer_BalanceDetail_ViewModel>(sql).ToList();
         }
+
+        /// <summary>
+        /// 获取我的未结算佣金
+        /// </summary>
+        /// <param name="customerId"></param>
+        /// <param name="groupId"></param>
+        /// <returns></returns>
+        public decimal GetMyNoSettlementCommission(int customerId, int rebateType, int groupId)
+        {
+            string sql = $@"SELECT SUM(Money) as money FROM rb_customer_balancedetail WHERE Group_Id ={groupId} and RebateType ={rebateType} and CustomerId ={customerId} and BalanceType =1 and BalanceState =2";
+            var Robj = ExecuteScalar(sql);
+            return Robj == null ? 0 : Convert.ToDecimal(Robj);
+        }
     }
 }

Edu.Repository/Customer/RB_Customer_RemitRepository.cs

@@ -98,5 +98,18 @@ WHERE 1=1
             builder.AppendFormat(" order by A.Id desc");
             return Get<RB_Customer_Remit_Extend>(builder.ToString(), parameters).ToList();
         }
+
+        /// <summary>
+        /// 获取我的已提现佣金
+        /// </summary>
+        /// <param name="customerId"></param>
+        /// <param name="groupId"></param>
+        /// <returns></returns>
+        public decimal GetMyWithdrawCommission(int customerId, int type, int groupId)
+        {
+            string sql = $@"SELECT SUM(AppliedMoney) as money FROM rb_customer_remit WHERE GroupId ={groupId} and Type ={type} and CustomerId ={customerId} and AuditStatus <>4";
+            var Robj = ExecuteScalar(sql);
+            return Robj == null ? 0 : Convert.ToDecimal(Robj);
+        }
     }
 }

Edu.Repository/Sell/RB_OrderRepository.cs

@@ -380,6 +380,10 @@ WHERE {where} ORDER BY {orderBy}
 
             }
 
+            if (demodel.CustomerId > 0)
+            {
+                where += $@" and o.{nameof(RB_Order_ViewModel.CustomerId)} ={demodel.CustomerId}";
+            }
             if (demodel.CourseSubject > 0)
             {
                 where += $@" and course.{nameof(RB_Order_ViewModel.CourseSubject)} = {(int)demodel.CourseSubject}";

Edu.WebApi/Controllers/Course/OrderController.cs

@@ -1425,7 +1425,8 @@ namespace Edu.WebApi.Controllers.Course
                 EnterID = base.ParmJObj.GetInt("EnterID"),
                 HelpEnterId = base.ParmJObj.GetInt("HelpEnterId", 0),
                 ClassNo = base.ParmJObj.GetStringValue("ClassNo"),
-                CourseSubject=base.ParmJObj.GetInt("CourseSubject"),
+                CourseSubject = base.ParmJObj.GetInt("CourseSubject"),
+                CustomerId = base.ParmJObj.GetInt("CustomerId", 0)
             };
             demodel.Group_Id = userInfo.Group_Id;
 

Edu.WebApi/Controllers/Customer/B2BCustomerController.cs

@@ -4,16 +4,13 @@ using Edu.Common.Enum.Customer;
 using Edu.Common.Plugin;
 using Edu.Model.ViewModel.Customer;
 using Edu.Module.Customer;
-using Edu.Module.Log;
 using Edu.WebApi.Filter;
 using Microsoft.AspNetCore.Cors;
-using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 using Newtonsoft.Json.Linq;
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Threading.Tasks;
 
 namespace Edu.WebApi.Controllers.Customer
 {
@@ -38,11 +35,6 @@ namespace Edu.WebApi.Controllers.Customer
         /// </summary>
         private readonly CustomerBalanceDetailModule balanceDetailModule = new CustomerBalanceDetailModule();
 
-        /// <summary>
-        /// 同业日志
-        /// </summary>
-        private readonly UserChangeLogModule userChangeLogModule = new UserChangeLogModule();
-
 
         #region 同行管理
 
@@ -442,7 +434,7 @@ namespace Edu.WebApi.Controllers.Customer
             return flag ? ApiResult.Success() : ApiResult.Failed(message: message);
         }
 
-        #region 同行调整
+        #region 同业调整
 
         /// <summary>
         /// 获取同行分页列表
@@ -498,11 +490,40 @@ namespace Edu.WebApi.Controllers.Customer
             var userInfo = base.UserInfo;
             JObject parms = JObject.Parse(base.RequestParm.Msg.ToString());
             int CustomerId = parms.GetInt("CustomerId", 0);//同业ID
+            int Type = parms.GetInt("Type", 1);//类型  1佣金  2幸福存折
             if (CustomerId <= 0) {
                 return ApiResult.ParamIsNull();
             }
 
-            return ApiResult.Success();
+            var RObj = customerModule.GetCustomerCommissionPassbook(CustomerId, Type, userInfo.Group_Id);
+            return ApiResult.Success("", RObj);
+        }
+
+        /// <summary>
+        /// 同行转交
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        public ApiResult SetCustomerCareOf() {
+            var userInfo = base.UserInfo;
+            JObject parms = JObject.Parse(base.RequestParm.Msg.ToString());
+            string CustomerIds = parms.GetStringValue("CustomerIds");//同业IDs
+            int EmpId = parms.GetInt("EmpId", 0);//接收人Id
+            if (string.IsNullOrEmpty(CustomerIds)) {
+                return ApiResult.ParamIsNull("请传递同业ID");
+            }
+            if (EmpId <= 0) {
+                return ApiResult.ParamIsNull("请传递接收人ID");
+            }
+
+            string msg = customerModule.SetCustomerCareOf(CustomerIds, EmpId, userInfo);
+            if (msg == "")
+            {
+                return ApiResult.Success();
+            }
+            else {
+                return ApiResult.Failed(msg);
+            }
         }
 
         #endregion