Merge #25 into master from cc_20260113_fix
feat:updateLineRegion * cc_20260113_fix: (1 commits squashed) - feat:updateLineRegion Signed-off-by: 正新 <accounts_6964c7bcd2a2c377c5bbd01b@mail.teambition.com> Merged-by: 正新 <accounts_6964c7bcd2a2c377c5bbd01b@mail.teambition.com> CR-link: https://codeup.aliyun.com/692ea314dec569489f6f167c/hangzhou/java/custom_zxjp/change/25
This commit is contained in:
@@ -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);
|
||||
|
||||
/**
|
||||
|
||||
@@ -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;
|
||||
|
||||
Reference in New Issue
Block a user