完善结清推送凭证

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/voucher/PaymentVoucher.java

@@ -58,5 +58,7 @@ public class PaymentVoucher {
         public String remarks;
         @ApiModelProperty("借贷方类型")
         public String type;
+        @ApiModelProperty("核算维度银行")
+        public String bank;
     }
 }

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/voucher/Voucher.java

@@ -39,6 +39,8 @@ public class Voucher {
         public String dimensionCustom;
         @ApiModelProperty("核算维度银行账号")
         public String bankAccount;
+        @ApiModelProperty("核算维度银行")
+        public String bank;
         @ApiModelProperty("借方金额")
         public String debit;
         @ApiModelProperty("贷方金额")

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java

@@ -3919,7 +3919,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
                     loanRepaymentHistoryFeign.saveHistoryByEntity(historyEntity);
                 }
                 //认资方退还垫款或者结清时资方逾期利息
-                if (v.getReceivablesName().equals("资方退还垫款") || v.getReceivablesName().equals("结清时资方逾期利息") || v.getReceivablesName().equals("贷款保证金扣罚")) {
+                if (v.getReceivablesName().equals("资方退还垫款") || v.getReceivablesName().equals("贷款保证金扣罚")) {
                     CollectionVoucher.CollectionVoucherDetail d = getReturnBackMoneyVoucher(v, collectionDate);
                     voucherDetails.add(d);
                 }
@@ -4095,7 +4095,8 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
                 //认名义价、合同违约金、其他费用收款
                 if (v.getReceivablesName().equals("名义价") ||
                         v.getReceivablesName().equals("合同违约金") ||
-                        v.getReceivablesName().equals("其他费用")
+                        v.getReceivablesName().equals("其他费用") ||
+                        v.getReceivablesName().equals("结清时资方逾期利息")
                 ) {
                     CollectionVoucher.CollectionVoucherDetail d = getBalanceMoneyVoucher(v, collectionDate);
                     voucherDetails.add(d);

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/FinKingDeeFeignRest.java

@@ -291,6 +291,7 @@ public class FinKingDeeFeignRest implements FinKingDeeFeign {
                     subjectNo2 = "1009.01.00";
                     dto1.setDebit(voucherDetail.getAmount().toString());
                     dto2.setCredit(voucherDetail.getAmount().toString());
+                    dto2.setBank("342");
                 }
                 dto1.setSummary(summary1);
                 dto2.setSummary(summary2);
@@ -583,14 +584,25 @@ public class FinKingDeeFeignRest implements FinKingDeeFeign {
                         resultDetails.add(dto2);
                         decimal = decimal.add(voucherDetail.getAmount());
                     } else if (payCostTitleValue.equals("结清时资方逾期利息")) {
-                        Voucher.VoucherResultDetailDto dto2 = new Voucher.VoucherResultDetailDto(); //贷方
-                        dto2.setSummary("收资方逾期利息");
-                        dto2.setSubjectNo("1201.02.03");
-                        dto2.setDimensionDept(voucherDetail.getDeptCode());
-                        dto2.setDimensionCustom(voucherDetail.getCustomerCode());
-                        dto2.setCredit(String.valueOf(voucherDetail.getAmount()));
-                        resultDetails.add(dto2);
-                        decimal = decimal.add(voucherDetail.getAmount());
+                        if (voucherDetail.getSubtrahend().compareTo(BigDecimal.ZERO) != 0) {
+                            Voucher.VoucherResultDetailDto dto2 = new Voucher.VoucherResultDetailDto(); //贷方
+                            dto2.setSummary("收资方逾期利息");
+                            dto2.setSubjectNo(bankCode);
+                            dto2.setDimensionDept(voucherDetail.getDeptCode());
+                            dto2.setDimensionCustom(voucherDetail.getCustomerCode());
+                            dto2.setCredit(String.valueOf(voucherDetail.getSubtrahend()));
+                            resultDetails.add(dto2);
+                            decimal = decimal.add(voucherDetail.getSubtrahend());
+                        }
+                        if (voucherDetail.getBalance().compareTo(BigDecimal.ZERO) != 0) {
+                            Voucher.VoucherResultDetailDto dto3 = new Voucher.VoucherResultDetailDto(); //贷方
+                            dto3.setSummary("结清资方逾期利息差额转收入");
+                            dto3.setSubjectNo("6002.01.17");
+                            dto3.setDimensionDept(voucherDetail.getDeptCode());
+                            dto3.setCredit(String.valueOf(voucherDetail.getBalance()));
+                            resultDetails.add(dto3);
+                            decimal = decimal.add(voucherDetail.getBalance());
+                        }
                     } else if (payCostTitleValue.equals("名义价")) {
                         if (voucherDetail.getSubtrahend().compareTo(BigDecimal.ZERO) != 0) {
                             Voucher.VoucherResultDetailDto dto2 = new Voucher.VoucherResultDetailDto(); //贷方
@@ -862,6 +874,7 @@ public class FinKingDeeFeignRest implements FinKingDeeFeign {
                     dto4.setSubjectNo("1009.01.00");
                     dto4.setDimensionDept(voucherDetail.getDeptCode());
                     dto4.setDimensionCustom(voucherDetail.getCustomerCode());
+                    dto4.setBank("342");
                     dto4.setCredit(String.valueOf(voucherDetail.getSubtrahend()));
                     resultDetails.add(dto4);
                     Voucher.VoucherResultDetailDto dto5 = new Voucher.VoucherResultDetailDto(); //贷方

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/voucher/VoucherService.java

@@ -91,6 +91,11 @@ public class VoucherService extends FinKingDeeService {
             } else {
                 m.put("FFLEX5", "");
             }
+            if (StringUtils.isNotBlank(c.getBank())) {
+                m.put("FF100003", c.getBank());
+            } else {
+                m.put("FF100003", "");
+            }
             if (StringUtils.isNotBlank(c.getDimensionCustom())) {
                 m.put("FFLEX6", c.getDimensionCustom());
             } else {

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansettleapply/LoanSettleApplyService.java

@@ -1654,7 +1654,10 @@ public class LoanSettleApplyService extends MybatisBaseService<LoanSettleApplyMa
                 fin.setUseOrgName(planDetails.getUseOrgName());
                 fin.setOrgSidPath(loanSettleApply.getOrgSidPath());
                 selectList.add(fin);
-                cwYYQ = cwYYQ.add(mm);
+                LoanSettleVoucherVo v = new LoanSettleVoucherVo();
+                v.setReceivablesName("结清时资方逾期利息");
+                v.setSubscriptionMoney(mm);
+                list.add(v);
             }
 
         }
@@ -2343,7 +2346,7 @@ public class LoanSettleApplyService extends MybatisBaseService<LoanSettleApplyMa
                             voucherDetail.setCredit(subscriptionMoney.toString());
                             resultDetails.add(voucherDetail);
                         }
-                        if (receivablesName.equals("名义价") || receivablesName.equals("合同违约金") || receivablesName.equals("其他费用")) {
+                        if (receivablesName.equals("名义价") || receivablesName.equals("合同违约金") || receivablesName.equals("其他费用") || receivablesName.equals("结清时资方逾期利息")) {
                             SettleFinVo finVo = getFinSettleVo(planDetails.getBusVinSid(), receivablesName, subscriptionMoney.toString()).getData();
                             if (null != finVo) {
                                 if (null != finVo.getSubtrahend()) {
@@ -4019,6 +4022,11 @@ public class LoanSettleApplyService extends MybatisBaseService<LoanSettleApplyMa
                         subtrahend = bankCost.getBankOtherReceivable();
                     }
                 }
+                if (receivablesName.equals("结清时资方逾期利息")) {
+                    if (null != bankCost.getBankInterest()) {
+                        subtrahend = bankCost.getBankInterest();
+                    }
+                }
             }
             if (null != companyCost) {
                 if (receivablesName.equals("名义价")) {
@@ -4036,6 +4044,11 @@ public class LoanSettleApplyService extends MybatisBaseService<LoanSettleApplyMa
                         companyAmount = companyCost.getCompanyOtherPrice();
                     }
                 }
+                if (receivablesName.equals("结清时资方逾期利息")) {
+                    if (null != companyCost.getBankOverInterest()) {
+                        companyAmount = companyCost.getBankOverInterest();
+                    }
+                }
             }
             PlanNoReturnMoney p = baseMapper.selectNoReturnMoneyByType(planDetailsSid, receivablesName);
             if (null != p) {

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebate/ScmVehRebateVo.java

@@ -60,6 +60,7 @@ public class ScmVehRebateVo implements Vo {
     private Date createTime; // 创建日期
     @ApiModelProperty("状态")
     private String state; // 状态
+    private String vehRebateSid; // 单车返利sid
 	@ApiModelProperty("品牌sid")
     private String brandSid; // 品牌sid
 	@ApiModelProperty("品牌名称")

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatecheckapplydetail/ScmVehrebateCheckapplydetailVo.java

@@ -138,4 +138,5 @@ public class ScmVehrebateCheckapplydetailVo implements Vo {
     private BigDecimal secondSuppCost;
     @ApiModelProperty("二次抵顶费用说明")
     private String secondSuppRemark;
+    private String money;
 }

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateMapper.xml

@@ -4,7 +4,7 @@
     <!--    <where> ${ew.sqlSegment} </where>-->
     <!--    ${ew.customSqlSegment} -->
     <select id="selectPageVo" resultType="com.yxt.anrui.scm.api.scmvehrebate.ScmVehRebateVo">
-        SELECT * FROM scm_veh_rebate
+        SELECT *,sid vehRebateSid FROM scm_veh_rebate
         <where>
             ${ew.sqlSegment}
         </where>

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatecheckapply/ScmVehrebateCheckapplyService.java

@@ -68,6 +68,7 @@ import com.yxt.anrui.scm.api.scmvehrebatecheckapply.ScmVehrebateCheckapplyDto;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.math.BigDecimal;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -263,6 +264,24 @@ public class ScmVehrebateCheckapplyService extends MybatisBaseService<ScmVehreba
         }
         scmVehrebateCheckapplyDetailsVo.setScmLastVehrebateCheckapplydetailDetails(scmLastVehrebateCheckapplydetailDetailsVos);
         List<ScmVehrebateCheckapplydetailVo> scmVehrebateCheckapplydetailVos = scmVehrebateCheckapplydetailService.selByMainSid(sid);
+        if (scmVehrebateCheckapplydetailVos.size() > 0) {
+            for (ScmVehrebateCheckapplydetailVo s : scmVehrebateCheckapplydetailVos) {
+                BigDecimal money = BigDecimal.ZERO;
+                if (null != s.getOnceTreatCost()) {
+                    money = money.add(s.getOnceTreatCost());
+                }
+                if (null != s.getOnceSuppCost()) {
+                    money = money.add(s.getOnceSuppCost());
+                }
+                if (null != s.getSecondTreatCost()) {
+                    money = money.add(s.getSecondTreatCost());
+                }
+                if (null != s.getSecondSuppCost()) {
+                    money = money.add(s.getSecondSuppCost());
+                }
+                s.setMoney(money.toString());
+            }
+        }
         scmVehrebateCheckapplyDetailsVo.setScmVehrebateCheckapplydetailList(scmVehrebateCheckapplydetailVos);
         return rb.success().setData(scmVehrebateCheckapplyDetailsVo);
     }