款项结转模块优化

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpreloancreditapply/FinPreloanCreditApplyFeign.java

@@ -69,12 +69,12 @@ public interface FinPreloanCreditApplyFeign {
     @ApiOperation("公司风控提交")
     @PostMapping("/submitCompanyRisk")
     @ResponseBody
-    public ResultBean submitCompanyRisk(@RequestBody FinPreloanCreditApplyDto dto);
+    public ResultBean submitCompanyRisk(@RequestBody FinSubmitCompanyRiskDto dto);
 
     @ApiOperation("资方风控提交")
     @PostMapping("/submitCapitalRisk")
     @ResponseBody
-    public ResultBean submitCapitalRisk(@RequestBody FinPreloanCreditApplyDto dto);
+    public ResultBean submitCapitalRisk(@RequestBody FinSubmitCapitalRiskDto dto);
         
     @ApiOperation("根据sid删除记录")
     @DeleteMapping("/delBySids")

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpreloancreditapply/FinPreloanCreditApplyFeignFallback.java

@@ -60,12 +60,12 @@ public class FinPreloanCreditApplyFeignFallback implements FinPreloanCreditApply
 	}
 
 	@Override
-	public ResultBean submitCompanyRisk(FinPreloanCreditApplyDto dto) {
+	public ResultBean submitCompanyRisk(FinSubmitCompanyRiskDto dto) {
 		return null;
 	}
 
 	@Override
-	public ResultBean submitCapitalRisk(FinPreloanCreditApplyDto dto) {
+	public ResultBean submitCapitalRisk(FinSubmitCapitalRiskDto dto) {
 		return null;
 	}
 

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpreloancreditapply/FinSubmitCapitalRiskDto.java

@@ -25,9 +25,7 @@
  *********************************************************/
 package com.yxt.anrui.fin.api.finpreloancreditapply;
 
-import com.yxt.anrui.fin.api.finpreloancreditpeo.FinPreloanCreditPeoDto;
 import com.yxt.common.core.dto.Dto;
-import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -39,12 +37,14 @@ public class FinSubmitCapitalRiskDto implements Dto {
 
     private String sid;
 
-	@ApiModelProperty("公司审核结构")
+    @ApiModelProperty("资方剩余额度")
-    private String gsshjg;
+    private String capitalBalance;
-	@ApiModelProperty("公司审核日期")
+	@ApiModelProperty("资方审核结果")
-    private String gsshDate;
+    private String zfshjg;
-	@ApiModelProperty("公司审核备注")
+	@ApiModelProperty("资方审核日期")
-    private String gsshRemarks;
+    private String zfshDate;
+	@ApiModelProperty("资方审核备注")
+    private String zfshRemarks;
     @ApiModelProperty("查询结果截图")
-    private List<String> gsQueryResult = new ArrayList<>();
+    private List<String> gsQueryResults = new ArrayList<>();
 }

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpreloancreditapply/FinSubmitCompanyRiskDto.java

@@ -52,56 +52,14 @@ import java.util.List;
 @ApiModel(value = "贷前信用审核申请表 数据传输对象", description = "贷前信用审核申请表 数据传输对象")
 public class FinSubmitCompanyRiskDto implements Dto {
 
-    private String sid; // sid
+    private String sid;
 
-	@ApiModelProperty("创建人接口")
+    @ApiModelProperty("公司审核结果")
-    private String createByName; // 创建人接口
+    private String gsshjg;
-	@ApiModelProperty("申请部门sid")
+    @ApiModelProperty("公司审核日期")
-    private String applyDeptSid; // 申请部门sid
+    private String gsshDate;
-	@ApiModelProperty("申请部门名称")
+    @ApiModelProperty("公司审核备注")
-    private String applyDeptName; // 申请部门名称
+    private String gsshRemarks;
-	@ApiModelProperty("车型sid")
+    @ApiModelProperty("查询结果截图")
-    private String modelSid; // 车型sid
+    private List<String> gsQueryResults = new ArrayList<>();
-	@ApiModelProperty("车型名称")
-    private String modelName; // 车型名称
-	@ApiModelProperty("客户类型key")
-    private String custTypeKey; // 客户类型key
-	@ApiModelProperty("客户类型value")
-    private String custTypeValue; // 客户类型value
-	@ApiModelProperty("企业sid")
-    private String qySid; // 企业sid
-	@ApiModelProperty("企业名称")
-    private String qyName; // 企业名称
-	@ApiModelProperty("身份证号码")
-    private String idCard; // 身份证号码
-	@ApiModelProperty("客户sid")
-    private String custSid; // 客户sid
-	@ApiModelProperty("客户名称")
-    private String custName; // 客户名称
-	@ApiModelProperty("手机号码")
-    private String phone; // 手机号码
-	@ApiModelProperty("资方sid")
-    private String capitalSid; // 资方sid
-	@ApiModelProperty("资方名称")
-    private String capitalName; // 资方名称
-	@ApiModelProperty("分公司sid")
-    private String useOrgSid; // 分公司sid
-	@ApiModelProperty("分公司名称")
-    private String useOrgName; // 分公司名称
-	@ApiModelProperty("组织全路径")
-    private String orgSidPath; // 组织全路径
-	@ApiModelProperty("申请编号")
-    private String billNo; // 申请编号
-    @ApiModelProperty("公司风控结果")
-    private String gsfkjg;
-    @ApiModelProperty("资方风控结果")
-    private String zffkjg;
-    @ApiModelProperty("申诉结果")
-    private String ssjg;
-    @ApiModelProperty("身份证正反面附件")
-    private List<String> idCardImages = new ArrayList<>();
-    @ApiModelProperty("贷前信用审核人员列表")
-    private List<FinPreloanCreditPeoDto> finPreloanCreditPeos;
-    @ApiModelProperty("公司风控要求的文件")
-    private List<String> comFkFiles = new ArrayList<>();
 }

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finfundscarriedforwardapply/FinFundsCarriedForwardApplyService.java

@@ -43,7 +43,6 @@ import com.yxt.anrui.fin.api.finfundscarriedforwardapply.flowable.SubmitFinFunds
 import com.yxt.anrui.fin.api.finfundscarriedforwardveh.FinFundsCarriedForwardVeh;
 import com.yxt.anrui.fin.api.finfundscarriedforwardveh.FinFundsCarriedForwardVehDetailsVo;
 import com.yxt.anrui.fin.api.finfundscarriedforwardveh.FinFundsCarriedForwardVehDto;
-import com.yxt.anrui.fin.api.finselectedreceivablesdetailed.AppFinSelectedReceivablesDetailedDto;
 import com.yxt.anrui.fin.api.finselectedreceivablesdetailed.FinSelectedReceivablesDetailed;
 import com.yxt.anrui.fin.api.finselectedreceivablesdetailed.FinSelectedReceivablesDetailedVo;
 import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.FinUncollectedReceivablesDetailed;
@@ -551,9 +550,11 @@ public class FinFundsCarriedForwardApplyService extends MybatisBaseService<FinFu
                 updateYeBySid(sid);
                 for (AppFinFundsCarriedForwardYXYSKXDto yxysFinFundsCarriedForwardYXYSKXVo : yxysFinFundsCarriedForwardYXYSKXVos) {
                     FinUncollectedReceivablesDetailed finUncollectedReceivablesDetailed = finUncollectedReceivablesDetailedService.fetchBySid(yxysFinFundsCarriedForwardYXYSKXVo.getReceivablesSid());
-                    BigDecimal currentReceivableMoney = finUncollectedReceivablesDetailed.getCurrentReceivableMoney().subtract(new BigDecimal(yxysFinFundsCarriedForwardYXYSKXVo.getConfirmMoney()));
+                    if (finUncollectedReceivablesDetailed != null){
-                    finUncollectedReceivablesDetailed.setCurrentReceivableMoney(currentReceivableMoney);
+                        BigDecimal currentReceivableMoney = finUncollectedReceivablesDetailed.getCurrentReceivableMoney().subtract(new BigDecimal(yxysFinFundsCarriedForwardYXYSKXVo.getConfirmMoney()));
-                    finUncollectedReceivablesDetailedService.updateById(finUncollectedReceivablesDetailed);
+                        finUncollectedReceivablesDetailed.setCurrentReceivableMoney(currentReceivableMoney);
+                        finUncollectedReceivablesDetailedService.updateById(finUncollectedReceivablesDetailed);
+                    }
                 }
                 return rb.success();
             }
@@ -608,9 +609,11 @@ public class FinFundsCarriedForwardApplyService extends MybatisBaseService<FinFu
             updateYeBySid(businessSid);
             for (AppFinFundsCarriedForwardYXYSKXDto yxysFinFundsCarriedForwardYXYSKXVo : yxysFinFundsCarriedForwardYXYSKXVos) {
                 FinUncollectedReceivablesDetailed finUncollectedReceivablesDetailed = finUncollectedReceivablesDetailedService.fetchBySid(yxysFinFundsCarriedForwardYXYSKXVo.getReceivablesSid());
-                BigDecimal currentReceivableMoney = finUncollectedReceivablesDetailed.getCurrentReceivableMoney().subtract(new BigDecimal(yxysFinFundsCarriedForwardYXYSKXVo.getConfirmMoney()));
+                if (finUncollectedReceivablesDetailed != null){
-                finUncollectedReceivablesDetailed.setCurrentReceivableMoney(currentReceivableMoney);
+                    BigDecimal currentReceivableMoney = finUncollectedReceivablesDetailed.getCurrentReceivableMoney().subtract(new BigDecimal(yxysFinFundsCarriedForwardYXYSKXVo.getConfirmMoney()));
-                finUncollectedReceivablesDetailedService.updateById(finUncollectedReceivablesDetailed);
+                    finUncollectedReceivablesDetailed.setCurrentReceivableMoney(currentReceivableMoney);
+                    finUncollectedReceivablesDetailedService.updateById(finUncollectedReceivablesDetailed);
+                }
             }
             //极光推送
             finFundsCarriedForwardApply = fetchBySid(businessSid);
@@ -816,9 +819,11 @@ public class FinFundsCarriedForwardApplyService extends MybatisBaseService<FinFu
                 if ("发起申请".equals(finFundsCarriedForwardApply.getNodeState())){
                     for (AppFinFundsCarriedForwardYXYSKXVo yxysFinFundsCarriedForwardYXYSKXVo : yxysFinFundsCarriedForwardYXYSKXVos) {
                         FinUncollectedReceivablesDetailed finUncollectedReceivablesDetailed = finUncollectedReceivablesDetailedService.fetchBySid(yxysFinFundsCarriedForwardYXYSKXVo.getReceivablesSid());
-                        BigDecimal currentReceivableMoney = finUncollectedReceivablesDetailed.getCurrentReceivableMoney().add(new BigDecimal(yxysFinFundsCarriedForwardYXYSKXVo.getConfirmMoney()));
+                        if (finUncollectedReceivablesDetailed != null){
-                        finUncollectedReceivablesDetailed.setCurrentReceivableMoney(currentReceivableMoney);
+                            BigDecimal currentReceivableMoney = finUncollectedReceivablesDetailed.getCurrentReceivableMoney().add(new BigDecimal(yxysFinFundsCarriedForwardYXYSKXVo.getConfirmMoney()));
-                        finUncollectedReceivablesDetailedService.updateById(finUncollectedReceivablesDetailed);
+                            finUncollectedReceivablesDetailed.setCurrentReceivableMoney(currentReceivableMoney);
+                            finUncollectedReceivablesDetailedService.updateById(finUncollectedReceivablesDetailed);
+                        }
                     }
                 }
                 return rb.success().setData(resultBean.getData());
@@ -856,9 +861,11 @@ public class FinFundsCarriedForwardApplyService extends MybatisBaseService<FinFu
                 if ("发起申请".equals(finFundsCarriedForwardApply.getNodeState())){
                     for (AppFinFundsCarriedForwardYXYSKXVo yxysFinFundsCarriedForwardYXYSKXVo : yxysFinFundsCarriedForwardYXYSKXVos) {
                         FinUncollectedReceivablesDetailed finUncollectedReceivablesDetailed = finUncollectedReceivablesDetailedService.fetchBySid(yxysFinFundsCarriedForwardYXYSKXVo.getReceivablesSid());
-                        BigDecimal currentReceivableMoney = finUncollectedReceivablesDetailed.getCurrentReceivableMoney().add(new BigDecimal(yxysFinFundsCarriedForwardYXYSKXVo.getConfirmMoney()));
+                        if (finUncollectedReceivablesDetailed != null){
-                        finUncollectedReceivablesDetailed.setCurrentReceivableMoney(currentReceivableMoney);
+                            BigDecimal currentReceivableMoney = finUncollectedReceivablesDetailed.getCurrentReceivableMoney().add(new BigDecimal(yxysFinFundsCarriedForwardYXYSKXVo.getConfirmMoney()));
-                        finUncollectedReceivablesDetailedService.updateById(finUncollectedReceivablesDetailed);
+                            finUncollectedReceivablesDetailed.setCurrentReceivableMoney(currentReceivableMoney);
+                            finUncollectedReceivablesDetailedService.updateById(finUncollectedReceivablesDetailed);
+                        }
                     }
                 }
                 return rb.success().setData(resultBean.getData());
@@ -878,9 +885,11 @@ public class FinFundsCarriedForwardApplyService extends MybatisBaseService<FinFu
                     if ("发起申请".equals(finFundsCarriedForwardApply.getNodeState())){
                         for (AppFinFundsCarriedForwardYXYSKXVo yxysFinFundsCarriedForwardYXYSKXVo : yxysFinFundsCarriedForwardYXYSKXVos) {
                             FinUncollectedReceivablesDetailed finUncollectedReceivablesDetailed = finUncollectedReceivablesDetailedService.fetchBySid(yxysFinFundsCarriedForwardYXYSKXVo.getReceivablesSid());
-                            BigDecimal currentReceivableMoney = finUncollectedReceivablesDetailed.getCurrentReceivableMoney().add(new BigDecimal(yxysFinFundsCarriedForwardYXYSKXVo.getConfirmMoney()));
+                            if (finUncollectedReceivablesDetailed != null){
-                            finUncollectedReceivablesDetailed.setCurrentReceivableMoney(currentReceivableMoney);
+                                BigDecimal currentReceivableMoney = finUncollectedReceivablesDetailed.getCurrentReceivableMoney().add(new BigDecimal(yxysFinFundsCarriedForwardYXYSKXVo.getConfirmMoney()));
-                            finUncollectedReceivablesDetailedService.updateById(finUncollectedReceivablesDetailed);
+                                finUncollectedReceivablesDetailed.setCurrentReceivableMoney(currentReceivableMoney);
+                                finUncollectedReceivablesDetailedService.updateById(finUncollectedReceivablesDetailed);
+                            }
                         }
                     }
                     return rb.success().setData(resultBean.getData());

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpreloancreditapply/FinPreloanCreditApplyRest.java

@@ -25,6 +25,7 @@
  *********************************************************/
 package com.yxt.anrui.fin.biz.finpreloancreditapply;
 
+import com.yxt.anrui.fin.api.finpreloancreditapply.*;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
@@ -34,12 +35,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
-import com.yxt.anrui.fin.api.finpreloancreditapply.FinPreloanCreditApply;
-import com.yxt.anrui.fin.api.finpreloancreditapply.FinPreloanCreditApplyQuery;
-import com.yxt.anrui.fin.api.finpreloancreditapply.FinPreloanCreditApplyVo;
-import com.yxt.anrui.fin.api.finpreloancreditapply.FinPreloanCreditApplyDetailsVo;
-import com.yxt.anrui.fin.api.finpreloancreditapply.FinPreloanCreditApplyDto;
-import com.yxt.anrui.fin.api.finpreloancreditapply.FinPreloanCreditApplyFeign;
 
 /**
  * Project: anrui-fin(贷前信用审核管理) <br/>
@@ -79,13 +74,13 @@ public class FinPreloanCreditApplyRest implements FinPreloanCreditApplyFeign {
 	}
 
 	@Override
-	public ResultBean submitCompanyRisk(FinPreloanCreditApplyDto dto) {
+	public ResultBean submitCompanyRisk(FinSubmitCompanyRiskDto dto) {
-		return null;
+		return finPreloanCreditApplyService.submitCompanyRisk(dto);
 	}
 
 	@Override
-	public ResultBean submitCapitalRisk(FinPreloanCreditApplyDto dto) {
+	public ResultBean submitCapitalRisk(FinSubmitCapitalRiskDto dto) {
-		return null;
+		return finPreloanCreditApplyService.submitCapitalRisk(dto);
 	}
 
 	@Override

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpreloancreditapply/FinPreloanCreditApplyService.java

@@ -323,4 +323,26 @@ public class FinPreloanCreditApplyService extends MybatisBaseService<FinPreloanC
 		}
 		return rb.success().setMsg("删除成功");
 	}
+
+	public ResultBean submitCompanyRisk(FinSubmitCompanyRiskDto dto) {
+		String dtoSid = dto.getSid();
+		commonAppendixFeign.delFilesByLinkSidAndAttachType(dtoSid,FinFileTypeEnum.FileTypeEnum.COMPANY_QUERYRES.getCode());
+		List<String> gsQueryResults = dto.getGsQueryResults();
+		for (String gsQueryResult : gsQueryResults) {
+			CommonAppendixDto commonAppendixDto = new CommonAppendixDto();
+			if (gsQueryResult.indexOf(fileUploadComponent.getUrlPrefix()) > -1) {
+				gsQueryResult = gsQueryResult.replace(fileUploadComponent.getUrlPrefix(), "");
+			}
+			commonAppendixDto.setFilePath(gsQueryResult);
+			commonAppendixDto.setLinkSid(dtoSid);
+			commonAppendixDto.setAttachType(FinFileTypeEnum.FileTypeEnum.COMPANY_QUERYRES.getCode());
+			commonAppendixFeign.save(commonAppendixDto);
+		}
+
+		return null;
+	}
+
+	public ResultBean submitCapitalRisk(FinSubmitCapitalRiskDto dto) {
+		return null;
+	}
 }

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinbound/ScmApplyInboundMapper.java

@@ -50,4 +50,7 @@ public interface ScmApplyInboundMapper extends BaseMapper<ScmApplyInbound> {
 
     @Update("update scm_apply_inbound set nodeState = '已办结' where sid = #{businessSid}")
     void updateNodeState(String businessSid);
+
+    @Update("update scm_apply_inbound set num = #{num},nodeState = '已办结' where sid = #{busSid}")
+    void updateNumAndNodeStateBySid(@Param("num") String num, @Param("busSid") String busSid);
 }

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinbound/ScmApplyInboundService.java

@@ -1015,20 +1015,16 @@ public class ScmApplyInboundService extends MybatisBaseService<ScmApplyInboundMa
             return new ResultBean().fail().setMsg("车型与配置贷款或全款销售指导价未维护，不可确认");
         }
         List<ScmApplyInboundVehicleDto> vehicleList = dto.getVehicleList();
-        ScmApplyInbound scmApplyInbound1 = fetchBySid(busSid);
+        ScmApplyInbound scmApplyInbound = null;
         if (StringUtils.isBlank(busSid)) {
             ResultBean<String> resultBean = saveOrUpdateApplyInBound(dto);
             if (!resultBean.getSuccess()) {
                 return ResultBean.fireFail().setMsg(resultBean.getMsg());
             }
             String businessSid = resultBean.getData();
-            ScmApplyInbound scmApplyInbound = fetchBySid(businessSid);
+            scmApplyInbound = fetchBySid(businessSid);
             List<ScmApplyInboundVehicleDto> scmApplyInboundVehicleDtos1 = new ArrayList<>();
             ScmApplyInboundDto scmApplyInboundDto = new ScmApplyInboundDto();
-            List<ScmApplyInboundVehicleDto> vehicleList1 = dto.getVehicleList();
-            if (vehicleList1.size() == 0) {
-                return new ResultBean().fail().setMsg("车辆列表不能为空");
-            }
             for (ScmApplyInboundVehicleDto scmApplyInboundVehicleDto : vehicleList) {
                 String vinNo = scmApplyInboundVehicleDto.getVinNo();
                 if (StringUtils.isBlank(vinNo)) {
@@ -1045,8 +1041,7 @@ public class ScmApplyInboundService extends MybatisBaseService<ScmApplyInboundMa
                 saveOrUpdateApplyInBound(scmApplyInboundDto);
             }
             int i = Integer.parseInt(num) - scmApplyInboundVehicleDtos1.size();
-            baseMapper.updateNumBySid(String.valueOf(i), businessSid);
+            baseMapper.updateNumAndNodeStateBySid(String.valueOf(i), businessSid);
-            baseMapper.updateNodeState(businessSid);
             //数据推送
             String name = "";
             String confirmSid = "";
@@ -1064,7 +1059,7 @@ public class ScmApplyInboundService extends MybatisBaseService<ScmApplyInboundMa
             }
             return resultBean;
         }
-        return confirmRZUpdate(dto, busSid, scmApplyInbound1);
+        return confirmRZUpdate(dto, busSid, scmApplyInbound);
     }
 
     private synchronized ResultBean confirmRZUpdate(SubmitScmApplyInboundDto dto, String businessSid, ScmApplyInbound scmApplyInbound) {