fix bug

models/company_approval.go

@@ -0,0 +1,10 @@
+package models
+
+import "rdluck_tools/orm"
+
+func GetCompanyApprovalCount(companyId int) (count int, err error) {
+	sql:=`SELECT COUNT(1) AS count FROM company_approval WHERE company_id=?  AND approve_status='待审批' `
+	o:=orm.NewOrm()
+	err=o.Raw(sql,companyId).QueryRow(&count)
+	return
+}

services/company_product.go

@@ -10,7 +10,7 @@ import (
 //客户自动冻结->试用两个月结束后，进入冻结
 func CompanyFreeze() (err error) {
 	defer func() {
-		if err!=nil {
+		if err != nil {
 			go utils.SendEmail(utils.APPNAME+"【"+utils.RunMode+"】"+"失败提醒", "试用两个月结束后，进入冻结 ErrMsg:"+err.Error(), utils.EmailSendToUsers)
 		}
 	}()
@@ -23,10 +23,17 @@ func CompanyFreeze() (err error) {
 	}
 	for k, v := range items {
 		fmt.Println(k, v.CompanyId)
+		count, err := models.GetCompanyApprovalCount(v.CompanyId)
+		if err != nil {
+			return err
+		}
+		if count > 0 {
+			continue
+		}
 		err = models.CompanyFreeze(v.CompanyId, v.ProductId)
 		if err != nil {
 			utils.FileLog.Info("CompanyFreeze Err:%s" + err.Error())
-			return
+			return err
 		}
 		//新增操作记录
 		{
@@ -43,7 +50,7 @@ func CompanyFreeze() (err error) {
 //客户自动流失->冻结超3个月未处理
 func CompanyLoss() (err error) {
 	defer func() {
-		if err!=nil {
+		if err != nil {
 			go utils.SendEmail(utils.APPNAME+"【"+utils.RunMode+"】"+"失败提醒", "自动流失->冻结超3个月未处理 ErrMsg:"+err.Error(), utils.EmailSendToUsers)
 		}
 	}()
@@ -56,10 +63,17 @@ func CompanyLoss() (err error) {
 	}
 	for k, v := range items {
 		fmt.Println(k, v.CompanyId)
+		count, err := models.GetCompanyApprovalCount(v.CompanyId)
+		if err != nil {
+			return err
+		}
+		if count > 0 {
+			continue
+		}
 		err = models.CompanyLoss(v.CompanyId, v.ProductId)
 		if err != nil {
 			utils.FileLog.Info("CompanyLoss Err:%s" + err.Error())
-			return
+			return err
 		}
 		//新增操作记录
 		{
@@ -76,7 +90,7 @@ func CompanyLoss() (err error) {
 //正式客户自动试用->合同到期未续约转试用
 func CompanyTryOut() (err error) {
 	defer func() {
-		if err!=nil {
+		if err != nil {
 			go utils.SendEmail(utils.APPNAME+"【"+utils.RunMode+"】"+"失败提醒", "正式客户自动试用->合同到期未续约转试用 ErrMsg:"+err.Error(), utils.EmailSendToUsers)
 		}
 	}()
@@ -88,11 +102,18 @@ func CompanyTryOut() (err error) {
 		return
 	}
 	for k, v := range items {
+		count, err := models.GetCompanyApprovalCount(v.CompanyId)
+		if err != nil {
+			return err
+		}
+		if count > 0 {
+			continue
+		}
 		fmt.Println(k, v.CompanyId)
 		err = models.CompanyTryOut(v.CompanyId, v.ProductId)
 		if err != nil {
 			utils.FileLog.Info("CompanyLoss Err:%s" + err.Error())
-			return
+			return err
 		}
 		//新增操作记录
 		{
@@ -180,11 +201,11 @@ func CompanyOldDataSync() {
 		if seller == nil {
 			fmt.Println("销售不存在:", v.SellsId)
 			//return
-		}else{
-			adminId=seller.AdminId
-			sellerRealName=seller.RealName
-			groupId=seller.GroupId
-			departmentId=seller.DepartmentId
+		} else {
+			adminId = seller.AdminId
+			sellerRealName = seller.RealName
+			groupId = seller.GroupId
+			departmentId = seller.DepartmentId
 		}
 		productItem.SellerId = adminId
 		productItem.SellerName = sellerRealName