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 9f9bfc7f1..32e377604 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMallBuildingController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMallBuildingController.java @@ -56,14 +56,14 @@ public class WxMallBuildingController extends BaseController { } floor.updateTenantInfo(getTenantInfo()); wxMallBuildingService.saveFloorImg(floor); - return new ResultData(); + } } } + String key = Constant.mallBuildingPrev + getTenantInfo().getTenantId(); RedisCacheUtils.removeCache(objectCommonRedisTemplate, key); - - return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL); + return new ResultData(); } @ApiOperation("保存楼层楼座面积") diff --git a/mallinkService/src/main/java/com/iformall/domain/dto/WxMerchantDto.java b/mallinkService/src/main/java/com/iformall/domain/dto/WxMerchantDto.java index 6f7f54491..fe6127f19 100644 --- a/mallinkService/src/main/java/com/iformall/domain/dto/WxMerchantDto.java +++ b/mallinkService/src/main/java/com/iformall/domain/dto/WxMerchantDto.java @@ -29,10 +29,10 @@ public class WxMerchantDto extends TenantEntity { private String shopNumber; @io.swagger.annotations.ApiModelProperty(value="楼座号",name="building") - private Integer building; + private Long building; @io.swagger.annotations.ApiModelProperty(value="楼层号",name="floor") - private Integer floor; + private Long floor; @io.swagger.annotations.ApiModelProperty(value = "是否显示在C端", name = "show") private Integer isPublic; diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxProjectConfigServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxProjectConfigServiceImpl.java index 31b65b56a..a60baf0e2 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxProjectConfigServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxProjectConfigServiceImpl.java @@ -181,7 +181,7 @@ public class WxProjectConfigServiceImpl implements WxProjectConfigService { wxMallFloor.setMallId(Long.parseLong(wxMallBuilding.getTenantId())); wxMallFloor.setBuildingId(wxMallBuilding.getId()); wxMallFloor.setBackgroundImg(Constant.floor_back_img); - if(wxMallFloor.getFloorMaps() != null || wxMallFloor.getFloorMaps().size() > 0) { + if(null != wxMallFloor.getFloorMaps() && wxMallFloor.getFloorMaps().size() > 0) { wxMallFloor.setFloorMap(JSON.toJSONString(wxMallFloor.getFloorMaps())); } wxMallFloorService.saveOrUpdate(wxMallFloor);