Merge branch 'feature/customer_1.0' into develop

opms_parent/app/handler/cust/customer.go

@@ -83,6 +83,7 @@ func (c *CustomerHeader) Create(ctx context.Context, req *model.Customer, rsp *c
 		return err
 	}
 	id, err := customerServer.Create(req)
+	
 	var Ids []int64
 	Ids = append(Ids, gconv.Int64(id))
 	_, err, rsp.Code, rsp.Msg = myerrors.CheckError(err)

opms_parent/app/service/cust/cust_customer.go

@@ -135,27 +135,49 @@ func (c *CustomerService) Create(req *model.Customer) (insertId int64, err error
 		err = gerror.New("该客户信息已存在,不可重复添加")
 		return
 	}
-
 	if err = gconv.Struct(req, cusTomer); err != nil {
 		return
 	}
 	service.SetCreatedInfo(cusTomer, c.GetCxtUserId(), c.GetCxtUserName())
 	cusTomer.CustCode = strconv.Itoa(int(gtime.Timestamp()))
+	cusTomer.CustStatus = "10"
+	Roles := c.GetCxtUserRoles()
+	roles := false
+	for _, v := range Roles {
+		if v == "Sales" { // 销售角色
+			roles = true
+		}
+	}
+	// 销售角色
+	if roles {
+		cusTomer.IsPublic = noPublic
+		cusTomer.SalesId = c.GetCxtUserId()
+		cusTomer.SalesName = c.GetCxtUserName()
+		lastId, err := Model.InsertAndGetId(cusTomer)
+		if err != nil && lastId > 0 {
+			belongData := new(model.CustCustomerBelong)
+			service.SetCreatedInfo(belongData, c.GetCxtUserId(), c.GetCxtUserName())
+			belongData.CustId = int(lastId)
+			belongData.SaleName = c.GetCxtUserName()
+			belongData.OpnType = AllocaTion
+			belongData.OpnPeople = c.GetCxtUserName()
+			belongData.OpnDatetime = gtime.Now()
+			_, err := c.BelongDao.InsertAndGetId(belongData)
+			if err != nil {
+				g.Log().Error(err)
+				err = gerror.New("创建失败")
+				
+			}
+		}
 
+	}
 	cusTomer.IsPublic = isPublic
-	cusTomer.CustStatus = "10"
 	res, err := Model.Insert(cusTomer)
 	if err != nil {
 		g.Log().Error(err)
 		err = gerror.New("创建失败")
 		return
 	}
-
-	/**
-	    	CustomerbelongService :=  new(CustomerbelongService)
-	  	    err = CustomerbelongService.Create(req)
-	*/
-
 	insertId, _ = res.LastInsertId()
 	return
 }

opms_parent/app/service/cust/cust_customer_belong.go

@@ -5,7 +5,6 @@ import (
 
 	"github.com/gogf/gf/errors/gerror"
 	"github.com/gogf/gf/frame/g"
-	"github.com/gogf/gf/os/gtime"
 	"github.com/gogf/gf/util/gconv"
 
 	"dashoo.cn/micro/app/dao/cust"
@@ -39,6 +38,7 @@ func (c *CustomerbelongService) GetList(CustId int) (Info []*model.CustomerBelon
 	return
 }
 
+//插入归属销售
 func (c *CustomerbelongService) Create(req *model.AddCustomerBelong) (err error) {
 	Model := c.Dao
 	cusTomerBelong := new(model.CustCustomerBelong)
@@ -47,9 +47,6 @@ func (c *CustomerbelongService) Create(req *model.AddCustomerBelong) (err error)
 		return
 	}
 	service.SetCreatedInfo(cusTomerBelong, c.GetCxtUserId(), c.GetCxtUserName())
-	cusTomerBelong.OpnType = noPublic
-	cusTomerBelong.OpnPeople = c.GetCxtUserName()
-	cusTomerBelong.OpnDatetime = gtime.Now()
 	_, err = Model.Insert(cusTomerBelong)
 	if err != nil {
 		g.Log().Error(err)
@@ -58,33 +55,3 @@ func (c *CustomerbelongService) Create(req *model.AddCustomerBelong) (err error)
 	}
 	return nil
 }
-
-//批量插入客户归属记录表
-//func (c *CustomerbelongService) Create(rep []*model.CustCustomer, req *model.DistriCustomer) (err error) {
-//	belongModel := c.Dao
-//	var belongData []*model.CustCustomerBelong
-//	date_time := gtime.Now()
-//	userName := c.GetCxtUserName()
-//	for _, v := range rep {
-//		orig_sale_name := v.SalesName
-//		belong := new(model.CustCustomerBelong) //map[string]interface{}{}
-//		belong.CustId = v.Id
-//		belong.SaleName = req.SalesName
-//		belong.OrigSaleName = orig_sale_name
-//		belong.OpnType = req.Receive
-//		belong.OpnPeople = userName
-//		belong.CreatedName = userName
-//		belong.OpnDatetime = date_time
-//		belong.Remark = req.Remark
-//		belong.CreatedBy = c.GetCxtUserId()
-//		belongData = append(belongData, belong)
-//	}
-//	_, err = belongModel.Insert(belongData)
-//	g.Log().Info("belong", belongData)
-//	if err != nil {
-//		err = gerror.New("插入失败")
-//		return err
-//	}
-//	return
-//
-//}