From f06819d80023fde3ad7b78f2f5707cdcaa9ba587 Mon Sep 17 00:00:00 2001 From: xhxu Date: Tue, 12 Jan 2021 13:52:08 +0800 Subject: [PATCH] build --- .../basic/WxMallBuildingController.java | 29 +++++++++++++++---- 1 file changed, 24 insertions(+), 5 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMallBuildingController.java b/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMallBuildingController.java index d4d16a0c8..37957ea64 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMallBuildingController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMallBuildingController.java @@ -32,9 +32,9 @@ public class WxMallBuildingController extends BaseController { } @ApiOperation("保存楼层楼座面积") - @PostMapping("saveFloorArea") + @PostMapping("saveFloorImg") @SystemControllerLog(description = "商城-楼座/楼层-保存面积") - public ResultData saveFloorArea(@RequestBody List record) { + public ResultData saveFloorImg(@RequestBody List record) { logger.debug("[" + getIpAddr() + "] WxMallBuildingController::addBuildingAndFloor"); if(record == null && record.size() > 0) { return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL); @@ -46,11 +46,11 @@ public class WxMallBuildingController extends BaseController { if (floor.getId() == null) { return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL); } - if (floor.getTotalArea() == null && floor.getOperatingArea() == null) { - return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL); - } floor.updateTenantInfo(getTenantInfo()); + floor.setTotalArea(null); + floor.setOperatingArea(null); wxMallBuildingService.saveFloorArea(floor); + return new ResultData(); } } } @@ -58,4 +58,23 @@ public class WxMallBuildingController extends BaseController { return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL); } + @ApiOperation("保存楼层楼座面积") + @PostMapping("saveFloorArea") + @SystemControllerLog(description = "商城-楼座/楼层-保存面积") + public ResultData saveFloorArea(@RequestBody WxMallFloor record) { + logger.debug("[" + getIpAddr() + "] WxMallBuildingController::addBuildingAndFloor"); + if(record == null) { + return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL); + } + if (record.getId() == null) { + return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL); + } + if (record.getTotalArea() == null && record.getOperatingArea() == null) { + return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL); + } + record.updateTenantInfo(getTenantInfo()); + wxMallBuildingService.saveFloorArea(record); + return new ResultData(); + } + }