修改

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordService.java

@@ -611,7 +611,13 @@ public class FinPaymentrecordService extends MybatisBaseService<FinPaymentrecord
                 } else if ("008".equals(costTypeKey) || "资方结清款".equals(finPaymentrecord.getCostTypeValue())) {
                     LoanRepurchaseApplyDetailsVo loanRepurchaseApply = loanRepurchaseApplyFeign.fetchDetailsBySid(finPaymentrecord.getApplySid()).getData();
                     if(loanRepurchaseApply != null){
-                        loanRepurchaseApplyFeign.pushRiskToFin(finPaymentrecord.getApplySid());
+                        String accountNumber = finPaymentrecord.getPayBankAccount();
+                        String payTypeCode = "";
+                        FinManufacturerBank manufacturerBank = finManufacturerBankService.selOneByBankNo(accountNumber, finPaymentrecord.getUseOrgSid()).getData();
+                        if (null != manufacturerBank) {
+                            payTypeCode = manufacturerBank.getDueBankKey();
+                        }
+                        loanRepurchaseApplyFeign.pushRiskToFin(finPaymentrecord.getApplySid(),payTypeCode,accountNumber);
                     }else{
                         if (StringUtils.isNotBlank(finPaymentrecord.getPayBankAccount())) {
                             String shouxufei = "0";
@@ -987,7 +993,13 @@ public class FinPaymentrecordService extends MybatisBaseService<FinPaymentrecord
                 } else if ("008".equals(costTypeKey) || "资方结清款".equals(finPaymentrecord.getCostTypeValue())) {
                     LoanRepurchaseApplyDetailsVo loanRepurchaseApply = loanRepurchaseApplyFeign.fetchDetailsBySid(finPaymentrecord.getApplySid()).getData();
                     if(loanRepurchaseApply != null){
-                        loanRepurchaseApplyFeign.pushRiskToFin(finPaymentrecord.getApplySid());
+                        String accountNumber = finPaymentrecord.getPayBankAccount();
+                        String payTypeCode = "";
+                        FinManufacturerBank manufacturerBank = finManufacturerBankService.selOneByBankNo(accountNumber, finPaymentrecord.getUseOrgSid()).getData();
+                        if (null != manufacturerBank) {
+                            payTypeCode = manufacturerBank.getDueBankKey();
+                        }
+                        loanRepurchaseApplyFeign.pushRiskToFin(finPaymentrecord.getApplySid(),payTypeCode,accountNumber);
                     }else{
                         if (StringUtils.isNotBlank(finPaymentrecord.getPayBankAccount())) {
                             String shouxufei = "0";

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepurchaseapply/LoanRepurchaseApplyFeign.java

@@ -117,8 +117,8 @@ public interface LoanRepurchaseApplyFeign {
     @ResponseBody
     public ResultBean<AppRepurchaseDetailsVo> appDetail(@PathVariable("sid") String sid);
 
-    @ApiOperation("app详情")
+    @ApiOperation("回购付款凭证推送")
     @PostMapping("/pushRiskToFin")
     @ResponseBody
-    ResultBean pushRiskToFin(@RequestParam("applySid") String applySid);
+    ResultBean pushRiskToFin(@RequestParam("applySid") String applySid,@RequestParam("payTypeCode")String payTypeCode,@RequestParam("accountNumber")String accountNumber);
 }

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepurchaseapply/LoanRepurchaseApplyFeignFallback.java

@@ -104,7 +104,7 @@ public class LoanRepurchaseApplyFeignFallback implements LoanRepurchaseApplyFeig
     }
 
     @Override
-    public ResultBean pushRiskToFin(String applySid) {
+    public ResultBean pushRiskToFin(String applySid,String payTypeCode,String accountNumber) {
         return null;
     }
 }

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepurchaseapply/LoanRepurchaseApplyRest.java

@@ -126,9 +126,9 @@ public class LoanRepurchaseApplyRest implements LoanRepurchaseApplyFeign {
     }
 
     @Override
-    public ResultBean pushRiskToFin(String applySid) {
+    public ResultBean pushRiskToFin(String applySid,String payTypeCode,String accountNumber) {
         ResultBean rb = ResultBean.fireFail();
-        loanRepurchaseApplyService.pushRiskToFin(applySid);
+        loanRepurchaseApplyService.pushRiskToFin(applySid,payTypeCode,accountNumber);
         return rb.success();
     }
 }

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepurchaseapply/LoanRepurchaseApplyService.java

@@ -834,7 +834,7 @@ public class LoanRepurchaseApplyService extends MybatisBaseService<LoanRepurchas
         }
     }
     @Transactional(rollbackFor = Exception.class)
-    public void pushRiskToFin(String businessSid){
+    public void pushRiskToFin(String businessSid,String payTypeCode,String accountNumber){
         LoanRepurchaseApply loanRepurchaseApply = fetchBySid(businessSid);
         LoanRepurchaseCost loanRepurchaseCost = loanRepurchaseCostService.selectByMainSid(businessSid);
         //查询月还明细表，遍历
@@ -943,12 +943,6 @@ public class LoanRepurchaseApplyService extends MybatisBaseService<LoanRepurchas
                     voucherResultDetailDtos.add(voucherResultDetailDtoDf);
                 }
                 Voucher.VoucherResultDetailDto voucherResultDetailDtoDf2 = new Voucher.VoucherResultDetailDto();
-                String accountNumber = loanRepurchaseCost.getBankAccount();
-                String payTypeCode = "";
-                FinManufacturerBank manufacturerBank = baseMapper.selectByAccountNumAndUseSid(accountNumber,loanRepurchaseApply.getUseOrgSid());
-                if (null != manufacturerBank) {
-                    payTypeCode = manufacturerBank.getDueBankKey();
-                }
 
                 all= all.add(loanRepurchaseCost.getBankSettlePrice());
                 if ("02".equals(payTypeCode)) {
@@ -957,10 +951,7 @@ public class LoanRepurchaseApplyService extends MybatisBaseService<LoanRepurchas
                     voucherResultDetailDtoDf2.setSubjectNo("1002.02.01");
                 }
                 voucherResultDetailDtoDf2.setSummary(loanRepurchaseApply.getBankName() + "结清");
-                //核算部门
-                voucherResultDetailDtoDf2.setDimensionDept(deptVo.getOrgCode());
-                //核算客户
-                voucherResultDetailDtoDf2.setDimensionCustom(customerNumber);
+                voucherResultDetailDtoDf2.setBankAccount(accountNumber);
                 voucherResultDetailDtoDf2.setCredit(loanRepurchaseCost.getBankSettlePrice().toString());
                 voucherResultDetailDtos.add(voucherResultDetailDtoDf2);
                 if(all.compareTo(BigDecimal.ZERO)>0){
@@ -973,7 +964,7 @@ public class LoanRepurchaseApplyService extends MybatisBaseService<LoanRepurchas
                     voucherResultDetailDtoJf.setDimensionDept(deptVo.getOrgCode());
                     //核算客户
                     voucherResultDetailDtoJf.setDimensionCustom(customerNumber);
-                    voucherResultDetailDtoJf.setCredit(all.toString());
+                    voucherResultDetailDtoJf.setDebit(all.toString());
                     voucherResultDetailDtos.add(voucherResultDetailDtoJf);
                 }
             }
@@ -1058,7 +1049,7 @@ public class LoanRepurchaseApplyService extends MybatisBaseService<LoanRepurchas
                 voucherResultDetailDtoJf.setDimensionDept(deptVo.getOrgCode());
                 //核算客户
                 voucherResultDetailDtoJf.setDimensionCustom(customerNumber);
-                voucherResultDetailDtoJf.setCredit(all2.toString());
+                voucherResultDetailDtoJf.setDebit(all2.toString());
                 voucherResultDetailDtos.add(voucherResultDetailDtoJf);
             }
             if(!voucherResultDetailDtos.isEmpty()){