diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxMerchantController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxMerchantController.java index 779151ce7..7699c5702 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxMerchantController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxMerchantController.java @@ -4,6 +4,7 @@ import com.github.pagehelper.PageInfo; import com.iformall.common.ErrorCode; import com.iformall.common.ResultData; import com.iformall.domain.dto.WxMerchantDto; +import com.iformall.domain.po.WxMerchantCorp; import com.iformall.domain.po.base.TenantEntity; import com.iformall.domain.vo.WxMerchantVo; import com.iformall.enums.EnumMerchantPublic; @@ -20,6 +21,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import java.util.HashMap; +import java.util.List; /** * @author Stormeye @@ -46,6 +48,20 @@ public class WxMerchantController extends BaseController { return new ResultData(wxMerchantService.listAsPageCVo(wxMerchantDto, pageNum, pageSize,true)); } + @ApiOperation("查询资质信息") + @GetMapping("/findCorp") + @ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query", required = true) + public ResultData findCorp(Long id) { + logger.debug("[" + getIpAddr() + "] WxMerchantController::findCorp"); + if(id == null) { + return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL); + } + WxMerchantCorp wxMerchantCorp = wxMerchantService.getMerchantCorp(getTenantInfo(),id); + return new ResultData(wxMerchantCorp); + } + + + @ApiOperation("根据code查询接口") @GetMapping("/findByCode") @ApiImplicitParam(name = "merchantCode", value = "merchantCode", dataType = "String", paramType = "query", required = true) diff --git a/mallinkService/src/main/java/com/iformall/service/WxMerchantService.java b/mallinkService/src/main/java/com/iformall/service/WxMerchantService.java index 47d783627..65aaa5a3c 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxMerchantService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxMerchantService.java @@ -3,6 +3,7 @@ package com.iformall.service; import com.github.pagehelper.PageInfo; import com.iformall.common.ResultData; import com.iformall.domain.dto.WxMerchantDto; +import com.iformall.domain.po.WxMerchantCorp; import com.iformall.domain.po.base.TenantEntity; import com.iformall.domain.po.WxMerchant; import com.iformall.domain.po.WxProfitSharingReceiver; @@ -187,4 +188,5 @@ public interface WxMerchantService { List findMerchantListByProduct(TenantEntity tenantEntity,Long productId,boolean hasShop); + WxMerchantCorp getMerchantCorp(TenantEntity tenantInfo, Long id); } 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 c81932c07..cf91b047e 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java @@ -1630,4 +1630,16 @@ public class WxMerchantServiceImpl implements WxMerchantService { } return null; } + + @Override + public WxMerchantCorp getMerchantCorp(TenantEntity tenantInfo, Long merchantId) { + WxMerchantCorp wxMerchantCorp = new WxMerchantCorp(); + wxMerchantCorp.updateTenantInfo(tenantInfo); + wxMerchantCorp.setMerchantId(merchantId); + List corps = wxMerchantCorpMapper.findList(wxMerchantCorp); + if(!corps.isEmpty()){ + return corps.get(0); + } + return null; + } }