Merge branch 'crm/crm_16.2.3' of http://8.136.199.33:3000/hongze/hz_crm_api into debug

controllers/company_user.go

@@ -333,10 +333,11 @@ func (this *CompanyUserController) AddUser() {
 							userSellerGroupInfoList, err := models.GetUserGroupSellersByUserId(int(mobileOneItem.UserId))
 
 							//根据分组校验
+							sellerNameSlice := make([]string, 0) //销售姓名切片
+							statusNameSlice := make([]string, 0) //客户状态姓名切片
 							if err == nil && len(userSellerGroupInfoList) > 0 {
-								sellerMap := make(map[int]string)    //销售信息map
-								sellerNameSlice := make([]string, 0) //销售姓名切片
-								statusNameSlice := make([]string, 0) //客户状态姓名切片
+								sellerMap := make(map[int]string) //销售信息map
+
 								for _, v := range userSellerGroupInfoList {
 									if v.Status != utils.COMPANY_STATUS_LOSE && v.Status != utils.COMPANY_STATUS_FOREVER && hasMove == true {
 										hasMove = false
@@ -350,6 +351,20 @@ func (this *CompanyUserController) AddUser() {
 								}
 								mobileOneItem.SellerRealName = strings.Join(sellerNameSlice, "/")
 								mobileOneItem.Status = strings.Join(statusNameSlice, "/")
+							} else {
+								//获取客户产品
+								productList, err := company.GetCompanyProductsByCompanyId(mobileOneItem.CompanyId)
+								if err != nil {
+									br.Msg = "获取信息失败"
+									br.ErrMsg = "获取产品信息失败，Err:" + err.Error()
+									return
+								}
+								for _, v := range productList {
+									statusNameSlice = append(statusNameSlice, v.Status)
+									sellerNameSlice = append(sellerNameSlice, v.SellerName)
+								}
+								mobileOneItem.SellerRealName = strings.Join(sellerNameSlice, "/")
+								mobileOneItem.Status = strings.Join(statusNameSlice, "/")
 							}
 						}
 
@@ -365,14 +380,14 @@ func (this *CompanyUserController) AddUser() {
 					}
 				} else {
 					if strings.Contains(mobileOneItem.Status, "/") {
-						if strings.Contains(mobileOneItem.Status, "正式") || strings.Contains(mobileOneItem.Status, "试用") {
+						if strings.Contains(mobileOneItem.Status, "正式") || strings.Contains(mobileOneItem.Status, "试用") || strings.Contains(mobileOneItem.Status, "流失") {
 							mobileOneItem.HasMove = false
 						} else {
 							mobileOneItem.HasMove = true
 						}
 					} else {
 						if mobileOneItem.Status == utils.COMPANY_STATUS_FREEZE || //冻结
-							mobileOneItem.Status == utils.COMPANY_STATUS_LOSE || //流失
+							//mobileOneItem.Status == utils.COMPANY_STATUS_LOSE || //流失
 							mobileOneItem.Status == utils.COMPANY_STATUS_POTENTIAL || //潜在
 							mobileOneItem.Status == utils.COMPANY_STATUS_FOREVER { //永续
 							mobileOneItem.HasMove = true
@@ -440,10 +455,11 @@ func (this *CompanyUserController) AddUser() {
 							userSellerGroupInfoList, err := models.GetUserGroupSellersByUserId(int(emailItem.UserId))
 
 							//根据分组校验
+							sellerNameSlice := make([]string, 0) //销售姓名切片
+							statusNameSlice := make([]string, 0) //客户状态姓名切片
 							if err == nil && len(userSellerGroupInfoList) > 0 {
-								sellerMap := make(map[int]string)    //销售信息map
-								sellerNameSlice := make([]string, 0) //销售姓名切片
-								statusNameSlice := make([]string, 0) //客户状态姓名切片
+								sellerMap := make(map[int]string) //销售信息map
+
 								for _, v := range userSellerGroupInfoList {
 									if v.Status != utils.COMPANY_STATUS_LOSE && v.Status != utils.COMPANY_STATUS_FOREVER && hasMove == true {
 										hasMove = false
@@ -457,6 +473,20 @@ func (this *CompanyUserController) AddUser() {
 								}
 								emailItem.SellerRealName = strings.Join(sellerNameSlice, "/")
 								emailItem.Status = strings.Join(statusNameSlice, "/")
+							} else {
+								//获取客户产品
+								productList, err := company.GetCompanyProductsByCompanyId(emailItem.CompanyId)
+								if err != nil {
+									br.Msg = "获取信息失败"
+									br.ErrMsg = "获取产品信息失败，Err:" + err.Error()
+									return
+								}
+								for _, v := range productList {
+									statusNameSlice = append(statusNameSlice, v.Status)
+									sellerNameSlice = append(sellerNameSlice, v.SellerName)
+								}
+								emailItem.SellerRealName = strings.Join(sellerNameSlice, "/")
+								emailItem.Status = strings.Join(statusNameSlice, "/")
 							}
 						}
 						//是否可移动
@@ -471,14 +501,14 @@ func (this *CompanyUserController) AddUser() {
 					}
 				} else {
 					if strings.Contains(emailItem.Status, "/") {
-						if strings.Contains(emailItem.Status, "正式") || strings.Contains(emailItem.Status, "试用") {
+						if strings.Contains(emailItem.Status, "正式") || strings.Contains(emailItem.Status, "试用") || strings.Contains(emailItem.Status, "流失") {
 							emailItem.HasMove = false
 						} else {
 							emailItem.HasMove = true
 						}
 					} else {
 						if emailItem.Status == utils.COMPANY_STATUS_FREEZE || //冻结
-							emailItem.Status == utils.COMPANY_STATUS_LOSE || //流失
+							//emailItem.Status == utils.COMPANY_STATUS_LOSE || //流失
 							emailItem.Status == utils.COMPANY_STATUS_POTENTIAL || //潜在
 							emailItem.Status == utils.COMPANY_STATUS_FOREVER { //永续
 							emailItem.HasMove = true