diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMerchantController.java b/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMerchantController.java index 9cfd63f38..33c5524f4 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMerchantController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMerchantController.java @@ -217,4 +217,13 @@ public class WxMerchantController extends BaseController { return wxMerchantService.useAccount(wxProfitSharingReceiver); } + @ApiOperation("查看是否存在商户名称相同记录") + @GetMapping("/hasMerchant") + @SystemControllerLog(description = "商户-查看是否存在商户名称相同记录") + public ResultData hasMerchant(@ModelAttribute WxMerchant wxMerchant) { + logger.debug("[" + getIpAddr() + "] WxMerchantController::hasMerchant"); + boolean has = wxMerchantService.hasMerchant(wxMerchant); + return new ResultData(has); + } + } diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxMerchantMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxMerchantMapper.java index 4bf7aeb5c..08c6606d9 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxMerchantMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxMerchantMapper.java @@ -19,4 +19,7 @@ public interface WxMerchantMapper extends CommonMapper { List findQrcodeEmptyList(); List> findBusByFloorId(Map params); + + int hasMerchant(WxMerchant wxMerchant); + } diff --git a/mallinkService/src/main/java/com/iformall/service/WxMerchantService.java b/mallinkService/src/main/java/com/iformall/service/WxMerchantService.java index 8b85b3cf7..dded89db5 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxMerchantService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxMerchantService.java @@ -100,4 +100,6 @@ public interface WxMerchantService { ResultData useAccount(WxProfitSharingReceiver wxProfitSharingReceiver); + boolean hasMerchant(WxMerchant wxMerchant); + } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java index 452902ddf..114b63f23 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java @@ -693,4 +693,10 @@ public class WxMerchantServiceImpl implements WxMerchantService { wxProfitSharingReceiverService.sendMsg(linkPhone, accout, merchantName, null, type, tenantId); return new ResultData(Result.SUCCESS, "操作成功"); } + + @Override + public boolean hasMerchant(WxMerchant wxMerchant) { + wxMerchant.setStatus(EnumMerchantStatus.VALID.getCode()); + return wxMerchantMapper.hasMerchant(wxMerchant) > 0 ? true : false; + } } diff --git a/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml b/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml index ee84e6c08..c21cbdb64 100644 --- a/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml @@ -243,4 +243,12 @@ and m.tenant_id = #{tenantId} group by m.business_id + + +