no message

models/send_company_user.go

@@ -140,6 +140,26 @@ func GetSendCompanyPermissionDataList(condition string, pars []interface{}) (ite
 	return
 }
 
+// 不做正式，试用，永续权限的校验
+func GetSendCompanyPermissionDataListNoChekcStatus(condition string, pars []interface{}) (items []*PermissionDataResp, err error) {
+	o := orm.NewOrmUsingDB("weekly_report")
+	sql := ` SELECT
+				company_id,
+				c.permission_name,
+				cp.status,
+				cp.end_date,
+				cp.start_date 
+			FROM
+				company_report_permission AS cp
+				INNER JOIN chart_permission AS c ON cp.chart_permission_id = c.chart_permission_id 
+			WHERE
+				1 = 1
+				AND cp.STATUS  NOT  IN ( '正式', '试用', '永续' )
+				AND c.chart_permission_name IN ( '医药', '消费', '科技', '智造', '策略', '研选扣点包', '专家', '路演服务' ) ` + condition + ` GROUP BY c.permission_name, cp.company_id `
+	_, err = o.Raw(sql, pars).QueryRows(&items)
+	return
+}
+
 // 获取FICC公司
 func GetSendCompanyFiccList(condition string) (items []*CompanyJson, err error) {
 	o := orm.NewOrmUsingDB("weekly_report")

services/send_company_user.go

@@ -231,6 +231,7 @@ func DotongbuShangHaApi(condition string) (err error) {
 		return
 	}
 	mappermissionData := make(map[int][]*models.PermissionData)
+	mappermissionDataNoChekcStatus := make(map[int][]*models.PermissionData)
 	if len(companyList) > 0 {
 		comapnyIdArr := make([]int, 0)
 		for _, v := range companyList {
@@ -262,6 +263,29 @@ func DotongbuShangHaApi(condition string) (err error) {
 				IsTryOut:       IsTryOut,
 			})
 		}
+
+		permissionDataListNoChekcStatus, e := models.GetSendCompanyPermissionDataListNoChekcStatus(conditionComapny, pars)
+		if e != nil {
+			err = errors.New("GetSendCompanyPermissionDataList, 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
+			}
+			mappermissionDataNoChekcStatus[v.CompanyId] = append(mappermissionDataNoChekcStatus[v.CompanyId], &models.PermissionData{
+				PermissionName: v.PermissionName,
+				StartTime:      strconv.Itoa(int(v.StartDate.Unix())),
+				EndTime:        strconv.Itoa(int(v.EndDate.Unix())),
+				IsTryOut:       IsTryOut,
+			})
+		}
 	}
 
 	fmt.Println("权益客户", len(companyList))
@@ -278,6 +302,8 @@ func DotongbuShangHaApi(condition string) (err error) {
 			//一次同步一百条
 			if len(mappermissionData[companyList[k].Cid]) > 0 {
 				companyList[k].PermissionData = mappermissionData[companyList[k].Cid]
+			} else if len(mappermissionDataNoChekcStatus[companyList[k].Cid]) > 0 {
+				companyList[k].PermissionData = mappermissionDataNoChekcStatus[companyList[k].Cid]
 			}
 			companyItems = append(companyItems, companyList[k])
 			if (k+1)%100 == 0 {