授信已使用额度状态判断,电子账户状态判断

sc-service/src/main/java/com/huyi/service/common/companyAcc/controller/companyAccController.java

@@ -80,7 +80,7 @@ public class companyAccController extends BaseController {
         //企业
         queryWrapper.eq(PayAccInf::getPaiCstno,companyId);
         //账户状态(0:未开通，1：冻结,2已开通3:待激活)
-        queryWrapper.eq(PayAccInf::getPaiStatus,"02");
+        queryWrapper.eq(PayAccInf::getPaiStatus,"2");
         //账户类型(00基本账户01贷款账户02信用账户03手续费账户04待结算账户05提现账户06虚拟账户)
         queryWrapper.eq(PayAccInf::getPaiAcctype,"06");
         //开户行号(302:中信银行)

sc-service/src/main/java/com/huyi/service/common/financeInf/controller/FinanceInfController.java

@@ -56,8 +56,10 @@ public class FinanceInfController extends BaseController {
             String zfiAmount = m.get("zfiAmount");
             //利率(融资费率)
             String zfpcrRate = m.get("zfpcrRate");
+            zfpcrRate = AmtUtil.divide(zfpcrRate,"100",4);
             //平台服务费收取费率(服务费率)
             String zfpcrChargeRate = m.get("zfpcrChargeRate");
+            zfpcrChargeRate = AmtUtil.divide(zfpcrChargeRate,"100",4);
             //放款日期
             String zfrLoanDate = m.get("zfrLoanDate");
             //融资状态
@@ -81,7 +83,7 @@ public class FinanceInfController extends BaseController {
             //预计融资成本
             String cost = AmtUtil.multiply(zfiAmount,zfpcrRate,2);
             cost = AmtUtil.multiply(cost,term,2);
-            cost = AmtUtil.divide(cost,"365");
+            cost = AmtUtil.divide(cost,"360");
             cost = AmtUtil.add(cost,money,2);
             /*预计净融资额：融资金额 – 预计融资成本*/
             String amount = AmtUtil.subtract(zfiAmount,cost,2);
@@ -99,7 +101,7 @@ public class FinanceInfController extends BaseController {
                 /*融资成本：融资金额*融资费率*融资期限 / 365 + 融资金额 * 服务费率*/
                 String costIng = AmtUtil.multiply(zfiAmount,zfpcrRate,2);
                 costIng = AmtUtil.multiply(costIng,termIng,2);
-                costIng = AmtUtil.divide(costIng,"365");
+                costIng = AmtUtil.divide(costIng,"360");
                 costIng = AmtUtil.add(costIng,money,2);
                 /*净融资额：融资金额 – 融资成本*/
                 String amountIng = AmtUtil.subtract(zfiAmount,costIng,2);

sc-service/src/main/java/com/huyi/service/creditLine/controller/CreditLineController.java

@@ -137,7 +137,7 @@ public class CreditLineController extends BaseController {
                 queryWrapper.in("zfi_supplier_quota_id", zfsqId);
                 //状态(00:待确权 01:待签收 02:已生效 03:已失效 04:融资中 05:已融资 06:平台退回 07:已失效(到期失效)08:已失效(还款成功失效)99:删除)
                 //queryWrapper.and(i -> i.ne("zfi_status", "00").or().ne("zfi_status", "03"));
-                queryWrapper.notIn("zfi_status","00,03,07,08");
+                queryWrapper.notIn("zfi_status","00","03","07","08");
                 queryWrapper.select("IFNULL(CAST(ROUND(SUM(zfi_amount),2)AS CHAR),'0.00') AS zfiAmount");
                 ZcFinanceInf zcFinanceInf = zcFinanceInfService.getOne(queryWrapper);
                 //申请金额(已用)
@@ -174,7 +174,7 @@ public class CreditLineController extends BaseController {
                 queryWrapper.in("zfi_core_quota_id", zfpcrId);
                 //状态(00:待确权 01:待签收 02:已生效 03:已失效 04:融资中 05:已融资 06:平台退回 07:已失效(到期失效)08:已失效(还款成功失效)99:删除)
                 //queryWrapper.and(i -> i.ne("zfi_status", "00").or().ne("zfi_status", "03"));
-                queryWrapper.notIn("zfi_status","00,03,07,08");
+                queryWrapper.notIn("zfi_status","00","03","07","08");
                 queryWrapper.select("IFNULL(CAST(ROUND(SUM(zfi_amount),2)AS CHAR),'0.00') AS zfiAmount");
                 ZcFinanceInf zcFinanceInf = zcFinanceInfService.getOne(queryWrapper);
                 //申请金额(已用)