u

dsk-system/src/main/java/com/dsk/system/service/impl/CustomerServiceImpl.java

@@ -8,6 +8,7 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.dsk.common.core.domain.R;
 import com.dsk.common.exception.ServiceException;
 import com.dsk.common.utils.SecurityUtils;
+import com.dsk.common.utils.StringUtils;
 import com.dsk.system.domain.customer.Customer;
 import com.dsk.system.domain.customer.CustomerUser;
 import com.dsk.system.domain.customer.dto.CustomerBusinessSearchDto;
@@ -183,31 +184,46 @@ public class CustomerServiceImpl implements ICustomerService {
         try {
             Map<String, Object> map = opportunityRadarService.enterpriseByName(customer.getCompanyName());
             if (!ObjectUtils.isEmpty(map.get("data"))) {
-                Integer companyId = MapUtil.getInt(BeanUtil.beanToMap(map.get("data")), "jskEid");
-                if(ObjectUtil.isNotEmpty(customer.getCompanyId()) && customer.getCompanyId() != companyId) {
+                Map<String, Object> data = BeanUtil.beanToMap(map.get("data"));
+                Integer companyId = MapUtil.getInt(data, "jskEid");
+                if(ObjectUtil.isNotEmpty(customer.getCompanyId()) && !customer.getCompanyId().equals(companyId)) {
                     return;
                 }
                 customer.setCompanyId(companyId);
                 if (ObjectUtils.isEmpty(customer.getLegalPerson())) {
-                    customer.setLegalPerson(MapUtil.getStr(map, "legalPerson"));
+                    customer.setLegalPerson(MapUtil.getStr(data, "legalPerson"));
                 }
                 if (ObjectUtils.isEmpty(customer.getRegisterCapital())) {
-                    customer.setRegisterCapital(MapUtil.getStr(map, "registeredCapitalStr"));
+                    customer.setRegisterCapital(MapUtil.getStr(data, "registeredCapitalStr"));
                 }
                 if (ObjectUtils.isEmpty(customer.getProvinceId())) {
-                    customer.setProvinceId(MapUtil.getInt(map, "provinceId"));
+                    customer.setProvinceId(MapUtil.getInt(data, "provinceId"));
                 }
                 if (ObjectUtils.isEmpty(customer.getCityId())) {
-                    customer.setCityId(MapUtil.getInt(map, "cityId"));
+                    customer.setCityId(MapUtil.getInt(data, "cityId"));
                 }
                 if (ObjectUtils.isEmpty(customer.getDistrictId())) {
-                    customer.setDistrictId(MapUtil.getInt(map, "countyId"));
+                    customer.setDistrictId(MapUtil.getInt(data, "countyId"));
                 }
                 if (ObjectUtils.isEmpty(customer.getRegisterAddress())) {
-                    customer.setRegisterAddress(MapUtil.getStr(map, "domicile"));
+                    if(ObjectUtil.isNotEmpty(MapUtil.getStr(data, "domicile"))){
+                        customer.setRegisterAddress(MapUtil.getStr(data, "domicile"));
+                    }else {
+                        String address = null;
+                        if (ObjectUtils.isEmpty(MapUtil.getStr(data, "province"))) {
+                            address = MapUtil.getStr(data, "province");
+                            if (ObjectUtils.isEmpty(MapUtil.getStr(data, "city"))) {
+                                address = address.concat("-").concat(MapUtil.getStr(data, "city"));
+                                if (ObjectUtils.isEmpty(MapUtil.getStr(data, "county"))) {
+                                    address = address.concat("-").concat(MapUtil.getStr(data, "county"));
+                                }
+                            }
+                        }
+                        customer.setRegisterAddress(address);
+                    }
                 }
                 if (ObjectUtils.isEmpty(customer.getCreditCode())) {
-                    customer.setCreditCode(MapUtil.getStr(map, "creditCode"));
+                    customer.setCreditCode(MapUtil.getStr(data, "creditCode"));
                 }
             }
         } catch (Exception e) {