Merge remote-tracking branch 'origin/master'

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturerbank/BaseManufacturerBankFeign.java

@@ -12,19 +12,6 @@ import org.springframework.web.bind.annotation.RequestBody;
 import javax.validation.Valid;
 import java.util.List;
 
-/**
- * Project: anrui-base(安瑞基础信息模块) <br/>
- * File: BaseManufacturerBankFeign.java <br/>
- * Class: com.yxt.anrui.base.api.basemanufacturerbank.BaseManufacturerBankFeign <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 = "供应厂商开户行信息")
 @FeignClient(
         contextId = "anrui-base-BaseManufacturerBank",
@@ -33,7 +20,6 @@ import java.util.List;
         fallback = BaseManufacturerBankFeignFallback.class)
 public interface BaseManufacturerBankFeign {
 
-
     @ApiOperation("保存或修改接口")
     @PostMapping("/savesOrUpdate")
     ResultBean saveOrUpdate(@Valid @RequestBody BaseManufacturerBankDto dto);
@@ -65,6 +51,6 @@ public interface BaseManufacturerBankFeign {
     ResultBean<String> selectBankAccount(@PathVariable("brandSid") String brandSid,@PathVariable("manufaSaleChannelValue") String manufaSaleChannelValue);
 
     @ApiOperation("根据品牌sid和厂家回款通路名称查询付款通路编码key")
-    @GetMapping("/selectBankAccount/{brandSid}/{actualPay}")
+    @GetMapping("/selectPaymentAccessNoKey/{brandSid}/{actualPay}")
     ResultBean<String> selectPaymentAccessNoKey(@PathVariable("brandSid") String brandSid,@PathVariable("actualPay") String actualPay);
 }

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapplyeve/FinPaymentapplyEveDetailsVo.java

@@ -25,7 +25,6 @@
  *********************************************************/
 package com.yxt.anrui.fin.api.finpaymentapplyeve;
 
-
 import com.yxt.common.core.vo.Vo;
 
 import io.swagger.annotations.ApiModel;
@@ -34,19 +33,6 @@ import lombok.Data;
 
 import java.math.BigDecimal;
 
-/**
- * Project: anrui-fin(付款申请平仓) <br/>
- * File: FinPaymentapplyEveVo.java <br/>
- * Class: com.yxt.anrui.fin.api.finpaymentapplyeve.FinPaymentapplyEveVo <br/>
- * Description: 付款申请-平仓 视图数据对象. <br/>
- * Copyright: Copyright (c) 2011 <br/>
- * Company: https://gitee.com/liuzp315 <br/>
- * Makedate: 2025-01-20 11:20:12 <br/>
- *
- * @author liupopo
- * @version 1.0
- * @since 1.0
- */
 @Data
 @ApiModel(value = "付款申请-平仓 视图数据详情", description = "付款申请-平仓 视图数据详情")
 public class FinPaymentapplyEveDetailsVo implements Vo {

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapply/FinPaymentapplyService.java

@@ -731,42 +731,43 @@ public class FinPaymentapplyService extends MybatisBaseService<FinPaymentapplyMa
                             //本次付款说明
                             finPaymentrecordDto.setPayRemark(finPaymentapply.getPayCompany() + "/" + finPaymentapplyDetailsBelowDetailsVo.getRemarks());
                             finPaymentrecordService.saveDto(finPaymentrecordDto);
-                            List<FinPaymentapplyDetailsBelowEveDetailsVo> finPaymentapplyDetailsBelowEveList = finPaymentapplyDetailsBelowEveService.selByMainSid(finPaymentapplyDetailsBelowDetailsVo.getSid());
-                            if (finPaymentapplyDetailsBelowEveList != null){
-                                for (FinPaymentapplyDetailsBelowEveDetailsVo finPaymentapplyDetailsBelowEveDetailsVo : finPaymentapplyDetailsBelowEveList) {
+                        }
+                    }
+                }
+                List<FinPaymentapplyEveDetailsVo> eveList = vo.getEveList();
+                eveList.removeAll(Collections.singleton(null));
+                if (!eveList.isEmpty()) {
+                    for (FinPaymentapplyEveDetailsVo finPaymentapplyEveDetailsVo : eveList) {
                         finPaymentrecordDto.setFinDataType(1);
                         //款项名称
                         finPaymentrecordDto.setCostTypeKey("");
-                                    finPaymentrecordDto.setCostTypeValue(finPaymentapplyDetailsBelowEveDetailsVo.getCostTitleValue());
+                        finPaymentrecordDto.setCostTypeValue("融资付款");
                         //款项详情
                         finPaymentrecordDto.setCostTitleKey("");
-                                    finPaymentrecordDto.setCostTitleValue(finPaymentapplyDetailsBelowEveDetailsVo.getCostTitleValue());
+                        finPaymentrecordDto.setCostTitleValue(finPaymentapplyEveDetailsVo.getCostTitleValue());
                         //付款方式
-                                    finPaymentrecordDto.setPayWayKey(finPaymentapplyDetailsBelowDetailsVo.getPaymentTypeKey());
-                                    finPaymentrecordDto.setPayWayValue(finPaymentapplyDetailsBelowDetailsVo.getPaymentType());
+                        finPaymentrecordDto.setPayWayKey(finPaymentapplyEveDetailsVo.getPayWayKey());
+                        finPaymentrecordDto.setPayWayValue(finPaymentapplyEveDetailsVo.getPayWayValue());
                         //是否推送回款返利
                         finPaymentrecordDto.setIsPushHkfl(0);
-                                    finPaymentrecordDto.setBusSid(finPaymentapplyDetailsBelowEveDetailsVo.getSid());
+                        finPaymentrecordDto.setBusSid(finPaymentapplyEveDetailsVo.getSid());
                         //收款银行账号
-                                    finPaymentrecordDto.setReceiveBankAccount(finPaymentapplyDetailsBelowEveDetailsVo.getReceivingAccount());
-                                    finPaymentrecordDto.setReceiveBank(finPaymentapplyDetailsBelowEveDetailsVo.getBank());
+                        finPaymentrecordDto.setReceiveBankAccount(finPaymentapplyEveDetailsVo.getReceivingAccount());
+                        finPaymentrecordDto.setReceiveBank(finPaymentapplyEveDetailsVo.getBank());
                         //收款单位名称
-                                    finPaymentrecordDto.setReceiveCompany(finPaymentapplyDetailsBelowEveDetailsVo.getReceiveCompany());
+                        finPaymentrecordDto.setReceiveCompany(finPaymentapplyEveDetailsVo.getReceiveCompany());
                         //金额
-                                    if (finPaymentapplyDetailsBelowEveDetailsVo.getExePayPrice() != null) {
-                                        finPaymentrecordDto.setCost(finPaymentapplyDetailsBelowEveDetailsVo.getExePayPrice().toString());
-                                        finPaymentrecordDto.setAccountsReceive(finPaymentapplyDetailsBelowEveDetailsVo.getExePayPrice().toString());
+                        if (finPaymentapplyEveDetailsVo.getExePayPrice() != null) {
+                            finPaymentrecordDto.setCost(finPaymentapplyEveDetailsVo.getExePayPrice().toString());
+                            finPaymentrecordDto.setAccountsReceive(finPaymentapplyEveDetailsVo.getExePayPrice().toString());
                         }
                         //备注
                         finPaymentrecordDto.setRemarks(finPaymentrecordDto.getCostTypeValue() + finPaymentrecordDto.getCostTitleValue());
                         //本次付款说明
-                                    finPaymentrecordDto.setPayRemark(finPaymentapply.getPayCompany() + "/" + finPaymentapplyDetailsBelowEveDetailsVo.getRemarks());
+                        finPaymentrecordDto.setPayRemark(finPaymentapply.getPayCompany() + "/" + finPaymentapplyEveDetailsVo.getRemarks());
                         finPaymentrecordService.saveDto(finPaymentrecordDto);
                     }
                 }
-                        }
-                    }
-                }
                 List<FinPaymentapplyVehicleVo> vehicleList = vo.getVehicleList();
                 if (vehicleList.size() > 0) {
                     for (FinPaymentapplyVehicleVo finPaymentapplyVehicleVo : vehicleList) {