项目基本信息推送

yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TSettleDomainServiceImpl.java

@@ -40,7 +40,6 @@ import org.springframework.stereotype.Service;
 
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Map;
 import java.util.stream.Collectors;
 
 /**
@@ -55,6 +54,9 @@ public class TSettleDomainServiceImpl extends ServiceImpl<TSettleDomainMapper, T
 	@Autowired
 	private RedisUtil redisUtil;
 
+	@Autowired
+	private UpmsDaprUtils upmsDaprUtils;
+
 	private final TCutsomerDataPermissonMapper permissonMapper;
 	/**
 	 * @Author fxj
@@ -117,14 +119,24 @@ public class TSettleDomainServiceImpl extends ServiceImpl<TSettleDomainMapper, T
 	@Override
 	public R updateProjectInfo(TSettleDomain tSettleDomain) {
 		if (Common.isNotNull(tSettleDomain)) {
-			if (Common.isNotNull(tSettleDomain.getEProvince())) {
-				tSettleDomain.setProvince(Integer.valueOf(RedisUtil.redis.opsForValue().get(CacheConstants.AREA_VALUE + tSettleDomain.getEProvince()).toString()));
-			}
-			if (Common.isNotNull(tSettleDomain.getECity())) {
-				tSettleDomain.setCity(Integer.valueOf(RedisUtil.redis.opsForValue().get(CacheConstants.AREA_VALUE + tSettleDomain.getECity()).toString()));
+
+			R<AreaVo> areaListR = upmsDaprUtils.getAreaListR();
+			if (null == areaListR || areaListR.getCode() != CommonConstants.SUCCESS) {
+				return R.failed("获取区域数据失败！");
 			}
-			if (Common.isNotNull(tSettleDomain.getETown())) {
-				tSettleDomain.setTown(Integer.valueOf(RedisUtil.redis.opsForValue().get(CacheConstants.AREA_VALUE + tSettleDomain.getETown()).toString()));
+			AreaVo areaList = areaListR.getData();
+			if (null != areaList && !areaList.getSysAreaList().isEmpty()) {
+				for (SysArea area : areaList.getSysAreaList()) {
+					if (Common.isNotNull(tSettleDomain.getEProvince()) && area.getAreaName().equals(tSettleDomain.getEProvince())) {
+						tSettleDomain.setProvince(area.getId());
+					}
+					if (Common.isNotNull(tSettleDomain.getECity()) && area.getAreaName().equals(tSettleDomain.getECity())) {
+						tSettleDomain.setCity(area.getId());
+					}
+					if (Common.isNotNull(tSettleDomain.getETown()) && area.getAreaName().equals(tSettleDomain.getETown())) {
+						tSettleDomain.setTown(area.getId());
+					}
+				}
 			}
 			TSettleDomain tSettleDomainInfo = baseMapper.selectById(tSettleDomain.getId());
 			if (Common.isNotNull(tSettleDomainInfo)) {