From 1673bbc494617026599ec3959ca14667dae52fca Mon Sep 17 00:00:00 2001 From: hupeng Date: Wed, 10 Apr 2019 19:42:01 +0800 Subject: [PATCH] =?UTF-8?q?[=E4=B8=9A=E6=80=81][=E6=96=B0=E5=A2=9E]:?= =?UTF-8?q?=E5=AD=90=E4=B8=9A=E6=80=81=E5=88=97=E8=A1=A8=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/WxBusinessController.java | 47 +++++-------------- .../com/iformall/tenant/TenantInfoImpl.java | 3 ++ 2 files changed, 15 insertions(+), 35 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/WxBusinessController.java b/mallinkAdmin/src/main/java/com/iformall/controller/WxBusinessController.java index 77661b2f1..56509492f 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/WxBusinessController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/WxBusinessController.java @@ -5,7 +5,9 @@ import com.iformall.annotation.SystemControllerLog; import com.iformall.common.Result; import com.iformall.common.ResultData; import com.iformall.domain.po.WxBusiness; +import com.iformall.domain.po.WxSubBusiness; import com.iformall.service.WxBusinessService; +import com.iformall.service.WxSubBusinessService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; @@ -27,6 +29,9 @@ public class WxBusinessController extends BaseController { @Autowired private WxBusinessService wxBusinessService; + @Autowired + private WxSubBusinessService wxSubBusinessService; + @ApiOperation("分页列表接口") @GetMapping("list") @ApiImplicitParams({ @@ -49,41 +54,13 @@ public class WxBusinessController extends BaseController { return new ResultData(busList); } - @ApiOperation("新增接口") - @PostMapping("add") - @SystemControllerLog(description = "业态-新增") - public ResultData add(@RequestBody WxBusiness wxBusiness) { - logger.debug("[" + getIpAddr() + "] WxBusinessController::add"); - //Assert.notNull(wxBusiness.getName(), "角色名不能为空"); - //Assert.isTrue(!checkUnique(sysRole.getName(), null), "重复的角色名"); - return new ResultData(); - } - - @ApiOperation("根据id更新接口") - @PostMapping("update") - @SystemControllerLog(description = "业态-更新") - public ResultData update(@RequestBody WxBusiness wxBusiness) { - logger.debug("[" + getIpAddr() + "] WxBusinessController::update"); - return new ResultData(); - } - - @ApiOperation("根据id删除接口") - @GetMapping("/del") - @ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query", required = true) - @SystemControllerLog(description = "业态-删除") - public ResultData delete(Long id) { - logger.debug("[" + getIpAddr() + "] WxBusinessController::delete"); - return new ResultData(Result.SUCCESS, "删除成功", null); - } - - @ApiOperation("根据id查询接口") - @GetMapping("/findById") - @ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query", required = true) - @SystemControllerLog(description = "业态-查询") - public ResultData findById(Integer id) { - logger.debug("[" + getIpAddr() + "] WxBusinessController::findById"); - return new ResultData(Result.SUCCESS, "查询成功", wxBusinessService.getById(id)); + @ApiOperation("子业态表接口") + @GetMapping("listSub") + @SystemControllerLog(description = "子业态") + public ResultData listSub(@ModelAttribute WxSubBusiness wxSubBusiness) { + logger.debug("[" + getIpAddr() + "] WxBusinessController::getList"); + final List busList = wxSubBusinessService.findList(wxSubBusiness); + return new ResultData(busList); } - } diff --git a/mallinkAdmin/src/main/java/com/iformall/tenant/TenantInfoImpl.java b/mallinkAdmin/src/main/java/com/iformall/tenant/TenantInfoImpl.java index e73834947..78109fa81 100644 --- a/mallinkAdmin/src/main/java/com/iformall/tenant/TenantInfoImpl.java +++ b/mallinkAdmin/src/main/java/com/iformall/tenant/TenantInfoImpl.java @@ -36,6 +36,9 @@ public class TenantInfoImpl implements TenantInfo { if ("wx_business".equals(tableName)) { return true; } + if ("wx_sub_business".equals(tableName)) { + return true; + } if ("wx_coupon_type".equals(tableName)) { return true; }