From 9b972677cd75213d84c4a86052fed3d2952d7548 Mon Sep 17 00:00:00 2001 From: dimengzhe <251008545@qq.com> Date: Mon, 10 Oct 2022 10:38:05 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9C=AA=E5=94=AE=E4=B9=B0=E6=96=AD=E5=92=8C?= =?UTF-8?q?=E4=BB=98=E6=AC=BE=E7=94=B3=E8=AF=B7=E7=9A=84=E9=94=80=E5=94=AE?= =?UTF-8?q?=E9=80=9A=E8=B7=AF=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BaseManufacturerBankFeign.java | 7 +++---- .../BaseManufacturerBankFeignFallback.java | 4 ++-- .../BaseManufacturerBankMapper.java | 4 ++-- .../BaseManufacturerBankMapper.xml | 8 ++++---- .../BaseManufacturerBankRest.java | 10 ++++++---- .../BaseManufacturerBankService.java | 16 ++++++++-------- 6 files changed, 25 insertions(+), 24 deletions(-) diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturerbank/BaseManufacturerBankFeign.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturerbank/BaseManufacturerBankFeign.java index 678a5e4d1b..19e1784179 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturerbank/BaseManufacturerBankFeign.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturerbank/BaseManufacturerBankFeign.java @@ -4,7 +4,6 @@ import com.yxt.common.core.result.ResultBean; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.cloud.openfeign.FeignClient; -import org.springframework.cloud.openfeign.SpringQueryMap; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.PostMapping; @@ -50,10 +49,10 @@ public interface BaseManufacturerBankFeign { public ResultBean selectDetails(@PathVariable("sid") String sid); @ApiOperation("未售买断获取厂家销售通路") - @GetMapping("/actualList/{useOrgSid}") - ResultBean> actualList(@PathVariable("useOrgSid") String useOrgSid); + @GetMapping("/actualList") + ResultBean> actualList(); @ApiOperation("付款申请获取厂家销售通路") @GetMapping("/payList") - ResultBean> payList(@SpringQueryMap BaseManPayQuery query); + ResultBean> payList(); } \ No newline at end of file diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturerbank/BaseManufacturerBankFeignFallback.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturerbank/BaseManufacturerBankFeignFallback.java index 4bae844e53..6ed7612744 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturerbank/BaseManufacturerBankFeignFallback.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturerbank/BaseManufacturerBankFeignFallback.java @@ -32,12 +32,12 @@ public class BaseManufacturerBankFeignFallback implements BaseManufacturerBankFe } @Override - public ResultBean> actualList(String useOrgSid) { + public ResultBean> actualList() { return null; } @Override - public ResultBean> payList(BaseManPayQuery query) { + public ResultBean> payList() { return null; } } \ No newline at end of file diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturerbank/BaseManufacturerBankMapper.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturerbank/BaseManufacturerBankMapper.java index 5022e91be4..d317fb6518 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturerbank/BaseManufacturerBankMapper.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturerbank/BaseManufacturerBankMapper.java @@ -62,9 +62,9 @@ public interface BaseManufacturerBankMapper extends BaseMapper selectByApplySid(String modelSid); - List actualList(@Param("useOrgSid") String useOrgSid, @Param("code") String code); + List actualList(@Param("supplierTypeValue") String supplierTypeValue, @Param("code") String code); List selectBankByApplySid(String createOrgSid); - List payList(@Param("useOrgSid") String useOrgSid, @Param("code") String code); + List payList(@Param("supplierTypeValue") String supplierTypeValue, @Param("code") String code); } \ No newline at end of file diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturerbank/BaseManufacturerBankMapper.xml b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturerbank/BaseManufacturerBankMapper.xml index f79c276acc..b60c274205 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturerbank/BaseManufacturerBankMapper.xml +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturerbank/BaseManufacturerBankMapper.xml @@ -72,13 +72,13 @@ @@ -91,13 +91,13 @@ \ No newline at end of file diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturerbank/BaseManufacturerBankRest.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturerbank/BaseManufacturerBankRest.java index b5e37c4d1b..9201dcf576 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturerbank/BaseManufacturerBankRest.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturerbank/BaseManufacturerBankRest.java @@ -77,16 +77,18 @@ public class BaseManufacturerBankRest implements BaseManufacturerBankFeign { } @Override - public ResultBean> actualList(String useOrgSid) { + public ResultBean> actualList() { ResultBean> rb = ResultBean.fireFail(); - List voList = baseManufacturerBankService.actualList(useOrgSid, DictCommonEnum.dueBank.HK_TYPE.getCode()); + String supplierTypeValue = "主机厂"; + List voList = baseManufacturerBankService.actualList(supplierTypeValue,DictCommonEnum.dueBank.HK_TYPE.getCode()); return rb.success().setData(voList); } @Override - public ResultBean> payList(BaseManPayQuery query) { + public ResultBean> payList() { ResultBean> rb = ResultBean.fireFail(); - List voList = baseManufacturerBankService.payList(query); + String supplierTypeValue = "主机厂"; + List voList = baseManufacturerBankService.payList(supplierTypeValue,DictCommonEnum.dueBank.HK_TYPE.getCode()); return rb.success().setData(voList); } diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturerbank/BaseManufacturerBankService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturerbank/BaseManufacturerBankService.java index 4ca6bc4dda..e9f80e761c 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturerbank/BaseManufacturerBankService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturerbank/BaseManufacturerBankService.java @@ -1,8 +1,10 @@ package com.yxt.anrui.base.biz.basemanufacturerbank; -import com.yxt.anrui.base.api.basemanufacturerbank.*; +import com.yxt.anrui.base.api.basemanufacturerbank.BaseManActualVo; +import com.yxt.anrui.base.api.basemanufacturerbank.BaseManPayVo; +import com.yxt.anrui.base.api.basemanufacturerbank.BaseManufacturerBank; +import com.yxt.anrui.base.api.basemanufacturerbank.BaseManufacturerBankVo; import com.yxt.anrui.base.api.busvehicleapply.BusApplyVo; -import com.yxt.anrui.base.common.enums.DictCommonEnum; import com.yxt.common.base.service.MybatisBaseService; import org.springframework.stereotype.Service; @@ -69,17 +71,15 @@ public class BaseManufacturerBankService extends MybatisBaseService actualList(String useOrgSid, String code) { - return baseMapper.actualList(useOrgSid,code); + public List actualList(String supplierTypeValue, String code) { + return baseMapper.actualList(supplierTypeValue,code); } public List selectBankByApplySid(String createOrgSid) { return baseMapper.selectBankByApplySid(createOrgSid); } - public List payList(BaseManPayQuery query) { - String useOrgSid = query.getUseOrgSid(); - String code = DictCommonEnum.dueBank.HK_TYPE.getCode(); - return baseMapper.payList(useOrgSid,code); + public List payList(String supplierTypeValue, String code) { + return baseMapper.payList(supplierTypeValue,code); } } \ No newline at end of file