diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java b/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java index e0ef03db0..725be33e6 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java @@ -5,17 +5,14 @@ import com.iformall.common.ErrorCode; import com.iformall.common.Result; import com.iformall.common.ResultData; import com.iformall.controller.base.BaseController; -import com.iformall.domain.po.MallUserInfo; -import com.iformall.domain.po.WxBillRent; -import com.iformall.domain.po.WxPayAccountBill; -import com.iformall.domain.po.WxRentContract; +import com.iformall.domain.po.*; import com.iformall.enums.EnumFromType; import com.iformall.enums.EnumRentStartType; import com.iformall.mapper.WxRentContractMapper; import com.iformall.service.WxBillRentService; +import com.iformall.service.WxMerchantService; import com.iformall.service.WxPayAccountBillService; import com.iformall.service.WxRentContractService; -import com.iformall.service.WxShopService; import com.iformall.utils.DateUtils; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; @@ -47,7 +44,7 @@ public class WxRentContractController extends BaseController { @Autowired private WxPayAccountBillService payAccountBillService; @Autowired - private WxShopService wxShopService; + private WxMerchantService wxMerchantService; @Autowired private WxRentContractMapper wxRentContractMapper; @@ -85,6 +82,13 @@ public class WxRentContractController extends BaseController { public ResultData add(@RequestBody WxRentContract wxRentContract) { logger.debug("[" + getIpAddr() + "] WxRentContractController::add"); + WxMerchant wxMerchant = new WxMerchant(); + wxMerchant.setName(wxRentContract.getMerchantName()); + wxMerchant.setId(wxRentContract.getMerchantId()); + if (wxMerchantService.hasMerchant(wxMerchant)) { + return new ResultData(ErrorCode.MERCHANT_NAME_IS_FOUND); + } + MallUserInfo user = getUser(); wxRentContract.setTenantId(user.getTenantId()); wxRentContract.setAdjustPeriodHandle(); diff --git a/mallinkService/src/main/java/com/iformall/common/ErrorCode.java b/mallinkService/src/main/java/com/iformall/common/ErrorCode.java index 29980d013..92f62bf62 100644 --- a/mallinkService/src/main/java/com/iformall/common/ErrorCode.java +++ b/mallinkService/src/main/java/com/iformall/common/ErrorCode.java @@ -86,7 +86,7 @@ public enum ErrorCode{ MERCHANT_INFO_NOT_EQUAL(2012, "商户信息不对应"), MERCHANT_INFO_NOT_VALID(2013, "商户信息禁用"), MERCHANT_REPORT_DATE_NOT_VALID(999, "上报日期大于当天"), - + MERCHANT_NAME_IS_FOUND(2014, "商户名称已存在"), /** * 券 */ 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 114b63f23..9b9b4a916 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java @@ -334,6 +334,10 @@ public class WxMerchantServiceImpl implements WxMerchantService { final IdWorker idWorker = IdWorker.get(); long merchantId = idWorker.nextId(); + //检查商户名称 + if (hasMerchant(wxMerchant)) { + return new ResultData(ErrorCode.MERCHANT_NAME_IS_FOUND); + } //保存商户商铺的关联 List shopidlist = wxMerchant.getShopids(); if (shopidlist.isEmpty()) { @@ -439,6 +443,10 @@ public class WxMerchantServiceImpl implements WxMerchantService { if (wxMerchant.getId() == null) { return new ResultData(ErrorCode.MERCHANT_INFO_NOT_FOUND); } + //检查商户名称 + if (hasMerchant(wxMerchant)) { + return new ResultData(ErrorCode.MERCHANT_NAME_IS_FOUND); + } Date date = new Date(); wxMerchant.setUpdateDate(date); wxMerchantMapper.updateByPrimaryKeySelective(wxMerchant); diff --git a/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml b/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml index eaa87ee95..5608176b5 100644 --- a/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml @@ -249,7 +249,7 @@