This commit is contained in:
Lemon
2023-08-03 19:36:29 +08:00
parent 9329001b87
commit 45a7c0d0fd

View File

@@ -258,34 +258,30 @@ public class PileStationInfoServiceImpl implements IPileStationInfoService {
PileStationInfo queryStationInfo = selectPileStationInfoById(pileStationInfo.getId()); PileStationInfo queryStationInfo = selectPileStationInfoById(pileStationInfo.getId());
String oldMerchantId = String.valueOf(queryStationInfo.getMerchantId()); String oldMerchantId = String.valueOf(queryStationInfo.getMerchantId());
String newMerchantId = String.valueOf(pileStationInfo.getMerchantId()); String newMerchantId = String.valueOf(pileStationInfo.getMerchantId());
if (!StringUtils.equals("null", newMerchantId)) { // 对比一下运营商有没有变化
if (!StringUtils.equals(oldMerchantId, newMerchantId)) {
// 对比一下运营商有没有变化 // 新旧运营商不一致,执行站点更换运营商逻辑
if (!StringUtils.equals(oldMerchantId, newMerchantId)) { stationUpdateMerchant(pileStationInfo, newMerchantId);
// 新旧运营商不一致,执行站点更换运营商逻辑 } else {
stationUpdateMerchant(pileStationInfo, newMerchantId); // 查询部门
} else { SysDept sysDept = sysDeptService.selectDeptById(Long.parseLong(pileStationInfo.getDeptId()));
// 查询部门 // 同步组织中的名称,联系人,电话
SysDept sysDept = sysDeptService.selectDeptById(Long.parseLong(pileStationInfo.getDeptId())); if (sysDept != null) {
// 同步组织中的名称,联系人,电话 sysDept.setDeptName(pileStationInfo.getStationName());
if (sysDept != null) { sysDept.setLeader(pileStationInfo.getStationAdminName());
sysDept.setDeptName(pileStationInfo.getStationName()); sysDept.setPhone(pileStationInfo.getStationTel());
sysDept.setLeader(pileStationInfo.getStationAdminName()); sysDept.setUpdateTime(DateUtils.getNowDate());
sysDept.setPhone(pileStationInfo.getStationTel()); sysDeptService.updateDept(sysDept);
sysDept.setUpdateTime(DateUtils.getNowDate());
sysDeptService.updateDept(sysDept);
}
} }
pileStationInfo.setUpdateBy(SecurityUtils.getUsername());
pileStationInfo.setUpdateTime(DateUtils.getNowDate());
int i = pileStationInfoMapper.updatePileStationInfo(pileStationInfo);
// 再次清缓存
redisCache.deleteObject(redisKey);
return i;
} }
return 0;
pileStationInfo.setUpdateBy(SecurityUtils.getUsername());
pileStationInfo.setUpdateTime(DateUtils.getNowDate());
int i = pileStationInfoMapper.updatePileStationInfo(pileStationInfo);
// 再次清缓存
redisCache.deleteObject(redisKey);
return i;
} }
/** /**