From 4313ec4d88b7c8992ff8585cc64c4ede080c72b6 Mon Sep 17 00:00:00 2001 From: hanlinghao <2969694837@qq.com> Date: Sat, 23 Apr 2022 15:12:42 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AE=A2=E6=88=B7=E6=A1=A3?= =?UTF-8?q?=E6=A1=88=E5=92=8C=E5=AE=A2=E6=88=B7=E5=9F=BA=E7=A1=80=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../crmcustomerfile/CrmCustomerFileFeign.java | 16 +++++------ .../CrmCustomerFileFeignFallback.java | 16 +++++------ .../crmcustomertemp/CrmCustomerTempFeign.java | 15 +++++++++- .../CrmCustomerTempFeignFallback.java | 12 ++++++++ .../crmcustomerfile/CrmCustomerFileMapper.xml | 12 ++++---- .../crmcustomerfile/CrmCustomerFileRest.java | 16 +++++------ .../crmcustomertemp/CrmCustomerTempRest.java | 28 +++++++++++++++++++ 7 files changed, 83 insertions(+), 32 deletions(-) diff --git a/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomerfile/CrmCustomerFileFeign.java b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomerfile/CrmCustomerFileFeign.java index ea46b069eb..74c616e83c 100644 --- a/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomerfile/CrmCustomerFileFeign.java +++ b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomerfile/CrmCustomerFileFeign.java @@ -85,16 +85,16 @@ public interface CrmCustomerFileFeign { public ResultBean fetchFileListBySid(@PathVariable("sid") String sid); - @ApiOperation("初始化客户档案") - @ResponseBody - @GetMapping("/initCustomerArchives/{customerSid}/{userSid}") - public ResultBean initCustomerArchives(@PathVariable("customerSid") String customerSid, @PathVariable("userSid") String userSid); +// @ApiOperation("初始化客户档案") +// @ResponseBody +// @GetMapping("/initCustomerArchives/{customerSid}/{userSid}") +// public ResultBean initCustomerArchives(@PathVariable("customerSid") String customerSid, @PathVariable("userSid") String userSid); - @ApiOperation("手机端保存客户档案") - @ResponseBody - @PutMapping("/saveCustomerArchives") - public ResultBean saveCustomerArchives(AppCrmCustomerTempArchivesDto dto); +// @ApiOperation("手机端保存客户档案") +// @ResponseBody +// @PutMapping("/saveCustomerArchives") +// public ResultBean saveCustomerArchives(AppCrmCustomerTempArchivesDto dto); } \ No newline at end of file diff --git a/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomerfile/CrmCustomerFileFeignFallback.java b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomerfile/CrmCustomerFileFeignFallback.java index 6815fa479a..df77c9166f 100644 --- a/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomerfile/CrmCustomerFileFeignFallback.java +++ b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomerfile/CrmCustomerFileFeignFallback.java @@ -65,13 +65,13 @@ public class CrmCustomerFileFeignFallback implements CrmCustomerFileFeign { return null; } - @Override - public ResultBean initCustomerArchives(String customerSid, String userSid) { - return null; - } +// @Override +// public ResultBean initCustomerArchives(String customerSid, String userSid) { +// return null; +// } - @Override - public ResultBean saveCustomerArchives(AppCrmCustomerTempArchivesDto dto) { - return null; - } +// @Override +// public ResultBean saveCustomerArchives(AppCrmCustomerTempArchivesDto dto) { +// return null; +// } } \ No newline at end of file diff --git a/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/CrmCustomerTempFeign.java b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/CrmCustomerTempFeign.java index 226bdc21f8..097d1cb2c1 100644 --- a/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/CrmCustomerTempFeign.java +++ b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/CrmCustomerTempFeign.java @@ -1,5 +1,7 @@ package com.yxt.anrui.crm.api.crmcustomertemp; +import com.yxt.anrui.crm.api.crmcustomerfile.AppCrmCustomerTempArchivesDto; +import com.yxt.anrui.crm.api.crmcustomerfile.AppCrmCustomerTempArchivesVo; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; @@ -130,6 +132,17 @@ public interface CrmCustomerTempFeign { @ApiOperation("手机端-获取客户基础信息（新）") @ResponseBody @GetMapping("/customerTempDetailsBySid/{sid}") - public ResultBean customerTempDetailsBySid(@RequestParam("sid") String sid); + public ResultBean customerTempDetailsBySid(@PathVariable("sid") String sid); + + @ApiOperation("初始化客户档案") + @ResponseBody + @GetMapping("/initCustomerArchives/{customerSid}/{userSid}") + public ResultBean initCustomerArchives(@PathVariable("customerSid") String customerSid, @PathVariable("userSid") String userSid); + + @ApiOperation("手机端保存客户档案") + @ResponseBody + @PutMapping("/saveCustomerArchives") + public ResultBean saveCustomerArchives(AppCrmCustomerTempArchivesDto dto); + } \ No newline at end of file diff --git a/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/CrmCustomerTempFeignFallback.java b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/CrmCustomerTempFeignFallback.java index 0617e040ef..5947c6e3aa 100644 --- a/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/CrmCustomerTempFeignFallback.java +++ b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/CrmCustomerTempFeignFallback.java @@ -1,5 +1,7 @@ package com.yxt.anrui.crm.api.crmcustomertemp; +import com.yxt.anrui.crm.api.crmcustomerfile.AppCrmCustomerTempArchivesDto; +import com.yxt.anrui.crm.api.crmcustomerfile.AppCrmCustomerTempArchivesVo; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; @@ -98,5 +100,15 @@ public class CrmCustomerTempFeignFallback implements CrmCustomerTempFeign { return null; } + @Override + public ResultBean initCustomerArchives(String customerSid, String userSid) { + return null; + } + + @Override + public ResultBean saveCustomerArchives(AppCrmCustomerTempArchivesDto dto) { + return null; + } + } \ No newline at end of file diff --git a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomerfile/CrmCustomerFileMapper.xml b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomerfile/CrmCustomerFileMapper.xml index 48c8c5ca1a..664a288900 100644 --- a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomerfile/CrmCustomerFileMapper.xml +++ b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomerfile/CrmCustomerFileMapper.xml @@ -23,13 +23,11 @@