出库推送开票

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java

@@ -731,7 +731,7 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
             BaseVehicleCertificateVo baseVehicleCertificate = baseVehicleCertificateFeign.selStateByVehicleSid(busDeliveredApplyDetails.getVinSid()).getData();
             if (baseVehicleCertificate != null) {
                 finBillVehicleDto.setCertificateStateKey(baseVehicleCertificate.getCertificateState());
-                finBillVehicleDto.setCertificateStateValue(baseVehicleCertificate.getCertificateSituationValue());
+                finBillVehicleDto.setCertificateStateValue(baseVehicleCertificate.getCertificateStateValue());
             }
             finBillVehicles.add(finBillVehicleDto);
         }

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansolutions/LoanSolutionsService.java

@@ -191,6 +191,11 @@ public class LoanSolutionsService extends MybatisBaseService<LoanSolutionsMapper
                     return rb.setMsg("请输入保险金额");
                 }
                 loanSolutions.setPremiumCb(1);
+                if (StringUtils.isNotBlank(dto.getOffsetPremium())) {
+                    if(new BigDecimal(dto.getOffsetPremium()).compareTo(new BigDecimal(premium))>0){
+                        return rb.setMsg("抵顶首年保险费不能超过保险费用");
+                    }
+                }
             } else {
                 loanTotal = loanTotal.add(new BigDecimal(BigInteger.ZERO));
                 loanSolutions.setPremiumCb(0);
@@ -206,12 +211,17 @@ public class LoanSolutionsService extends MybatisBaseService<LoanSolutionsMapper
                     return rb.setMsg("请输入购置税");
                 }
                 loanSolutions.setPurchaseTaxCb(1);
+                if (StringUtils.isNotBlank(dto.getOffsetPurchasetax())) {
+                    if(new BigDecimal(dto.getOffsetPurchasetax()).compareTo(new BigDecimal(purchaseTax))>0){
+                        return rb.setMsg("抵顶购置税不能超过购置税");
+                    }
+                }
             } else {
                 loanTotal = loanTotal.add(new BigDecimal(BigInteger.ZERO));
                 loanSolutions.setPurchaseTaxCb(0);
             }
             //是否勾选车损上浮
-            if (dto.isVehDamageFloatCb()) {
+           /* if (dto.isVehDamageFloatCb()) {
                 //车损上浮
                 String vehDamageFloat = dto.getVehDamageFloat();
                 if (StringUtils.isNotBlank(vehDamageFloat)) {
@@ -224,7 +234,7 @@ public class LoanSolutionsService extends MybatisBaseService<LoanSolutionsMapper
             } else {
                 loanTotal = loanTotal.add(new BigDecimal(BigInteger.ZERO));
                 loanSolutions.setVehDamageFloatCb(0);
-            }
+            }*/
             loanSolutions.setLoanTotal(loanTotal);
             //产品贷款金额
             BigDecimal loanAmount = new BigDecimal(BigInteger.ZERO);
@@ -509,19 +519,23 @@ public class LoanSolutionsService extends MybatisBaseService<LoanSolutionsMapper
             BigDecimal offsetTotal = new BigDecimal(BigInteger.ZERO);
             //抵顶首年保险费
             String offsetPremium = dto.getOffsetPremium();
-            if (StringUtils.isNotBlank(offsetPremium)) {
+            if(dto.isPremiumCb()){
-                offsetTotal = offsetTotal.add(new BigDecimal(offsetPremium));
+                if (StringUtils.isNotBlank(offsetPremium)) {
-                loanSolutionsDetail.setOffsetPremium(new BigDecimal(offsetPremium));
+                    offsetTotal = offsetTotal.add(new BigDecimal(offsetPremium));
-            } else {
+                    loanSolutionsDetail.setOffsetPremium(new BigDecimal(offsetPremium));
-                loanSolutionsDetail.setOffsetPremium(BigDecimal.ZERO);
+                } else {
+                    loanSolutionsDetail.setOffsetPremium(BigDecimal.ZERO);
+                }
             }
-            //抵顶购置税
+            if (dto.isPurchaseTaxCb()) {
-            String offsetPurchasetax = dto.getOffsetPurchasetax();
+                //抵顶购置税
-            if (StringUtils.isNotBlank(offsetPurchasetax)) {
+                String offsetPurchasetax = dto.getOffsetPurchasetax();
-                offsetTotal = offsetTotal.add(new BigDecimal(offsetPurchasetax));
+                if (StringUtils.isNotBlank(offsetPurchasetax)) {
-                loanSolutionsDetail.setOffsetPurchasetax(new BigDecimal(offsetPurchasetax));
+                    offsetTotal = offsetTotal.add(new BigDecimal(offsetPurchasetax));
-            } else {
+                    loanSolutionsDetail.setOffsetPurchasetax(new BigDecimal(offsetPurchasetax));
-                loanSolutionsDetail.setOffsetPurchasetax(BigDecimal.ZERO);
+                } else {
+                    loanSolutionsDetail.setOffsetPurchasetax(BigDecimal.ZERO);
+                }
             }
             //实收合计 = 应收合计-抵顶合计
             BigDecimal realTotal = receivableTotal.subtract(offsetTotal);