|
|
|
@@ -75,7 +75,7 @@ public class WxBrandController extends BaseController { |
|
|
|
wxMerchant.setBrand(wxBrand.getId()); |
|
|
|
List<WxMerchant> merchantList = wxMerchantService.findList(wxMerchant); |
|
|
|
if(CollectionUtils.isNotEmpty(merchantList)){ |
|
|
|
return new ResultData(Result.ERROR, "您有未解绑的商户,请先解绑。"); |
|
|
|
return new ResultData(Result.ERROR, "请先删除已绑定该品牌的商户。"); |
|
|
|
} |
|
|
|
} |
|
|
|
wxBrandService.update(wxBrand); |
|
|
|
|