Merge remote-tracking branch 'origin/master'

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

@@ -113,12 +113,14 @@ public class CreditLineController extends BaseController {
             Map<String,String>  m = (Map<String, String>) listAll.get(j);
             //授信额度
             String zfpcrAmount = m.get("zfpcrAmount");
+            //授信id
+            String zfpcrId = m.get("zfpcrId");
             //融资产品
             String zfpcrProductId = m.get("zfpcrProductId");
             //通过融资产品查询融信表申请金额
             QueryWrapper<ZcFinanceInf> queryWrapper = new QueryWrapper<>();
             //融资产品id
-            queryWrapper.eq("zfi_product_id",zfpcrProductId);
+            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"));
             queryWrapper.select("IFNULL(CAST(ROUND(SUM(zfi_amount),2)AS CHAR),'0.00') AS zfiAmount");

sc-service/src/main/java/com/huyi/service/financeRecord/controller/FinanceRecordController.java

@@ -365,7 +365,7 @@ public class FinanceRecordController extends BaseController {
         //融信id
         zcFinanceInf.setZfiId(zfrFinanceId);
         //融信状态(00:待确权 01:待签收 02:已生效 03:已失效 04:融资中 05:已融资 06:平台退回)
-//        zcFinanceInf.setZfiStatus("04");
+        zcFinanceInf.setZfiStatus("04");
         //修改人
         zcFinanceInf.setUpdateBy(userId);
         //修改时间

sc-service/src/main/java/com/huyi/service/financeRecord/controller/RecordSealController.java

@@ -680,7 +680,7 @@ public class RecordSealController extends BaseController {
                 financeFileRelService.updateById(financeFileRel);
             }
         }
-        /**-------- 盖章完成修改融信状态并 开始--------**/
+        /**-------- 盖章完成修改融信状态和融资状态 开始--------**/
         //获取此操作员
         LoginUser userInfo = tokenService.getLoginUser();
         SysUser user = userInfo.getSysUser();
@@ -696,7 +696,18 @@ public class RecordSealController extends BaseController {
         //修改人
         finance.setUpdateBy(userId);
         financeInfService.updateById(finance);
-        /**-------- 盖章完成修改融信状态并且发起审批 结束--------**/
+        //修改融资状态
+        LambdaQueryWrapper<ZcFinanceRecord> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(ZcFinanceRecord::getZfrFinanceId,zfiId);
+        ZcFinanceRecord zcFinanceRecord = new ZcFinanceRecord();
+        //融资状态(00:融资中 01:已放款 02:融资失败 03:已结算 04:合同待签署)
+        zcFinanceRecord.setZfrStatus("00");
+        //修改时间
+        zcFinanceRecord.setCreateTime(DateUtils.getNowDate());
+        //修改人
+        zcFinanceRecord.setUpdateBy(userId);
+        iZcFinanceRecordService.update(zcFinanceRecord,queryWrapper);
+        /**-------- 盖章完成修改融信状态和融资状态 结束--------**/
         return AjaxResult.success();
     }