Merge remote-tracking branch 'origin/master'

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basetrailer/BaseTrailerService.java

@@ -29,6 +29,7 @@ import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.date.DateUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yxt.anrui.base.api.basedistributor.BaseDistributorListVo;
 import com.yxt.anrui.base.api.basemanufacturer.BaseManufacturer;
 import com.yxt.anrui.base.api.basepurchasesystem.BasePurchaseSystemDetailsVo;
 import com.yxt.anrui.base.api.basetrailer.*;
@@ -63,10 +64,14 @@ import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrderFeign;
 import com.yxt.anrui.buscenter.api.bussalesorder.app.order.AppOrderDetailsVo;
 import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicle;
 import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicleFeign;
+import com.yxt.anrui.crm.api.crmcustomertemp.CrmCustomerTempFeign;
+import com.yxt.anrui.crm.api.crmcustomertemp.CrmCustomerTempVo;
 import com.yxt.anrui.fin.api.finbillapplication.FinBillApplicationDetailsVo;
 import com.yxt.anrui.fin.api.finbillapplication.FinBillApplicationFeign;
 import com.yxt.anrui.fin.api.finbillvehicle.FinBillVehicleDetailsVo;
 import com.yxt.anrui.fin.api.finbillvehicle.FinBillVehicleFeign;
+import com.yxt.anrui.fin.api.fincompanyinvoicing.FinCompanyInvoicingDetailsVo;
+import com.yxt.anrui.fin.api.fincompanyinvoicing.FinCompanyInvoicingFeign;
 import com.yxt.anrui.fin.api.finvehicleinvoice.FinVehicleInvoiceDto;
 import com.yxt.anrui.fin.api.finvehicleinvoice.FinVehicleInvoiceFeign;
 import com.yxt.anrui.fin.api.kingdee.FinKingDeeFeign;
@@ -155,6 +160,10 @@ public class BaseTrailerService extends MybatisBaseService<BaseTrailerMapper, Ba
     private BaseVehinstallService baseVehinstallService;
     @Autowired
     private BaseVehinstallmodelService baseVehinstallmodelService;
+    @Autowired
+    private FinCompanyInvoicingFeign finCompanyInvoicingFeign;
+    @Autowired
+    private CrmCustomerTempFeign crmCustomerTempFeign;
 
     private QueryWrapper<BaseTrailer> createQueryWrapper(BaseTrailerQuery query) {
         // 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
@@ -533,7 +542,7 @@ public class BaseTrailerService extends MybatisBaseService<BaseTrailerMapper, Ba
         if (!vehicleState.equals("0002")) {
             return rb.setMsg("此主车车辆库存状态不是出库，请重新选择");
         }
-        /*FinBillVehicleDetailsVo finBillVehicleDetailsVo = finBillVehicleFeign.fetchByVehSid(vehSid).getData();
+        FinBillVehicleDetailsVo finBillVehicleDetailsVo = finBillVehicleFeign.fetchByVehSid(vehSid).getData();
         FinBillApplicationDetailsVo finBillApplicationDetailsVo = null;
         if (finBillVehicleDetailsVo == null){
             return rb.setMsg("关联的主车未开票，不可出库");
@@ -543,7 +552,7 @@ public class BaseTrailerService extends MybatisBaseService<BaseTrailerMapper, Ba
             if (!finBillApplicationDetailsVo.getNodeState().equals("已办结")){
                 return rb.setMsg("关联的主车未开票，不可出库");
             }
-        }*/
+        }
         BaseVehicleOutDetailsVo baseVehicleOutDetailsVo = baseVehicleOutService.selByOrgSidAndVehSid(baseTrailer.getUseOrgSid(), vehSid);
         BaseVehicleOut baseVehicleOut = new BaseVehicleOut();
         BeanUtil.copyProperties(baseVehicleOutDetailsVo, baseVehicleOut, "sid");
@@ -625,22 +634,41 @@ public class BaseTrailerService extends MybatisBaseService<BaseTrailerMapper, Ba
                 saveOrUpdate(baseTrailer);
             }
         }
-        /*FinVehicleInvoiceDto finVehicleInvoiceDto = new FinVehicleInvoiceDto();
+        FinVehicleInvoiceDto finVehicleInvoiceDto = new FinVehicleInvoiceDto();
         finVehicleInvoiceDto.setInvoiceTitle(finBillApplicationDetailsVo.getOpenTickUnitName());
         finVehicleInvoiceDto.setContractNo(finBillApplicationDetailsVo.getContractNo());
         finVehicleInvoiceDto.setCustomerName(finBillApplicationDetailsVo.getCustomerName());
+        finVehicleInvoiceDto.setVehicleSid(baseTrailer.getSid());
         finVehicleInvoiceDto.setVIN(baseTrailer.getVinNo());
-        finVehicleInvoiceDto.setInvoiceTypeKey(finBillApplicationDetailsVo.getOpenTickTypeKey());
+        finVehicleInvoiceDto.setInvoiceTypeKey(finBillVehicleDetailsVo.getBillTypeKey());
-        finVehicleInvoiceDto.setInvoiceType(finBillApplicationDetailsVo.getOpenTickTypeValue());
+        finVehicleInvoiceDto.setInvoiceType(finBillVehicleDetailsVo.getBillTypeValue());
         finVehicleInvoiceDto.setInvoiceAmount(baseTrailer.getOneBillMoney());
         finVehicleInvoiceDto.setBillingStateKey("001");
         finVehicleInvoiceDto.setBillingState("未开票");
-        finVehicleInvoiceDto.setInvoicingName(finBillApplicationDetailsVo.getOpenTickName());
+        finVehicleInvoiceDto.setTransferStateKey("001");
+        finVehicleInvoiceDto.setTransferState("未移交");
+        finVehicleInvoiceDto.setVehicleType("挂车");
+        finVehicleInvoiceDto.setBillingSid(finBillApplicationDetailsVo.getSid());
+        finVehicleInvoiceDto.setInvoicingName(finBillVehicleDetailsVo.getOpenTickName());
         finVehicleInvoiceDto.setCreateBySid(finBillApplicationDetailsVo.getCreateBySid());
         finVehicleInvoiceDto.setBusinessStateKey(finBillApplicationDetailsVo.getBillStateKey());
         finVehicleInvoiceDto.setBusinessState(finBillApplicationDetailsVo.getBillStateValue());
         finVehicleInvoiceDto.setUseOrgSid(finBillApplicationDetailsVo.getUseOrgSid());
-        finVehicleInvoiceFeign.saveOrUpdate(finVehicleInvoiceDto);*/
+        FinCompanyInvoicingDetailsVo finCompanyInvoicingDetailsVo = finCompanyInvoicingFeign.fetchDetailsBySid(finBillVehicleDetailsVo.getOpenTickSid()).getData();
+        if (StringUtils.isNotBlank(finCompanyInvoicingDetailsVo.getBankAccount())){
+            finVehicleInvoiceDto.setAddress(finCompanyInvoicingDetailsVo.getAddress());
+            finVehicleInvoiceDto.setTelPhone(finCompanyInvoicingDetailsVo.getPhone());
+            finVehicleInvoiceDto.setOpeningBank(finCompanyInvoicingDetailsVo.getBankName());
+            finVehicleInvoiceDto.setBankNum(finCompanyInvoicingDetailsVo.getBankAccount());
+            finVehicleInvoiceDto.setTaxpayerNo(finCompanyInvoicingDetailsVo.getTaxpayerNo());
+            finVehicleInvoiceDto.setIsTakeTicket("是");
+        }else {
+            CrmCustomerTempVo crmCustomerTempVo = crmCustomerTempFeign.fetchSid(finBillVehicleDetailsVo.getOpenTickSid()).getData();
+            finVehicleInvoiceDto.setTelPhone(crmCustomerTempVo.getMobile());
+            finVehicleInvoiceDto.setTaxpayerNo(crmCustomerTempVo.getIDNumber());
+            finVehicleInvoiceDto.setIsTakeTicket("是");
+        }
+        finVehicleInvoiceFeign.saveOrUpdate(finVehicleInvoiceDto);
         return rb.success();
     }
 

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/bushandoverprepare/BusHandoverPrepareAddDto.java

@@ -46,4 +46,6 @@ public class BusHandoverPrepareAddDto implements Dto {
 
     private String model;
 
+
+
 }

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverprepare/BusHandoverPrepareFeign.java

@@ -36,19 +36,9 @@ import org.springframework.cloud.openfeign.SpringQueryMap;
 import org.springframework.web.bind.annotation.*;
 
 /**
- * Project: bus_handover(交车准备) <br/>
+ * 交车准备
- * File: BusHandoverPrepareFeign.java <br/>
- * Class: com.yxt.anrui.buscenter.api.bushandoverprepare.BusHandoverPrepareFeign <br/>
- * Description: 交车准备-申请表. <br/>
- * Copyright: Copyright (c) 2011 <br/>
- * Company: https://gitee.com/liuzp315 <br/>
- * Makedate: 2022-11-09 15:44:18 <br/>
- *
- * @author liupopo
- * @version 1.0
- * @since 1.0
  */
-@Api(tags = "交车准备-申请表")
+@Api(tags = "交车准备")
 @FeignClient(
         contextId = "anrui-buscenter-handover-BusHandoverPrepare",
         name = "anrui-buscenter",
@@ -99,22 +89,22 @@ public interface BusHandoverPrepareFeign {
     @ResponseBody
     ResultBean<AppBusHandoverPrepareInfoVo> getDeliveryPlanInfo(@SpringQueryMap AppBusHandoverPrepareInfoQuery query);
 
-    @ApiOperation("修改交车准备 各资料状态修改")
+/*    @ApiOperation("修改交车准备 各资料状态修改")
     @PutMapping("/saveState")
     @ResponseBody
-    ResultBean saveState(@RequestBody AppStateDateDto dto);
+    ResultBean saveState(@RequestBody AppStateDateDto dto);*/
 
-    @ApiOperation("获取交车准备 发票信息")
+    @ApiOperation("交车准备的发票信息")
     @GetMapping("/getInvoiceInfo")
     @ResponseBody
     ResultBean<AppInvoicingInfoVo> getInvoiceInfo(@SpringQueryMap AppInvoicingInfoQuery query);
 
-    @ApiOperation("获取交车准备 合格证信息")
+    @ApiOperation("交车准备的合格证信息")
     @GetMapping("/getCertificateInfo")
     @ResponseBody
     ResultBean<AppCertificateInfoVo> getCertificateInfo(@SpringQueryMap AppCertificateInfoQuery query);
 
-    @ApiOperation("获取交车准备 保单信息")
+    @ApiOperation("交车准备的保单信息")
     @GetMapping("/getPolicyInfo")
     @ResponseBody
     ResultBean<AppPolicyInfoVo> getPolicyInfo(@SpringQueryMap AppPolicyInfoQuery query);
@@ -124,7 +114,7 @@ public interface BusHandoverPrepareFeign {
     @ResponseBody
     ResultBean savePolicyInfo(@RequestBody AppPolicyDto dto);
 
-    @ApiOperation("获取交车准备 其他资料信息")
+    @ApiOperation("交车准备的其他资料信息")
     @GetMapping("/getOtherDataInfo")
     @ResponseBody
     ResultBean<AppOtherDataInfoVo> getOtherDataInfo(@SpringQueryMap AppOtherDataInfoQuery query);
@@ -149,4 +139,14 @@ public interface BusHandoverPrepareFeign {
     @ResponseBody
     ResultBean submitDeliveryPlanInfo(@RequestBody AppSubmitHandoverPrepareDto dto);
 
+    @ApiOperation("交车准备的随车资料信息")
+    @GetMapping("/getVehicleInformationInfo")
+    @ResponseBody
+    ResultBean<HandoverInformationVo> getVehicleInformationInfo(@RequestParam("sid") String sid);
+
+    @ApiOperation("随车资料确认")
+    @PostMapping("/updateVehicleInformation")
+    @ResponseBody
+    ResultBean updateVehicleInformation(@RequestParam("sid") String sid);
+
 }

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverprepare/BusHandoverPrepareFeignFallback.java

@@ -84,10 +84,10 @@ public class BusHandoverPrepareFeignFallback implements BusHandoverPrepareFeign
 		return null;
 	}
 
-	@Override
+	/*@Override
 	public ResultBean saveState(AppStateDateDto dto) {
 		return null;
-	}
+	}*/
 
 	@Override
 	public ResultBean<AppInvoicingInfoVo> getInvoiceInfo(AppInvoicingInfoQuery query) {
@@ -133,4 +133,14 @@ public class BusHandoverPrepareFeignFallback implements BusHandoverPrepareFeign
 	public ResultBean submitDeliveryPlanInfo(AppSubmitHandoverPrepareDto dto) {
 		return null;
 	}
+
+	@Override
+	public ResultBean<HandoverInformationVo> getVehicleInformationInfo(String sid) {
+		return null;
+	}
+
+	@Override
+	public ResultBean updateVehicleInformation(String sid) {
+		return null;
+	}
 }

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverprepare/HandoverInformationIntemVo.java

@@ -0,0 +1,25 @@
+package com.yxt.anrui.buscenter.api.bushandoverprepare;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @description: 随车资料交接
+ * @author: dimengzhe
+ * @date: 2023/5/30
+ **/
+@Data
+public class HandoverInformationIntemVo {
+
+    @ApiModelProperty("随车资料")
+    private String vehicleHandoverData;
+    @ApiModelProperty("接收人")
+    private String recName;
+    @ApiModelProperty("移交人")
+    private String transferName;
+    @ApiModelProperty("备注")
+    private String remarks;
+    @ApiModelProperty("交接日期")
+    private String recTime;
+
+}

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverprepare/HandoverInformationVo.java

@@ -0,0 +1,28 @@
+package com.yxt.anrui.buscenter.api.bushandoverprepare;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @description: 交车准备随车资料
+ * @author: dimengzhe
+ * @date: 2023/5/30
+ **/
+@Data
+public class HandoverInformationVo {
+
+    @ApiModelProperty("车架号")
+    private String vinNo;
+    @ApiModelProperty("车型名称")
+    private String model;
+    @ApiModelProperty("合同编号")
+    private String contractNo;
+    @ApiModelProperty("客户名称")
+    private String customerName;
+    @ApiModelProperty("交接记录")
+    private List<HandoverInformationIntemVo> itemList = new ArrayList<>();
+
+}

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

@@ -3,13 +3,13 @@ package com.yxt.anrui.buscenter.api.bushandoverpreparevehicle;
 import com.yxt.common.core.dto.Dto;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-
 @Data
 public class AppBusHandoverPrepareVehicleDto implements Dto {
     private static final long serialVersionUID = -8913800891100928726L;
 
     @ApiModelProperty("交车申请表sid")
     private String mainSid;
+    private String sid;
     @ApiModelProperty("车架号")
     private String vinNo;
     @ApiModelProperty("车辆sid")
@@ -25,4 +25,8 @@ public class AppBusHandoverPrepareVehicleDto implements Dto {
     @ApiModelProperty("其他资料")
     private boolean otherDataState;
 
+    @ApiModelProperty("业务状态")
+    private String subscription;
+    private String subscriptionKey;
+
 }

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

@@ -66,4 +66,8 @@ public class BusHandoverPrepareVehicle extends BaseEntity {
     private int onBoardDataState;
     @ApiModelProperty("其他资料状态")
     private int otherDataState;
+
+    @ApiModelProperty("业务状态")
+    private String subscription;
+    private String subscriptionKey;
 }

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-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderFeign.java

@@ -314,4 +314,9 @@ public interface BusSalesOrderFeign {
     @GetMapping("/selectBusinessSidByQKKP")
     @ResponseBody
     ResultBean<List<String>> selectBusinessSidByQKKP(@RequestParam("userSid") String userSid, @RequestParam("orgPath") String orgPath);
+
+    @ApiOperation("销售订单流程预演测试")
+    @GetMapping("/yuyanTestBean")
+    @ResponseBody
+    ResultBean yuyanTestBean(@SpringQueryMap BusSaleOrderNodeQuery query);
 }

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderFeignFallback.java

@@ -290,4 +290,9 @@ public class BusSalesOrderFeignFallback implements BusSalesOrderFeign {
     public ResultBean<List<String>> selectBusinessSidByQKKP(String userSid, String orgPath) {
         return null;
     }
+
+    @Override
+    public ResultBean yuyanTestBean(BusSaleOrderNodeQuery query) {
+        return null;
+    }
 }

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;
 
     /**
      * 欠款提车分页列表查询条件
@@ -796,14 +801,14 @@ public class BusArrearsCarryVehicleApplyService extends MybatisBaseService<BusAr
         //车架号发生变化，重新生成新车买卖合同（欠款）、欠款提车担保承诺书、总经理担保承诺书、
         //回购日期发生变化，重新生成欠款提车担保承诺书
         if (StringUtils.isBlank(sid)) {
-            //生成新车买卖合同（欠款）
+            /*//生成新车买卖合同（欠款）
             carContractDownloadUrl = carContractDownloadUrl(dto, map);
             //生成欠款提车担保承诺书
             guaranteeLetterDownloadUrl = guaranteeLetterDownloadUrl(dto, map);
             //生成总经理担保书
             zjlLetterDownloadUrl = zjlLetterDownloadUrl(dto, map);
             //生成股东会对外担保决议
-            gdLetterDownloadUrl = gdLetterDownloadUrl(dto, map);
+            gdLetterDownloadUrl = gdLetterDownloadUrl(dto, map);*/
             PdfVo pdfVo = new PdfVo();
             List<File> filesList = new ArrayList<>();
             if (StringUtils.isNotBlank(carContractDownloadUrl)) {
@@ -891,13 +896,13 @@ public class BusArrearsCarryVehicleApplyService extends MybatisBaseService<BusAr
             }
             if (isChange) {
                 //生成新车买卖合同（欠款）
-                carContractDownloadUrl = carContractDownloadUrl(dto, map);
+//                carContractDownloadUrl = carContractDownloadUrl(dto, map);
                 //生成总经理担保书
-                zjlLetterDownloadUrl = zjlLetterDownloadUrl(dto, map);
+//                zjlLetterDownloadUrl = zjlLetterDownloadUrl(dto, map);
             }
             if (dateChange || isChange) {
                 //生成欠款提车担保承诺书
-                guaranteeLetterDownloadUrl = guaranteeLetterDownloadUrl(dto, map);
+//                guaranteeLetterDownloadUrl = guaranteeLetterDownloadUrl(dto, map);
             }
             //新车买卖合同（欠款）
             PdfVo pdfVo = new PdfVo();
@@ -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())));
+                    } else {//担保贷款: 实收合计
-            //根据合同号查询已经审核通过的总认款
+                        wMoneyAll = wMoneyAll.add(new BigDecimal(solutionsDetailsVo.getRealTotal()));
-            ResultBean<String> subscribtAllResultBean = finCollectionConfirmationFeign.selectCollectionMoney(dto.getContractId());
+                    }
+                } 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

@@ -92,4 +92,8 @@ public interface BusDeliveredMapper extends BaseMapper<BusDelivered> {
     int updateStateByContractNo(@Param("contractNo") String contractNo, @Param("list") List<String> vinSidList, @Param("state") int i);
 
     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

@@ -117,4 +117,12 @@
             and length(bv.linkSid)>0
         </where>
     </select>
+
+    <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

@@ -650,4 +650,14 @@ public class BusDeliveredService extends MybatisBaseService<BusDeliveredMapper,
         }
         return rb.success().setData(list);
     }
+
+    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/busdeliveredapply/BusDeliveredApplyService.java

@@ -45,6 +45,7 @@ import com.yxt.anrui.base.api.basevehicleout.BaseVehicleZSOutDto;
 import com.yxt.anrui.base.api.commoncontract.CommonContractFeign;
 import com.yxt.anrui.base.common.utils.Rule;
 import com.yxt.anrui.buscenter.api.busdelivered.AppDeliveredDetailsVo;
+import com.yxt.anrui.buscenter.api.busdelivered.BusDelivered;
 import com.yxt.anrui.buscenter.api.busdelivered.DeliveredDictVo;
 import com.yxt.anrui.buscenter.api.busdeliveredapply.*;
 import com.yxt.anrui.buscenter.api.busdeliveredapplydetails.AppCarListVo;
@@ -770,6 +771,11 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
                 AppBusHandoverPrepareVehicleDto appBusHandoverPrepareVehicleDto = new AppBusHandoverPrepareVehicleDto();
                 appBusHandoverPrepareVehicleDto.setVinNo(details.getVinNo());
                 appBusHandoverPrepareVehicleDto.setVinSid(details.getVinSid());
+                //根据合同编号和车辆sid查询
+                BusSalesOrderVehicle busSalesOrderVehicle = busSalesOrderVehicleService.selectByNoAndVinSid(busDeliveredApply.getContractNo(),details.getVinSid());
+                BusDelivered busDelivered = busDeliveredService.getState(busDeliveredApply.getContractNo(),busSalesOrderVehicle.getSid());
+                appBusHandoverPrepareVehicleDto.setSubscription(busDelivered.getSubscription());
+                appBusHandoverPrepareVehicleDto.setSubscriptionKey(busDelivered.getSubscriptionKey());
                 dtos.add(appBusHandoverPrepareVehicleDto);
             }
         }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandoverprepare/BusHandoverPrepareRest.java

@@ -26,6 +26,7 @@
 package com.yxt.anrui.buscenter.biz.bushandoverprepare;
 
 import com.yxt.anrui.buscenter.api.bushandoverprepare.BusHandoverPrepareFeign;
+import com.yxt.anrui.buscenter.api.bushandoverprepare.HandoverInformationVo;
 import com.yxt.anrui.buscenter.api.bushandoverprepare.app.*;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
@@ -113,10 +114,10 @@ public class BusHandoverPrepareRest implements BusHandoverPrepareFeign {
         return busHandoverPrepareService.getDeliveryPlanInfo(query);
     }
 
-    @Override
+   /* @Override
     public ResultBean saveState(AppStateDateDto dto) {
         return busHandoverPrepareService.saveState(dto);
-    }
+    }*/
 
     @Override
     public ResultBean<AppInvoicingInfoVo> getInvoiceInfo(AppInvoicingInfoQuery query) {
@@ -162,4 +163,14 @@ public class BusHandoverPrepareRest implements BusHandoverPrepareFeign {
     public ResultBean submitDeliveryPlanInfo(AppSubmitHandoverPrepareDto dto) {
         return busHandoverPrepareService.submitDeliveryPlanInfo(dto);
     }
+
+    @Override
+    public ResultBean<HandoverInformationVo> getVehicleInformationInfo(String sid) {
+        return busHandoverPrepareService.getVehicleInformationInfo(sid);
+    }
+
+    @Override
+    public ResultBean updateVehicleInformation(String sid) {
+        return busHandoverPrepareService.updateVehicleInformation(sid);
+    }
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandoverprepare/BusHandoverPrepareService.java

@@ -36,14 +36,19 @@ import com.yxt.anrui.buscenter.api.buscenterfile.BuscenterFile;
 import com.yxt.anrui.buscenter.api.buscenterfile.BuscenterFileEnum;
 import com.yxt.anrui.buscenter.api.bushandoverprepare.BusHandoverPrepare;
 import com.yxt.anrui.buscenter.api.bushandoverprepare.BusHandoverPrepareAddDto;
+import com.yxt.anrui.buscenter.api.bushandoverprepare.HandoverInformationIntemVo;
+import com.yxt.anrui.buscenter.api.bushandoverprepare.HandoverInformationVo;
 import com.yxt.anrui.buscenter.api.bushandoverprepare.app.*;
 import com.yxt.anrui.buscenter.api.bushandoverpreparevehicle.AppBusHandoverPrepareVehicleDto;
 import com.yxt.anrui.buscenter.api.bushandoverpreparevehicle.AppBusHandoverPrepareVehicleInfoVo;
 import com.yxt.anrui.buscenter.api.bushandoverpreparevehicle.BusHandoverPrepareVehicle;
 import com.yxt.anrui.buscenter.api.bushandoverwait.BusHandoverWaitDto;
+import com.yxt.anrui.buscenter.api.busvehicleinformationhandover.BusVehicleInformationHandover;
 import com.yxt.anrui.buscenter.biz.buscenterfile.BuscenterFileService;
 import com.yxt.anrui.buscenter.biz.bushandoverpreparevehicle.BusHandoverPrepareVehicleService;
 import com.yxt.anrui.buscenter.biz.bushandoverwait.BusHandoverWaitService;
+import com.yxt.anrui.buscenter.biz.busvehicleinformation.BusVehicleInformationService;
+import com.yxt.anrui.buscenter.biz.busvehicleinformationhandover.BusVehicleInformationHandoverService;
 import com.yxt.anrui.fin.api.finbillvehicle.FinBillVehicleFeign;
 import com.yxt.anrui.fin.api.finvehicleinvoice.FinVehicleInvoiceFeign;
 import com.yxt.anrui.fin.api.finvehicleinvoice.VehicleInvoiceVo;
@@ -62,6 +67,7 @@ import org.springframework.stereotype.Service;
 
 import java.util.ArrayList;
 import java.util.Collections;
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -99,6 +105,10 @@ public class BusHandoverPrepareService extends MybatisBaseService<BusHandoverPre
     private SysUserFeign sysUserFeign;
     @Autowired
     private FinVehicleInvoiceFeign finVehicleInvoiceFeign;
+    @Autowired
+    private BusVehicleInformationHandoverService busVehicleInformationHandoverService;
+    @Autowired
+    private BusVehicleInformationService busVehicleInformationService;
 
    /* private QueryWrapper<BusHandoverPrepare> createQueryWrapper(BusHandoverPrepareQuery query) {
         // todo: 这里根据具体业务调整查询条件
@@ -279,11 +289,11 @@ public class BusHandoverPrepareService extends MybatisBaseService<BusHandoverPre
      * @param dto
      * @return
      */
-    public ResultBean saveState(AppStateDateDto dto) {
+   /* public ResultBean saveState(AppStateDateDto dto) {
         ResultBean rb = ResultBean.fireFail();
         busHandoverPrepareVehicleService.saveState(dto);
         return rb.success();
-    }
+    }*/
 
     /**
      * 获取交车准备 发票信息
@@ -416,12 +426,19 @@ public class BusHandoverPrepareService extends MybatisBaseService<BusHandoverPre
         List<AppBusHandoverPrepareVehicleDto> handoverPrepareVehicleDtos = dto.getCarDataList();
         if (handoverPrepareVehicleDtos.size() > 0) {
             String sid = dto.getSid();
-            busHandoverPrepareVehicleService.deleteByMainSid(sid);
+//            busHandoverPrepareVehicleService.deleteByMainSid(sid);
             for (AppBusHandoverPrepareVehicleDto handoverPrepareVehicleDto : handoverPrepareVehicleDtos) {
-                BusHandoverPrepareVehicle busHandoverPrepareVehicle = new BusHandoverPrepareVehicle();
+               /* BusHandoverPrepareVehicle busHandoverPrepareVehicle = new BusHandoverPrepareVehicle();
                 BeanUtil.copyProperties(handoverPrepareVehicleDto, busHandoverPrepareVehicle);
                 busHandoverPrepareVehicle.setMainSid(busHandoverPrepare.getSid());
-                busHandoverPrepareVehicleService.save(busHandoverPrepareVehicle);
+                busHandoverPrepareVehicleService.save(busHandoverPrepareVehicle);*/
+                BusHandoverPrepareVehicle busHandoverPrepareVehicle = busHandoverPrepareVehicleService.fetchBySid(handoverPrepareVehicleDto.getSid());
+                busHandoverPrepareVehicle.setInvoicingState(handoverPrepareVehicleDto.isInvoicingState()?1:0);
+                busHandoverPrepareVehicle.setCertificateState(handoverPrepareVehicleDto.isCertificateState()?1:0);
+                busHandoverPrepareVehicle.setOnBoardDataState(handoverPrepareVehicleDto.isOnBoardDataState()?1:0);
+                busHandoverPrepareVehicle.setOtherDataState(handoverPrepareVehicleDto.isOtherDataState()?1:0);
+                busHandoverPrepareVehicle.setPolicyState(handoverPrepareVehicleDto.isPolicyState()?1:0);
+                busHandoverPrepareVehicleService.updateById(busHandoverPrepareVehicle);
             }
         }
         updateById(busHandoverPrepare);
@@ -459,12 +476,19 @@ public class BusHandoverPrepareService extends MybatisBaseService<BusHandoverPre
         List<AppBusHandoverPrepareVehicleDto> handoverPrepareVehicleDtos = dto.getCarDataList();
         if (handoverPrepareVehicleDtos.size() > 0) {
             String sid = dto.getSid();
-            busHandoverPrepareVehicleService.deleteByMainSid(sid);
+//            busHandoverPrepareVehicleService.deleteByMainSid(sid);
             for (AppBusHandoverPrepareVehicleDto handoverPrepareVehicleDto : handoverPrepareVehicleDtos) {
-                BusHandoverPrepareVehicle busHandoverPrepareVehicle = new BusHandoverPrepareVehicle();
+                BusHandoverPrepareVehicle busHandoverPrepareVehicle = busHandoverPrepareVehicleService.fetchBySid(handoverPrepareVehicleDto.getSid());
+                busHandoverPrepareVehicle.setInvoicingState(handoverPrepareVehicleDto.isInvoicingState()?1:0);
+                busHandoverPrepareVehicle.setCertificateState(handoverPrepareVehicleDto.isCertificateState()?1:0);
+                busHandoverPrepareVehicle.setOnBoardDataState(handoverPrepareVehicleDto.isOnBoardDataState()?1:0);
+                busHandoverPrepareVehicle.setOtherDataState(handoverPrepareVehicleDto.isOtherDataState()?1:0);
+                busHandoverPrepareVehicle.setPolicyState(handoverPrepareVehicleDto.isPolicyState()?1:0);
+                busHandoverPrepareVehicleService.updateById(busHandoverPrepareVehicle);
+               /* BusHandoverPrepareVehicle busHandoverPrepareVehicle = new BusHandoverPrepareVehicle();
                 BeanUtil.copyProperties(handoverPrepareVehicleDto, busHandoverPrepareVehicle);
                 busHandoverPrepareVehicle.setMainSid(busHandoverPrepare.getSid());
-                busHandoverPrepareVehicleService.save(busHandoverPrepareVehicle);
+                busHandoverPrepareVehicleService.save(busHandoverPrepareVehicle);*/
 
                 BusHandoverWaitDto busHandoverWaitDto = new BusHandoverWaitDto();
                 busHandoverWaitDto.setContractNo(busHandoverPrepare.getContractNo());
@@ -477,6 +501,8 @@ public class BusHandoverPrepareService extends MybatisBaseService<BusHandoverPre
                     busHandoverWaitDto.setModelSid(data.getModelSid());
                     busHandoverWaitDto.setModelName(data.getModelName());
                 }
+                busHandoverWaitDto.setPayStateKey(busHandoverPrepareVehicle.getSubscriptionKey());
+                busHandoverWaitDto.setPayStateValue(busHandoverPrepareVehicle.getSubscription());
                 busHandoverWaitDto.setUseOrgSid(busHandoverPrepare.getUseOrgSid());
                 busHandoverWaitDto.setPayTypeKey(busHandoverPrepare.getPayTypeKey());
                 busHandoverWaitDto.setPayTypeValue(busHandoverPrepare.getPayType());
@@ -488,4 +514,44 @@ public class BusHandoverPrepareService extends MybatisBaseService<BusHandoverPre
         updateById(busHandoverPrepare);
         return rb.success();
     }
+
+    /**
+     * 交车准备获取随车资料
+     * @param sid
+     * @return
+     */
+    public ResultBean<HandoverInformationVo> getVehicleInformationInfo(String sid) {
+        ResultBean<HandoverInformationVo> rb = ResultBean.fireFail();
+        HandoverInformationVo handoverInformationVo = new HandoverInformationVo();
+        BusHandoverPrepareVehicle busHandoverPrepareVehicle = busHandoverPrepareVehicleService.fetchBySid(sid);
+        BusVehicleInformationHandover busVehicleInformationHandover = busVehicleInformationHandoverService.getVehicleInformationInfo(busHandoverPrepareVehicle.getVinSid());
+        if (busVehicleInformationHandover != null) {
+            handoverInformationVo.setContractNo(busVehicleInformationHandover.getContractNo());
+            handoverInformationVo.setCustomerName(busVehicleInformationHandover.getCustomerName());
+            handoverInformationVo.setVinNo(busVehicleInformationHandover.getVinNo());
+            handoverInformationVo.setModel(busVehicleInformationHandover.getModel());
+            //根据随车资料主表sid查询随车资料的记录
+            List<HandoverInformationIntemVo> list = busVehicleInformationService.selectByMainSid(busVehicleInformationHandover.getSid());
+            list.removeAll(Collections.singleton(null));
+            handoverInformationVo.setItemList(list);
+        }
+        return rb.success().setData(handoverInformationVo);
+    }
+
+    /**
+     * 随车资料确认
+     *
+     * @param sid
+     * @return
+     */
+    public ResultBean updateVehicleInformation(String sid) {
+        ResultBean rb = ResultBean.fireFail();
+        BusHandoverPrepareVehicle busHandoverPrepareVehicle = busHandoverPrepareVehicleService.fetchBySid(sid);
+        BusVehicleInformationHandover busVehicleInformationHandover = busVehicleInformationHandoverService.getVehicleInformationInfo(busHandoverPrepareVehicle.getVinSid());
+        if (busVehicleInformationHandover != null) {
+            //根据随车资料主表sid查询随车资料的记录
+            busVehicleInformationService.updateDate(busVehicleInformationHandover.getSid(), new Date());
+        }
+        return rb.success();
+    }
 }

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/BusSalesOrderRest.java

@@ -371,4 +371,9 @@ public class BusSalesOrderRest implements BusSalesOrderFeign {
     public ResultBean<List<String>> selectBusinessSidByQKKP(String userSid, String orgPath) {
         return busSalesOrderService.selectBusinessSidByQKKP(userSid,orgPath);
     }
+
+    @Override
+    public ResultBean yuyanTestBean(BusSaleOrderNodeQuery query) {
+        return busSalesOrderService.yuyanTestBean(query);
+    }
 }

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

@@ -134,6 +134,7 @@ import com.yxt.anrui.flowable.api.flow.FlowableFeign;
 import com.yxt.anrui.flowable.api.flow.UpdateFlowFieldVo;
 import com.yxt.anrui.flowable.api.flowtask.FlowTaskFeign;
 import com.yxt.anrui.flowable.api.flowtask.FlowTaskVo;
+import com.yxt.anrui.flowable.api.flowtask.FlowableQuery;
 import com.yxt.anrui.flowable.api.flowtask.LatestTaskVo;
 import com.yxt.anrui.flowable.api.utils.ProcDefEnum;
 import com.yxt.anrui.flowable.sqloperationsymbol.BusinessVariables;
@@ -6556,4 +6557,27 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
     public List<String> selectByContractNoToVin(String contractId) {
         return baseMapper.selectByContractNoToVin(contractId);
     }
+
+    public ResultBean yuyanTestBean(BusSaleOrderNodeQuery query) {
+        ResultBean rb = ResultBean.fireFail();
+        //根据业务sid查询订单信息
+        BusSalesOrder busSalesOrder = fetchBySid(query.getBusinessSid());
+        //流程中的参数赋值、若有网关，则赋值网关中判断的字段。
+        Map<String, Object> variables = getOrderMap(busSalesOrder);
+        String modelId = busSalesOrder.getProcDefId();
+        if(StringUtils.isBlank(modelId)){
+            modelId = ProcDefEnum.SALESORDER.getProDefId();
+        }
+        FlowableQuery flowableQuery = new FlowableQuery();
+        flowableQuery.setModelId(modelId);
+        flowableQuery.setMap(variables);
+        ResultBean<List<Map<String,Object>>> yuyanTest = flowTaskFeign.yuyanTest(flowableQuery);
+        List<Map<String,Object>> S = yuyanTest.getData();
+
+        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/java/com/yxt/anrui/buscenter/biz/busvehicleinformation/BusVehicleInformationMapper.java

@@ -1,10 +1,12 @@
 package com.yxt.anrui.buscenter.biz.busvehicleinformation;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yxt.anrui.buscenter.api.bushandoverprepare.HandoverInformationIntemVo;
 import com.yxt.anrui.buscenter.api.busvehicleinformation.BusVehicleInformation;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -17,4 +19,8 @@ public interface BusVehicleInformationMapper extends BaseMapper<BusVehicleInform
     List<BusVehicleInformation> getByHandoverSid(@Param("handoverSid") String handoverSid);
 
     BusVehicleInformation selectByHandoverNumAndHandoverSid(@Param("handoverNum")String handoverNum, @Param("sid")String sid);
+
+    List<HandoverInformationIntemVo> selectByMainSid(String sid);
+
+    int selectByMainSidUpdate(@Param("sid") String sid, @Param("date") Date date);
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busvehicleinformation/BusVehicleInformationMapper.xml

@@ -19,4 +19,12 @@
           and handoverSid = #{sid}
 
     </select>
+
+    <select id="selectByMainSid" resultType="com.yxt.anrui.buscenter.api.bushandoverprepare.HandoverInformationIntemVo">
+        select vehicleHandoverData,recName,transferName,remarks,DATE_FORMAT(recTime,'%Y-%m-%d') AS recTime from bus_vehicle_information where handoverSid = #{sid}
+    </select>
+
+    <select id="selectByMainSidUpdate" resultType="int">
+        update bus_vehicle_information set recTime = #{date} where handoverSid = #{sid}
+    </select>
 </mapper>

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busvehicleinformation/BusVehicleInformationService.java

@@ -1,10 +1,11 @@
 package com.yxt.anrui.buscenter.biz.busvehicleinformation;
 
+import com.yxt.anrui.buscenter.api.bushandoverprepare.HandoverInformationIntemVo;
 import com.yxt.anrui.buscenter.api.busvehicleinformation.BusVehicleInformation;
 import com.yxt.common.base.service.MybatisBaseService;
-import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Service;
 
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -22,4 +23,12 @@ public class BusVehicleInformationService extends MybatisBaseService<BusVehicleI
     public BusVehicleInformation selectByHandoverNumAndHandoverSid(String handoverNum, String sid) {
         return baseMapper.selectByHandoverNumAndHandoverSid(handoverNum,sid);
     }
+
+    public List<HandoverInformationIntemVo> selectByMainSid(String sid) {
+        return baseMapper.selectByMainSid(sid);
+    }
+
+    public int updateDate(String sid, Date date) {
+        return baseMapper.selectByMainSidUpdate(sid, date);
+    }
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busvehicleinformationhandover/BusVehicleInformationHandoverMapper.java

@@ -19,4 +19,6 @@ public interface BusVehicleInformationHandoverMapper extends BaseMapper<BusVehic
     IPage<BusVehicleInformationHandoverVo> selectPageVo(IPage<BusVehicleInformationHandover> page, @Param(Constants.WRAPPER) QueryWrapper<BusVehicleInformationHandover> qw);
 
     BusVehicleInformationHandover selectByVehicleSid(@Param("vehicleSid") String vehicleSid);
+
+    BusVehicleInformationHandover getVehicleInformationInfo(String sid);
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busvehicleinformationhandover/BusVehicleInformationHandoverMapper.xml

@@ -35,4 +35,9 @@
         from bus_vehicle_information_handover
         where vehicleSid = #{vehicleSid}
     </select>
+
+    <select id="getVehicleInformationInfo"
+            resultType="com.yxt.anrui.buscenter.api.busvehicleinformationhandover.BusVehicleInformationHandover">
+        select * from bus_vehicle_information_handover where vehicleSid = #{sid}
+    </select>
 </mapper>

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busvehicleinformationhandover/BusVehicleInformationHandoverService.java

@@ -4,14 +4,12 @@ package com.yxt.anrui.buscenter.biz.busvehicleinformationhandover;
 import cn.hutool.core.bean.BeanUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.yxt.anrui.base.api.basevehicle.BaseVehicleFeign;
 import com.yxt.anrui.base.api.basevehiclemodel.BaseVehicleModel;
 import com.yxt.anrui.base.api.basevehiclemodel.BaseVehicleModelFeign;
 import com.yxt.anrui.buscenter.api.busvehicleinformation.BusVehicleInformation;
 import com.yxt.anrui.buscenter.api.busvehicleinformation.BusVehicleInformationDto;
 import com.yxt.anrui.buscenter.api.busvehicleinformation.BusVehicleInformationVo;
 import com.yxt.anrui.buscenter.api.busvehicleinformationhandover.*;
-
 import com.yxt.anrui.buscenter.biz.busvehicleinformation.BusVehicleInformationService;
 import com.yxt.common.base.service.MybatisBaseService;
 import com.yxt.common.base.utils.PagerUtil;
@@ -23,7 +21,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.ArrayList;
-import java.util.Date;
 import java.util.List;
 
 /**
@@ -462,4 +459,8 @@ public class BusVehicleInformationHandoverService extends MybatisBaseService<Bus
         vo.setInformations(voList);
         return rb.success().setData(vo);
     }
+
+    public BusVehicleInformationHandover getVehicleInformationInfo(String sid) {
+        return baseMapper.getVehicleInformationInfo(sid);
+    }
 }

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:spacing w:line="440" w:line-rule="exact"/>
-                        <w:tab w:val="left" w:pos="1320"/>
-                    </w:tabs>
-                    <w:spacing w:line="360" w:line-rule="auto"/>
                     <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:b-cs/>
-                        <w:sz-cs w:val="36"/>
+                        <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:spacing w:line="440" w:line-rule="exact"/>
-                    <w:ind w:left="2255"/>
+                    <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:b/>
-                        <w:sz-cs w:val="28"/>
+                        <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"/>
+                        <w:rFonts w:ascii="宋体" w:h-ansi="宋体" w:cs="宋体" w:hint="fareast"/>
-                        <wx:font wx:val="宋体"/>
+                        <w:b/>
-                        <w:spacing w:val="2"/>
+                        <w:b-cs/>
-                        <w:sz w:val="28"/>
+                        <w:sz w:val="36"/>
-                        <w:sz-cs w:val="28"/>
+                        <w:sz-cs w:val="36"/>
-                    </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: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-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/CrmAppDisAndCustm.java

@@ -0,0 +1,11 @@
+package com.yxt.anrui.crm.api.crmcustomertemp;
+
+import lombok.Data;
+
+@Data
+public class CrmAppDisAndCustm {
+
+    private String id;
+    private String dictValue;
+    private CrmExtra extra;
+}

anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/CrmCustomerTempFeign.java

@@ -93,7 +93,7 @@ public interface CrmCustomerTempFeign {
      */
     @ApiOperation("开票信息维护客户新增修改")
     @PostMapping("/billApplicatSaveCust")
-    public ResultBean billApplicatSaveCust(@Valid @RequestBody CrmCustomerBillApplicationDto dto);
+    public ResultBean<CrmAppDisAndCustm> billApplicatSaveCust(@Valid @RequestBody CrmCustomerBillApplicationDto dto);
 
 
     /**

anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/CrmExtra.java

@@ -0,0 +1,11 @@
+package com.yxt.anrui.crm.api.crmcustomertemp;
+
+import lombok.Data;
+
+@Data
+public class CrmExtra {
+
+    private String name;
+    private String sid;
+    private String info;
+}

anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempRest.java

@@ -115,7 +115,7 @@ public class CrmCustomerTempRest implements CrmCustomerTempFeign {
     }
 
     @Override
-    public ResultBean billApplicatSaveCust(CrmCustomerBillApplicationDto dto) {
+    public ResultBean<CrmAppDisAndCustm> billApplicatSaveCust(CrmCustomerBillApplicationDto dto) {
         return crmCustomerTempService.billApplicatSaveCust(dto);
     }
 

anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempService.java

@@ -1101,7 +1101,7 @@ public class CrmCustomerTempService extends MybatisBaseService<CrmCustomerTempMa
         return rb.success().setData(customerQuery.getCustomerNo());
     }
 
-    public ResultBean billApplicatSaveCust(CrmCustomerBillApplicationDto dto) {
+    public ResultBean<CrmAppDisAndCustm> billApplicatSaveCust(CrmCustomerBillApplicationDto dto) {
         ResultBean rb = ResultBean.fireFail();
         String dtoSid = dto.getSid();
         //手机号
@@ -1116,6 +1116,11 @@ public class CrmCustomerTempService extends MybatisBaseService<CrmCustomerTempMa
         String name = dto.getName();
         //业务员sid
         String staffSid = dto.getStaffSid();
+        if (StringUtils.isBlank(staffSid)){
+            String userSid = dto.getCreateBySid();
+            SysUserVo sysUserVo = sysUserFeign.fetchBySid(userSid).getData();
+            staffSid = sysUserVo.getStaffSid();
+        }
         if (StringUtils.isBlank(dtoSid)){//新增
             //生成客户编码：分公司简称+部门编码+手机号+姓名首字母大写拼写
             String customerNo = getPrefix(staffSid, name, phone);
@@ -1145,8 +1150,16 @@ public class CrmCustomerTempService extends MybatisBaseService<CrmCustomerTempMa
             crmCustomerTempDto.setIsOnRemindkey("0");
             crmCustomerTempDto.setIsOnRemind("否");
             crmCustomerTempDto.setRemind_day("未设置提醒");
-            saveCrmCustomerTemp(crmCustomerTempDto, sysUserVo);
+            CrmCustomerTemp crmCustomerTempNew = saveCrmCustomerTemp(crmCustomerTempDto, sysUserVo);
-            return rb.success();
+            CrmAppDisAndCustm crmAppDisAndCustm = new CrmAppDisAndCustm();
+            CrmExtra crmExtra = new CrmExtra();
+            crmAppDisAndCustm.setId(crmCustomerTempNew.getSid());
+            crmAppDisAndCustm.setDictValue(crmCustomerTempNew.getName());
+            crmExtra.setSid(crmCustomerTempNew.getSid());
+            crmExtra.setName(crmCustomerTempNew.getName());
+            crmExtra.setInfo(crmCustomerTempNew.getIDNumber());
+            crmAppDisAndCustm.setExtra(crmExtra);
+            return rb.success().setData(crmAppDisAndCustm);
         }
         CrmCustomerTempUpdateDto crmCustomerTempDto = new CrmCustomerTempUpdateDto();
         crmCustomerTempDto.setName(name);
@@ -1162,6 +1175,14 @@ public class CrmCustomerTempService extends MybatisBaseService<CrmCustomerTempMa
         if (!resultBean.getSuccess()) {
             return rb.setMsg(resultBean.getMsg());
         }
-        return rb.success().setMsg(resultBean.getMsg());
+        CrmAppDisAndCustm crmAppDisAndCustm = new CrmAppDisAndCustm();
+        CrmExtra crmExtra = new CrmExtra();
+        crmAppDisAndCustm.setId(dtoSid);
+        crmAppDisAndCustm.setDictValue(name);
+        crmExtra.setSid(dtoSid);
+        crmExtra.setName(name);
+        crmExtra.setInfo(crmCustomerTempDto.getIDNumber());
+        crmAppDisAndCustm.setExtra(crmExtra);
+        return rb.success().setMsg(resultBean.getMsg()).setData(crmAppDisAndCustm);
     }
 }

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-api/src/main/java/com/yxt/anrui/fin/api/fincompanyinvoicing/FinAppDisAndCustm.java

@@ -0,0 +1,11 @@
+package com.yxt.anrui.fin.api.fincompanyinvoicing;
+
+import lombok.Data;
+
+@Data
+public class FinAppDisAndCustm {
+
+    private String id;
+    private String dictValue;
+    private FinExtra extra;
+}

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincompanyinvoicing/FinCompanyInvoicingFeign.java

@@ -25,8 +25,6 @@
  *********************************************************/
 package com.yxt.anrui.fin.api.fincompanyinvoicing;
 
-import com.yxt.anrui.fin.api.finvehicleinvoice.FinVehicleInvoiceQuery;
-import com.yxt.anrui.fin.api.finvehicleinvoice.FinVehicleInvoiceVo;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
@@ -69,6 +67,10 @@ public interface FinCompanyInvoicingFeign {
     public ResultBean save(@RequestBody FinCompanyInvoicingDto dto);
         
     @ApiOperation("根据sid删除记录")
+    @DeleteMapping("/delBySidsPath/{sid}")
+    public ResultBean delBySidsPath(@PathVariable("sid") String sid);
+
+    @ApiOperation("移动端删除")
     @DeleteMapping("/delBySids")
     @ResponseBody
     public ResultBean delBySids(@RequestBody String[] sids);
@@ -107,7 +109,7 @@ public interface FinCompanyInvoicingFeign {
     @ApiOperation("企业开票信息管理新增或保存")
     @PostMapping("/qySaveOrUpdate")
     @ResponseBody
-    public ResultBean qySaveOrUpdate(@RequestBody FinCompanyInvoicingDto dto);
+    public ResultBean<FinAppDisAndCustm> qySaveOrUpdate(@RequestBody FinCompanyInvoicingDto dto);
 
     @ApiOperation("企业开票信息管理根据分公司sid查询不带采购系统的开票信息")
     @PostMapping("/qySelByUseOrgSid")

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincompanyinvoicing/FinCompanyInvoicingFeignFallback.java

@@ -59,6 +59,11 @@ public class FinCompanyInvoicingFeignFallback implements FinCompanyInvoicingFeig
         return ResultBean.fireFail().setMsg("接口anrui-fin/fincompanyinvoicing/save无法访问");
     }
 
+    @Override
+    public ResultBean delBySidsPath(String sid) {
+        return null;
+    }
+
     @Override
     public ResultBean delBySids(String[] sids) {
         return ResultBean.fireFail().setMsg("接口anrui-fin/fincompanyinvoicing/delBySids无法访问");

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincompanyinvoicing/FinExtra.java

@@ -0,0 +1,11 @@
+package com.yxt.anrui.fin.api.fincompanyinvoicing;
+
+import lombok.Data;
+
+@Data
+public class FinExtra {
+
+    private String name;
+    private String sid;
+    private String info;
+}

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;
@@ -54,6 +53,8 @@ import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrderFeign;
 import com.yxt.anrui.buscenter.api.bussalesorderprice.BusSalesOrderPrice;
 import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicle;
 import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicleFeign;
+import com.yxt.anrui.crm.api.crmcustomertemp.CrmCustomerTempFeign;
+import com.yxt.anrui.crm.api.crmcustomertemp.CrmCustomerTempVo;
 import com.yxt.anrui.fin.api.finbillapplication.*;
 import com.yxt.anrui.fin.api.finbillapplication.flowable.FinBillCompleteDto;
 import com.yxt.anrui.fin.api.finbillapplication.flowable.FinBillNodeQuery;
@@ -66,10 +67,12 @@ import com.yxt.anrui.fin.api.finbilltrailer.FinBillTrailerVo;
 import com.yxt.anrui.fin.api.finbillvehicle.FinBillVehicle;
 import com.yxt.anrui.fin.api.finbillvehicle.FinBillVehicleDto;
 import com.yxt.anrui.fin.api.finbillvehicle.FinBillVehicleVo;
+import com.yxt.anrui.fin.api.fincompanyinvoicing.FinCompanyInvoicingDetailsVo;
 import com.yxt.anrui.fin.api.finvehicleinvoice.FinVehicleInvoiceDto;
 import com.yxt.anrui.fin.biz.finbillfile.FinBillFileService;
 import com.yxt.anrui.fin.biz.finbilltrailer.FinBillTrailerService;
 import com.yxt.anrui.fin.biz.finbillvehicle.FinBillVehicleService;
+import com.yxt.anrui.fin.biz.fincompanyinvoicing.FinCompanyInvoicingService;
 import com.yxt.anrui.fin.biz.finselectedreceivablesdetailed.FinSelectedReceivablesDetailedService;
 import com.yxt.anrui.fin.biz.finuncollectedreceivablesdetailed.FinUncollectedReceivablesDetailedService;
 import com.yxt.anrui.fin.biz.finvehicleinvoice.FinVehicleInvoiceService;
@@ -165,6 +168,10 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
     private BaseVehicleCertificateFeign baseVehicleCertificateFeign;
     @Autowired
     private BaseVehicleAppendixFeign baseVehicleAppendixFeign;
+    @Autowired
+    private FinCompanyInvoicingService finCompanyInvoicingService;
+    @Autowired
+    private CrmCustomerTempFeign crmCustomerTempFeign;
 
     private QueryWrapper<FinBillApplication> createQueryWrapper(FinBillApplicationQuery query) {
         // todo: 这里根据具体业务调整查询条件
@@ -564,6 +571,12 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
         Map<String, Object> appMap = new HashMap<>();
         appMap.put("sid", businessSid);
         variables.put("app", appMap);
+        //判断是否是高低开，若是，则isTrue网关参数为true=============添加
+        String contractNo = finBillApplication.getContractNo();
+        BusSalesOrderPrice data = busSalesOrderFeign.selectByContractNo(contractNo).getData();
+        if (data != null) {
+            variables.put("isAdj", !data.getSingleFinalPrice().equals(finBillApplication.getOneBillMoney()));
+        }
         //========================================
         finBillApplication = fetchBySid(businessSid);
         FlowProcessMapQuery flowProcessMapQuery = new FlowProcessMapQuery();
@@ -574,12 +587,6 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
         //=======================================
         bv.setFormVariables(variables);
         bv.setOrgSidPath(finBillApplication.getOrgSidPath());
-        //判断是否是高低开，若是，则isTrue网关参数为true=============添加
-        String contractNo = finBillApplication.getContractNo();
-        BusSalesOrderPrice data = busSalesOrderFeign.selectByContractNo(contractNo).getData();
-        if (data != null) {
-            variables.put("isAdj", !data.getSingleFinalPrice().equals(finBillApplication.getOneBillMoney()));
-        }
         if (bv.getTaskId().equals(finBillApplication.getTaskId())) {
             ResultBean<UpdateFlowFieldVo> resultBean = flowableFeign.handleProsess(bv);
             if (!resultBean.getSuccess()) {
@@ -613,13 +620,20 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
                         finVehicleInvoiceDto.setBusinessStateKey(finBillApplication.getBillStateKey());
                         finVehicleInvoiceDto.setBusinessState(finBillApplication.getBillStateValue());
                         finVehicleInvoiceDto.setUseOrgSid(finBillApplication.getUseOrgSid());
-                        BaseDistributorListVo baseDistributorListVo = baseDistributorFeign.selectDisListBySid(finBillVehicleVo.getOpenTickSid()).getData();
+                        FinCompanyInvoicingDetailsVo finCompanyInvoicingDetailsVo = finCompanyInvoicingService.fetchDetailsVoBySid(finBillVehicleVo.getOpenTickSid());
-                        finVehicleInvoiceDto.setAddress(baseDistributorListVo.getRegistDetailAddress());
+                        if (StringUtils.isNotBlank(finCompanyInvoicingDetailsVo.getBankAccount())){
-                        finVehicleInvoiceDto.setTelPhone(baseDistributorListVo.getInvoPhone());
+                            finVehicleInvoiceDto.setAddress(finCompanyInvoicingDetailsVo.getAddress());
-                        finVehicleInvoiceDto.setOpeningBank(baseDistributorListVo.getInvoBank());
+                            finVehicleInvoiceDto.setTelPhone(finCompanyInvoicingDetailsVo.getPhone());
-                        finVehicleInvoiceDto.setBankNum(baseDistributorListVo.getInvoBankNum());
+                            finVehicleInvoiceDto.setOpeningBank(finCompanyInvoicingDetailsVo.getBankName());
-                        finVehicleInvoiceDto.setTaxpayerNo(baseDistributorListVo.getRegistNum());
+                            finVehicleInvoiceDto.setBankNum(finCompanyInvoicingDetailsVo.getBankAccount());
+                            finVehicleInvoiceDto.setTaxpayerNo(finCompanyInvoicingDetailsVo.getTaxpayerNo());
+                            finVehicleInvoiceDto.setIsTakeTicket("是");
+                        }else {
+                            CrmCustomerTempVo crmCustomerTempVo = crmCustomerTempFeign.fetchSid(finBillVehicleVo.getOpenTickSid()).getData();
+                            finVehicleInvoiceDto.setTelPhone(crmCustomerTempVo.getMobile());
+                            finVehicleInvoiceDto.setTaxpayerNo(crmCustomerTempVo.getIDNumber());
                             finVehicleInvoiceDto.setIsTakeTicket("是");
+                        }
                         finVehicleInvoiceService.mySave(finVehicleInvoiceDto);
                     }
                 }
@@ -627,7 +641,7 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
                     for (FinBillTrailerVo finBillTrailerVo : finBillTrailerVos) {
                         String gcVinNo = finBillTrailerVo.getGcVinNo();
                         BaseTrailerDetailsVo baseTrailerDetailsVo = baseTrailerFeign.fetchByGcVinNo(gcVinNo).getData();
-                        int count = finVehicleInvoiceService.selectCountByVinSid(baseTrailerDetailsVo.getVehSid());
+                        int count = finVehicleInvoiceService.selectCountByVinSid(baseTrailerDetailsVo.getSid());
                         if (count == 0) {
                             FinVehicleInvoiceDto finVehicleInvoiceDto = new FinVehicleInvoiceDto();
                             finVehicleInvoiceDto.setInvoiceTitle(finBillApplication.getOpenTickUnitName());
@@ -649,13 +663,20 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
                             finVehicleInvoiceDto.setBusinessStateKey(finBillApplication.getBillStateKey());
                             finVehicleInvoiceDto.setBusinessState(finBillApplication.getBillStateValue());
                             finVehicleInvoiceDto.setUseOrgSid(finBillApplication.getUseOrgSid());
-                            BaseDistributorListVo baseDistributorListVo = baseDistributorFeign.selectDisListBySid(finBillTrailerVo.getOpenTickSid()).getData();
+                            FinCompanyInvoicingDetailsVo finCompanyInvoicingDetailsVo = finCompanyInvoicingService.fetchDetailsVoBySid(finBillTrailerVo.getOpenTickSid());
-                            finVehicleInvoiceDto.setAddress(baseDistributorListVo.getRegistDetailAddress());
+                            if (StringUtils.isNotBlank(finCompanyInvoicingDetailsVo.getBankAccount())){
-                            finVehicleInvoiceDto.setTelPhone(baseDistributorListVo.getInvoPhone());
+                                finVehicleInvoiceDto.setAddress(finCompanyInvoicingDetailsVo.getAddress());
-                            finVehicleInvoiceDto.setOpeningBank(baseDistributorListVo.getInvoBank());
+                                finVehicleInvoiceDto.setTelPhone(finCompanyInvoicingDetailsVo.getPhone());
-                            finVehicleInvoiceDto.setBankNum(baseDistributorListVo.getInvoBankNum());
+                                finVehicleInvoiceDto.setOpeningBank(finCompanyInvoicingDetailsVo.getBankName());
-                            finVehicleInvoiceDto.setTaxpayerNo(baseDistributorListVo.getRegistNum());
+                                finVehicleInvoiceDto.setBankNum(finCompanyInvoicingDetailsVo.getBankAccount());
+                                finVehicleInvoiceDto.setTaxpayerNo(finCompanyInvoicingDetailsVo.getTaxpayerNo());
+                                finVehicleInvoiceDto.setIsTakeTicket("是");
+                            }else {
+                                CrmCustomerTempVo crmCustomerTempVo = crmCustomerTempFeign.fetchSid(finBillTrailerVo.getOpenTickSid()).getData();
+                                finVehicleInvoiceDto.setTelPhone(crmCustomerTempVo.getMobile());
+                                finVehicleInvoiceDto.setTaxpayerNo(crmCustomerTempVo.getIDNumber());
                                 finVehicleInvoiceDto.setIsTakeTicket("是");
+                            }
                             finVehicleInvoiceService.mySave(finVehicleInvoiceDto);
                         }
                     }
@@ -938,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();
@@ -1889,13 +1918,20 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
                         finVehicleInvoiceDto.setBusinessStateKey(finBillApplication.getBillStateKey());
                         finVehicleInvoiceDto.setBusinessState(finBillApplication.getBillStateValue());
                         finVehicleInvoiceDto.setUseOrgSid(finBillApplication.getUseOrgSid());
-                        BaseDistributorListVo baseDistributorListVo = baseDistributorFeign.selectDisListBySid(finBillVehicleVo.getOpenTickSid()).getData();
+                        FinCompanyInvoicingDetailsVo finCompanyInvoicingDetailsVo = finCompanyInvoicingService.fetchDetailsVoBySid(finBillVehicleVo.getOpenTickSid());
-                        finVehicleInvoiceDto.setAddress(baseDistributorListVo.getRegistDetailAddress());
+                        if (StringUtils.isNotBlank(finCompanyInvoicingDetailsVo.getBankAccount())){
-                        finVehicleInvoiceDto.setTelPhone(baseDistributorListVo.getInvoPhone());
+                            finVehicleInvoiceDto.setAddress(finCompanyInvoicingDetailsVo.getAddress());
-                        finVehicleInvoiceDto.setOpeningBank(baseDistributorListVo.getInvoBank());
+                            finVehicleInvoiceDto.setTelPhone(finCompanyInvoicingDetailsVo.getPhone());
-                        finVehicleInvoiceDto.setBankNum(baseDistributorListVo.getInvoBankNum());
+                            finVehicleInvoiceDto.setOpeningBank(finCompanyInvoicingDetailsVo.getBankName());
-                        finVehicleInvoiceDto.setTaxpayerNo(baseDistributorListVo.getRegistNum());
+                            finVehicleInvoiceDto.setBankNum(finCompanyInvoicingDetailsVo.getBankAccount());
-                        finVehicleInvoiceDto.setIsTakeTicket(finBillApplication.getIsLQOrigInvoice());
+                            finVehicleInvoiceDto.setTaxpayerNo(finCompanyInvoicingDetailsVo.getTaxpayerNo());
+                            finVehicleInvoiceDto.setIsTakeTicket("是");
+                        }else {
+                            CrmCustomerTempVo crmCustomerTempVo = crmCustomerTempFeign.fetchSid(finBillVehicleVo.getOpenTickSid()).getData();
+                            finVehicleInvoiceDto.setTelPhone(crmCustomerTempVo.getMobile());
+                            finVehicleInvoiceDto.setTaxpayerNo(crmCustomerTempVo.getIDNumber());
+                            finVehicleInvoiceDto.setIsTakeTicket("是");
+                        }
                         finVehicleInvoiceService.mySave(finVehicleInvoiceDto);
                     }
                 }
@@ -1925,13 +1961,20 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
                             finVehicleInvoiceDto.setBusinessStateKey(finBillApplication.getBillStateKey());
                             finVehicleInvoiceDto.setBusinessState(finBillApplication.getBillStateValue());
                             finVehicleInvoiceDto.setUseOrgSid(finBillApplication.getUseOrgSid());
-                            BaseDistributorListVo baseDistributorListVo = baseDistributorFeign.selectDisListBySid(finBillTrailerVo.getOpenTickSid()).getData();
+                            FinCompanyInvoicingDetailsVo finCompanyInvoicingDetailsVo = finCompanyInvoicingService.fetchDetailsVoBySid(finBillTrailerVo.getOpenTickSid());
-                            finVehicleInvoiceDto.setAddress(baseDistributorListVo.getRegistDetailAddress());
+                            if (StringUtils.isNotBlank(finCompanyInvoicingDetailsVo.getBankAccount())){
-                            finVehicleInvoiceDto.setTelPhone(baseDistributorListVo.getInvoPhone());
+                                finVehicleInvoiceDto.setAddress(finCompanyInvoicingDetailsVo.getAddress());
-                            finVehicleInvoiceDto.setOpeningBank(baseDistributorListVo.getInvoBank());
+                                finVehicleInvoiceDto.setTelPhone(finCompanyInvoicingDetailsVo.getPhone());
-                            finVehicleInvoiceDto.setBankNum(baseDistributorListVo.getInvoBankNum());
+                                finVehicleInvoiceDto.setOpeningBank(finCompanyInvoicingDetailsVo.getBankName());
-                            finVehicleInvoiceDto.setTaxpayerNo(baseDistributorListVo.getRegistNum());
+                                finVehicleInvoiceDto.setBankNum(finCompanyInvoicingDetailsVo.getBankAccount());
-                            finVehicleInvoiceDto.setIsTakeTicket(finBillApplication.getIsLQOrigInvoice());
+                                finVehicleInvoiceDto.setTaxpayerNo(finCompanyInvoicingDetailsVo.getTaxpayerNo());
+                                finVehicleInvoiceDto.setIsTakeTicket("是");
+                            }else {
+                                CrmCustomerTempVo crmCustomerTempVo = crmCustomerTempFeign.fetchSid(finBillTrailerVo.getOpenTickSid()).getData();
+                                finVehicleInvoiceDto.setTelPhone(crmCustomerTempVo.getMobile());
+                                finVehicleInvoiceDto.setTaxpayerNo(crmCustomerTempVo.getIDNumber());
+                                finVehicleInvoiceDto.setIsTakeTicket("是");
+                            }
                             finVehicleInvoiceService.mySave(finVehicleInvoiceDto);
                         }
                     }
@@ -2956,6 +2999,12 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
         Map<String, Object> appMap = new HashMap<>();
         appMap.put("sid", businessSid);
         variables.put("app", appMap);
+        //判断是否是高低开，若是，则isTrue网关参数为true=============添加
+        String contractNo = finBillApplication.getContractNo();
+        BusSalesOrderPrice data = busSalesOrderFeign.selectByContractNo(contractNo).getData();
+        if (data != null) {
+            variables.put("isAdj", !data.getSingleFinalPrice().equals(finBillApplication.getOneBillMoney()));
+        }
         //========================================
         finBillApplication = fetchBySid(businessSid);
         FlowProcessMapQuery flowProcessMapQuery = new FlowProcessMapQuery();
@@ -2966,12 +3015,6 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
         //=======================================
         bv.setFormVariables(variables);
         bv.setOrgSidPath(finBillApplication.getOrgSidPath());
-        //判断是否是高低开，若是，则isTrue网关参数为true=============添加
-        String contractNo = finBillApplication.getContractNo();
-        BusSalesOrderPrice data = busSalesOrderFeign.selectByContractNo(contractNo).getData();
-        if (data != null) {
-            variables.put("isAdj", !data.getSingleFinalPrice().equals(finBillApplication.getOneBillMoney()));
-        }
         if (bv.getTaskId().equals(finBillApplication.getTaskId())) {
             ResultBean<UpdateFlowFieldVo> resultBean = flowableFeign.handleProsess(bv);
             if (!resultBean.getSuccess()) {

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);
+    }
 }

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincompanyinvoicing/FinCompanyInvoicingMapper.xml

@@ -16,6 +16,7 @@
             ${ew.sqlSegment}
         </where>
         AND (fci.purchaseSystemSid IS NULL OR LENGTH(fci.purchaseSystemSid) = 0)
+        ORDER BY fci.createTime DESC
     </select>
 
     <select id="selectListAllVo" resultType="com.yxt.anrui.fin.api.fincompanyinvoicing.FinCompanyInvoicingVo">

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincompanyinvoicing/FinCompanyInvoicingRest.java

@@ -75,6 +75,13 @@ public class FinCompanyInvoicingRest implements FinCompanyInvoicingFeign {
 		return finCompanyInvoicingService.saveOrUpdateDto(dto);
 	}
 
+	@Override
+	public ResultBean delBySidsPath(String sid) {
+		ResultBean rb = ResultBean.fireFail();
+		finCompanyInvoicingService.delBySidsPath(sid);
+		return rb.success();
+	}
+
 	@Override
 	@ApiOperation("根据sid批量删除")
     @DeleteMapping("/delBySids")
@@ -125,7 +132,7 @@ public class FinCompanyInvoicingRest implements FinCompanyInvoicingFeign {
 	}
 
 	@Override
-	public ResultBean qySaveOrUpdate(FinCompanyInvoicingDto dto) {
+	public ResultBean<FinAppDisAndCustm> qySaveOrUpdate(FinCompanyInvoicingDto dto) {
 		return finCompanyInvoicingService.qySaveOrUpdate(dto);
 	}
 

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincompanyinvoicing/FinCompanyInvoicingService.java

@@ -34,6 +34,8 @@ import com.yxt.anrui.fin.api.fincompanyinvoicing.*;
 import com.yxt.anrui.fin.api.finvehicleinvoice.FinVehicleInvoiceVo;
 import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign;
 import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo;
+import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrg;
+import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign;
 import com.yxt.anrui.portal.api.sysuser.PrivilegeQuery;
 import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
 import com.yxt.common.base.service.MybatisBaseService;
@@ -65,6 +67,8 @@ import java.util.List;
 @Service
 public class FinCompanyInvoicingService extends MybatisBaseService<FinCompanyInvoicingMapper, FinCompanyInvoicing> {
 
+    @Resource
+    private SysStaffOrgFeign sysStaffOrgFeign;
     @Resource
     private SysOrganizationFeign sysOrganizationFeign;
     @Autowired
@@ -151,10 +155,11 @@ public class FinCompanyInvoicingService extends MybatisBaseService<FinCompanyInv
         return rb.success();
     }
 
-    public void insertByDto(FinCompanyInvoicingDto dto) {
+    public String insertByDto(FinCompanyInvoicingDto dto) {
         FinCompanyInvoicing entity = new FinCompanyInvoicing();
         BeanUtil.copyProperties(dto, entity, "id", "sid");
         baseMapper.insert(entity);
+        return entity.getSid();
     }
 
     public void updateByDto(FinCompanyInvoicingDto dto) {
@@ -247,17 +252,25 @@ public class FinCompanyInvoicingService extends MybatisBaseService<FinCompanyInv
             qw.like("fci.taxpayerNo", query.getTaxpayerNo());
         }
         //移动端查询条件
-
+        if (StringUtils.isNotBlank(query.getAppName())){
+            qw.and(wrapper -> wrapper.like("fci.name", query.getAppName()).or().like("fci.taxpayerNo", query.getAppName()));
+        }
         IPage<FinCompanyInvoicing> page = PagerUtil.queryToPage(pq);
         IPage<FinCompanyInvoicingVo> pagging = baseMapper.selectPageVo(page, qw);
         PagerVo<FinCompanyInvoicingVo> p = PagerUtil.pageToVo(pagging, null);
         return p;
     }
 
-    public ResultBean qySaveOrUpdate(FinCompanyInvoicingDto dto) {
+    public ResultBean<FinAppDisAndCustm> qySaveOrUpdate(FinCompanyInvoicingDto dto) {
         ResultBean rb = ResultBean.fireFail();
         String dtoSid = dto.getSid();
         String useOrgSid = dto.getUseOrgSid();
+        if (StringUtils.isBlank(useOrgSid)){
+            useOrgSid = sysStaffOrgFeign.getOrgSidByPath(dto.getOrgSidPath()).getData();
+            dto.setUseOrgSid(useOrgSid);
+            SysOrganizationVo sysOrganizationVo = sysOrganizationFeign.fetchBySid(useOrgSid).getData();
+            dto.setUseOrgName(sysOrganizationVo.getName());
+        }
         String name = dto.getName();
         String taxpayerNo = dto.getTaxpayerNo();
         if (StringUtils.isBlank(dtoSid)) {//新增
@@ -272,8 +285,32 @@ public class FinCompanyInvoicingService extends MybatisBaseService<FinCompanyInv
             if (finCompanyInvoicingDetailsVo1 != null || finCompanyInvoicingDetailsVo2 != null) {
                 return rb.setMsg("该企业开票信息已存在");
             }
-            this.insertByDto(dto);
+            String sid = this.insertByDto(dto);
-            return rb.success();
+            FinAppDisAndCustm finAppDisAndCustm = new FinAppDisAndCustm();
+            FinExtra finExtra = new FinExtra();
+            finAppDisAndCustm.setId(sid);
+            finAppDisAndCustm.setDictValue(name);
+            finExtra.setSid(sid);
+            finExtra.setName(name);
+            String openTickRemarks = "";
+            if (StringUtils.isNotBlank(openTickRemarks + dto.getTaxpayerNo())) {
+                openTickRemarks = openTickRemarks + dto.getTaxpayerNo() + "；";
+            }
+            if (StringUtils.isNotBlank(dto.getAddress())) {
+                openTickRemarks = openTickRemarks + dto.getAddress() + "；";
+            }
+            if (StringUtils.isNotBlank(dto.getPhone())) {
+                openTickRemarks = openTickRemarks + dto.getPhone() + "；";
+            }
+            if (StringUtils.isNotBlank(dto.getBankName())) {
+                openTickRemarks = openTickRemarks + dto.getBankName() + "；";
+            }
+            if (StringUtils.isNotBlank(dto.getBankAccount())) {
+                openTickRemarks = openTickRemarks + dto.getBankAccount() + "；";
+            }
+            finExtra.setInfo(openTickRemarks);
+            finAppDisAndCustm.setExtra(finExtra);
+            return rb.success().setData(finAppDisAndCustm);
         }
         QueryWrapper qw1 = new QueryWrapper<>();
         qw1.eq("useOrgSid", useOrgSid);
@@ -289,7 +326,31 @@ public class FinCompanyInvoicingService extends MybatisBaseService<FinCompanyInv
             return rb.setMsg("该企业开票信息已存在");
         }
         this.updateByDto(dto);
-        return rb.success();
+        FinAppDisAndCustm finAppDisAndCustm = new FinAppDisAndCustm();
+        FinExtra finExtra = new FinExtra();
+        finAppDisAndCustm.setId(dtoSid);
+        finAppDisAndCustm.setDictValue(name);
+        finExtra.setSid(dtoSid);
+        finExtra.setName(name);
+        String openTickRemarks = "";
+        if (StringUtils.isNotBlank(openTickRemarks + dto.getTaxpayerNo())) {
+            openTickRemarks = openTickRemarks + dto.getTaxpayerNo() + "；";
+        }
+        if (StringUtils.isNotBlank(dto.getAddress())) {
+            openTickRemarks = openTickRemarks + dto.getAddress() + "；";
+        }
+        if (StringUtils.isNotBlank(dto.getPhone())) {
+            openTickRemarks = openTickRemarks + dto.getPhone() + "；";
+        }
+        if (StringUtils.isNotBlank(dto.getBankName())) {
+            openTickRemarks = openTickRemarks + dto.getBankName() + "；";
+        }
+        if (StringUtils.isNotBlank(dto.getBankAccount())) {
+            openTickRemarks = openTickRemarks + dto.getBankAccount() + "；";
+        }
+        finExtra.setInfo(openTickRemarks);
+        finAppDisAndCustm.setExtra(finExtra);
+        return rb.success().setData(finAppDisAndCustm);
     }
 
     public List<FinCompanyInvoicingDetailsVo> qyFetchListByName(String name,String useOrgSid) {
@@ -317,4 +378,8 @@ public class FinCompanyInvoicingService extends MybatisBaseService<FinCompanyInv
         List<FinCompanyInvoicingBillListVo> finCompanyInvoicingBillListVos = baseMapper.qySelByUseOrgSid(qw);
         return finCompanyInvoicingBillListVos;
     }
+
+    public void delBySidsPath(String sid) {
+        deleteBySid(sid);
+    }
 }

anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/flowtask/FlowTaskFeign.java

@@ -185,4 +185,8 @@ public interface FlowTaskFeign {
     @ApiOperation(value = "根据流程实例的id获取最新待办环节")
     @PostMapping(value = "/获取上一个环节")
     ResultBean getPreviousNodesForReject(@RequestBody BusinessVariables bv);
+
+    @ApiOperation(value = "流程预演测试")
+    @PostMapping(value = "/yuyanTest")
+    ResultBean<List<Map<String,Object>>> yuyanTest(@RequestBody FlowableQuery flowableQuery);
 }

anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/flowtask/FlowTaskFeignFallBack.java

@@ -183,4 +183,9 @@ public class FlowTaskFeignFallBack implements FlowTaskFeign {
         return null;
     }
 
+    @Override
+    public ResultBean<List<Map<String,Object>>> yuyanTest(FlowableQuery flowableQuery) {
+        return null;
+    }
+
 }

anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/flowtask/FlowableQuery.java

@@ -0,0 +1,19 @@
+package com.yxt.anrui.flowable.api.flowtask;
+
+import lombok.Data;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * @description: 预演流程参数
+ * @author: dimengzhe
+ * @date: 2023/5/30
+ **/
+@Data
+public class FlowableQuery {
+
+    private String modelId;
+
+    private Map<String,Object> map = new HashMap<>();
+}

anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowtask/FlowTaskController.java

@@ -29,7 +29,6 @@ import org.flowable.engine.repository.ProcessDefinition;
 import org.flowable.task.api.Task;
 import org.flowable.task.api.history.HistoricTaskInstance;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
@@ -330,4 +329,9 @@ public class FlowTaskController implements FlowTaskFeign {
     public ResultBean getPreviousNodesForReject(BusinessVariables bv) {
         return flowTaskService.getPreviousNodesForReject(bv);
     }
+
+    @Override
+    public ResultBean<List<Map<String,Object>>> yuyanTest(FlowableQuery flowableQuery) {
+        return flowTaskService.yuyanTest(flowableQuery);
+    }
 }

anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowtask/FlowTaskService.java

@@ -2074,4 +2074,36 @@ public class FlowTaskService extends MybatisBaseService<FlowTaskMapper, FlowTask
         ResultBean<Page<FlowTaskDto>> rb = new ResultBean<Page<FlowTaskDto>>();
         return rb.success().setData(page);
     }
+
+    public ResultBean<List<Map<String,Object>>> yuyanTest(FlowableQuery flowableQuery) {
+        ResultBean<List<Map<String,Object>>> rb = ResultBean.fireFail();
+        List<Map<String,Object>> list = new ArrayList<>();
+        String modelId = flowableQuery.getModelId();
+        Map<String,Object> map = flowableQuery.getMap();
+        List<FlowElement> flowElements = processService.calApprovePath("", modelId,map);
+        List<FlowElement> collect = flowElements.stream().filter(item -> item.getId().length() > 0).collect(Collectors.toList());
+        for (int i = 0; i < collect.size(); i++) {
+            Map<String,Object> itemMap = new HashMap<>();
+                FlowElement item = collect.get(i);
+                log.info("flowElement:{}", item);
+                log.info("nodeName:{}", item.getName());
+            itemMap.put("nodeName",item.getName());
+                log.info("nodeId:{}", item.getId());
+            itemMap.put("nodeId",item.getId());
+                String s = JSON.toJSONString(item);
+                JSONObject jsonObject = JSONObject.parseObject(s);
+                log.info("item:{}", jsonObject);
+                Object candidateGroups = jsonObject.get("candidateGroups");
+                JSONArray candidateGroups_arr = new JSONArray();
+                if (candidateGroups != null) {
+                    candidateGroups_arr = JSONArray.parseArray(candidateGroups.toString());
+                }
+                if (candidateGroups_arr.size() > 0) {
+                    log.info("candidateGroups_sid:{}", candidateGroups_arr.get(0));
+                }
+                log.info("candidateGroups:{}", candidateGroups_arr);
+                list.add(itemMap);
+        }
+        return rb.success().setData(list);
+    }
 }

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/deliveryPlan/AppBusHandoverPrepareFeign.java

@@ -65,11 +65,11 @@ public interface AppBusHandoverPrepareFeign {
     @ResponseBody
     ResultBean<HandoverPrepareInfoVo> getDeliveryPlanInfo(@SpringQueryMap HandoverPrepareInfoQuery query);
 
-    @ApiOperation("修改交车准备 其他资料信息")
+   /* @ApiOperation("修改交车准备 其他资料信息")
     @PutMapping("/saveState")
     @ResponseBody
     ResultBean saveState(@RequestBody StateDateDto dto);
-
+*/
     @ApiOperation("获取交车准备 发票信息")
     @GetMapping("/getInvoiceInfo")
     @ResponseBody

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/deliveryPlan/AppBusHandoverPrepareFeignFallback.java

@@ -57,10 +57,10 @@ public class AppBusHandoverPrepareFeignFallback implements AppBusHandoverPrepare
         return null;
     }
 
-    @Override
+   /* @Override
     public ResultBean saveState(StateDateDto dto) {
         return null;
-    }
+    }*/
 
     @Override
     public ResultBean<InvoicingInfoVo> getInvoiceInfo(InvoicingInfoQuery query) {

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/deliveryPlan/AppBusHandoverPrepareRest.java

@@ -25,15 +25,14 @@
  *********************************************************/
 package com.yxt.anrui.terminal.biz.autoservice.deliveryPlan;
 
-import com.yxt.anrui.buscenter.api.bushandoverprepare.*;
 import com.yxt.anrui.terminal.api.autoservice.deliveryPlan.*;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
 import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 /**
  * Project: bus_handover(交车准备) <br/>
@@ -66,10 +65,10 @@ public class AppBusHandoverPrepareRest implements AppBusHandoverPrepareFeign {
         return appBusHandoverPrepareService.getDeliveryPlanInfo(query);
     }
 
-    @Override
+   /* @Override
     public ResultBean saveState(StateDateDto dto) {
         return appBusHandoverPrepareService.saveState(dto);
-    }
+    }*/
 
     @Override
     public ResultBean<InvoicingInfoVo> getInvoiceInfo(InvoicingInfoQuery query) {

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/deliveryPlan/AppBusHandoverPrepareService.java

@@ -88,13 +88,13 @@ public class AppBusHandoverPrepareService {
         return rb.success().setData(vo);
     }
 
-    public ResultBean saveState(StateDateDto dto) {
+ /*   public ResultBean saveState(StateDateDto dto) {
         AppStateDateDto appStateDateDto = new AppStateDateDto();
         BeanUtil.copyProperties(dto, appStateDateDto);
         ResultBean resultBean = busHandoverPrepareFeign.saveState(appStateDateDto);
         return resultBean;
     }
-
+*/
     public ResultBean<InvoicingInfoVo> getInvoiceInfo(InvoicingInfoQuery query) {
         ResultBean<InvoicingInfoVo> rb = ResultBean.fireFail();
         InvoicingInfoVo vo = new InvoicingInfoVo();