no message

services/send_company_user.go

@@ -266,16 +266,11 @@ func DotongbuShangHaApi(condition string) (err error) {
 
 		permissionDataListNoChekcStatus, e := models.GetSendCompanyPermissionDataListNoChekcStatus(conditionComapny, pars)
 		if e != nil {
-			err = errors.New("GetSendCompanyPermissionDataList, Err: " + e.Error())
+			err = errors.New("GetSendCompanyPermissionDataListNoChekcStatus, Err: " + e.Error())
 			return
 		}
 		//var IsTryOut int
 		for _, v := range permissionDataListNoChekcStatus {
-			if v.Status == "试用" {
-				IsTryOut = 1
-			} else {
-				IsTryOut = 0
-			}
 			if v.PermissionName == utils.YAN_XUAN_KOU_DIAN_BAO_NAME {
 				v.PermissionName = utils.MAI_FANG_YAN_XUAN_NAME
 			}
@@ -283,7 +278,7 @@ func DotongbuShangHaApi(condition string) (err error) {
 				PermissionName: v.PermissionName,
 				StartTime:      strconv.Itoa(int(v.StartDate.Unix())),
 				EndTime:        strconv.Itoa(int(v.EndDate.Unix())),
-				IsTryOut:       IsTryOut,
+				IsTryOut:       1,
 			})
 		}
 	}
@@ -339,6 +334,7 @@ func DotongbuShangHaApi(condition string) (err error) {
 		return err
 	}
 	mappermissionDataFicc := make(map[int][]*models.PermissionData)
+	mappermissionDataFiccNoChekcStatus := make(map[int][]*models.PermissionData)
 	if len(companyFiccList) > 0 {
 		comapnyIdArr := make([]int, 0)
 		for _, v := range companyFiccList {
@@ -370,6 +366,24 @@ func DotongbuShangHaApi(condition string) (err error) {
 				IsTryOut:       IsTryOut,
 			})
 		}
+
+		permissionDataListNoChekcStatus, e := models.GetSendCompanyPermissionDataListNoChekcStatus(conditionComapny, pars)
+		if e != nil {
+			err = errors.New("GetSendCompanyPermissionDataListNoChekcStatus, Err: " + e.Error())
+			return
+		}
+		//var IsTryOut int
+		for _, v := range permissionDataListNoChekcStatus {
+			if v.PermissionName == utils.YAN_XUAN_KOU_DIAN_BAO_NAME {
+				v.PermissionName = utils.MAI_FANG_YAN_XUAN_NAME
+			}
+			mappermissionDataFiccNoChekcStatus[v.CompanyId] = append(mappermissionDataFiccNoChekcStatus[v.CompanyId], &models.PermissionData{
+				PermissionName: v.PermissionName,
+				StartTime:      strconv.Itoa(int(v.StartDate.Unix())),
+				EndTime:        strconv.Itoa(int(v.EndDate.Unix())),
+				IsTryOut:       1,
+			})
+		}
 	}
 
 	fmt.Println("FICC客户", len(companyFiccList))
@@ -382,6 +396,8 @@ func DotongbuShangHaApi(condition string) (err error) {
 			companyFiccList[k].EndDate = strconv.Itoa(int(companyFiccList[k].EndDateTime.Unix()))
 			if len(mappermissionDataFicc[companyFiccList[k].Cid]) > 0 {
 				companyFiccList[k].PermissionData = mappermissionDataFicc[companyFiccList[k].Cid]
+			} else if len(mappermissionDataFiccNoChekcStatus[companyList[k].Cid]) > 0 {
+				companyFiccList[k].PermissionData = mappermissionDataFiccNoChekcStatus[companyList[k].Cid]
 			}
 			//一次同步一百条
 			companyFiccItems = append(companyFiccItems, companyFiccList[k])