| @@ -32,9 +32,9 @@ public class WxMallBuildingController extends BaseController { | |||||
| } | } | ||||
| @ApiOperation("保存楼层楼座面积") | @ApiOperation("保存楼层楼座面积") | ||||
| @PostMapping("saveFloorArea") | |||||
| @PostMapping("saveFloorImg") | |||||
| @SystemControllerLog(description = "商城-楼座/楼层-保存面积") | @SystemControllerLog(description = "商城-楼座/楼层-保存面积") | ||||
| public ResultData saveFloorArea(@RequestBody List<WxMallBuilding> record) { | |||||
| public ResultData saveFloorImg(@RequestBody List<WxMallBuilding> record) { | |||||
| logger.debug("[" + getIpAddr() + "] WxMallBuildingController::addBuildingAndFloor"); | logger.debug("[" + getIpAddr() + "] WxMallBuildingController::addBuildingAndFloor"); | ||||
| if(record == null && record.size() > 0) { | if(record == null && record.size() > 0) { | ||||
| return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL); | return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL); | ||||
| @@ -46,11 +46,11 @@ public class WxMallBuildingController extends BaseController { | |||||
| if (floor.getId() == null) { | if (floor.getId() == null) { | ||||
| return new ResultData(ErrorCode.SYS_PARAMETER_NOT_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.updateTenantInfo(getTenantInfo()); | ||||
| floor.setTotalArea(null); | |||||
| floor.setOperatingArea(null); | |||||
| wxMallBuildingService.saveFloorArea(floor); | wxMallBuildingService.saveFloorArea(floor); | ||||
| return new ResultData(); | |||||
| } | } | ||||
| } | } | ||||
| } | } | ||||
| @@ -58,4 +58,23 @@ public class WxMallBuildingController extends BaseController { | |||||
| return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL); | 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(); | |||||
| } | |||||
| } | } | ||||