diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/WxBrandController.java b/mallinkAdmin/src/main/java/com/iformall/controller/WxBrandController.java index cdcc08d40..bdf8382a6 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/WxBrandController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/WxBrandController.java @@ -7,6 +7,7 @@ import com.iformall.domain.po.WxBrand; import com.iformall.service.WxBrandService; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; +import io.swagger.annotations.ApiOperation; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -78,5 +79,15 @@ public class WxBrandController extends BaseController { } + @ApiOperation("查询品牌名称是否存在") + @GetMapping("hasBrand") + @ApiImplicitParams({ + @ApiImplicitParam(name = "name", value = "name", dataType = "String", paramType = "query", required = true), + @ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query")}) + public ResultData hasBrand(String name, Long id) { + logger.debug("[" + getIpAddr() + "] WxBrandController::hasBrand"); + return wxBrandService.hasBrand(getTenantId(), name, id); + } + } diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxBrandMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxBrandMapper.java index 2ffab76fa..424ce29d0 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxBrandMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxBrandMapper.java @@ -17,4 +17,6 @@ public interface WxBrandMapper extends CommonMapper { List> queryBrand(String tenantId); + int hasBrand(WxBrand wxBrand); + } diff --git a/mallinkService/src/main/java/com/iformall/service/WxBrandService.java b/mallinkService/src/main/java/com/iformall/service/WxBrandService.java index 357fcdc1c..4173f4447 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxBrandService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxBrandService.java @@ -43,4 +43,7 @@ public interface WxBrandService { ResultData update(WxBrand wxBrand); List> queryBrand(String id); + + ResultData hasBrand(String tenantId, String name, Long id); + } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxBrandServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBrandServiceImpl.java index a852b0ad3..fe457ad52 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBrandServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBrandServiceImpl.java @@ -7,6 +7,7 @@ import com.iformall.common.IdWorker; import com.iformall.common.Result; import com.iformall.common.ResultData; import com.iformall.domain.po.WxBrand; +import com.iformall.domain.po.WxShop; import com.iformall.exception.MallinkException; import com.iformall.mapper.WxBrandMapper; import com.iformall.service.WxBrandService; @@ -86,5 +87,15 @@ public class WxBrandServiceImpl implements WxBrandService { return wxBrandMapper.queryBrand(tenantId); } + @Override + public ResultData hasBrand(String tenantId, String name, Long id) { + WxBrand wxBrand = new WxBrand(); + wxBrand.setTenantId(tenantId); + wxBrand.setName(name); + wxBrand.setId(id); + int count = wxBrandMapper.hasBrand(wxBrand); + return new ResultData(ResultData.SUCCESS, "查询成功", count > 0 ? true : false); + } + } diff --git a/mallinkService/src/main/resources/mapper/WxBrandMapper.xml b/mallinkService/src/main/resources/mapper/WxBrandMapper.xml index c51de0c5a..ed3793844 100644 --- a/mallinkService/src/main/resources/mapper/WxBrandMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxBrandMapper.xml @@ -42,7 +42,12 @@ select id,`name` value from wx_brand where tenant_id=#{value} - +