垫款推送出纳付款调整

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentrecord/FinPaymentrecordFeign.java

@@ -70,7 +70,7 @@ public interface FinPaymentrecordFeign {
     @ApiOperation("新增")
     @PostMapping("/save")
     @ResponseBody
-    public ResultBean save(@RequestBody FinPaymentrecordDto dto);
+    public ResultBean<String> save(@RequestBody FinPaymentrecordDto dto);
 
     @ApiOperation("新增")
     @PostMapping("/saveReturnSid")

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentrecord/FinPaymentrecordFeignFallback.java

@@ -62,8 +62,8 @@ public class FinPaymentrecordFeignFallback implements FinPaymentrecordFeign {
     }
 
     @Override
-    public ResultBean save(FinPaymentrecordDto dto) {
-        return ResultBean.fireFail().setMsg("接口anrui-fin/finpaymentrecord/save无法访问");
+    public ResultBean<String> save(FinPaymentrecordDto dto) {
+        return null;
     }
 
     @Override

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordRest.java

@@ -73,7 +73,7 @@ public class FinPaymentrecordRest implements FinPaymentrecordFeign {
     }
 
     @Override
-    public ResultBean save(FinPaymentrecordDto dto) {
+    public ResultBean<String> save(FinPaymentrecordDto dto) {
         return finPaymentrecordService.saveDto(dto);
     }
 

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordService.java

@@ -325,12 +325,12 @@ public class FinPaymentrecordService extends MybatisBaseService<FinPaymentrecord
         return p;
     }
 
-    public ResultBean saveDto(FinPaymentrecordDto dto) {
+    public ResultBean<String> saveDto(FinPaymentrecordDto dto) {
         ResultBean rb = ResultBean.fireFail();
         FinPaymentrecord finPaymentrecord = new FinPaymentrecord();
         BeanUtil.copyProperties(dto, finPaymentrecord, "sid");
         baseMapper.insert(finPaymentrecord);
-        return rb.success();
+        return rb.success().setData(finPaymentrecord.getSid());
     }
 
     public ResultBean<String> saveReturnSid(FinPaymentrecordDto dto) {

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbepadsincereveh/LoanBePadsincereVeh.java

@@ -84,5 +84,6 @@ public class LoanBePadsincereVeh extends BaseEntity {
     private String saleVehSid;
 	@ApiModelProperty("垫款申请sid")
     private String mainSid; // 垫款申请sid
-
+    @ApiModelProperty("出纳付款列表sid")
+    private String paySid;
 }

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbepadsincereapply/LoanBePadsincereApplyService.java

@@ -467,7 +467,7 @@ public class LoanBePadsincereApplyService extends MybatisBaseService<LoanBePadsi
             }
             BePadsincereExcelInfo importVo = new BePadsincereExcelInfo();
             int physicalNumberOfCells = row.getPhysicalNumberOfCells();
-            if (physicalNumberOfCells < 8){
+            if (physicalNumberOfCells < 8) {
                 physicalNumberOfCells = 8;
             }
             for (int i = 0; i < physicalNumberOfCells; i++) {
@@ -909,7 +909,8 @@ public class LoanBePadsincereApplyService extends MybatisBaseService<LoanBePadsi
             UpdateFlowFieldVo ufVo = resultBean.getData();
             updateFlowFiled(BeanUtil.beanToMap(resultBean.getData()));
             if ("Event_end".equals(resultBean.getData().getTaskDefKey())) {
-                for (LoanBePadsincereVehDetailsVo loanBePadsincereVehDetailsVo : loanBePadsincereVehDetailsVos) {
+                List<LoanBePadsincereVehDetailsVo> loanBePadsincereVehDetailsVos1 = mergeListByBankCon(loanBePadsincereVehDetailsVos);
+                for (LoanBePadsincereVehDetailsVo loanBePadsincereVehDetailsVo : loanBePadsincereVehDetailsVos1) {
                     FinPaymentrecordDto finPaymentrecordDto = new FinPaymentrecordDto();
                     finPaymentrecordDto.setApplySid("");
                     finPaymentrecordDto.setPayCompanySid("");
@@ -934,7 +935,8 @@ public class LoanBePadsincereApplyService extends MybatisBaseService<LoanBePadsi
                     finPaymentrecordDto.setPurchaseSystemSid("");
                     finPaymentrecordDto.setPurchaseSystemName("");
                     finPaymentrecordDto.setBusRemarks(loanBePadsincereApply.getPaymentRemarks());
-                    finPaymentrecordFeign.save(finPaymentrecordDto);
+                    String sid = finPaymentrecordFeign.save(finPaymentrecordDto).getData();
+                    loanBePadsincereVehService.updatePaySid(sid,loanBePadsincereApply.getSid());
                 }
             } else {
                 //极光推送
@@ -958,6 +960,20 @@ public class LoanBePadsincereApplyService extends MybatisBaseService<LoanBePadsi
         }
     }
 
+    private static List<LoanBePadsincereVehDetailsVo> mergeListByBankCon(List<LoanBePadsincereVehDetailsVo> loanBePadsincereVehDetailsVoList){
+        Map<String, LoanBePadsincereVehDetailsVo> voHashMap = new HashMap<>();
+        for (LoanBePadsincereVehDetailsVo loanBePadsincereVehDetailsVo : loanBePadsincereVehDetailsVoList) {
+            String bankCon = loanBePadsincereVehDetailsVo.getBankContractNo();
+            if (voHashMap.containsKey(bankCon)){
+                LoanBePadsincereVehDetailsVo loanBePadsincereVehDetailsVo1 = voHashMap.get(bankCon);
+                loanBePadsincereVehDetailsVo1.setPadMoney(String.valueOf(Double.parseDouble(loanBePadsincereVehDetailsVo1.getPadMoney()) + Double.parseDouble(loanBePadsincereVehDetailsVo.getPadMoney())));
+            }else {
+                voHashMap.put(bankCon,loanBePadsincereVehDetailsVo);
+            }
+        }
+        return new ArrayList<>(voHashMap.values());
+    }
+
     public ResultBean breakProcess(LoanBePadsincereTaskQuery query) {
         ResultBean rb = ResultBean.fireFail();
         if (StringUtils.isBlank(query.getInstanceId())) {

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbepadsincereveh/LoanBePadsincereVehMapper.java

@@ -30,10 +30,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.toolkit.Constants;
 import com.yxt.anrui.riskcenter.api.loanbepadsincereveh.LoanBePadsincereVehDetailsVo;
-import org.apache.ibatis.annotations.Delete;
-import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
-import org.apache.ibatis.annotations.Select;
+import org.apache.ibatis.annotations.*;
 import com.yxt.anrui.riskcenter.api.loanbepadsincereveh.LoanBePadsincereVeh;
 import com.yxt.anrui.riskcenter.api.loanbepadsincereveh.LoanBePadsincereVehVo;
 
@@ -70,4 +67,7 @@ public interface LoanBePadsincereVehMapper extends BaseMapper<LoanBePadsincereVe
 
 	@Select("select *,saleVehSid AS busVinSid from loan_be_padsincere_veh where mainSid = #{sid}")
 	List<LoanBePadsincereVehDetailsVo> selByMainSid(String sid);
+
+	@Update("update loan_be_padsincere_veh set paySid = #{paySid} where mainSid = #{mainSid}")
+    void updatePaySid(@Param("paySid") String paySid,@Param("mainSid") String mainSid);
 }

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbepadsincereveh/LoanBePadsincereVehService.java

@@ -102,4 +102,8 @@ public class LoanBePadsincereVehService extends MybatisBaseService<LoanBePadsinc
     public List<LoanBePadsincereVehDetailsVo> selByMainSid(String sid) {
         return baseMapper.selByMainSid(sid);
     }
+
+    public void updatePaySid(String paySid, String mainSid) {
+        baseMapper.updatePaySid(paySid,mainSid);
+    }
 }

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitprep/LoanHomevisitPrepService.java

@@ -443,7 +443,7 @@ public class LoanHomevisitPrepService extends MybatisBaseService<LoanHomevisitPr
         printConfirmDto.setSalesOrderVehicles(salesOrderVehicles);
         List<File> filesList = new ArrayList<>();
         //贷款车辆买卖合同
-        /*List<String> dkclmmhts = dkclmmht(printConfirmDto, conSetUpKey);*/
+        List<String> dkclmmhts = dkclmmht(printConfirmDto, conSetUpKey);
         //生成车辆融资协议
         List<String> clrzxyUrls = generateCLRZXY(printConfirmDto, conSetUpKey);
         //生成还款协议
@@ -476,12 +476,12 @@ public class LoanHomevisitPrepService extends MybatisBaseService<LoanHomevisitPr
             //生成公司股东会对外担保决议
             gsgddwdbjyUrls = gsgddwdbjy(printConfirmDto, conSetUpKey);
         }
-        /*if (dkclmmhts != null && dkclmmhts.size() > 0) {
+        if (dkclmmhts != null && dkclmmhts.size() > 0) {
             for (String dkclmmht : dkclmmhts) {
                 File file = new File(docPdfComponent.getUploadTemplateUrl() + dkclmmht);
                 filesList.add(file);
             }
-        }*/
+        }
         if (clrzxyUrls != null && clrzxyUrls.size() > 0) {
             for (String clrzxyUrl : clrzxyUrls) {
                 File file = new File(docPdfComponent.getUploadTemplateUrl() + clrzxyUrl);