From 0e86e29f4ea2c7f8b7397fedde873a01a405a4ee Mon Sep 17 00:00:00 2001 From: gongbiao Date: Thu, 18 Apr 2019 18:00:14 +0800 Subject: [PATCH] =?UTF-8?q?[=E8=B4=A6=E5=8D=95=E5=AE=A1=E6=89=B9][?= =?UTF-8?q?=E4=BF=AE=E6=94=B9][=E6=9F=A5=E8=AF=A2=E5=95=86=E6=88=B7?= =?UTF-8?q?=E4=BF=A1=E6=81=AF]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/WxMerchantController.java | 11 ++++++++ .../com/iformall/domain/vo/WxMerchantVo.java | 25 ++++++++++++++++++- .../iformall/service/WxMerchantService.java | 3 +++ .../service/impl/WxMerchantServiceImpl.java | 8 ++++++ .../resources/mapper/WxMerchantMapper.xml | 16 +++++++++--- 5 files changed, 58 insertions(+), 5 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/WxMerchantController.java b/mallinkAdmin/src/main/java/com/iformall/controller/WxMerchantController.java index 6cf3569ac..2c04b8faa 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/WxMerchantController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/WxMerchantController.java @@ -8,6 +8,7 @@ import com.iformall.domain.po.WxLevelConfig; import com.iformall.domain.po.WxMerchant; import com.iformall.domain.po.WxProfitSharingReceiver; import com.iformall.domain.vo.WxMerchantSimpleVo; +import com.iformall.domain.vo.WxMerchantVo; import com.iformall.service.WxMerchantService; import com.iformall.service.WxProfitSharingReceiverService; import io.swagger.annotations.ApiImplicitParam; @@ -164,4 +165,14 @@ public class WxMerchantController extends BaseController { return new ResultData(wxMerchantService.findList(getTenantId())); } + @ApiOperation("根据id查询接口") + @GetMapping("/findMerchantById") + @ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query", required = true) + @SystemControllerLog(description = "商户-查询") + public ResultData findMerchantById(Long id) { + logger.debug("[" + getIpAddr() + "] WxMerchantController::findMerchantById"); + WxMerchantVo wxMerchant = wxMerchantService.findMerchantById(id); + return new ResultData(wxMerchant); + } + } diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/WxMerchantVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/WxMerchantVo.java index e9e5db819..cc849b141 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/WxMerchantVo.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxMerchantVo.java @@ -69,7 +69,30 @@ public class WxMerchantVo { @io.swagger.annotations.ApiModelProperty(value = "品牌图", name = "brandImg") private String brandImg; - public String getBrandName() { + + @io.swagger.annotations.ApiModelProperty(value = "店面类型", name = "shopType") + private Integer shopType; + + @io.swagger.annotations.ApiModelProperty(value = "业态名称", name = "businessName") + private String businessName; + + public Integer getShopType() { + return shopType; + } + + public void setShopType(Integer shopType) { + this.shopType = shopType; + } + + public String getBusinessName() { + return businessName; + } + + public void setBusinessName(String businessName) { + this.businessName = businessName; + } + + public String getBrandName() { return brandName; } diff --git a/mallinkService/src/main/java/com/iformall/service/WxMerchantService.java b/mallinkService/src/main/java/com/iformall/service/WxMerchantService.java index 6043ace5d..7a739c49f 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxMerchantService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxMerchantService.java @@ -79,4 +79,7 @@ public interface WxMerchantService { ResultData updateMerchantTax(WxMerchant wxMerchant); ResultData updateMerchantLevel(WxMerchant wxMerchant); + + WxMerchantVo findMerchantById(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 12549814a..46f8527a1 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java @@ -551,4 +551,12 @@ public class WxMerchantServiceImpl implements WxMerchantService { } return new ResultData(Result.SUCCESS, "操作成功"); } + + @Override + public WxMerchantVo findMerchantById(Long id) { + WxMerchantVo merchant = new WxMerchantVo(); + merchant.setId(id); + List listCVo = wxMerchantMapper.findListCVo(merchant); + return listCVo.isEmpty() ? new WxMerchantVo() : listCVo.get(0); + } } diff --git a/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml b/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml index ac4b7093c..24c34ccc3 100644 --- a/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml @@ -119,9 +119,9 @@ - m.id, - m.img_url,m.name,m.link_phone,m.status,m.business_id,m.sub_business_id, - m.is_public,m.email,m.title,m.cover_picture,b.name as brand_name,b.logo as brand_img + m.id,m.img_url,m.name,m.link_phone,m.status,m.business_id,m.sub_business_id, + m.is_public,m.email,m.title,m.cover_picture,b.name as brand_name,b.logo as brand_img, + m.shop_type,bu.title as business_name