diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/LineService.java b/coolstore-partner-service/src/main/java/com/cool/store/service/LineService.java index 9c0a041b1..3788a592a 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/LineService.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/LineService.java @@ -109,7 +109,7 @@ public interface LineService { */ Integer updatePartnerName(String username,Long lineId); - Integer updateRegionId(Long regionId,Long lineId); + Integer updateRegionId(Long regionId,Long investRegionId,Long lineId); Boolean hasRegionId(Long lineId); /** diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/LineServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/LineServiceImpl.java index 905208ddf..0f8c7f653 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/LineServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/LineServiceImpl.java @@ -655,7 +655,7 @@ public class LineServiceImpl implements LineService { } @Override - public Integer updateRegionId(Long regionId, Long lineId) { + public Integer updateRegionId(Long regionId,Long investRegionId, Long lineId) { log.info("regionID:{}",regionId); LineInfoDO lineInfo = lineInfoDAO.getLineInfo(lineId); if (lineInfo == null) { @@ -664,6 +664,7 @@ public class LineServiceImpl implements LineService { LineInfoDO lineInfoDO = new LineInfoDO(); lineInfoDO.setId(lineId); lineInfoDO.setRegionId(regionId); + lineInfoDO.setInvestRegionId(investRegionId); lineInfoDO.setUpdateTime(new Date()); return lineInfoDAO.updateLineInfo(lineInfoDO); } @@ -674,7 +675,7 @@ public class LineServiceImpl implements LineService { if (lineInfo == null) { throw new ServiceException(ErrorCodeEnum.LINE_ID_IS_NOT_EXIST); } - if (lineInfo.getRegionId() != null&&lineInfo.getRegionId() != 0 ){ + if ((lineInfo.getRegionId() != null&&lineInfo.getRegionId() != 0) && lineInfo.getInvestRegionId() != null&&lineInfo.getInvestRegionId() != 0){ return true; } return false; diff --git a/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/LineInfoController.java b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/LineInfoController.java index 1d481f408..c9e81990a 100644 --- a/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/LineInfoController.java +++ b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/LineInfoController.java @@ -182,8 +182,10 @@ public class LineInfoController { @ApiOperation("修改所属大区/分公司") @GetMapping("/updateLineRegion") - public ResponseResult updateLineRegion(@RequestParam("regionId")Long regionId,@RequestParam("lineId")Long lineId) { - return ResponseResult.success(lineService.updateRegionId(regionId,lineId)); + public ResponseResult updateLineRegion(@RequestParam("regionId")Long regionId, + @RequestParam("investRegionId")Long investRegionId, + @RequestParam("lineId")Long lineId) { + return ResponseResult.success(lineService.updateRegionId(regionId,investRegionId,lineId)); } @ApiOperation("判断是否有所属大区/分公司 0否 1是") @GetMapping("/hasLineRegion")