|
|
@@ -76,7 +76,7 @@ func WorkDataHandle(company, phone, demand, name, product string, acceptanceData
|
|
|
if cluename == "" {
|
|
|
cluename = phone //没有线索名，手机号代替
|
|
|
}
|
|
|
- ok, data, saleData := false, map[string]interface{}{}, []map[string]interface{}{}
|
|
|
+ ok, data, saleData, isNewScore := false, map[string]interface{}{}, []map[string]interface{}{}, false
|
|
|
isGroup, isCommerce := GetCompanyType(cluename, uId)
|
|
|
uCount, _ := TiDb.FindOne("dwd_f_crm_clue_info", map[string]interface{}{"uid": uId}, "", ""), true //查当前线索是否已存在
|
|
|
if uCount != nil && len(*uCount) > 0 {
|
|
|
@@ -120,6 +120,7 @@ func WorkDataHandle(company, phone, demand, name, product string, acceptanceData
|
|
|
log.Println("工单分配程序：", positionId)
|
|
|
if positionId == 0 {
|
|
|
//线索变更
|
|
|
+ isNewScore = true
|
|
|
ok, data, saleData = FindPosition(0, "", gconv.String(acceptanceData["creator_time"]))
|
|
|
if !ok {
|
|
|
log.Println(positionId, "用户查询失败")
|
|
|
@@ -147,14 +148,16 @@ func WorkDataHandle(company, phone, demand, name, product string, acceptanceData
|
|
|
if !ok {
|
|
|
return false
|
|
|
}
|
|
|
+ isNewScore = true
|
|
|
SaveClue("", "", uId, "5", "169", "新增线索", "主动咨询客服留资客户", cluename, name, gconv.String(data["name"]), phone, "", "", "", "", "", "", gconv.String(data["seat_number"]), gconv.Int64(data["position_id"]), "", "", "", []string{}, "", isGroup, isCommerce, false, demand)
|
|
|
}
|
|
|
//工单生成
|
|
|
- ok1 := AddOrderWork(acceptanceData, data, product, phone, company)
|
|
|
+ ok1 := AddOrderWork(acceptanceData, data, product, phone, company, isNewScore)
|
|
|
log.Println("工单创建", ok1, gconv.String(acceptanceData["acceptance_no"]))
|
|
|
return true
|
|
|
}
|
|
|
-func AddOrderWork(acceptanceData map[string]interface{}, userData map[string]interface{}, product, phone, company string) bool {
|
|
|
+func AddOrderWork(acceptanceData map[string]interface{}, userData map[string]interface{}, product, phone, company string, isNewScore bool) bool {
|
|
|
+ time.Sleep(time.Second * 1)
|
|
|
nowTime := time.Now().Format(date.Date_Full_Layout)
|
|
|
work_order_no := fmt.Sprintf("GD%s%s", time.Now().Format(date.Date_yyyyMMdd), FindNumber("gd"))
|
|
|
productArr := []string{}
|
|
|
@@ -229,6 +232,20 @@ func AddOrderWork(acceptanceData map[string]interface{}, userData map[string]int
|
|
|
"update_time": common.If(gconv.Int64(userData["orderStatus"]) == 0, nowTime, nil),
|
|
|
}
|
|
|
WorkOrder.Insert("approval_record", approvalRecordMap)
|
|
|
+ //工单分配记录添加
|
|
|
+ if isNewScore {
|
|
|
+ orderWorkAllocationRecord := map[string]interface{}{
|
|
|
+ "person_name": userData["name"],
|
|
|
+ "position_id": userData["position_id"],
|
|
|
+ "dept_name": personMap["deptName"],
|
|
|
+ "dept_id": personMap["deptId"],
|
|
|
+ "work_order_no": work_order_no,
|
|
|
+ "create_time": nowTime,
|
|
|
+ "company_dept_numb": common.If(gconv.String(personMap["deptName"]) == "销售三部", 3, 1),
|
|
|
+ "whee_time": cfg.AllocationTime,
|
|
|
+ }
|
|
|
+ WorkOrder.Insert("order_work_allocation_record", orderWorkAllocationRecord)
|
|
|
+ }
|
|
|
WorkMail(personMap,
|
|
|
strings.Join(productArr, ","),
|
|
|
gconv.Int64(common.If(gconv.Int64(userData["orderStatus"]) == 0, 2, 1)),
|
|
|
@@ -323,8 +340,13 @@ func FindNumber(moudle string) string {
|
|
|
}
|
|
|
|
|
|
// 人员查询
|
|
|
+<<<<<<< HEAD
|
|
|
func GetAllocation(proportion1, proportion3 float64, deptCount1, deptCount3 int64, administrators1, administrators3 map[string]interface{}, creatorTime string) map[string]interface{} {
|
|
|
|
|
|
+=======
|
|
|
+func GetAllocation(proportion1, proportion3 float64, deptCount1, deptCount3 int64, administrators1, administrators3 map[string]interface{}) map[string]interface{} {
|
|
|
+ log.Println("分配比例查询", cfg.AllocationTime, cfg.AllocationRatio, proportion1, proportion3, deptCount1, deptCount3)
|
|
|
+>>>>>>> master
|
|
|
if deptCount1 == 0 {
|
|
|
return administrators1
|
|
|
}
|
|
|
@@ -336,7 +358,7 @@ func GetAllocation(proportion1, proportion3 float64, deptCount1, deptCount3 int6
|
|
|
if cfg.AllocationRatio == 0 {
|
|
|
//重新计算
|
|
|
cfg.AllocationRatio = math.Round(proportion1 / proportion3)
|
|
|
- cfg.AllocationTime = creatorTime
|
|
|
+ cfg.AllocationTime = time.Now().Format(date.Date_Full_Layout)
|
|
|
common.WriteSysConfig(&cfg)
|
|
|
log.Println("新增计算比例", cfg.AllocationRatio)
|
|
|
return administrators1
|
|
|
@@ -344,7 +366,7 @@ func GetAllocation(proportion1, proportion3 float64, deptCount1, deptCount3 int6
|
|
|
if nowAllocationRatio == cfg.AllocationRatio {
|
|
|
//重新计算
|
|
|
cfg.AllocationRatio = math.Round(proportion1 / proportion3)
|
|
|
- cfg.AllocationTime = creatorTime
|
|
|
+ cfg.AllocationTime = time.Now().Format(date.Date_Full_Layout)
|
|
|
common.WriteSysConfig(&cfg)
|
|
|
return administrators1
|
|
|
}
|
|
|
@@ -459,37 +481,18 @@ FROM
|
|
|
}
|
|
|
//按照比例分配选择一部还是三部
|
|
|
//一部查询
|
|
|
- deptCount1 := CalculateProportion(deptNameMap1)
|
|
|
+ deptCount1 := CalculateProportion(1)
|
|
|
//三部查询
|
|
|
- deptCount3 := CalculateProportion(deptNameMap3)
|
|
|
- return true, GetAllocation(proportion1, proportion3, deptCount1, deptCount3, administrators1, administrators3, creatorTime), allData
|
|
|
- log.Println("电销信息获取失败", positionId)
|
|
|
- return false, map[string]interface{}{}, allData
|
|
|
+ deptCount3 := CalculateProportion(3)
|
|
|
+ return true, GetAllocation(proportion1, proportion3, deptCount1, deptCount3, administrators1, administrators3), allData
|
|
|
}
|
|
|
|
|
|
-func CalculateProportion(deptNameMap map[string]interface{}) int64 {
|
|
|
- deptNameStr := ""
|
|
|
- for k := range deptNameMap {
|
|
|
- if deptNameStr == "" {
|
|
|
- deptNameStr = k
|
|
|
- } else {
|
|
|
- deptNameStr = fmt.Sprintf("%s,%s", deptNameStr, k)
|
|
|
- }
|
|
|
- }
|
|
|
- if deptNameStr == "" {
|
|
|
- return int64(0)
|
|
|
- }
|
|
|
- count := int64(0)
|
|
|
- sql := fmt.Sprintf(`SELECT
|
|
|
+func CalculateProportion(deptNumb int64) int64 {
|
|
|
+ data := WorkOrder.SelectBySql(`SELECT
|
|
|
sum(1) as count
|
|
|
FROM
|
|
|
- order_work a
|
|
|
- INNER JOIN approval_record b ON a.creator_time >= "%s"
|
|
|
- AND FIND_IN_SET( a.department_no , "%s")
|
|
|
- AND a.work_order_no = b.work_order_no
|
|
|
- and (b.new_status!= 1 or b.new_status is null )
|
|
|
- `, cfg.AllocationTime, deptNameStr)
|
|
|
- data := WorkOrder.SelectBySql(sql)
|
|
|
+ order_work_allocation_record where create_time >? and company_dept_numb=? `, cfg.AllocationTime, deptNumb)
|
|
|
+ count := int64(0)
|
|
|
if data != nil && len(*data) > 0 {
|
|
|
count = gconv.Int64((*data)[0]["count"])
|
|
|
}
|
|
|
@@ -753,7 +756,7 @@ func userbase() {
|
|
|
INNER JOIN dwd_f_userbase_baseinfo b ON
|
|
|
b.status= 1
|
|
|
and (b.s_platform != 'xcx' or b.s_sourceid='jyzbw' or b.s_platform is NULL)
|
|
|
- AND a.phone = b.phone and a.baseinfo_id= b.uid and a.source ="0101"
|
|
|
+ AND a.phone = b.phone and a.baseinfo_id= b.uid and b.source ="0101"
|
|
|
and a.phone is not NULL
|
|
|
and a.createtime >="%s"
|
|
|
and a.createtime <"%s"
|
