更改

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<String> selectBankAccount(@PathVariable("brandSid") String brandSid,@PathVariable("manufaSaleChannelValue") String manufaSaleChannelValue);
+
+    @ApiOperation("根据品牌sid和厂家回款通路名称查询付款通路编码key")
+    @GetMapping("/selectBankAccount/{brandSid}/{actualPay}")
+    ResultBean<String> selectPaymentAccessNoKey(@PathVariable("brandSid") String brandSid,@PathVariable("actualPay") String actualPay);
 }

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(安瑞基础信息模块) <br/>
- * File: BaseManufacturerBankFeignFallback.java <br/>
- * Class: com.yxt.anrui.base.api.basemanufacturerbank.BaseManufacturerBankFeignFallback <br/>
- * Description: 供应厂商开户行信息. <br/>
- * Copyright: Copyright (c) 2011 <br/>
- * Company: https://gitee.com/liuzp315 <br/>
- * Makedate: 2021-09-10 11:31:46 <br/>
- *
- * @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<String> selectBankAccount(String brandSid, String manufaSaleChannelValue) {
         return null;
     }
+
+    @Override
+    public ResultBean<String> selectPaymentAccessNoKey(String brandSid, String actualPay) {
+        return null;
+    }
 }

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(安瑞基础信息模块) <br/>
- * File: BaseVehicleBrand.java <br/>
- * Class: com.yxt.anrui.base.api.basevehiclebrand.BaseVehicleBrand <br/>
- * Description: 品牌信息. <br/>
- * Copyright: Copyright (c) 2011 <br/>
- * Company: https://gitee.com/liuzp315 <br/>
- * Makedate: 2021-09-10 11:31:46 <br/>
- *
- * @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;
 }

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<BaseManufacturerB
     List<BaseManufacturerBank> selectByManSid(String sid);
 
     int updateBySidIsDeletes(String s);
+
+    String selectPaymentAccessNoKey(@Param("brandSid") String brandSid,@Param("actualPay") String actualPay);
 }

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}
     </update>
+
+    <select id="selectPaymentAccessNoKey" resultType="java.lang.String">
+        SELECT bmb.paymentAccessNoKey
+        FROM base_manufacturer_bank bmb
+                 LEFT JOIN base_manufacturer bm ON bm.sid = bmb.manufacturerSid
+                 LEFT JOIN base_vehicle_brand bvb ON bvb.manufacturerSid = bm.sid
+        WHERE bvb.sid = #{brandSid}
+          AND bmb.actualPay = #{actualPay}
+          AND bmb.isDelete = 0
+          AND bm.isDelete = 0
+    </select>
 </mapper>

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(安瑞基础信息模块) <br/>
- * File: BaseManufacturerBankFeignFallback.java <br/>
- * Class: com.yxt.anrui.base.biz.basemanufacturerbank.BaseManufacturerBankRest <br/>
- * Description: 供应厂商开户行信息. <br/>
- * Copyright: Copyright (c) 2011 <br/>
- * Company: https://gitee.com/liuzp315 <br/>
- * Makedate: 2021-09-10 11:31:46 <br/>
- *
- * @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<List<BaseManActualVo>> actualList() {
         ResultBean<List<BaseManActualVo>> rb = ResultBean.fireFail();
         String supplierTypeValue = "主机厂";
-        List<BaseManActualVo> voList = baseManufacturerBankService.actualList(supplierTypeValue,DictCommonEnum.dueBank.HK_TYPE.getCode());
+        List<BaseManActualVo> 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<List<BaseManPayVo>> payList() {
         ResultBean<List<BaseManPayVo>> rb = ResultBean.fireFail();
         String supplierTypeValue = "主机厂";
-        List<BaseManPayVo> voList = baseManufacturerBankService.payList(supplierTypeValue,DictCommonEnum.dueBank.HK_TYPE.getCode());
+        List<BaseManPayVo> 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<String> selectBankAccount(String brandSid, String manufaSaleChannelValue) {
-        return baseManufacturerBankService.selectBankAccount(brandSid,manufaSaleChannelValue);
+        return baseManufacturerBankService.selectBankAccount(brandSid, manufaSaleChannelValue);
+    }
+
+    @Override
+    public ResultBean<String> selectPaymentAccessNoKey(String brandSid, String actualPay) {
+        return baseManufacturerBankService.selectPaymentAccessNoKey(brandSid, actualPay);
     }
 
 

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<BaseManufact
     public int updateBySidIsDeletes(String s) {
         return baseMapper.updateBySidIsDeletes(s);
     }
+
+    public ResultBean<String> selectPaymentAccessNoKey(String brandSid, String actualPay) {
+        ResultBean rb = ResultBean.fireFail();
+        String paymentAccessNoKey = baseMapper.selectPaymentAccessNoKey(brandSid, actualPay);
+        return rb.success().setData(paymentAccessNoKey);
+    }
 }

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;
 

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(财务) <br/>
- * File: FinPaymentrecordDto.java <br/>
- * Class: com.yxt.anrui.fin.api.finpaymentrecord.FinPaymentrecordDto <br/>
- * Description: fin_paymentrecord 数据传输对象. <br/>
- * Copyright: Copyright (c) 2011 <br/>
- * Company: https://gitee.com/liuzp315 <br/>
- * Makedate: 2022-06-23 13:45:10 <br/>
- *
- * @author liupopo
- * @version 1.0
- * @since 1.0
- */
 @Data
 @ApiModel(value = "fin_paymentrecord 数据传输对象", description = "fin_paymentrecord 数据传输对象")
 public class FinPaymentrecordDto implements Dto {

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(财务) <br/>
- * File: FinPaymentapplyService.java <br/>
- * Class: com.yxt.anrui.fin.biz.finpaymentapply.FinPaymentapplyService <br/>
- * Description: fin_paymentapply 业务逻辑. <br/>
- * Copyright: Copyright (c) 2011 <br/>
- * Company: https://gitee.com/liuzp315 <br/>
- * Makedate: 2022-06-23 13:45:10 <br/>
- *
- * @author liupopo
- * @version 1.0
- * @since 1.0
- */
 @Service
 public class FinPaymentapplyService extends MybatisBaseService<FinPaymentapplyMapper, FinPaymentapply> {
 
@@ -147,6 +137,8 @@ public class FinPaymentapplyService extends MybatisBaseService<FinPaymentapplyMa
     private MessageFeign messageFeign;
     @Autowired
     private BaseVehicleFeign baseVehicleFeign;
+    @Autowired
+    private BaseManufacturerBankFeign baseManufacturerBankFeign;
 
     public PagerVo<FinPaymentapplyVo> listPageVo(PagerQuery<FinPaymentapplyQuery> pq) {
         FinPaymentapplyQuery query = pq.getParams();
@@ -669,6 +661,14 @@ public class FinPaymentapplyService extends MybatisBaseService<FinPaymentapplyMa
                         //款项名称
                         finPaymentrecordDto.setCostTypeKey(finPaymentapplyDetailVo.getCostTitleKey());
                         finPaymentrecordDto.setCostTypeValue(finPaymentapplyDetailVo.getCostTitleValue());
+                        if ("009".equals(finPaymentapplyDetailVo.getCostTitleKey())) {
+                            String paymentAccessNoKey = baseManufacturerBankFeign.selectPaymentAccessNoKey(finPaymentapply.getCarBrandSid(), finPaymentapplyDetailVo.getActualPay()).getData();
+                            finPaymentrecordDto.setPayChannel(paymentAccessNoKey);
+                            finPaymentrecordDto.setPayCostType("payChannel");
+                        } else {
+                            finPaymentrecordDto.setPayChannel(finPaymentapplyDetailVo.getCostTitleKey());
+                            finPaymentrecordDto.setPayCostType("payCostType");
+                        }
                         //款项详情
                         finPaymentrecordDto.setCostTitleKey(finPaymentapplyDetailVo.getCostTitleKey());
                         finPaymentrecordDto.setCostTitleValue(finPaymentapplyDetailVo.getCostTitleValue());