aa

business/jxstore/cms/store.go

@@ -4057,8 +4057,23 @@ func GetDiffJxStoreAndMTWMStoreInfo(ctx *jxcontext.Context, storeIDs []int) (err
 	return err
 }
 
-func GetBrands(ctx *jxcontext.Context, name string, brandID int) (brands []*model.Brand, err error) {
+type GetBrandsResult struct {
-	return dao.GetBrands(dao.GetDB(), name, brandID)
+	*model.Brand
+	Balance int `json:"balance"`
+}
+
+func GetBrands(ctx *jxcontext.Context, name string, brandID int) (getBrandsResult []*GetBrandsResult, err error) {
+	brands, _ := dao.GetBrands(dao.GetDB(), name, brandID)
+	for _, v := range brands {
+		balance, _ := partner.CurStoreAcctManager.GetBrandBalance(v.ID)
+		result := &GetBrandsResult{
+			Brand:   v,
+			Balance: balance,
+		}
+		getBrandsResult = append(getBrandsResult, result)
+	}
+	return getBrandsResult, err
+
 }
 
 func AddBrand(ctx *jxcontext.Context, brand *model.Brand) (err error) {
@@ -4085,6 +4100,12 @@ func UpdateBrand(ctx *jxcontext.Context, payload map[string]interface{}, isDel b
 		brand.DeletedAt = time.Now()
 		brand.LastOperator = ctx.GetUserName()
 		dao.UpdateEntity(db, brand, "DeletedAt", "LastOperator")
+		//品牌下的用户也删了
+		if brandUsers, _ := dao.GetBrandUser(db, brand.ID, ""); len(brandUsers) > 0 {
+			for _, v := range brandUsers {
+				UpdateBrandUser(ctx, v.BrandID, v.UserID, true)
+			}
+		}
 	} else {
 		valid := dao.StrictMakeMapByStructObject(payload, brand, ctx.GetUserName())
 		if len(valid) > 0 {