修改融资开立负数问题

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

@@ -47,7 +47,7 @@ public class FinanceInfController extends BaseController {
         //获取企业
         String companyId = user.getCompanyId();
         Map map = new HashMap();
-        if (!SalaryConstants.OPEX.equals(companyId)||!"03".equals(user.getCompanyType())) {
+        if (!SalaryConstants.OPEX.equals(companyId)&&!"03".equals(user.getCompanyType())) {
             map.put("companyId", companyId);
         }
         map.put("zfiId",zfrFinanceId);

sc-service/src/main/java/com/huyi/service/conmany/controller/OwnCompanyManageController.java

@@ -665,7 +665,7 @@ public class OwnCompanyManageController extends BaseController
             if(CommonUtil.isNotEmpty(scrType)) {
                 map.put("scrType", scrType);
             }
-            if(CommonUtil.isNotEmpty(scrStatus)) {
+            if(CommonUtil.isNotEmpty(scrStatus)&&!"03".equals(scrStatus)) {
                 map.put("scrStatus", scrStatus);
             }
         }else if(SalaryConstants.OPEX.equals(companyId)) {
@@ -681,7 +681,7 @@ public class OwnCompanyManageController extends BaseController
             if (CommonUtil.isNotEmpty(scrType)) {
                 map.put("scrType", scrType);
             }
-            if (CommonUtil.isNotEmpty(scrStatus)) {
+            if(CommonUtil.isNotEmpty(scrStatus)&&!"03".equals(scrStatus)) {
                 map.put("scrStatus", scrStatus);
             }
             if(CommonUtil.isNotEmpty(scrContarct)){

sc-service/src/main/java/com/huyi/service/credit/controller/OwnCreditController.java

@@ -931,6 +931,33 @@ public class OwnCreditController extends BaseController {
         String zfpSplit = CommonUtil.objToString(map.get("zfpSplit"));
         //获取放款方式
         String zfpcrLoanType = CommonUtil.objToString(map.get("zfpcrLoanType"));
+        String zfsqId = CommonUtil.objToString(map.get("zfsqId"));
+        String remaining ="";
+        if(CommonUtil.isNotEmpty(zfsqId)){
+                //查询供应商的授信额度
+                LambdaQueryWrapper<ZcFinanceSupplierQuota> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+                //公司
+                lambdaQueryWrapper.eq(ZcFinanceSupplierQuota::getZfsqCompanyId,companyId);
+                //授信编号
+                lambdaQueryWrapper.eq(ZcFinanceSupplierQuota::getZfsqId,zfsqId);
+                //授信额度
+                String amount = "";
+                List<ZcFinanceSupplierQuota>   list = financeSupplierQuotaService.findZcFinanceSupplierQuotas(lambdaQueryWrapper);
+                System.out.println("list====================>"+list);
+                if(list.size() < 1){
+                    return AjaxResult.error("获取授信额度信息失败");
+                }
+                amount = list.get(0).getZfsqAmount();
+                //获取已用的授信额度
+                Map m = new HashMap();
+                m.put("zfsqId",zfsqId);
+                m.put("companyId",companyId);
+                String userdBalance =  ownCreditService.getSupplierUsedBalance(m);
+                System.out.println("userdBalance====================>"+userdBalance);
+                //获取剩余额度
+                 remaining = AmtUtil.subtract(amount,userdBalance,2);
+            }
+        System.out.println("remaining====================>"+remaining);
         //融信编号
         String  str = "";
         //判断类型
@@ -984,10 +1011,17 @@ public class OwnCreditController extends BaseController {
         //非供应商申请
         if(!"0".equals(type)){
             //获取可用额度
-            String availableAmt = CommonUtil.objToString(map.get("availableAmt"));
-            if(CommonUtil.compare(zfiAmount,availableAmt) == 1){
-                throw new Exception("签发金额不可大于可用额度");
+            if(CommonUtil.isEmpty(remaining)){
+                String availableAmt = CommonUtil.objToString(map.get("availableAmt"));
+                if(CommonUtil.compare(zfiAmount,availableAmt) == 1){
+                    throw new Exception("签发金额不可大于可用额度");
+                }
+            }else{
+                if(CommonUtil.compare(zfiAmount,remaining) == 1){
+                    throw new Exception("签发金额不可大于可用额度");
+                }
             }
+
             //获取产品的最小融资金额
             String zfpMinimumAmount = CommonUtil.objToString(map.get("zfpMinimumAmount"));
             //如果最小融资金额大于签发金额

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

@@ -155,6 +155,7 @@ public class CreditLineController extends BaseController {
                 //状态(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.ne("zfi_product_id","");
                 queryWrapper.select("IFNULL(CAST(ROUND(SUM(zfi_amount),2)AS CHAR),'0.00') AS zfiAmount");
                 ZcFinanceInf zcFinanceInf = zcFinanceInfService.getOne(queryWrapper);
                 //申请金额(已用)
@@ -191,6 +192,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.ne("zfi_product_id","");
                 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);

sc-service/src/main/resources/mapper/credit/OwnCreditMapper.xml

@@ -322,7 +322,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                  CAST(ROUND(IFNULL(SUM(f.zfi_amount),0),2) AS CHAR)              'allAmount'
 
             FROM   zc_finance_inf f
-            WHERE f.zfi_status IN ('01','02','04','05')
+            WHERE
+             f.zfi_status IN ('01','02','04','05','06')
+             AND f.`zfi_product_id` != ''
             <if test="companyId != null  and companyId != ''">
                 AND f.zfi_core_id = #{companyId}
             </if>
@@ -338,7 +340,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         CAST(ROUND(IFNULL(SUM(f.zfi_amount),0),2) AS CHAR)              'allAmount'
 
         FROM   zc_finance_inf f
-        WHERE f.zfi_status IN ('01','02','04','05')
+        WHERE (f.zfi_status IN ('00','01','02','04','05','06')  or f.zfi_status is null)
         <if test="companyId != null  and companyId != ''">
             AND f.zfi_supplier_id = #{companyId}
         </if>