fix bug

夏天
1 parent 5752fbcf
Showing 4 changed files with 28 additions and 46 deletions
fw-valhalla-rpc/src/main/java/cn/fw/valhalla/rpc/cas/CasRpcService.java
fw-valhalla-sdk/src/main/java/cn/fw/valhalla/sdk/result/CustomerInfoDto.java
fw-valhalla-service/src/main/java/cn/fw/valhalla/service/bus/cust/CustomerBizService.java
fw-valhalla-service/src/main/java/cn/fw/valhalla/service/bus/cust/PickUpCustomerService.java
 package cn.fw.valhalla.rpc.cas;
  
 import cn.fw.cas.sdk.api.CasApiService;
-import cn.fw.cas.sdk.result.DutySubstituteDto;
 import cn.fw.data.base.domain.common.Message;
-import cn.fw.valhalla.rpc.cas.dto.SubstituteDTO;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
  
 import java.util.Objects;
@@ -25,33 +22,6 @@ public class CasRpcService {
         this.casApiService = casApiService;
     }
  
-    /**
-     * 查询服务顾问代班人
-     *
-     * @param shopId
-     * @param userId
-     * @return
-     */
-    public SubstituteDTO getSubstitute(Long shopId, Long userId) {
-        try {
-            Message<DutySubstituteDto> msg = casApiService.getAdvisorSubstitute(shopId, userId);
-            log.info("调用售后查询服务顾问代班人接口状态: {}", msg.isSuccess());
-            if (!msg.isSuccess()) {
-                return null;
-            }
-            DutySubstituteDto data = msg.getData();
-            log.info("查询服务顾问代班人 data[{}]", data);
-            if (Objects.isNull(data)) {
-                return null;
-            }
-            SubstituteDTO dto = new SubstituteDTO();
-            BeanUtils.copyProperties(data, dto);
-            return dto;
-        } catch (Exception e) {
-            log.error("查询服务顾问代班人失败", e);
-            return null;
-        }
-    }
  
     public int getPullinTimes(final Long groupId, final Long customerId) {
         try {
@@ -158,4 +158,31 @@ public class CustomerInfoDto {
      * 贷款到期时间
      */
     private Date expires;
+    /**
+     * 车主工作单位
+     */
+    private String contactCompanyName;
+    /**
+     * 车主联系地址-地区-编码
+     */
+    private String contactAreaCode;
+    /**
+     * 车主联系地址-地区-名称
+     */
+    private String contactAreaName;
+    /**
+     * 车主联系地址-详情
+     */
+    private String contactAddress;
+    /**
+     * 车主联系地址-详情-经度
+     */
+    private String contactAddressLng;
+    /**
+     * 车主联系地址-详情-纬度
+     */
+    private String contactAddressLat;
+
+
+
 }
 \ No newline at end of file
@@ -338,16 +338,7 @@ public class CustomerBizService extends AbstractCustomerService {
         if (Objects.isNull(shop)) {
             return new ReceptionResultDto(false, "服务顾问服务站信息不正确");
         }
-        if (Objects.nonNull(customer.getAdviserId())) {
-            if (customer.getShopId().equals(shop.getId())) {
-                boolean canReception = userId.equals(customer.getAdviserId());
-                SubstituteDTO substitute = casRpcService.getSubstitute(customer.getShopId(), customer.getAdviserId());
-                if (Objects.nonNull(substitute)) {
-                    canReception = canReception || userId.equals(substitute.getSubstituteId());
-                }
-                return new ReceptionResultDto(canReception, canReception ? "" : "无法接待其他人的客户");
-            }
-        }
+
         boolean bool = affiliationRecordService.count(Wrappers.<AffiliationRecord>lambdaQuery()
                 .eq(AffiliationRecord::getType, CustomerChangeTypeEnum.DEFEAT)
                 .eq(AffiliationRecord::getOriginUserId, userId)
@@ -135,12 +135,6 @@ public class PickUpCustomerService extends AbstractCustomerService {
             UserInfoDTO user = userService.user(customer.getAdviserId());
             String userName = Optional.ofNullable(user).map(UserInfoDTO::getUserName).orElse("");
             detailVO.setAdviserName(userName);
-            SubstituteDTO substitute = casRpcService.getSubstitute(customer.getShopId(), customer.getAdviserId());
-            if (Objects.nonNull(substitute)) {
-                detailVO.setSubstituteId(substitute.getSubstituteId());
-                detailVO.setSubstitute(substitute.getSubstitute());
-                canReception = userId.equals(customer.getAdviserId()) || userId.equals(substitute.getSubstituteId());
-            }
         }
         detailVO.setCanReception(canReception);
         return detailVO;