From 429c9ebcf5870c3fc1aee5b82779066a33775446 Mon Sep 17 00:00:00 2001 From: ligaode Date: Wed, 26 Mar 2025 15:21:46 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BaseManufacturerBankFeign.java | 4 ++ .../BaseManufacturerBankFeignFallback.java | 19 +++------ .../basevehiclebrand/BaseVehicleBrand.java | 41 +++++++------------ .../BaseManufacturerBankMapper.java | 2 + .../BaseManufacturerBankMapper.xml | 11 +++++ .../BaseManufacturerBankRest.java | 24 ++++------- .../BaseManufacturerBankService.java | 6 +++ .../FinPaymentapplyDetailVo.java | 2 - .../finpaymentrecord/FinPaymentrecordDto.java | 14 ------- .../FinPaymentapplyService.java | 26 ++++++------ 10 files changed, 63 insertions(+), 86 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 b56df30738..58b56aea09 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 @@ -63,4 +63,8 @@ public interface BaseManufacturerBankFeign { @ApiOperation("根据品牌sid和厂家回款通路名称查询银行账号") @GetMapping("/selectBankAccount/{brandSid}/{manufaSaleChannelValue}") ResultBean selectBankAccount(@PathVariable("brandSid") String brandSid,@PathVariable("manufaSaleChannelValue") String manufaSaleChannelValue); + + @ApiOperation("根据品牌sid和厂家回款通路名称查询付款通路编码key") + @GetMapping("/selectBankAccount/{brandSid}/{actualPay}") + ResultBean selectPaymentAccessNoKey(@PathVariable("brandSid") String brandSid,@PathVariable("actualPay") String actualPay); } \ 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 4dc7a19c9b..e855219268 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 @@ -2,22 +2,8 @@ package com.yxt.anrui.base.api.basemanufacturerbank; import com.yxt.common.core.result.ResultBean; import org.springframework.stereotype.Component; - import java.util.List; -/** - * Project: anrui-base(安瑞基础信息模块)
- * File: BaseManufacturerBankFeignFallback.java
- * Class: com.yxt.anrui.base.api.basemanufacturerbank.BaseManufacturerBankFeignFallback
- * Description: 供应厂商开户行信息.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2021-09-10 11:31:46
- * - * @author liupopo - * @version 1.0 - * @since 1.0 - */ @Component public class BaseManufacturerBankFeignFallback implements BaseManufacturerBankFeign { @@ -50,4 +36,9 @@ public class BaseManufacturerBankFeignFallback implements BaseManufacturerBankFe public ResultBean selectBankAccount(String brandSid, String manufaSaleChannelValue) { return null; } + + @Override + public ResultBean selectPaymentAccessNoKey(String brandSid, String actualPay) { + return null; + } } \ No newline at end of file diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclebrand/BaseVehicleBrand.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclebrand/BaseVehicleBrand.java index 9f5521c819..7d5d2a4156 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclebrand/BaseVehicleBrand.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclebrand/BaseVehicleBrand.java @@ -6,53 +6,40 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -/** - * Project: anrui-base(安瑞基础信息模块)
- * File: BaseVehicleBrand.java
- * Class: com.yxt.anrui.base.api.basevehiclebrand.BaseVehicleBrand
- * Description: 品牌信息.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2021-09-10 11:31:46
- * - * @author liupopo - * @version 1.0 - * @since 1.0 - */ @ApiModel(value = "品牌信息", description = "品牌信息") @TableName("base_vehicle_brand") @Data public class BaseVehicleBrand extends BaseEntity { private static final long serialVersionUID = 1L; - - @ApiModelProperty("品牌编码(陕汽必须字段)") + + @ApiModelProperty("品牌编码(陕汽必须字段)") private String brandCode; - - @ApiModelProperty("品牌名称(陕汽必须字段)") + + @ApiModelProperty("品牌名称(陕汽必须字段)") private String brandName; @ApiModelProperty("品牌简称(品牌首字母，但不可重复)") private String brandShortName; - - @ApiModelProperty("品牌类型key值") + + @ApiModelProperty("品牌类型key值") private String brandType; @ApiModelProperty("品牌类型value值") private String brandTypeValue; - - @ApiModelProperty("是否有效(陕汽必须字段)") + + @ApiModelProperty("是否有效(陕汽必须字段)") private String isValidity; - - @ApiModelProperty("创建组织(陕汽必须的字段)") + + @ApiModelProperty("创建组织(陕汽必须的字段)") private String createOrg; - - @ApiModelProperty("使用组织(陕汽必须的字段)") + + @ApiModelProperty("使用组织(陕汽必须的字段)") private String useOrg; @ApiModelProperty("使用组织名称") private String useOrgName; - - @ApiModelProperty("厂商sid(陕汽必须字段)") + + @ApiModelProperty("厂商sid(陕汽必须字段)") private String manufacturerSid; } 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 86c3f1c301..7074d11d33 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 @@ -85,4 +85,6 @@ public interface BaseManufacturerBankMapper extends BaseMapper selectByManSid(String sid); int updateBySidIsDeletes(String s); + + String selectPaymentAccessNoKey(@Param("brandSid") String brandSid,@Param("actualPay") String actualPay); } \ 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 fc9ff21ac0..8c69771c23 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 @@ -175,4 +175,15 @@ UPDATE base_manufacturer_bank SET isDelete = 1 where sid = #{s} + + \ 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 e48bd84d28..b4e24ee8ac 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 @@ -12,19 +12,6 @@ import org.springframework.web.bind.annotation.RestController; import java.util.List; -/** - * Project: anrui-base(安瑞基础信息模块)
- * File: BaseManufacturerBankFeignFallback.java
- * Class: com.yxt.anrui.base.biz.basemanufacturerbank.BaseManufacturerBankRest
- * Description: 供应厂商开户行信息.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2021-09-10 11:31:46
- * - * @author liupopo - * @version 1.0 - * @since 1.0 - */ @Api(tags = "供应厂商开户行信息") @RestController @RequestMapping("v1/basemanufacturerbank") @@ -80,7 +67,7 @@ public class BaseManufacturerBankRest implements BaseManufacturerBankFeign { public ResultBean> actualList() { ResultBean> rb = ResultBean.fireFail(); String supplierTypeValue = "主机厂"; - List voList = baseManufacturerBankService.actualList(supplierTypeValue,DictCommonEnum.dueBank.HK_TYPE.getCode()); + List voList = baseManufacturerBankService.actualList(supplierTypeValue, DictCommonEnum.dueBank.HK_TYPE.getCode()); return rb.success().setData(voList); } @@ -88,7 +75,7 @@ public class BaseManufacturerBankRest implements BaseManufacturerBankFeign { public ResultBean> payList() { ResultBean> rb = ResultBean.fireFail(); String supplierTypeValue = "主机厂"; - List voList = baseManufacturerBankService.payList(supplierTypeValue,DictCommonEnum.dueBank.HK_TYPE.getCode()); + List voList = baseManufacturerBankService.payList(supplierTypeValue, DictCommonEnum.dueBank.HK_TYPE.getCode()); return rb.success().setData(voList); } @@ -101,7 +88,12 @@ public class BaseManufacturerBankRest implements BaseManufacturerBankFeign { @Override public ResultBean selectBankAccount(String brandSid, String manufaSaleChannelValue) { - return baseManufacturerBankService.selectBankAccount(brandSid,manufaSaleChannelValue); + return baseManufacturerBankService.selectBankAccount(brandSid, manufaSaleChannelValue); + } + + @Override + public ResultBean selectPaymentAccessNoKey(String brandSid, String actualPay) { + return baseManufacturerBankService.selectPaymentAccessNoKey(brandSid, actualPay); } 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 083e250da3..2a40616e24 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 @@ -110,4 +110,10 @@ public class BaseManufacturerBankService extends MybatisBaseService selectPaymentAccessNoKey(String brandSid, String actualPay) { + ResultBean rb = ResultBean.fireFail(); + String paymentAccessNoKey = baseMapper.selectPaymentAccessNoKey(brandSid, actualPay); + return rb.success().setData(paymentAccessNoKey); + } } \ No newline at end of file diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapplydetails/FinPaymentapplyDetailVo.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapplydetails/FinPaymentapplyDetailVo.java index 4a558ca039..108cf97581 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapplydetails/FinPaymentapplyDetailVo.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapplydetails/FinPaymentapplyDetailVo.java @@ -1,11 +1,9 @@ package com.yxt.anrui.fin.api.finpaymentapplydetails; import com.yxt.anrui.fin.api.finpaymentapplydetailsbelow.FinPaymentapplyDetailsBelowDetailsVo; -import com.yxt.anrui.fin.api.finpaymentapplydetailsbelow.FinPaymentapplyDetailsBelowDto; import com.yxt.common.core.vo.Vo; import io.swagger.annotations.ApiModelProperty; import lombok.Data; - import java.math.BigDecimal; import java.util.List; diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentrecord/FinPaymentrecordDto.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentrecord/FinPaymentrecordDto.java index 84f11da9f4..5dc009c5d2 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentrecord/FinPaymentrecordDto.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentrecord/FinPaymentrecordDto.java @@ -25,25 +25,11 @@ *********************************************************/ package com.yxt.anrui.fin.api.finpaymentrecord; - import com.yxt.common.core.dto.Dto; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -/** - * Project: anrui-fin(财务)
- * File: FinPaymentrecordDto.java
- * Class: com.yxt.anrui.fin.api.finpaymentrecord.FinPaymentrecordDto
- * Description: fin_paymentrecord 数据传输对象.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2022-06-23 13:45:10
- * - * @author liupopo - * @version 1.0 - * @since 1.0 - */ @Data @ApiModel(value = "fin_paymentrecord 数据传输对象", description = "fin_paymentrecord 数据传输对象") public class FinPaymentrecordDto implements Dto { diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapply/FinPaymentapplyService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapply/FinPaymentapplyService.java index 2edb8bd9bc..60ba3ef764 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapply/FinPaymentapplyService.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapply/FinPaymentapplyService.java @@ -30,7 +30,10 @@ import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.google.common.util.concurrent.ThreadFactoryBuilder; +import com.yxt.anrui.base.api.basemanufacturerbank.BaseManufacturerBankFeign; import com.yxt.anrui.base.api.basevehicle.BaseVehicleFeign; +import com.yxt.anrui.base.api.basevehiclebrand.BaseVehicleBrand; +import com.yxt.anrui.base.api.basevehiclebrand.BaseVehicleBrandFeign; import com.yxt.anrui.base.common.enums.BillTypeEnum; import com.yxt.anrui.base.common.utils.Rule; import com.yxt.anrui.base.common.utils.domain.BillNo; @@ -97,19 +100,6 @@ import java.util.*; import java.util.concurrent.*; import java.util.stream.Collectors; -/** - * Project: anrui-fin(财务)
- * File: FinPaymentapplyService.java
- * Class: com.yxt.anrui.fin.biz.finpaymentapply.FinPaymentapplyService
- * Description: fin_paymentapply 业务逻辑.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2022-06-23 13:45:10
- * - * @author liupopo - * @version 1.0 - * @since 1.0 - */ @Service public class FinPaymentapplyService extends MybatisBaseService { @@ -147,6 +137,8 @@ public class FinPaymentapplyService extends MybatisBaseService listPageVo(PagerQuery pq) { FinPaymentapplyQuery query = pq.getParams(); @@ -669,6 +661,14 @@ public class FinPaymentapplyService extends MybatisBaseService