From 0932cd608bc195d0703e936dfbd3bbf131841e87 Mon Sep 17 00:00:00 2001 From: gongbiao Date: Thu, 17 Jan 2019 17:07:56 +0800 Subject: [PATCH] =?UTF-8?q?[=E5=BA=97=E9=93=BA][=E4=BF=AE=E6=94=B9][?= =?UTF-8?q?=E5=88=A4=E6=96=AD=E5=90=8D=E7=A7=B0=E6=83=9F=E4=B8=80]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/iformall/controller/WxShopController.java | 7 ++++--- .../src/main/java/com/iformall/service/WxShopService.java | 2 +- .../java/com/iformall/service/impl/WxShopServiceImpl.java | 4 ++-- mallinkService/src/main/resources/mapper/WxShopMapper.xml | 2 +- 4 files changed, 8 insertions(+), 7 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/WxShopController.java b/mallinkAdmin/src/main/java/com/iformall/controller/WxShopController.java index c9c05c7e9..08209bfa1 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/WxShopController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/WxShopController.java @@ -95,10 +95,11 @@ public class WxShopController extends BaseController { @GetMapping("hasShopNumber") @ApiImplicitParams({ @ApiImplicitParam(name = "shopNumber", value = "shopNumber", dataType = "String", paramType = "query", required = true), - @ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query")}) - public ResultData hasShopNumber(String shopNumber,Long id) { + @ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query"), + @ApiImplicitParam(name = "type", value = "type", dataType = "Integer", paramType = "query", required = true)}) + public ResultData hasShopNumber(String shopNumber, Long id, Integer type) { logger.debug("[" + getIpAddr() + "] WxShopController::hasShopNumber"); - return wxShopService.hasShopNumber(getTenantId(), shopNumber,id); + return wxShopService.hasShopNumber(getTenantId(), shopNumber, id, type); } diff --git a/mallinkService/src/main/java/com/iformall/service/WxShopService.java b/mallinkService/src/main/java/com/iformall/service/WxShopService.java index 150e753ab..5a434f51f 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxShopService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxShopService.java @@ -46,7 +46,7 @@ public interface WxShopService { ResultData getMerchantShopByShopId(String tenantId, String shopId); - ResultData hasShopNumber(String tenantId, String shopNumber, Long id); + ResultData hasShopNumber(String tenantId, String shopNumber, Long id, Integer type); PageInfo> listShopFromContract(WxShop wxShop, Integer pageNum, Integer pageSize); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxShopServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxShopServiceImpl.java index b23c540c0..3db7d7d45 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxShopServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxShopServiceImpl.java @@ -1,7 +1,6 @@ package com.iformall.service.impl; import java.util.*; -import java.util.stream.Collectors; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; @@ -86,10 +85,11 @@ public class WxShopServiceImpl implements WxShopService { } @Override - public ResultData hasShopNumber(String tenantId, String shopNumber, Long id) { + public ResultData hasShopNumber(String tenantId, String shopNumber, Long id, Integer type) { WxShop wxShop = new WxShop(); wxShop.setTenantId(tenantId); wxShop.setShopNumber(shopNumber); + wxShop.setType(type); wxShop.setId(id); int count = wxShopMapper.hasShopNumber(wxShop); return new ResultData(ResultData.SUCCESS, "查询成功", count > 0 ? true : false); diff --git a/mallinkService/src/main/resources/mapper/WxShopMapper.xml b/mallinkService/src/main/resources/mapper/WxShopMapper.xml index 878fe83d8..59ecb6b0e 100644 --- a/mallinkService/src/main/resources/mapper/WxShopMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxShopMapper.xml @@ -315,7 +315,7 @@