查询本企业电子账户,授信已用额度状态校验

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

@@ -1,6 +1,9 @@
 package com.huyi.service.common.companyAcc.controller;
 
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.huyi.service.base.entity.PayAccInf;
+import com.huyi.service.base.service.IPayAccInfService;
 import com.huyi.service.common.companyAcc.service.CompanyAccService;
 import com.tianhu.common.core.constant.SalaryConstants;
 import com.tianhu.common.core.utils.CommonUtil;
@@ -33,7 +36,8 @@ public class companyAccController extends BaseController {
     private TokenService tokenService;
     @Autowired
     private CompanyAccService companyAccService;
-
+    @Autowired
+    private IPayAccInfService iPayAccInfService;
 
     /**
      * 查询核心企业还款账户
@@ -61,5 +65,27 @@ public class companyAccController extends BaseController {
         return AjaxResult.success(list);
     }
 
-
+    /**
+     * 查询本企业的电子账户
+     * @return
+     */
+    @GetMapping("/listAcc")
+    public AjaxResult listAcc(){
+        //查询当前操作员
+        LoginUser userInfo = tokenService.getLoginUser();
+        SysUser use = userInfo.getSysUser();
+        //获取企业
+        String companyId = use.getCompanyId();
+        LambdaQueryWrapper<PayAccInf> queryWrapper = new LambdaQueryWrapper<>();
+        //企业
+        queryWrapper.eq(PayAccInf::getPaiCstno,companyId);
+        //账户状态(0:未开通，1：冻结,2已开通3:待激活)
+        queryWrapper.eq(PayAccInf::getPaiStatus,"02");
+        //账户类型(00基本账户01贷款账户02信用账户03手续费账户04待结算账户05提现账户06虚拟账户)
+        queryWrapper.eq(PayAccInf::getPaiAcctype,"06");
+        //开户行号(302:中信银行)
+        queryWrapper.eq(PayAccInf::getPaiQlbankno,"302");
+        List<PayAccInf> list = iPayAccInfService.findPayAccInfs(queryWrapper);
+        return AjaxResult.success(list);
+    }
 }

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

@@ -135,7 +135,7 @@ public class CreditLineController extends BaseController {
                 QueryWrapper<ZcFinanceInf> queryWrapper = new QueryWrapper<>();
                 //授信id
                 queryWrapper.in("zfi_supplier_quota_id", zfsqId);
-                //状态(00:待确权 01:待签收 02:已生效 03:已失效 04:融资中 05:已融资)
+                //状态(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.select("IFNULL(CAST(ROUND(SUM(zfi_amount),2)AS CHAR),'0.00') AS zfiAmount");
@@ -172,8 +172,9 @@ public class CreditLineController extends BaseController {
                 QueryWrapper<ZcFinanceInf> queryWrapper = new QueryWrapper<>();
                 //授信id
                 queryWrapper.in("zfi_core_quota_id", zfpcrId);
-                //状态(00:待确权 01:待签收 02:已生效 03:已失效 04:融资中 05:已融资)
-                queryWrapper.and(i -> i.ne("zfi_status", "00").or().ne("zfi_status", "03"));
+                //状态(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.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/creditLine/CreditLineMapper.xml

@@ -76,6 +76,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             q.zfsq_id               'zfsqId',
             q.zfsq_amount           'zfsqAmount',
             q.zfsq_status           'zfsqStatus',
+            r.zfpcr_id              'zfpcrId',
             r.zfpcr_start_date      'zfpcrStartDate',
             r.zfpcr_end_date        'zfpcrEndDate',
             r.zfpcr_rate 			'zfpcrRate',