修改

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdelivered/BusDeliveredFeign.java

@@ -102,4 +102,9 @@ public interface BusDeliveredFeign {
     @PostMapping("/selectInfo")
     @ResponseBody
     ResultBean<List<AppCarListVo>> selectInfo(@RequestBody DeliverDetailsQuery query);
+
+    @ApiOperation("根据busVinSid查询待出库")
+    @GetMapping("/selectByBusVinSid")
+    @ResponseBody
+    ResultBean<BusDelivered> selectByBusVinSid(@RequestParam("busVinSid") String busVinSid);
 }

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdelivered/BusDeliveredFeignFallback.java

@@ -90,4 +90,9 @@ public class BusDeliveredFeignFallback implements BusDeliveredFeign {
 	public ResultBean<List<AppCarListVo>> selectInfo(DeliverDetailsQuery query) {
 		return null;
 	}
+
+	@Override
+	public ResultBean<BusDelivered> selectByBusVinSid(String busVinSid) {
+		return null;
+	}
 }

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverpreparevehicle/BusHandoverPrepareVehicleFeign.java

@@ -48,7 +48,7 @@ import java.util.List;
  * @version 1.0
  * @since 1.0
  */
-@Api(tags = "交车准备-申请表")
+@Api(tags = "交车准备车辆子表")
 @FeignClient(
         contextId = "anrui-buscenter-handover-BusHandoverPrepareVehicle",
         name = "anrui-buscenter",

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyService.java

@@ -34,6 +34,7 @@ import com.yxt.anrui.buscenter.api.busarrearscarryvehicledetails.BusArrearsCarry
 import com.yxt.anrui.buscenter.api.buscenterfile.BuscenterFile;
 import com.yxt.anrui.buscenter.api.buscenterfile.BuscenterFileEnum;
 import com.yxt.anrui.buscenter.api.busdelivered.BusDeliveredDto;
+import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrder;
 import com.yxt.anrui.buscenter.api.bussalesorder.app.order.*;
 import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicle;
 import com.yxt.anrui.buscenter.biz.busarrearscarryvehicledetails.BusArrearsCarryVehicleDetailsService;
@@ -64,6 +65,8 @@ import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign;
 import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
 import com.yxt.anrui.portal.api.sysuser.SysUserVo;
 import com.yxt.anrui.portal.api.sysuser.UserRoleQuery;
+import com.yxt.anrui.riskcenter.api.loansolutions.LoanSolutionsFeign;
+import com.yxt.anrui.riskcenter.api.loansolutions.app.SolutionsDetailsVo;
 import com.yxt.anrui.scm.api.scmwarehouse.ScmWarehouseFeign;
 import com.yxt.anrui.scm.api.scmwarehouse.ScmWarehouseVo;
 import com.yxt.common.base.config.component.DocPdfComponent;
@@ -187,6 +190,8 @@ public class BusArrearsCarryVehicleApplyService extends MybatisBaseService<BusAr
     private ScmWarehouseFeign scmWarehouseFeign;
     @Autowired
     private BusSalesOrderVehicleService busSalesOrderVehicleService;
+    @Autowired
+    private LoanSolutionsFeign loanSolutionsFeign;
 
     /**
      * 欠款提车分页列表查询条件
@@ -1307,25 +1312,64 @@ public class BusArrearsCarryVehicleApplyService extends MybatisBaseService<BusAr
             map.put("remarks", remarks);
             //合同
             AppOrderPriceInfoVo appOrderPriceInfoVo = appOrderDetailsVo.getPriceInfo();
-            map.put("money", appOrderPriceInfoVo.getTotalPrice());
+            //单车价格
             BigDecimal wMoneyAll = BigDecimal.ZERO;
-            if (StringUtils.isNotBlank(appOrderPriceInfoVo.getTotalPrice())) {
-                wMoneyAll = wMoneyAll.add(new BigDecimal(appOrderPriceInfoVo.getTotalPrice()));
+            //=================================================
+            BusSalesOrder busSalesOrder = busSalesOrderService.selectDetailsByContractNo(dto.getContractId());
+            if ("2".equals(busSalesOrder.getFinancePlan()) || "2".equals(busSalesOrder.getPayTypeKey())) {
+                //根据销售订单sid查询金融方案
+                ResultBean<SolutionsDetailsVo> solutionsDetailsVoResultBean = loanSolutionsFeign.selectDetailsss(busSalesOrder.getSid());
+                SolutionsDetailsVo solutionsDetailsVo = solutionsDetailsVoResultBean.getData();
+                if (solutionsDetailsVo != null) {
+                    if (StringUtils.isNotBlank(solutionsDetailsVo.getTypeKey())) {
+                        //推送车款
+                        if ("02".equals(solutionsDetailsVo.getTypeKey())) {
+                            //外部金融：单车整体成交价-厂家贴息+服务费
+                            wMoneyAll = wMoneyAll.add(new BigDecimal(appOrderPriceInfoVo.getSingleFinalPrice()).subtract(new BigDecimal(solutionsDetailsVo.getFactoryDiscount())).add(new BigDecimal(solutionsDetailsVo.getServiceAmount())));
+                        } else {
+                            //自营非担保：实收合计
+                            wMoneyAll = wMoneyAll.add(new BigDecimal(solutionsDetailsVo.getRealTotal()));
                         }
-            map.put("DaXieMoney", TransformMoney.transform(TransformMoney.getDecimalStr(Double.valueOf(appOrderPriceInfoVo.getTotalPrice()).doubleValue())));
-            //根据合同号查询已经审核通过的总认款
-            ResultBean<String> subscribtAllResultBean = finCollectionConfirmationFeign.selectCollectionMoney(dto.getContractId());
+                    } else {//担保贷款: 实收合计
+                        wMoneyAll = wMoneyAll.add(new BigDecimal(solutionsDetailsVo.getRealTotal()));
+                    }
+                } else {
+                    //推送车款：单车整体成交价
+                    wMoneyAll = wMoneyAll.add(new BigDecimal(appOrderPriceInfoVo.getSingleFinalPrice()));
+                }
+            } else {
+                //推送车款：单车整体成交价
+                wMoneyAll = wMoneyAll.add(new BigDecimal(appOrderPriceInfoVo.getSingleFinalPrice()));
+            }
+            //总价款
+            wMoneyAll = wMoneyAll.multiply(new BigDecimal(stringList.size()));
+            map.put("money", wMoneyAll.toString());
+            //=================================================
+            /*if (StringUtils.isNotBlank(appOrderPriceInfoVo.getTotalPrice())) {
+                wMoneyAll = wMoneyAll.add(new BigDecimal(appOrderPriceInfoVo.getTotalPrice()));
+            }*/
+            map.put("DaXieMoney", TransformMoney.transform(TransformMoney.getDecimalStr(Double.valueOf(wMoneyAll.toString()).doubleValue())));
+            BigDecimal sqMoney = BigDecimal.ZERO;
+            //已付车款
+            List<String> vinSidList = vinList.stream().map(v -> v.getCarSid()).collect(Collectors.toList());
+            List<String> busVinSidList = busSalesOrderVehicleService.selectByVinSidAndContractNo(vinSidList,dto.getContractId());
+            ResultBean<String> subscribtAllResultBean = finCollectionConfirmationFeign.selectCollectionMoneys(dto.getContractId(),busVinSidList);
             if (subscribtAllResultBean.getData() != null) {
                 map.put("YMoney", subscribtAllResultBean.getData());
-                wMoneyAll = wMoneyAll.subtract(new BigDecimal(subscribtAllResultBean.getData()));
+                sqMoney = wMoneyAll.subtract(new BigDecimal(subscribtAllResultBean.getData()));
+            }else{
+                map.put("YMoney", BigDecimal.ZERO);
+                sqMoney = wMoneyAll.subtract(BigDecimal.ZERO);
             }
-            if (wMoneyAll.compareTo(BigDecimal.ZERO) < 0) {
+            //尚欠车款
+            if (sqMoney.compareTo(BigDecimal.ZERO) <= 0) {
                 map.put("wMoney", "0");
             } else {
-                map.put("wMoney", wMoneyAll.toString());
+                map.put("wMoney", sqMoney.toString());
             }
+            //尚欠车款大写
             if (StringUtils.isNotBlank(subscribtAllResultBean.getData())) {
-                map.put("DyMoney", TransformMoney.transform(TransformMoney.getDecimalStr(Double.valueOf(subscribtAllResultBean.getData()).doubleValue())));
+                map.put("DyMoney", TransformMoney.transform(TransformMoney.getDecimalStr(Double.valueOf(sqMoney.toString()).doubleValue())));
             } else {
                 map.put("DyMoney", TransformMoney.transform(TransformMoney.getDecimalStr(Double.valueOf(String.valueOf(BigDecimal.ZERO)).doubleValue())));
             }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdelivered/BusDeliveredMapper.java

@@ -94,4 +94,6 @@ public interface BusDeliveredMapper extends BaseMapper<BusDelivered> {
     IPage<BusDeliveredVo> selectListsVo(IPage<BusDelivered> page,@Param(Constants.WRAPPER) QueryWrapper<BusDelivered> qw);
 
     BusDelivered getState(@Param("contractNo") String contractNo, @Param("vinSid") String vinSid);
+
+    BusDelivered selectByBusVinSid(String busVinSid);
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdelivered/BusDeliveredMapper.xml

@@ -121,4 +121,8 @@
     <select id="getState" resultType="com.yxt.anrui.buscenter.api.busdelivered.BusDelivered">
         select * from bus_delivered where contractNo = #{contractNo} and busVinSid = #{vinSid}
     </select>
+
+    <select id="selectByBusVinSid" resultType="com.yxt.anrui.buscenter.api.busdelivered.BusDelivered">
+        select * from bus_delivered where busVinSid = #{busVinSid}
+    </select>
 </mapper>

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdelivered/BusDeliveredRest.java

@@ -120,4 +120,9 @@ public class BusDeliveredRest implements BusDeliveredFeign {
     public ResultBean<List<AppCarListVo>> selectInfo(DeliverDetailsQuery query) {
         return busDeliveredService.selectInfo(query);
     }
+
+    @Override
+    public ResultBean<BusDelivered> selectByBusVinSid(String busVinSid) {
+        return busDeliveredService.selectByBusVinSid(busVinSid);
+    }
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdelivered/BusDeliveredService.java

@@ -654,4 +654,10 @@ public class BusDeliveredService extends MybatisBaseService<BusDeliveredMapper,
     public BusDelivered getState(String contractNo, String vinSid) {
         return baseMapper.getState(contractNo,vinSid);
     }
+
+    public ResultBean<BusDelivered> selectByBusVinSid(String busVinSid) {
+        ResultBean<BusDelivered> rb = ResultBean.fireFail();
+        BusDelivered busDelivered = baseMapper.selectByBusVinSid(busVinSid);
+        return rb.success().setData(busDelivered);
+    }
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyMapper.xml

@@ -21,6 +21,7 @@
         <where>
             ${ew.sqlSegment}
         </where>
+        order by bd.billNo desc
     </select>
 
     <update id="updateStateBySid">
@@ -62,7 +63,7 @@
                   , '%')
             </if>
         </where>
-        order by bd.id desc
+        order by bd.billNo desc
     </select>
 
     <update id="updateStateAndReason">

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandoverpreparevehicle/BusHandoverPrepareVehicleRest.java

@@ -25,6 +25,7 @@
  *********************************************************/
 package com.yxt.anrui.buscenter.biz.bushandoverpreparevehicle;
 
+import com.yxt.anrui.buscenter.api.bushandoverpreparevehicle.*;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
@@ -33,14 +34,6 @@ import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
-import java.util.List;
-import com.yxt.anrui.buscenter.api.bushandoverpreparevehicle.BusHandoverPrepareVehicle;
-import com.yxt.anrui.buscenter.api.bushandoverpreparevehicle.BusHandoverPrepareVehicleQuery;
-import com.yxt.anrui.buscenter.api.bushandoverpreparevehicle.BusHandoverPrepareVehicleVo;
-import com.yxt.anrui.buscenter.api.bushandoverpreparevehicle.BusHandoverPrepareVehicleDetailsVo;
-import com.yxt.anrui.buscenter.api.bushandoverpreparevehicle.BusHandoverPrepareVehicleDto;
-import com.yxt.anrui.buscenter.api.bushandoverpreparevehicle.BusHandoverPrepareVehicleFeign;
-
 /**
  * Project: bus_handover(交车准备) <br/>
  * File: BusHandoverPrepareVehicleFeignFallback.java <br/>
@@ -54,7 +47,7 @@ import com.yxt.anrui.buscenter.api.bushandoverpreparevehicle.BusHandoverPrepareV
  * @version 1.0
  * @since 1.0
  */
-@Api(tags = "交车准备-申请表")
+@Api(tags = "交车准备车辆子表")
 @RestController("com.yxt.anrui.buscenter.biz.bushandoverpreparevehicle.BusHandoverPrepareVehicleRest")
 @RequestMapping("v1/bushandoverpreparevehicle")
 public class BusHandoverPrepareVehicleRest implements BusHandoverPrepareVehicleFeign {

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.java

@@ -209,4 +209,6 @@ public interface BusSalesOrderMapper extends BaseMapper<BusSalesOrder> {
     List<String> selectQKBusinessSid(@Param("userSid") String userSid, @Param("useOrgSid") String useOrgSid);
 
     List<String> selectByContractNoToVin(String contractId);
+
+    BusSalesOrder selectDetailsByContractNo(String contractId);
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.xml

@@ -418,4 +418,8 @@
         select bv.sid from bus_sales_order_vehicle bv left join bus_sales_order bo on bo.sid = bv.salesOrderSid
         where bo.contractNo = #{contractId}
     </select>
+
+    <select id="selectDetailsByContractNo" resultType="com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrder">
+        select * from bus_sales_order where contractNo = #{contractId}
+    </select>
 </mapper>

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java

@@ -6576,4 +6576,8 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
 
         return rb.success().setData(yuyanTest.getData());
     }
+
+    public BusSalesOrder selectDetailsByContractNo(String contractId) {
+        return baseMapper.selectDetailsByContractNo(contractId);
+    }
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleMapper.java

@@ -123,4 +123,13 @@ public interface BusSalesOrderVehicleMapper extends BaseMapper<BusSalesOrderVehi
 
     @Select("select * from bus_sales_order_vehicle where temporaryNo = #{fNumber}")
     BusSalesOrderVehicle fetchByLSBM(String fNumber);
+
+    /**
+     * 欠款提车查询已选车辆的关联的销售订单的车辆sid
+     *
+     * @param vinSidList
+     * @param contractId
+     * @return
+     */
+    List<String> selectByVinSidAndContractNo(@Param("list") List<String> vinSidList, @Param("contractNo") String contractId);
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleMapper.xml

@@ -141,4 +141,12 @@
             and length(bv.linkSid)>0
         </where>
     </select>
+
+    <select id="selectByVinSidAndContractNo" resultType="java.lang.String">
+        select bv.sid from bus_sales_order_vehicle bv left join bus_sales_order bo on bo.sid = bv.salesOrderSid
+        where bo.contractNo = #{contractNo} and bv.linkSid in
+        <foreach collection="list" item="item" index="index" open="(" separator="," close=")">
+            #{item}
+        </foreach>
+    </select>
 </mapper>

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleService.java

@@ -480,4 +480,14 @@ public class BusSalesOrderVehicleService extends MybatisBaseService<BusSalesOrde
         BusSalesOrderVehicle busSalesOrderVehicle = baseMapper.fetchByLSBM(fNumber);
         return rb.success().setData(busSalesOrderVehicle);
     }
+    /**
+     * 欠款提车查询已选车辆的关联的销售订单的车辆sid
+     *
+     * @param vinSidList
+     * @param contractId
+     * @return
+     */
+    public List<String> selectByVinSidAndContractNo(List<String> vinSidList, String contractId) {
+        return baseMapper.selectByVinSidAndContractNo(vinSidList,contractId);
+    }
 }

anrui-buscenter/anrui-buscenter-biz/src/main/resources/ftl/gd.ftl

@@ -483,24 +483,21 @@
             </w:p>
             <w:p wsp:rsidR="00B67617" wsp:rsidRDefault="00000000">
                 <w:pPr>
-                    <w:tabs>
-                        <w:tab w:val="left" w:pos="1320"/>
-                    </w:tabs>
-                    <w:spacing w:line="360" w:line-rule="auto"/>
+                    <w:spacing w:line="440" w:line-rule="exact"/>
                     <w:jc w:val="center"/>
                     <w:rPr>
                         <w:rFonts w:ascii="宋体" w:h-ansi="宋体" w:cs="宋体"/>
                         <wx:font wx:val="宋体"/>
                         <w:b/>
-                        <w:sz w:val="36"/>
-                        <w:sz-cs w:val="36"/>
+                        <w:b-cs/>
+                        <w:sz w:val="24"/>
                     </w:rPr>
                 </w:pPr>
                 <w:r>
                     <w:rPr>
                         <w:rFonts w:ascii="宋体" w:h-ansi="宋体" w:cs="宋体" w:hint="fareast"/>
-                        <wx:font wx:val="宋体"/>
                         <w:b/>
+                        <w:b-cs/>
                         <w:sz w:val="36"/>
                         <w:sz-cs w:val="36"/>
                     </w:rPr>

anrui-buscenter/anrui-buscenter-biz/src/main/resources/ftl/gd2.ftl

@@ -554,34 +554,25 @@
         <wx:sect>
             <w:p wsp:rsidR="00602C30" wsp:rsidRDefault="00000000">
                 <w:pPr>
-                    <w:spacing w:before="180" w:line="226" w:line-rule="auto"/>
-                    <w:ind w:left="2255"/>
+                    <w:spacing w:line="440" w:line-rule="exact"/>
+                    <w:jc w:val="center"/>
                     <w:rPr>
-                        <w:rFonts w:ascii="宋体" w:fareast="宋体" w:h-ansi="宋体" w:cs="宋体"/>
+                        <w:rFonts w:ascii="宋体" w:h-ansi="宋体" w:cs="宋体"/>
                         <wx:font wx:val="宋体"/>
-                        <w:sz w:val="28"/>
-                        <w:sz-cs w:val="28"/>
+                        <w:b/>
+                        <w:b-cs/>
+                        <w:sz w:val="24"/>
                     </w:rPr>
                 </w:pPr>
                 <w:r wsp:rsidRPr="005B0C88">
                     <w:rPr>
-                        <w:rFonts w:ascii="宋体" w:fareast="宋体" w:h-ansi="宋体" w:cs="宋体" w:hint="fareast"/>
-                        <wx:font wx:val="宋体"/>
-                        <w:spacing w:val="2"/>
-                        <w:sz w:val="28"/>
-                        <w:sz-cs w:val="28"/>
-                    </w:rPr>
-                    <w:t>公</w:t>
-                </w:r>
-                <w:r wsp:rsidRPr="005B0C88">
-                    <w:rPr>
-                        <w:rFonts w:ascii="宋体" w:fareast="宋体" w:h-ansi="宋体" w:cs="宋体" w:hint="fareast"/>
-                        <wx:font wx:val="宋体"/>
-                        <w:spacing w:val="1"/>
-                        <w:sz w:val="28"/>
-                        <w:sz-cs w:val="28"/>
+                        <w:rFonts w:ascii="宋体" w:h-ansi="宋体" w:cs="宋体" w:hint="fareast"/>
+                        <w:b/>
+                        <w:b-cs/>
+                        <w:sz w:val="36"/>
+                        <w:sz-cs w:val="36"/>
                     </w:rPr>
-                    <w:t>司股东会对外担保决议</w:t>
+                    <w:t>公司股东会对外担保决议</w:t>
                 </w:r>
             </w:p>
             <w:p wsp:rsidR="00602C30" wsp:rsidRDefault="00602C30">
@@ -728,7 +719,7 @@
                         <w:sz-cs w:val="23"/>
                         <w:u w:val="single"/>
                     </w:rPr>
-                    <w:t> (合同)</w:t>
+                    <w:t></w:t>
                 </w:r>
                 <w:r>
                     <w:rPr>
@@ -1243,18 +1234,11 @@
                         <w:sz w:val="23"/>
                         <w:sz-cs w:val="23"/>
                     </w:rPr>
-                    <w:t>年</w:t>
-                </w:r>
-                <w:r>
-                    <w:rPr>
-                        <w:rFonts w:ascii="仿宋" w:fareast="仿宋" w:h-ansi="仿宋" w:cs="仿宋"/>
-                        <wx:font wx:val="仿宋"/>
-                        <w:spacing w:val="6"/>
-                        <w:sz w:val="23"/>
-                        <w:sz-cs w:val="23"/>
-                    </w:rPr>
                     <w:t></w:t>
                 </w:r>
+                <w:pPr>
+                    <w:spacing w:line="283" w:line-rule="auto"/>
+                </w:pPr>
                 <w:r>
                     <w:rPr>
                         <w:rFonts w:ascii="仿宋" w:fareast="仿宋" w:h-ansi="仿宋" w:cs="仿宋"/>
@@ -1263,7 +1247,7 @@
                         <w:sz w:val="23"/>
                         <w:sz-cs w:val="23"/>
                     </w:rPr>
-                    <w:t> 月 日</w:t>
+                    <w:t>   年   月   日</w:t>
                 </w:r>
             </w:p>
             <w:sectPr wsp:rsidR="00602C30">

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmationFeign.java

@@ -161,4 +161,8 @@ public interface FinCollectionConfirmationFeign {
     @ApiOperation("更新已选择的款项明细的车架号")
     @PutMapping("/updateVin")
     ResultBean updateVin(@RequestParam("vinNo") String vinNo, @RequestParam("contractNo") String contractNo, @RequestParam("temporaryNo") String temporaryNo);
+
+    @ApiOperation("欠款提车已选车辆的已认款")
+    @GetMapping("/selectCollectionMoneys")
+    ResultBean<String> selectCollectionMoneys(@RequestParam("contractId") String contractId, @RequestParam("busVinSidList") List<String> busVinSidList);
 }

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmationFeignFallback.java

@@ -172,4 +172,9 @@ public class FinCollectionConfirmationFeignFallback implements FinCollectionConf
     public ResultBean updateVin(String vinNo, String contractNo, String temporaryNo) {
         return null;
     }
+
+    @Override
+    public ResultBean<String> selectCollectionMoneys(String contractId, List<String> busVinSidList) {
+        return null;
+    }
 }

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationService.java

@@ -31,7 +31,6 @@ import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yxt.anrui.base.api.basedistributor.BaseDistributorFeign;
-import com.yxt.anrui.base.api.basedistributor.BaseDistributorListVo;
 import com.yxt.anrui.base.api.baseinternalpurchase.flow.GetNodeVo;
 import com.yxt.anrui.base.api.basetrailer.BaseTrailerDetailsVo;
 import com.yxt.anrui.base.api.basetrailer.BaseTrailerFeign;
@@ -960,6 +959,14 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
         bv.setBusinessSid(businessSid);
         //用户sid
         bv.setUserSid(dto.getCreateBySid());
+        //========================================
+        finBillApplication = fetchBySid(businessSid);
+        FlowProcessMapQuery flowProcessMapQuery = new FlowProcessMapQuery();
+        flowProcessMapQuery.setProDefKey(bv.getModelId());
+        flowProcessMapQuery.setVariables(variables);
+        flowProcessMapQuery.setContractNo(finBillApplication.getContractNo());
+        variables = flowableFeign.getMap(flowProcessMapQuery).getData();
+        //=======================================
         bv.setFormVariables(variables);
         //流程定义id
         String billStateKey = dto.getBillStateKey();

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationMapper.java

@@ -118,4 +118,6 @@ public interface FinCollectionConfirmationMapper extends BaseMapper<FinCollectio
     void updateDown(@Param("skdSid") String skdSid,@Param("downNum") String downNum);
 
     String selectCollectionMoney(String contractNo);
+
+    String selectCollectionMoneys(@Param("contractNo") String contractId, @Param("list") List<String> busVinSidList);
 }

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationMapper.xml

@@ -184,4 +184,12 @@
         contractNo = #{contractNo} and auditState = 3
 
     </select>
+
+    <select id="selectCollectionMoneys" resultType="java.lang.String">
+        select sum(fsd.subscriptionMoney) from fin_selected_receivables_detailed  fsd left join fin_uncollected_receivables_detailed fusd on fusd.sid = fsd.receivablesSid
+        where fsd. auditState = 3 and fusd.busVinSid in
+        <foreach collection="list" item="item" index="index" open="(" separator="," close=")">
+            #{item}
+        </foreach>
+    </select>
 </mapper>

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationRest.java

@@ -250,4 +250,9 @@ public class FinCollectionConfirmationRest implements FinCollectionConfirmationF
     public ResultBean updateVin(String vinNo, String contractNo, String temporaryNo) {
         return finCollectionConfirmationService.updateVin(vinNo, contractNo, temporaryNo);
     }
+
+    @Override
+    public ResultBean<String> selectCollectionMoneys(String contractId, List<String> busVinSidList) {
+        return finCollectionConfirmationService.selectCollectionMoneys(contractId,busVinSidList);
+    }
 }

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java

@@ -41,6 +41,7 @@ import com.yxt.anrui.base.common.enums.BillTypeEnum;
 import com.yxt.anrui.base.common.enums.VehicleStateTempOrLast;
 import com.yxt.anrui.base.common.utils.Rule;
 import com.yxt.anrui.base.common.utils.domain.BillNo;
+import com.yxt.anrui.buscenter.api.busdelivered.BusDelivered;
 import com.yxt.anrui.buscenter.api.busdelivered.BusDeliveredDto;
 import com.yxt.anrui.buscenter.api.busdelivered.BusDeliveredFeign;
 import com.yxt.anrui.buscenter.api.busdeposit.AppBusDepositBuscenterDetailVo;
@@ -2246,6 +2247,9 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
                                 leftAll = leftAll.add(singleFinalPrice);
                                 rightAll = rightAll.add(bigDecimalVinAll);
                             }
+                            //根据busVinSid查询待出库中是否存在该数据
+                            ResultBean<BusDelivered> busDeliveredResultBean = busDeliveredFeign.selectByBusVinSid(finUncollectedReceivablesDetailed.getBusVinSid());
+                            if(busDeliveredResultBean.getData() == null){
                                 if (leftAll.compareTo(rightAll) <= 0) {//推送待出库
                                     BusDeliveredDto busDeliveredDto = new BusDeliveredDto();
                                     busDeliveredDto.setSubscriptionKey(VehicleStateTempOrLast.PaymentEnum.PAY_MODELS.getCode());
@@ -2281,6 +2285,8 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
                                     ResultBean resultBean1 = busDeliveredFeign.save(busDeliveredDto);
                                 }
                             }
+
+                        }
                     }
                 }
             });
@@ -4276,4 +4282,10 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
         baseMapper.updateById(confirmation);
         return rb.success().setMsg("撤回成功");
     }
+
+    public ResultBean<String> selectCollectionMoneys(String contractId, List<String> busVinSidList) {
+        ResultBean<String> rb = ResultBean.fireFail();
+        String moneyAll = baseMapper.selectCollectionMoneys(contractId,busVinSidList);
+        return rb.success().setData(moneyAll);
+    }
 }