门店

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

@@ -17,12 +17,13 @@ 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.AppletsUserApiService;
 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.lang.StringUtils;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -57,7 +58,7 @@ public class ProblemOutApiServiceImpl implements ProblemOutApiService {
     @Autowired
     private StoreApiService storeApiService;
     @Autowired
-    private UserOwnerApiService userOwnerApiService;
+    private AppletsUserApiService appletsUserApiService;
 
     @Override
     @Transactional(rollbackFor = Exception.class)
@@ -75,11 +76,10 @@ public class ProblemOutApiServiceImpl implements ProblemOutApiService {
             problemDTO.setMemberName(memberUserDTO.getName());
             problemDTO.setMemberPhone(memberUserDTO.getMobile());
             // 用ACU关联的MCU的主卡最高权重服务门店
-            ServiceResponse<UserOwnerDTO> userMaxOwner = userOwnerApiService.getUserMaxOwner(problemDTO.getEnterpriseId(), problemDTO.getEcuId(), 1, problemDTO.getAreaId(), null);
+            ServiceResponse<UserOwnerDTO> resp = appletsUserApiService.getUserOwnerByAppletConfigId(problemDTO.getAreaId(), problemDTO.getEnterpriseId(), problemDTO.getEcuId());
 
-            if (userMaxOwner != null && userMaxOwner.getResult() != null && userMaxOwner.getResult().getStoreInfoId() != null) {
-                Integer storeInfoId = userMaxOwner.getResult().getStoreInfoId();
-                StoreDTO storeDTO = storeApiService.getStoreByStoreInfoId(memberUserDTO.getEnterpriseId(), storeInfoId).getResult();
+            if (resp != null && resp.getResult() != null && StringUtils.isNotBlank(resp.getResult().getOwnerId())) {
+                StoreDTO storeDTO = storeApiService.getStoreByStoreInfoId(memberUserDTO.getEnterpriseId(), Integer.valueOf(resp.getResult().getOwnerId())).getResult();
                 if (storeDTO != null) {
                     problemDTO.setStoreName(storeDTO.getStoreName());
                 }