From fd888729e4bd854372974d602ad587860abe1ee3 Mon Sep 17 00:00:00 2001 From: wjt Date: Tue, 30 May 2023 11:48:12 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=88=9B=E5=BB=BA=E4=BB=A3?= =?UTF-8?q?=E7=90=86=E5=95=86=E8=B4=A6=E5=8F=B7=E5=BC=82=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/baiye/feign/SourceClueClient.java | 6 +++--- .../baiye/feign/callback/SourceClueClientFallback.java | 8 ++++---- .../agent/service/impl/CustomManageServiceImpl.java | 2 +- .../modules/system/service/impl/UserServiceImpl.java | 2 +- .../java/com/baiye/module/controller/ClueController.java | 3 +-- 5 files changed, 10 insertions(+), 11 deletions(-) diff --git a/ad-platform-manage/ad-platform-management/src/main/java/com/baiye/feign/SourceClueClient.java b/ad-platform-manage/ad-platform-management/src/main/java/com/baiye/feign/SourceClueClient.java index ebbfde0b..b50bfaef 100644 --- a/ad-platform-manage/ad-platform-management/src/main/java/com/baiye/feign/SourceClueClient.java +++ b/ad-platform-manage/ad-platform-management/src/main/java/com/baiye/feign/SourceClueClient.java @@ -80,9 +80,9 @@ public interface SourceClueClient { @GetMapping(API_PREFIX + "/delClueByUser") ResponseEntity> delClueByUser(@RequestParam("userId") Long userId); - @ApiOperation("更新资源信息") - @PostMapping(API_PREFIX + "/update") - CommonResponse update(@RequestBody ClueMiddle clueMiddle); +// @ApiOperation("更新资源信息") +// @PostMapping(API_PREFIX + "/update") +// CommonResponse update(@RequestBody ClueMiddle clueMiddle); @ApiOperation("查询有意向的线索") @GetMapping(API_PREFIX + "/queryClueByCondition") diff --git a/ad-platform-manage/ad-platform-management/src/main/java/com/baiye/feign/callback/SourceClueClientFallback.java b/ad-platform-manage/ad-platform-management/src/main/java/com/baiye/feign/callback/SourceClueClientFallback.java index 104578aa..20f1a48d 100644 --- a/ad-platform-manage/ad-platform-management/src/main/java/com/baiye/feign/callback/SourceClueClientFallback.java +++ b/ad-platform-manage/ad-platform-management/src/main/java/com/baiye/feign/callback/SourceClueClientFallback.java @@ -80,10 +80,10 @@ public class SourceClueClientFallback implements SourceClueClient { return null; } - @Override - public CommonResponse update(ClueMiddle clueMiddle) { - return null; - } +// @Override +// public CommonResponse update(ClueMiddle clueMiddle) { +// return null; +// } @Override public ResponseEntity> queryClueByCondition(String startTime, String endTime, Long memberId) { diff --git a/ad-platform-manage/ad-platform-management/src/main/java/com/baiye/modules/agent/service/impl/CustomManageServiceImpl.java b/ad-platform-manage/ad-platform-management/src/main/java/com/baiye/modules/agent/service/impl/CustomManageServiceImpl.java index fb805fca..6a968462 100644 --- a/ad-platform-manage/ad-platform-management/src/main/java/com/baiye/modules/agent/service/impl/CustomManageServiceImpl.java +++ b/ad-platform-manage/ad-platform-management/src/main/java/com/baiye/modules/agent/service/impl/CustomManageServiceImpl.java @@ -348,7 +348,7 @@ public class CustomManageServiceImpl implements CustomManageService { @Override public void saveChannelCustom(String name, String phone, Long userId, Long parentId) { - ChannelCustom byUserId = channelCustomRepository.findByUserId(userId); + ChannelCustom byUserId = channelCustomRepository.findByUserId(parentId); channelCustomRepository.save(new ChannelCustom().addCustom(name, phone, userId, byUserId.getId())); } diff --git a/ad-platform-manage/ad-platform-management/src/main/java/com/baiye/modules/system/service/impl/UserServiceImpl.java b/ad-platform-manage/ad-platform-management/src/main/java/com/baiye/modules/system/service/impl/UserServiceImpl.java index e9c9f5c0..b39fe712 100644 --- a/ad-platform-manage/ad-platform-management/src/main/java/com/baiye/modules/system/service/impl/UserServiceImpl.java +++ b/ad-platform-manage/ad-platform-management/src/main/java/com/baiye/modules/system/service/impl/UserServiceImpl.java @@ -307,7 +307,7 @@ public class UserServiceImpl implements UserService { createTask(userCreateResult.getId(), "拓客模块-拓客回流池", DefaultNumberConstants.SIX_NUMBER); //同步直客 if (userDTO.getIsChannelActive() == null || !userDTO.getIsChannelActive()) { - customManageService.saveChannelCustom(userDTO.getUsername(), userDTO.getPhone(), user.getId(), null); + customManageService.saveChannelCustom(userDTO.getUsername(), userDTO.getPhone(), user.getId(), userId); } //添加质量图 qualityScoreService.addDefault(userCreateResult.getId()); diff --git a/ad-platform-services/ad-platform-source/src/main/java/com/baiye/module/controller/ClueController.java b/ad-platform-services/ad-platform-source/src/main/java/com/baiye/module/controller/ClueController.java index 80be287c..7bf97bf1 100644 --- a/ad-platform-services/ad-platform-source/src/main/java/com/baiye/module/controller/ClueController.java +++ b/ad-platform-services/ad-platform-source/src/main/java/com/baiye/module/controller/ClueController.java @@ -106,7 +106,6 @@ public class ClueController { @ApiOperation("更新资源信息") @PostMapping("/update") - @Inner(value = false) @Log("更新资源信息") public CommonResponse update(@Validated @RequestBody ClueMiddle clueMiddle) { clueService.update(clueMiddle); @@ -236,7 +235,7 @@ public class ClueController { public CommonResponse updateCallStatus(@RequestParam("clueId") Long clueId, @RequestParam("clueCallStatus") Integer clueCallStatus, @RequestParam("clueType") Integer clueType) { - clueService.updateCallStatus(clueId, clueCallStatus,clueType); + clueService.updateCallStatus(clueId, clueCallStatus, clueType); return CommonResponse.createBySuccess(); } }