门店

gic-evaluate-service/src/main/java/com/gic/evaluate/service/outer/impl/ProblemOutApiServiceImpl.java

@@ -16,12 +16,13 @@ import com.gic.evaluate.entity.TabProblemImg;
 import com.gic.evaluate.service.*;
 import com.gic.member.api.dto.AcuDetailDTO;
 import com.gic.member.api.dto.MemberUserDTO;
+import com.gic.member.api.dto.UserOwnerDTO;
 import com.gic.member.api.service.CuDetailService;
 import com.gic.member.api.service.MemberUserApiService;
+import com.gic.member.api.service.UserOwnerApiService;
 import com.gic.store.dto.StoreDTO;
 import com.gic.store.service.StoreApiService;
 import org.apache.commons.collections.CollectionUtils;
-import org.apache.commons.lang3.StringUtils;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -55,6 +56,8 @@ public class ProblemOutApiServiceImpl implements ProblemOutApiService {
     private CuDetailService cuDetailService;
     @Autowired
     private StoreApiService storeApiService;
+    @Autowired
+    private UserOwnerApiService userOwnerApiService;
 
     @Override
     @Transactional(rollbackFor = Exception.class)
@@ -71,11 +74,12 @@ public class ProblemOutApiServiceImpl implements ProblemOutApiService {
             MemberUserDTO memberUserDTO = memberUserDtoServiceResponse.getResult();
             problemDTO.setMemberName(memberUserDTO.getName());
             problemDTO.setMemberPhone(memberUserDTO.getMobile());
-            // 门店
-            ServiceResponse<String> serviceStoreId = cuDetailService.getServiceStoreId(problemDTO.getAreaId(), problemDTO.getMemberId(), problemDTO.getUnionId(), problemDTO.getEnterpriseId(), problemDTO.getEcuId());
+            // 用ACU关联的MCU的主卡最高权重服务门店
+            ServiceResponse<UserOwnerDTO> userMaxOwner = userOwnerApiService.getUserMaxOwner(problemDTO.getEnterpriseId(), problemDTO.getEcuId(), 1, problemDTO.getAreaId(), null);
 
-            if (serviceStoreId != null && StringUtils.isNotBlank(serviceStoreId.getResult())) {
-                StoreDTO storeDTO = storeApiService.getStoreByStoreInfoId(memberUserDTO.getEnterpriseId(), Integer.valueOf(serviceStoreId.getResult())).getResult();
+            if (userMaxOwner != null && userMaxOwner.getResult() != null && userMaxOwner.getResult().getStoreInfoId() != null) {
+                Integer storeInfoId = userMaxOwner.getResult().getStoreInfoId();
+                StoreDTO storeDTO = storeApiService.getStoreByStoreInfoId(memberUserDTO.getEnterpriseId(), storeInfoId).getResult();
                 if (storeDTO != null) {
                     problemDTO.setStoreName(storeDTO.getStoreName());
                 }