Merge branch 'master' of http://8.136.199.33:3000/hongze/hz_crm_api into crm/crm_15.4

controllers/company_share.go

@@ -407,9 +407,9 @@ func (this *CompanyController) CompanyShareList() {
 		itemStatus := item.Status
 		if itemStatus != "" {
 			if !strings.Contains(item.Status, "/") {
-				if itemStatus == utils.COMPANY_STATUS_FOREVER { //永续
+				if strings.Contains(itemStatus, utils.COMPANY_STATUS_FOREVER) { //永续
 					expireDay = "-"
-				} else if itemStatus == utils.COMPANY_STATUS_TRY_OUT || itemStatus == utils.COMPANY_STATUS_FORMAL { //试用/正式
+				} else if strings.Contains(itemStatus, utils.COMPANY_STATUS_TRY_OUT) || strings.Contains(itemStatus, utils.COMPANY_STATUS_FORMAL) { //试用/正式
 					if item.StartDate != "" && item.EndDate != "" {
 						endDateTime, _ := time.Parse(utils.FormatDate, item.EndDate)
 						endDateTime = endDateTime.AddDate(0, 0, 1)
@@ -421,9 +421,9 @@ func (this *CompanyController) CompanyShareList() {
 					} else {
 						expireDay = "-"
 					}
-				} else if itemStatus == utils.COMPANY_STATUS_LOSE {
+				} else if strings.Contains(itemStatus, utils.COMPANY_STATUS_LOSE) {
 					expireDay = "-"
-				} else if itemStatus == utils.COMPANY_STATUS_FREEZE {
+				} else if strings.Contains(itemStatus, utils.COMPANY_STATUS_FREEZE) {
 					if item.StartDate != "" && item.EndDate != "" {
 						endDateTime, _ := time.Parse(utils.FormatDate, item.EndDate)
 						endDateTime = endDateTime.AddDate(0, 0, 0)
@@ -452,9 +452,9 @@ func (this *CompanyController) CompanyShareList() {
 						ficcEndDate = endDateArr[0]
 						tryEndDate = endDateArr[1]
 					}
-					if ficcStatus == utils.COMPANY_STATUS_FOREVER { //永续
+					if strings.Contains(ficcStatus, utils.COMPANY_STATUS_FOREVER) { //永续
 						ficcExpireDay = "-"
-					} else if ficcStatus == utils.COMPANY_STATUS_TRY_OUT || ficcStatus == utils.COMPANY_STATUS_FORMAL { //试用/正式
+					} else if strings.Contains(ficcStatus, utils.COMPANY_STATUS_X_CLASS_TRY_OUT) || strings.Contains(ficcStatus, utils.COMPANY_STATUS_FORMAL) { //试用/正式
 						if ficcEndDate != "" {
 							endDateTime, _ := time.Parse(utils.FormatDate, ficcEndDate)
 							endDateTime = endDateTime.AddDate(0, 0, 1)
@@ -466,9 +466,9 @@ func (this *CompanyController) CompanyShareList() {
 						} else {
 							ficcExpireDay = "-"
 						}
-					} else if ficcStatus == utils.COMPANY_STATUS_LOSE { //流失
+					} else if strings.Contains(ficcStatus, utils.COMPANY_STATUS_LOSE) { //流失
 						ficcExpireDay = "-"
-					} else if ficcStatus == utils.COMPANY_STATUS_FREEZE { //冻结
+					} else if strings.Contains(ficcStatus, utils.COMPANY_STATUS_FREEZE) { //冻结
 						if item.StartDate != "" && item.EndDate != "" {
 							endDateTime, _ := time.Parse(utils.FormatDate, ficcEndDate)
 							endDateTime = endDateTime.AddDate(0, 0, 0)
@@ -484,9 +484,9 @@ func (this *CompanyController) CompanyShareList() {
 						ficcExpireDay = "-"
 					}
 
-					if raiStatus == utils.COMPANY_STATUS_FOREVER { //永续
+					if strings.Contains(raiStatus, utils.COMPANY_STATUS_FOREVER) { //永续
 						tryExpireDay = "-"
-					} else if raiStatus == utils.COMPANY_STATUS_TRY_OUT || raiStatus == utils.COMPANY_STATUS_FORMAL { //试用/正式
+					} else if strings.Contains(raiStatus, utils.COMPANY_STATUS_X_CLASS_TRY_OUT) || strings.Contains(raiStatus, utils.COMPANY_STATUS_FORMAL) { //试用/正式
 						if tryEndDate != "" {
 							endDateTime, _ := time.Parse(utils.FormatDate, tryEndDate)
 							endDateTime = endDateTime.AddDate(0, 0, 1)
@@ -498,9 +498,9 @@ func (this *CompanyController) CompanyShareList() {
 						} else {
 							tryExpireDay = "-"
 						}
-					} else if raiStatus == utils.COMPANY_STATUS_LOSE { //流失
+					} else if strings.Contains(raiStatus, utils.COMPANY_STATUS_LOSE) { //流失
 						tryExpireDay = "-"
-					} else if raiStatus == utils.COMPANY_STATUS_FREEZE { //冻结
+					} else if strings.Contains(raiStatus, utils.COMPANY_STATUS_FREEZE) { //冻结
 						if item.StartDate != "" && item.EndDate != "" {
 							endDateTime, _ := time.Parse(utils.FormatDate, tryEndDate)
 							endDateTime = endDateTime.AddDate(0, 0, 0)
@@ -533,7 +533,7 @@ func (this *CompanyController) CompanyShareList() {
 		}
 		list[i].BtnItem = btnItem
 
-		if item.FreezeStartDate != "" && item.FreezeEndDate != "" && item.Status == utils.COMPANY_STATUS_FREEZE {
+		if item.FreezeStartDate != "" && item.FreezeEndDate != "" && strings.Contains(item.Status, utils.COMPANY_STATUS_FREEZE) {
 			freezeEndDate, _ := time.Parse(utils.FormatDate, item.FreezeEndDate)
 			if time.Now().Before(freezeEndDate) {
 				expireDays := freezeEndDate.Sub(time.Now()).Hours() / 24

controllers/company_user.go

@@ -109,7 +109,6 @@ func (this *CompanyUserController) AddUser() {
 		}
 	}
 
-
 	//权益类客户，邮箱必填（2021-03-22 13:32:59修改）
 	if productId == 1 || regionType == "国内" { //ficc类客户
 		if req.MobileOne == "" && req.Email == "" {
@@ -3194,7 +3193,8 @@ func (this *CompanyUserController) ViewReportList() {
 			} else {
 				lastViewTimeT = time.Now()
 			}
-			lastViewTime = lastViewTimeT.Format(utils.FormatDateTime)
+			// 默认要把最新的记录列出来，所以往后加1s
+			lastViewTime = lastViewTimeT.Add(1 * time.Second).Format(utils.FormatDateTime)
 		}
 	// 权益
 	case 2: // ficc
@@ -3208,7 +3208,8 @@ func (this *CompanyUserController) ViewReportList() {
 			} else {
 				lastViewTimeT = time.Now()
 			}
-			lastViewTime = lastViewTimeT.Format(utils.FormatDateTime)
+			// 默认要把最新的记录列出来，所以往后加1s
+			lastViewTime = lastViewTimeT.Add(1 * time.Second).Format(utils.FormatDateTime)
 		}
 	default:
 		if lastViewTimeT.IsZero() {
@@ -3378,7 +3379,18 @@ func (this *CompanyUserController) ViewReportList() {
 	for _, v := range recordList {
 		tmpKey := fmt.Sprint(v.Source, "_", v.ReportId)
 		if tmpInfo, ok := viewReportMap[tmpKey]; ok {
-			list = append(list, &tmpInfo)
+			stopTime := `--`
+			if v.StopTime > 0 {
+				stopTime = fmt.Sprint(v.StopTime)
+			}
+			list = append(list, &company.ViewReportList{
+				ResearchReportName: tmpInfo.ResearchReportName,
+				ReportType:         tmpInfo.ReportType,
+				CreatedTime:        v.CreateTime,
+				TxtType:            tmpInfo.TxtType,
+				MatchTypeName:      tmpInfo.MatchTypeName,
+				StopTime:           stopTime,
+			})
 		}
 	}
 

controllers/user_login.go

@@ -143,7 +143,7 @@ func (this *UserLoginController) GetVerifyCode() {
 			br.Msg = "请输入手机号"
 			return
 		}
-		if req.TelAreaCode == "86" && !utils.ValidateMobileFormatat(req.Mobile) {
+		if req.TelAreaCode == utils.TelAreaCodeHome && !utils.ValidateMobileFormatat(req.Mobile) {
 			br.Msg = "您的手机号输入有误, 请检查"
 			return
 		}
@@ -250,12 +250,13 @@ func (this *UserLoginController) Login() {
 
 	// 入参
 	type UserLoginReq struct {
-		LoginType  int    `description:"登录方式: 1-账号; 2-手机号; 3-邮箱"`
-		Username   string `description:"账号"`
-		Password   string `description:"密码"`
-		Mobile     string `description:"手机号"`
-		Email      string `description:"邮箱"`
-		VerifyCode string `description:"验证码"`
+		LoginType   int    `description:"登录方式: 1-账号; 2-手机号; 3-邮箱"`
+		Username    string `description:"账号"`
+		Password    string `description:"密码"`
+		Mobile      string `description:"手机号"`
+		Email       string `description:"邮箱"`
+		VerifyCode  string `description:"验证码"`
+		TelAreaCode string `description:"区号"`
 	}
 	var req UserLoginReq
 	err := json.Unmarshal(this.Ctx.Input.RequestBody, &req)
@@ -266,19 +267,7 @@ func (this *UserLoginController) Login() {
 	}
 	req.Username = strings.TrimSpace(req.Username)
 	req.Mobile = strings.TrimSpace(req.Mobile)
-	if req.Mobile != "" {
-		if !utils.ValidateMobileFormatat(req.Mobile) {
-			br.Msg = "您的手机号输入有误, 请检查"
-			return
-		}
-	}
 	req.Email = strings.TrimSpace(req.Email)
-	if req.Email != "" {
-		if !utils.ValidateEmailFormatat(req.Email) {
-			br.Msg = "您的邮箱输入有误, 请检查"
-			return
-		}
-	}
 	req.VerifyCode = strings.TrimSpace(req.VerifyCode)
 	if req.LoginType != 1 && req.LoginType != 2 && req.LoginType != 3 {
 		br.Msg = "登录方式有误"
@@ -367,7 +356,7 @@ func (this *UserLoginController) Login() {
 			br.Msg = "请输入手机号"
 			return
 		}
-		if !utils.ValidateMobileFormatat(req.Mobile) {
+		if req.TelAreaCode == utils.TelAreaCodeHome && !utils.ValidateMobileFormatat(req.Mobile) {
 			br.Msg = "您的手机号输入有误, 请检查"
 			return
 		}
@@ -466,7 +455,7 @@ func (this *UserLoginController) Login() {
 	account := utils.MD5(sysUser.AdminName)
 	token := utils.GenToken(account)
 	sysSession := new(system.SysSession)
-	sysSession.UserName = req.Username
+	sysSession.UserName = sysUser.AdminName
 	sysSession.SysUserId = sysUser.AdminId
 	sysSession.ExpiredTime = time.Now().AddDate(0, 0, 90)
 	sysSession.IsRemember = 0 // 均需要做过期校验
@@ -647,11 +636,12 @@ func (this *UserLoginController) ForgetCodeVerify() {
 	}()
 
 	type ForgetCodeVerifyReq struct {
-		FindType   int    `description:"密码找回方式: 1-手机号; 2-邮箱"`
-		VerifyCode string `description:"验证码"`
-		UserName   string `description:"用户名"`
-		Mobile     string `description:"手机号"`
-		Email      string `description:"邮箱"`
+		FindType    int    `description:"密码找回方式: 1-手机号; 2-邮箱"`
+		VerifyCode  string `description:"验证码"`
+		UserName    string `description:"用户名"`
+		Mobile      string `description:"手机号"`
+		Email       string `description:"邮箱"`
+		TelAreaCode string `description:"区号"`
 	}
 	var req ForgetCodeVerifyReq
 	err := json.Unmarshal(this.Ctx.Input.RequestBody, &req)
@@ -678,7 +668,7 @@ func (this *UserLoginController) ForgetCodeVerify() {
 			br.Msg = "请输入手机号"
 			return
 		}
-		if !utils.ValidateMobileFormatat(req.Mobile) {
+		if req.TelAreaCode == utils.TelAreaCodeHome && !utils.ValidateMobileFormatat(req.Mobile) {
 			br.Msg = "您的手机号输入有误, 请检查"
 			return
 		}

services/statistic_report/company.go

@@ -108,9 +108,9 @@ func CompanyList(sysUser *system.Admin, req statisticModels.IncrementalCompanyLi
 				sortStr = " ORDER BY sort_todo_end_time asc, b.view_total desc, a.created_time desc"
 			}
 		} else if sortParam == "sellerName" {
-			sortStr = " ORDER BY b.seller_name "
+			sortStr = " ORDER BY CONVERT( b.seller_name USING gbk ) COLLATE gbk_chinese_ci "
 		} else if sortParam == "shareSellerName" {
-			sortStr = " ORDER BY b.share_seller "
+			sortStr = " ORDER BY CONVERT( b.share_seller USING gbk ) COLLATE gbk_chinese_ci "
 		} else if sortParam == "status" {
 			sortStr = " ORDER BY b.status "
 		}  else if sortParam == "serviceYears" {

utils/constants.go

@@ -580,3 +580,7 @@ func GetWeeklyDatabase() (databaseName string) {
 const (
 	EnCompanyIdStep = 10000000
 )
+
+const (
+	TelAreaCodeHome = "86" // 大陆区号
+)