Merge branch 'dev_v1.5.24_wh' of jianyu/datatools into feature/v1.5.24

clueSync/kc.go

@@ -1233,6 +1233,21 @@ func KcOrderFormat(orderCode string, bigmemberService, combo map[int64]string) *
 				product_type += combo[common.Int64All(filterMap["comboId"])]
 			}
 		}
+		//联系人姓名
+		sqlStr := `SELECT
+					a.phone,
+					b.NAME AS bname
+				FROM
+					dwd_f_userbase_contacts a
+					INNER JOIN dwd_f_crm_clue_info b ON (  a.phone =  ? AND a.baseinfo_id = b.uid )
+					LEFT JOIN dwd_f_csm_customer_info c ON ( b.id = c.clue_id)`
+		userName := ""
+		if user_phone != "" {
+			userData := TiDb.SelectBySql(sqlStr, user_phone)
+			if userData != nil && len(*userData) > 0 {
+				userName = gconv.String((*userData)[0]["bname"])
+			}
+		}
 		data = &OrderInfo{
 			Id:          id,
 			CompanyName: common.ObjToString((*orderData)[0]["company_name"]),
@@ -1245,6 +1260,7 @@ func KcOrderFormat(orderCode string, bigmemberService, combo map[int64]string) *
 			StartEnd:    fmt.Sprintf("%s--%s", strings.Split(common.ObjToString((*orderData)[0]["vip_starttime"]), " ")[0], strings.Split(common.ObjToString((*orderData)[0]["vip_endtime"]), " ")[0]),
 			SeriveList:  serviceList,
 			SaleName:    common.ObjToString((*orderData)[0]["create_person"]),
+			UserName:    userName,
 		}
 	}
 	return data