aa

business/model/dao/store.go

@@ -990,7 +990,7 @@ func GetStoreAuditPage(db *DaoDB, statuss []int, keyword string, applyTimeStart,
 	return pagedInfo, err
 }
 
-func GetBrands(db *DaoDB, name string, brandID int) (brands []*model.Brand, err error) {
+func GetBrands(db *DaoDB, name string, brandID int, poolKey string) (brands []*model.Brand, err error) {
 	sql := `
 		SELECT * 
 		  FROM brand 
@@ -1007,6 +1007,10 @@ func GetBrands(db *DaoDB, name string, brandID int) (brands []*model.Brand, err
 		sql += " AND id = ?"
 		sqlParams = append(sqlParams, brandID)
 	}
+	if poolKey != "" {
+		sql += " AND secret_number_pool_key = ?"
+		sqlParams = append(sqlParams, poolKey)
+	}
 	err = GetRows(db, &brands, sql, sqlParams)
 	return brands, err
 }

business/model/store.go

@@ -22,11 +22,12 @@ const (
 	BrandBillTypeIncome = 1 //收入
 	BrandBillTypeExpend = 2 //支出
 
-	BrandBillFeeTypeSys      = 1 //系统划入
-	BrandBillFeeTypeCharge   = 2 //人工充值
-	BrandBillFeeTypeSms      = 3 //短信费用
-	BrandBillFeeTypeVoice    = 4 //语音费用
-	BrandBillFeeTypeDelivery = 5 //三方配送费
+	BrandBillFeeTypeSys          = 1 //系统划入
+	BrandBillFeeTypeCharge       = 2 //人工充值
+	BrandBillFeeTypeSms          = 3 //短信费用
+	BrandBillFeeTypeVoice        = 4 //语音费用
+	BrandBillFeeTypeDelivery     = 5 //三方配送费
+	BrandBillFeeTypeSecretNumber = 6 //隐私号电话
 
 	BrandOpenMTPS  = 1  //品牌开关标志, 美团配送
 	BrandOpenDaDa  = 2  //达达