fix bug

controllers/overseas_custom/custom.go

@@ -502,7 +502,7 @@ func (this *OverseasCustomController) CustomLabelStatistics() {
 	var condition string
 	var pars []interface{}
 
-	condition += " AND m.company_status = '试用' AND m.overseas_status='' "
+	condition += " AND m.overseas_status='试用' "
 	if keywords != "" {
 		k := "%" + keywords + "%"
 		enCompanyIds, e := models.GetEnCompanyIdsByKeyword(k)

models/overseas_custom/overseas_custom_seller.go

@@ -1,7 +1,6 @@
 package overseas_custom
 
 import (
-	"context"
 	"fmt"
 	"github.com/beego/beego/v2/client/orm"
 	"hongze/hz_crm_api/models/company"
@@ -109,14 +108,10 @@ func (m *OverseasCustomerSale) HandelCompanyStatus(sellerId int) (err error) {
 	}
 
 	o := orm.NewOrm()
-	tx, err := o.BeginWithCtx(context.TODO())
-	if err != nil {
-		return err
-	}
 	enCompanyList := make([]*EnglishCompany, 0)
 	sql := ` SELECT * FROM %s.english_company WHERE seller_id=? AND is_deleted=0 `
 	sql = fmt.Sprintf(sql, databaseName)
-	_, err = tx.Raw(sql, sellerId).QueryRows(&enCompanyList)
+	_, err = o.Raw(sql, sellerId).QueryRows(&enCompanyList)
 	if err != nil {
 		return err
 	}
@@ -134,7 +129,7 @@ func (m *OverseasCustomerSale) HandelCompanyStatus(sellerId int) (err error) {
 			}
 			sql = ` UPDATE %s.english_company SET overseas_status=?,reset_btn=? WHERE company_id=? `
 			sql = fmt.Sprintf(sql, databaseName)
-			_, err = tx.Raw(sql, overseasStatus, resetBtn, v.CompanyId).Exec()
+			_, err = o.Raw(sql, overseasStatus, resetBtn, v.CompanyId).Exec()
 			if err != nil {
 				return err
 			}
@@ -143,7 +138,7 @@ func (m *OverseasCustomerSale) HandelCompanyStatus(sellerId int) (err error) {
 
 	companyList := make([]*company.CompanyProduct, 0)
 	sql = ` SELECT * FROM company_product WHERE seller_id=? `
-	_, err = tx.Raw(sql, sellerId).QueryRows(&companyList)
+	_, err = o.Raw(sql, sellerId).QueryRows(&companyList)
 	if err != nil {
 		return err
 	}
@@ -163,7 +158,7 @@ func (m *OverseasCustomerSale) HandelCompanyStatus(sellerId int) (err error) {
 				resetBtn = 0
 			}
 			sql = ` UPDATE company SET overseas_status=?,reset_btn=? WHERE company_id=? `
-			_, err = tx.Raw(sql, overseasStatus, resetBtn, v.CompanyId).Exec()
+			_, err = o.Raw(sql, overseasStatus, resetBtn, v.CompanyId).Exec()
 			if err != nil {
 				return err
 			}