Merge remote-tracking branch 'origin/master'

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,finPaymentrecord.getCost().toString());
                     }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,finPaymentrecord.getCost().toString());
                     }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

@@ -18,6 +18,7 @@ import org.springframework.cloud.openfeign.SpringQueryMap;
 import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
+import java.math.BigDecimal;
 import java.util.List;
 
 
@@ -117,8 +118,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, @RequestParam("cost")String cost);
 }

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,String cost) {
         return null;
     }
 }

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

@@ -239,7 +239,7 @@
     <select id="selectByAccountNumAndUseSid" resultType="com.yxt.anrui.fin.api.finmanufacturerbank.FinManufacturerBank">
         select *
         from anrui_fin.fin_manufacturer_bank
-        where bankAccount = #{bankAccount}
+        where bankAccount = #{accountNumber}
           and useOrgSid = #{useOrgSid}
     </select>
 

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,String cost) {
         ResultBean rb = ResultBean.fireFail();
-        loanRepurchaseApplyService.pushRiskToFin(applySid);
+        loanRepurchaseApplyService.pushRiskToFin(applySid,payTypeCode,accountNumber,cost);
         return rb.success();
     }
 }

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

@@ -833,15 +833,18 @@ public class LoanRepurchaseApplyService extends MybatisBaseService<LoanRepurchas
             return rb.setMsg("操作失败!提交的数据不一致");
         }
     }
-
+    @Transactional(rollbackFor = Exception.class)
-    public void pushRiskToFin(String businessSid){
+    public void pushRiskToFin(String businessSid,String payTypeCode,String accountNumber,String cost){
         LoanRepurchaseApply loanRepurchaseApply = fetchBySid(businessSid);
         LoanRepurchaseCost loanRepurchaseCost = loanRepurchaseCostService.selectByMainSid(businessSid);
         //查询月还明细表，遍历
         List<LoanRepaymentPlanDetails> list = loanRepaymentPlanDetailsService.selectByBusVinSid2(loanRepurchaseApply.getBusVinSid());
         list.removeAll(Collections.singleton(null));
         if(!list.isEmpty()){
-            BigDecimal bankSettlePrice = loanRepurchaseCost.getBankSettlePrice();
+            BigDecimal bankSettlePrice = BigDecimal.ZERO;
+            if(StringUtils.isNotBlank(cost)){
+                bankSettlePrice = new BigDecimal(cost);
+            }
             if(bankSettlePrice != null && bankSettlePrice.compareTo(BigDecimal.ZERO)>0){
                 for (int jj = 0; jj < list.size(); jj++) {
                     LoanRepaymentPlanDetails loanRepaymentPlanDetails = list.get(jj);
@@ -858,7 +861,6 @@ public class LoanRepurchaseApplyService extends MybatisBaseService<LoanRepurchas
                             loanRepaymentPlanDetails.setPaymentMoney(paymentMoney);
                             loanRepaymentPlanDetailsService.updateById(loanRepaymentPlanDetails);
                         }else{
-                            bankSettlePrice = BigDecimal.ZERO;
                             BigDecimal paymentMoney = loanRepaymentPlanDetails.getPaymentMoney();
                             if(paymentMoney != null){
                                 paymentMoney = paymentMoney.add(bankSettlePrice);
@@ -943,12 +945,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 +953,7 @@ public class LoanRepurchaseApplyService extends MybatisBaseService<LoanRepurchas
                     voucherResultDetailDtoDf2.setSubjectNo("1002.02.01");
                 }
                 voucherResultDetailDtoDf2.setSummary(loanRepurchaseApply.getBankName() + "结清");
-                //核算部门
+                voucherResultDetailDtoDf2.setBankAccount(accountNumber);
-                voucherResultDetailDtoDf2.setDimensionDept(deptVo.getOrgCode());
-                //核算客户
-                voucherResultDetailDtoDf2.setDimensionCustom(customerNumber);
                 voucherResultDetailDtoDf2.setCredit(loanRepurchaseCost.getBankSettlePrice().toString());
                 voucherResultDetailDtos.add(voucherResultDetailDtoDf2);
                 if(all.compareTo(BigDecimal.ZERO)>0){
@@ -973,7 +966,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);
                 }
             }
@@ -981,8 +974,17 @@ public class LoanRepurchaseApplyService extends MybatisBaseService<LoanRepurchas
             BigDecimal bankContractLiquidated = loanRepurchaseCost.getBankContractLiquidated();//合同违约金
             BigDecimal bankNominalPrice = loanRepurchaseCost.getBankNominalPrice();//名义价
             BigDecimal bankOtherReceivable = loanRepurchaseCost.getBankOtherReceivable();//资方其他应收
-            BigDecimal all2 = bankContractLiquidated.add(bankNominalPrice).add(bankOtherReceivable);
+            BigDecimal all2 = BigDecimal.ZERO;
-            if(bankContractLiquidated.compareTo(BigDecimal.ZERO)>0){
+            if(bankContractLiquidated != null){
+                all2 = all2.add(bankContractLiquidated);
+            }
+            if(bankNominalPrice != null){
+                all2 = all2.add(bankNominalPrice);
+            }
+            if(bankOtherReceivable != null){
+                all2 = all2.add(bankOtherReceivable);
+            }
+            if(bankContractLiquidated != null && bankContractLiquidated.compareTo(BigDecimal.ZERO)>0){
                 Voucher.VoucherResultDetailDto voucherResultDetailDtoDf = new Voucher.VoucherResultDetailDto();
                 if (null != dictCommonVo) {
                     voucherResultDetailDtoDf.setSubjectNo(dictCommonVo.getDictValue());
@@ -995,7 +997,7 @@ public class LoanRepurchaseApplyService extends MybatisBaseService<LoanRepurchas
                 voucherResultDetailDtoDf.setCredit(bankContractLiquidated.toString());
                 voucherResultDetailDtos.add(voucherResultDetailDtoDf);
             }
-            if(bankNominalPrice.compareTo(BigDecimal.ZERO)>0){
+            if(bankNominalPrice != null && bankNominalPrice.compareTo(BigDecimal.ZERO)>0){
                 Voucher.VoucherResultDetailDto voucherResultDetailDtoDf = new Voucher.VoucherResultDetailDto();
                 if (null != dictCommonVo) {
                     voucherResultDetailDtoDf.setSubjectNo(dictCommonVo.getDictValue());
@@ -1008,7 +1010,7 @@ public class LoanRepurchaseApplyService extends MybatisBaseService<LoanRepurchas
                 voucherResultDetailDtoDf.setCredit(bankNominalPrice.toString());
                 voucherResultDetailDtos.add(voucherResultDetailDtoDf);
             }
-            if(bankOtherReceivable.compareTo(BigDecimal.ZERO)>0){
+            if(bankOtherReceivable != null && bankOtherReceivable.compareTo(BigDecimal.ZERO)>0){
                 Voucher.VoucherResultDetailDto voucherResultDetailDtoDf = new Voucher.VoucherResultDetailDto();
                 if (null != dictCommonVo) {
                     voucherResultDetailDtoDf.setSubjectNo(dictCommonVo.getDictValue());
@@ -1049,7 +1051,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()){