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

clueSync/kc.go

@@ -1114,32 +1114,52 @@ func KcSend(orderCode, personName string) {
 		}
 		table := ""
 		orderInfo.DisKcName = personName
-		deptData := Mysql.SelectBySql(`select  b.mail  as  mail from jianyu.entniche_department_user a inner join jianyu.entniche_user b on a.dept_id=? and a.user_id=b.id `, db.KeCheng.DeptId)
+		deptData := Mysql.SelectBySql("select b.mail from jianyu.entniche_department_user a inner join jianyu.entniche_user b on a.dept_id=? and a.user_id=b.id and b.name=? ", db.KeCheng.DeptId, personName)
+		adminData := Mysql.SelectBySql(`	select c.mail   from entniche_department_user  a   INNER JOIN     entniche_user_role b  on  a.dept_id=59005 and  a.user_id = b.user_id and  b.role_id=2  INNER JOIN   entniche_user c  on a.user_id=c.id`)
 		table += fmt.Sprintf(db.KeCheng.Mail.Table, orderInfo.ProductType, orderInfo.CompanyName, orderInfo.UserPhone, orderInfo.UserName, orderInfo.OrderCode, orderInfo.PayMoney, orderInfo.StartEnd, orderInfo.DisKcName, orderInfo.SaleName, tableAppend)
+		adminMailStr := ""
+		if adminData != nil && len(*adminData) > 0 {
+			adminMailStr = gconv.String((*adminData)[0]["mail"])
+		}
 		//发送邮件
-		if deptData != nil && len(*deptData) > 0 && table != "" {
-			mailMap := map[string]bool{}
-			for _, m := range *deptData {
-				mailStr := gconv.String(m["mail"])
-				if mailStr == "" {
-					continue
-				}
-				if _, exists := mailMap[mailStr]; exists {
-					continue
+		if personName == "" {
+			if adminData != nil && len(*adminData) > 0 {
+				//发送给管理员
+				if adminMailStr != "" {
+					gmail := &mail.GmailAuth{
+						SmtpHost: db.Mail.SmtpHost,
+						SmtpPort: db.Mail.SmtpPort,
+						User:     db.Mail.User,
+						Pwd:      db.Mail.Pwd,
+					}
+					status := mail.GSendMail_q("剑鱼标讯", adminMailStr, "", "", db.KeCheng.Title, fmt.Sprintf(db.KeCheng.Mail.Content, table), "", "", gmail)
+					if status {
+						log.Println("客成发邮件 send mail success", table, adminMailStr)
+					}
 				}
-				mailMap[mailStr] = true
+			}
+			return
+		}
+		//当事人  管理员发送
+		if deptData != nil && len(*deptData) > 0 {
+			mailStr := gconv.String((*deptData)[0]["mail"])
+			if mailStr != "" || adminMailStr != "" {
 				gmail := &mail.GmailAuth{
 					SmtpHost: db.Mail.SmtpHost,
 					SmtpPort: db.Mail.SmtpPort,
 					User:     db.Mail.User,
 					Pwd:      db.Mail.Pwd,
 				}
-				status := mail.GSendMail_q("剑鱼标讯", mailStr, "", "", db.KeCheng.Title, fmt.Sprintf(db.KeCheng.Mail.Content, table), "", "", gmail)
+				status := true
+				if mailStr == "" {
+					status = mail.GSendMail_q("剑鱼标讯", adminMailStr, "", "", db.KeCheng.Title, fmt.Sprintf(db.KeCheng.Mail.Content, table), "", "", gmail)
+				} else {
+					status = mail.GSendMail_q("剑鱼标讯", mailStr, adminMailStr, "", db.KeCheng.Title, fmt.Sprintf(db.KeCheng.Mail.Content, table), "", "", gmail)
+				}
 				if status {
-					log.Println("客成发邮件 send mail success", table, mailStr)
+					log.Println("客成发邮件 send mail success", table, mailStr, adminMailStr)
 				}
 			}
-
 		}
 	}
 }