소스 검색

益寿缘-销售端-优化获客链接接口逻辑

cgp 8 시간 전
부모
커밋
63d4619002

+ 1 - 13
fs-company/src/main/java/com/fs/company/controller/qw/QwAcquisitionAssistantController.java

@@ -3,19 +3,13 @@ package com.fs.company.controller.qw;
 import java.util.Collections;
 import java.util.List;
 
-import cn.hutool.json.JSONUtil;
-import com.fs.chat.config.QwConfig;
 import com.fs.common.exception.CustomException;
 import com.fs.common.utils.ServletUtils;
 import com.fs.common.utils.StringUtils;
-import com.fs.company.domain.CompanyConfig;
-import com.fs.company.mapper.CompanyUserMapper;
-import com.fs.company.service.ICompanyConfigService;
 import com.fs.framework.security.LoginUser;
 import com.fs.framework.service.TokenService;
 import com.fs.qw.domain.QwCompany;
 import com.fs.qw.domain.QwUser;
-import com.fs.qw.dto.acquisition.AcquisitionGetResponse;
 import com.fs.qw.dto.acquisition.AcquisitionListResponse;
 import com.fs.qw.service.IQwCompanyService;
 import com.fs.qw.service.IQwUserService;
@@ -112,14 +106,8 @@ public class QwAcquisitionAssistantController extends BaseController {
     @GetMapping("/getDetailByLinkId/{linkId}")
     public AjaxResult getDetailByLinkId(@PathVariable String linkId) {
         try {
-            QwAcquisitionAssistant acquisitionAssistant = new QwAcquisitionAssistant();
-            acquisitionAssistant.setLinkId(linkId);
-            List<QwAcquisitionAssistant> qwAcquisitionAssistants = qwAcquisitionAssistantService.selectQwAcquisitionAssistantList(acquisitionAssistant);
-            QwCompany qwCompany = getQwCompany(qwAcquisitionAssistants.get(0).getCorpId());
             // 调用获取详情服务
-            AcquisitionAssistantDetailVO detailVo = qwAcquisitionAssistantService.getDetailWithQw(
-                    qwCompany.getCorpId(), qwCompany.getOpenSecret(), linkId);
-
+            AcquisitionAssistantDetailVO detailVo = qwAcquisitionAssistantService.getDetailWithQw(linkId);
             return AjaxResult.success("获取成功", detailVo);
         } catch (CustomException e) {
             return AjaxResult.error(e.getMessage());

+ 2 - 4
fs-service/src/main/java/com/fs/qw/service/IQwAcquisitionAssistantService.java

@@ -2,7 +2,6 @@ package com.fs.qw.service;
 
 import com.fs.common.exception.CustomException;
 import com.fs.qw.domain.QwAcquisitionAssistant;
-import com.fs.qw.dto.acquisition.AcquisitionGetResponse;
 import com.fs.qw.dto.acquisition.AcquisitionListResponse;
 import com.fs.qw.vo.AcquisitionAssistantDetailVO;
 
@@ -41,15 +40,14 @@ public interface IQwAcquisitionAssistantService
      * @return 企微返回的列表数据
      */
     public AcquisitionListResponse getQwList(String corpid, String corpsecret, Integer limit, String cursor);
+
     /**
      * 获取获客链接详情(从企微实时查询)
-     * @param corpid 企业ID
-     * @param corpsecret 应用密钥
      * @param linkId 获客链接ID
      * @return 企微返回的详情数据
      * @throws CustomException 当调用企微API失败时抛出
      */
-    public AcquisitionAssistantDetailVO getDetailWithQw(String corpid, String corpsecret, String linkId);
+    public AcquisitionAssistantDetailVO getDetailWithQw(String linkId);
 
     /**
      * 根据linkId同步单个获客链接详情到本地

+ 6 - 6
fs-service/src/main/java/com/fs/qw/service/impl/QwAcquisitionAssistantServiceImpl.java

@@ -57,7 +57,7 @@ public class QwAcquisitionAssistantServiceImpl implements IQwAcquisitionAssistan
 
         if (token == null || StringUtils.isEmpty(token.getAccess_token())) {
             log.error("获取access_token失败, corpid:{}", corpid);
-            throw new CustomException("获取企业微信access_token失败");
+            throw new CustomException("获客链接管理-获取企业微信access_token失败");
         }
 
         return apiPath + "?access_token=" + token.getAccess_token();
@@ -193,7 +193,7 @@ public class QwAcquisitionAssistantServiceImpl implements IQwAcquisitionAssistan
         } else {
             assistant.setUpdateTime(new Date());
         }
-        assistant.setSyncTime(new Date());
+        assistant.setSyncTime(DateUtils.getNowDate());
         assistant.buildJsonFields();
         assistant.setRangeDesc(generateRangeDesc(assistant));
 
@@ -258,7 +258,7 @@ public class QwAcquisitionAssistantServiceImpl implements IQwAcquisitionAssistan
 
             for (String linkId : linkIdList) {
                 try {
-                    AcquisitionAssistantDetailVO detail = getDetailWithQw(corpid, corpsecret, linkId);
+                    AcquisitionAssistantDetailVO detail = getDetailWithQw(linkId);
                     QwAcquisitionAssistant assistant = convertToLocal(linkId, detail);
 
                     QwAcquisitionAssistant existData = qwAcquisitionAssistantMapper.selectQwAcquisitionAssistantByLinkId(linkId);
@@ -425,7 +425,7 @@ public class QwAcquisitionAssistantServiceImpl implements IQwAcquisitionAssistan
     // ==================== 获取详情方法 ====================
 
     @Override
-    public AcquisitionAssistantDetailVO getDetailWithQw(String corpid, String corpsecret, String linkId) {
+    public AcquisitionAssistantDetailVO getDetailWithQw( String linkId) {
         if (StringUtils.isEmpty(linkId)) {
             throw new CustomException("链接ID不能为空");
         }
@@ -448,7 +448,7 @@ public class QwAcquisitionAssistantServiceImpl implements IQwAcquisitionAssistan
             AcquisitionGetRequest request = new AcquisitionGetRequest();
             request.setLinkId(linkId);
 
-            String url = buildApiUrl(corpid, corpsecret, QwApiConfig.getAcquisition);
+            String url = buildApiUrl(qwCompany.getCorpId(), qwCompany.getOpenSecret(), QwApiConfig.getAcquisition);
             qwDetail = callQwApi(url, request, AcquisitionGetResponse.class, "获取获客链接详情");
         } catch (Exception e) {
             log.error("调用企微API失败", e);
@@ -461,7 +461,7 @@ public class QwAcquisitionAssistantServiceImpl implements IQwAcquisitionAssistan
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void syncDetailToLocal(String corpid, String corpsecret, String linkId) {
-        AcquisitionAssistantDetailVO detail = getDetailWithQw(corpid, corpsecret, linkId);
+        AcquisitionAssistantDetailVO detail = getDetailWithQw(linkId);
         QwAcquisitionAssistant assistant = convertToLocal(linkId, detail);
 
         QwAcquisitionAssistant existData = qwAcquisitionAssistantMapper.selectQwAcquisitionAssistantByLinkId(linkId);