From c712fc43f6f142e7d0c18a35c979c49a98538c34 Mon Sep 17 00:00:00 2001 From: hupeng Date: Thu, 9 May 2019 15:17:20 +0800 Subject: [PATCH] =?UTF-8?q?[=E4=B8=9A=E6=80=81][=E4=BF=AE=E6=94=B9]:C?= =?UTF-8?q?=E7=AB=AF=E4=B8=9A=E6=80=81=E5=88=97=E8=A1=A8=E9=9A=90=E8=97=8F?= =?UTF-8?q?=E6=B2=A1=E6=9C=89=E5=86=85=E5=AE=B9=E7=9A=84=E9=A1=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/sys/WxBusinessController.java | 2 +- .../controller/WxBusinessController.java | 21 ++-------- .../iformall/enums/EnumBusinessFilter.java | 38 +++++++++++++++++++ .../com/iformall/mapper/WxBusinessMapper.java | 4 +- .../iformall/service/WxBusinessService.java | 2 +- .../service/impl/WxBusinessServiceImpl.java | 13 ++++++- .../resources/mapper/WxBusinessMapper.xml | 37 +++++++++++++++--- .../controller/sys/WxBusinessController.java | 2 +- 8 files changed, 89 insertions(+), 30 deletions(-) create mode 100644 mallinkService/src/main/java/com/iformall/enums/EnumBusinessFilter.java diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/sys/WxBusinessController.java b/mallinkAdmin/src/main/java/com/iformall/controller/sys/WxBusinessController.java index 21de83030..e01d23700 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/sys/WxBusinessController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/sys/WxBusinessController.java @@ -33,7 +33,7 @@ public class WxBusinessController extends BaseController { @SystemControllerLog(description = "业态-全列表") public ResultData listAll() { logger.debug("[" + getIpAddr() + "] WxBusinessController::getList"); - final List busList = wxBusinessService.findListAll(); + final List busList = wxBusinessService.findListAll(getTenantId(),null); return new ResultData(busList); } diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxBusinessController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxBusinessController.java index f7b7ad3cf..06fad11e4 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxBusinessController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxBusinessController.java @@ -12,10 +12,7 @@ import io.swagger.annotations.ApiOperation; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.ModelAttribute; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; import java.util.List; import java.util.stream.Collectors; @@ -29,22 +26,10 @@ public class WxBusinessController extends BaseController { @Autowired private WxBusinessService wxBusinessService; - @ApiOperation("分页列表接口") - @GetMapping("list") - @ApiImplicitParams({ - @ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true), - @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)}) - public ResultData list(WxBusiness wxBusiness, Integer pageNum, Integer pageSize) { - if (null == wxBusiness) wxBusiness = new WxBusiness(); - final PageInfo page = wxBusinessService.listAsPage(wxBusiness, pageNum, pageSize); - return new ResultData(page); - } - - @ApiOperation("业态全列表接口") @GetMapping("listAll") - public ResultData listAll(@ModelAttribute WxBusiness wxBusiness) { - final List busList = wxBusinessService.findListAll(); + public ResultData listAll(@RequestParam Integer filter) { + final List busList = wxBusinessService.findListAll(getTenantId(),filter); return new ResultData(busList); } diff --git a/mallinkService/src/main/java/com/iformall/enums/EnumBusinessFilter.java b/mallinkService/src/main/java/com/iformall/enums/EnumBusinessFilter.java new file mode 100644 index 000000000..bb2b20e11 --- /dev/null +++ b/mallinkService/src/main/java/com/iformall/enums/EnumBusinessFilter.java @@ -0,0 +1,38 @@ +package com.iformall.enums; + +/** + * Created by Stormeye on 2018/08/09. + */ +public enum EnumBusinessFilter { + + // 1:商户 2:卡券 + FILTER_BY_MERCHANT(1, "merchant"), + FILTER_BY_COUPON(2, "coupon"), + + ; + + public static EnumBusinessFilter getEnum(Integer code) { + for (EnumBusinessFilter value : values()) { + if (value.getCode().equals(code)) { + return value; + } + } + return null; + } + + private Integer code; + private String message; + + EnumBusinessFilter(Integer code, String message) { + this.code = code; + this.message = message; + } + + public Integer getCode() { + return code; + } + + public String getMessage() { + return message; + } +} diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxBusinessMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxBusinessMapper.java index 13c167507..add494ad7 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxBusinessMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxBusinessMapper.java @@ -3,11 +3,13 @@ package com.iformall.mapper; import java.util.*; import com.iformall.common.CommonMapper; import com.iformall.domain.po.WxBusiness; +import io.lettuce.core.dynamic.annotation.Param; public interface WxBusinessMapper extends CommonMapper { List findList(WxBusiness wxBusiness); List findListAll(); - + List findListForMerchant(@Param("tenantId") String tenantId); + List findListForCoupon(@Param("tenantId") String tenantId); } diff --git a/mallinkService/src/main/java/com/iformall/service/WxBusinessService.java b/mallinkService/src/main/java/com/iformall/service/WxBusinessService.java index f62e0674b..a9d7b27e0 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxBusinessService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxBusinessService.java @@ -30,7 +30,7 @@ public interface WxBusinessService { * * @return */ - List findListAll(); + List findListAll(String tenantId, Integer filter); /** * 根据Id获得实体 diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxBusinessServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBusinessServiceImpl.java index 896be04f8..2c3c099fd 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBusinessServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBusinessServiceImpl.java @@ -3,6 +3,8 @@ package com.iformall.service.impl; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import com.iformall.domain.po.WxBusiness; +import com.iformall.enums.EnumBusiness; +import com.iformall.enums.EnumBusinessFilter; import com.iformall.mapper.WxBusinessMapper; import com.iformall.service.WxBusinessService; import org.slf4j.Logger; @@ -30,8 +32,15 @@ public class WxBusinessServiceImpl implements WxBusinessService { } @Override - public List findListAll() { - return wxBusinessMapper.findListAll(); + public List findListAll(String tenantId, Integer filter) { + if (filter == null) + return wxBusinessMapper.findListAll(); + else if (filter.equals(EnumBusinessFilter.FILTER_BY_COUPON.getCode())) + return wxBusinessMapper.findListForCoupon(tenantId); + else if (filter.equals(EnumBusinessFilter.FILTER_BY_MERCHANT.getCode())) + return wxBusinessMapper.findListForMerchant(tenantId); + else + return wxBusinessMapper.findListAll(); } diff --git a/mallinkService/src/main/resources/mapper/WxBusinessMapper.xml b/mallinkService/src/main/resources/mapper/WxBusinessMapper.xml index d599e0233..10a92e4cc 100644 --- a/mallinkService/src/main/resources/mapper/WxBusinessMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxBusinessMapper.xml @@ -49,13 +49,38 @@ - select from wx_business order by create_date asc - - - - - + + + + + + + + diff --git a/mallinkSysAdmin/src/main/java/com/iformall/controller/sys/WxBusinessController.java b/mallinkSysAdmin/src/main/java/com/iformall/controller/sys/WxBusinessController.java index 21de83030..e01d23700 100644 --- a/mallinkSysAdmin/src/main/java/com/iformall/controller/sys/WxBusinessController.java +++ b/mallinkSysAdmin/src/main/java/com/iformall/controller/sys/WxBusinessController.java @@ -33,7 +33,7 @@ public class WxBusinessController extends BaseController { @SystemControllerLog(description = "业态-全列表") public ResultData listAll() { logger.debug("[" + getIpAddr() + "] WxBusinessController::getList"); - final List busList = wxBusinessService.findListAll(); + final List busList = wxBusinessService.findListAll(getTenantId(),null); return new ResultData(busList); }