Merge remote-tracking branch 'origin/master'

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturer/BaseBankVo.java

@@ -0,0 +1,16 @@
+package com.yxt.anrui.base.api.basemanufacturer;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class BaseBankVo implements Vo {
+
+    @ApiModelProperty(value = "银行账号")
+    private String bankAccount;
+    @ApiModelProperty(value = "开户行")
+    private String depositBank;
+    @ApiModelProperty(value = "供应商")
+    private String manufacturerName;
+}

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturer/BaseManufacturerFeign.java

@@ -14,19 +14,6 @@ import javax.validation.Valid;
 import java.util.List;
 import java.util.Map;
 
-/**
- * Project: anrui-base(安瑞基础信息模块) <br/>
- * File: BaseManufacturerFeign.java <br/>
- * Class: com.yxt.anrui.base.api.basemanufacturer.BaseManufacturerFeign <br/>
- * Description: 供应厂商信息. <br/>
- * Copyright: Copyright (c) 2011 <br/>
- * Company: https://gitee.com/liuzp315 <br/>
- * Makedate: 2021-09-10 11:31:46 <br/>
- *
- * @author liupopo
- * @version 1.0
- * @since 1.0
- */
 @Api(tags = "供应厂商信息")
 @FeignClient(
         contextId = "anrui-base-BaseManufacturer",
@@ -75,7 +62,12 @@ public interface BaseManufacturerFeign {
     @ApiOperation("获取分公司和分类获取供应商")
     @PostMapping("/getGysTypeByOrgSid")
     @ResponseBody
-    public ResultBean<List<BaseManufacturerVo>> getGysTypeByOrgSid(@RequestParam("orgSid") String orgSid,@RequestParam("supplierType") String supplierType);
+    public ResultBean<List<BaseManufacturerVo>> getGysTypeByOrgSid(@RequestParam("orgSid") String orgSid, @RequestParam("supplierType") String supplierType);
+
+    @ApiOperation("根据分公司和分类获取开户行信息")
+    @PostMapping("/getKhhByOrgSid")
+    @ResponseBody
+    public ResultBean<List<BaseBankVo>> getKhhByOrgSid(@RequestParam("orgSid") String orgSid, @RequestParam("supplierType") String supplierType);
 
     /**
      * 生成厂商开户行信息到供应商
@@ -142,7 +134,7 @@ public interface BaseManufacturerFeign {
     @ApiOperation("车辆台账新增查询供应商")
     @GetMapping("/selectSupplier")
     @ResponseBody
-    public ResultBean<List<Map<String,String>>> selectSupplier(@RequestParam("manPurOrderTypeKey") String manPurOrderTypeKey,@RequestParam(value = "carBrandSid",required = false) String carBrandSid,@RequestParam("orgSid") String orgSid);
+    public ResultBean<List<Map<String, String>>> selectSupplier(@RequestParam("manPurOrderTypeKey") String manPurOrderTypeKey, @RequestParam(value = "carBrandSid", required = false) String carBrandSid, @RequestParam("orgSid") String orgSid);
 
     /**
      * 外采供应商名称下拉选
@@ -224,27 +216,27 @@ public interface BaseManufacturerFeign {
     @ApiOperation("根据分公司sid和厂商sid查询供应商sid")
     @GetMapping("/selectByOrgSidAndManBankSid/{useOrgSid}/{manufacturerSid}")
     @ResponseBody
-    ResultBean<BaseManufacturerDetailsVo> selectByOrgSidAndManBankSid(@PathVariable("useOrgSid") String useOrgSid,@PathVariable("manufacturerSid") String manufacturerSid);
+    ResultBean<BaseManufacturerDetailsVo> selectByOrgSidAndManBankSid(@PathVariable("useOrgSid") String useOrgSid, @PathVariable("manufacturerSid") String manufacturerSid);
 
     @ApiOperation("根据车型sid查询品牌、厂商等信息")
     @GetMapping("/getManDetails/{modelSid}")
     @ResponseBody
-    ResultBean<BaseOutManuVo> getManDetails(@PathVariable("modelSid")String modelSid);
+    ResultBean<BaseOutManuVo> getManDetails(@PathVariable("modelSid") String modelSid);
 
     @ApiOperation("根据车型sid查询品牌、厂商等信息")
     @GetMapping("/selectByInternalPurchaseSid/{buyerOrgSid}/{sellerOrgName}")
     @ResponseBody
-    ResultBean<String> selectByInternalPurchaseSid(@PathVariable("buyerOrgSid")String buyerOrgSid,@PathVariable("sellerOrgName") String sellerOrgName);
+    ResultBean<String> selectByInternalPurchaseSid(@PathVariable("buyerOrgSid") String buyerOrgSid, @PathVariable("sellerOrgName") String sellerOrgName);
 
     @ApiOperation("查询分公司下的供应商信息和主机厂信息")
     @GetMapping("/getDetailsList")
     @ResponseBody
-    ResultBean<List<ManufacturerVo>> getDetailsList(@RequestParam("orgSid")String orgSid);
+    ResultBean<List<ManufacturerVo>> getDetailsList(@RequestParam("orgSid") String orgSid);
 
     @ApiOperation("查询供应商下的开户行信息")
     @GetMapping("/getBankList")
     @ResponseBody
-    ResultBean<List<ManBankVo>> getBankList(@RequestParam("sid")String sid);
+    ResultBean<List<ManBankVo>> getBankList(@RequestParam("sid") String sid);
 
     @ApiOperation("根据供应商code查询供应商信息")
     @GetMapping("/fetchByCode")

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturer/BaseManufacturerFeignFallback.java

@@ -8,19 +8,6 @@ import org.springframework.stereotype.Component;
 import java.util.List;
 import java.util.Map;
 
-/**
- * Project: anrui-base(安瑞基础信息模块) <br/>
- * File: BaseManufacturerFeignFallback.java <br/>
- * Class: com.yxt.anrui.base.api.basemanufacturer.BaseManufacturerFeignFallback <br/>
- * Description: 供应厂商信息. <br/>
- * Copyright: Copyright (c) 2011 <br/>
- * Company: https://gitee.com/liuzp315 <br/>
- * Makedate: 2021-09-10 11:31:46 <br/>
- *
- * @author liupopo
- * @version 1.0
- * @since 1.0
- */
 @Component
 public class BaseManufacturerFeignFallback implements BaseManufacturerFeign {
 
@@ -45,6 +32,11 @@ public class BaseManufacturerFeignFallback implements BaseManufacturerFeign {
         return null;
     }
 
+    @Override
+    public ResultBean<List<BaseBankVo>> getKhhByOrgSid(String orgSid, String supplierType) {
+        return null;
+    }
+
     @Override
     public ResultBean copyManBankToGys(String orgSid) {
         return null;

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturer/BaseManufacturerVo.java

@@ -1,25 +1,11 @@
 package com.yxt.anrui.base.api.basemanufacturer;
 
-
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.yxt.common.core.vo.Vo;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-/**
- * Project: anrui-base(安瑞基础信息模块) <br/>
- * File: BaseManufacturerVo.java <br/>
- * Class: com.yxt.anrui.base.api.basemanufacturer.BaseManufacturerVo <br/>
- * Description: 供应厂商信息 视图数据对象. <br/>
- * Copyright: Copyright (c) 2011 <br/>
- * Company: https://gitee.com/liuzp315 <br/>
- * Makedate: 2021-09-10 11:31:46 <br/>
- *
- * @author liupopo
- * @version 1.0
- * @since 1.0
- */
 @ApiModel(value = "供应厂商信息 视图数据对象", description = "供应厂商信息 视图数据对象")
 @Data
 public class BaseManufacturerVo implements Vo {

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerMapper.java

@@ -155,4 +155,6 @@ public interface BaseManufacturerMapper extends BaseMapper<BaseManufacturer> {
 
     @Select("SELECT * FROM base_manufacturer WHERE manufacturerCode = #{supplierCode}")
     BaseManufacturerDetailsVo fetchByCode(String supplierCode);
+
+    List<BaseBankVo> getKhhByOrgSid(@Param("orgSid") String orgSid,@Param("supplierType") String supplierType);
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerMapper.xml

@@ -352,4 +352,15 @@
         left join base_vehicle_brand bb on bb.manufacturerSid = bm.sid
         where bm.supplierType = '0001' and bm.isDelete = 0 and bb.useOrg like concat('%',#{orgSid},'%')
     </select>
+
+    <select id="getKhhByOrgSid" resultType="com.yxt.anrui.base.api.basemanufacturer.BaseBankVo">
+        SELECT bb.bankAccount,
+               bb.depositBank,
+               b.manufacturerName
+        FROM base_manufacturer_bank bb
+                 LEFT JOIN base_manufacturer b
+                           ON bb.manufacturerSid = b.sid
+        WHERE b.createOrg = #{orgSid}
+          AND b.supplierType = #{supplierType}
+    </select>
 </mapper>

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerRest.java

@@ -24,19 +24,6 @@ import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 
-/**
- * Project: anrui-base(安瑞基础信息模块) <br/>
- * File: BaseManufacturerFeignFallback.java <br/>
- * Class: com.yxt.anrui.base.biz.basemanufacturer.BaseManufacturerRest <br/>
- * Description: 供应厂商信息. <br/>
- * Copyright: Copyright (c) 2011 <br/>
- * Company: https://gitee.com/liuzp315 <br/>
- * Makedate: 2021-09-10 11:31:46 <br/>
- *
- * @author liupopo
- * @version 1.0
- * @since 1.0
- */
 @Api(tags = "供应厂商信息")
 @Controller
 @RequestMapping("v1/basemanufacturer")
@@ -92,8 +79,13 @@ public class BaseManufacturerRest implements BaseManufacturerFeign {
     }
 
     @Override
-    public ResultBean<List<BaseManufacturerVo>> getGysTypeByOrgSid(String orgSid,String supplierType) {
-        return baseManufacturerService.getGysTypeByOrgSid(orgSid,supplierType);
+    public ResultBean<List<BaseManufacturerVo>> getGysTypeByOrgSid(String orgSid, String supplierType) {
+        return baseManufacturerService.getGysTypeByOrgSid(orgSid, supplierType);
+    }
+
+    @Override
+    public ResultBean<List<BaseBankVo>> getKhhByOrgSid(String orgSid, String supplierType) {
+        return baseManufacturerService.getKhhByOrgSid(orgSid, supplierType);
     }
 
     @Override
@@ -136,8 +128,8 @@ public class BaseManufacturerRest implements BaseManufacturerFeign {
     }
 
     @Override
-    public ResultBean<List<Map<String, String>>> selectSupplier(String manPurOrderTypeKey, String carBrandSid,String orgSid) {
-        return baseManufacturerService.selectSupplier(manPurOrderTypeKey,carBrandSid,orgSid);
+    public ResultBean<List<Map<String, String>>> selectSupplier(String manPurOrderTypeKey, String carBrandSid, String orgSid) {
+        return baseManufacturerService.selectSupplier(manPurOrderTypeKey, carBrandSid, orgSid);
     }
 
     @Override
@@ -235,7 +227,7 @@ public class BaseManufacturerRest implements BaseManufacturerFeign {
 
     @Override
     public ResultBean<String> selectByInternalPurchaseSid(String buyerOrgSid, String sellerOrgName) {
-        return baseManufacturerService.selectByInternalPurchaseSid(buyerOrgSid,sellerOrgName);
+        return baseManufacturerService.selectByInternalPurchaseSid(buyerOrgSid, sellerOrgName);
     }
 
     @Override

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerService.java

@@ -139,8 +139,8 @@ public class BaseManufacturerService extends MybatisBaseService<BaseManufacturer
      * @param name 厂商名称
      * @return
      */
-    public int selectCountByName(String name,String createOrg) {
-        return baseMapper.selectCountByName(name,createOrg);
+    public int selectCountByName(String name, String createOrg) {
+        return baseMapper.selectCountByName(name, createOrg);
     }
 
     /**
@@ -334,14 +334,14 @@ public class BaseManufacturerService extends MybatisBaseService<BaseManufacturer
         } catch (Exception e) {
             e.printStackTrace();
         }
-        if (StringUtils.isBlank(baseManufacturerDto.getCreateOrg())){
+        if (StringUtils.isBlank(baseManufacturerDto.getCreateOrg())) {
             //集团推送所有分公司的供应商
             //查询所有分公司，并向所有分公司中插入供应商信息
             ResultBean<List<SysOrganizationVo>> orgList = sysOrganizationFeign.selectOrgSidList();
             List<SysOrganizationVo> list = orgList.getData();
             for (SysOrganizationVo sysOrganizationVo : list) {
                 List<BasePurchaseSystemDetailsVo> data = basePurchaseSystemService.fetchOrgCodeByUseOrgSid(sysOrganizationVo.getSid()).getData();
-                if (data != null){
+                if (data != null) {
                     for (BasePurchaseSystemDetailsVo datum : data) {
                         BdSupplier bdSupplier = new BdSupplier();
                         bdSupplier.setFName(baseManufacturerDto.getManufacturerName());
@@ -350,7 +350,7 @@ public class BaseManufacturerService extends MybatisBaseService<BaseManufacturer
                         bdSupplier.setFNumber(baseManufacturerDto.getManufacturerCode());
                         finKingDeeFeign.draftBdSupplier(bdSupplier);
                     }
-                }else {
+                } else {
                     BdSupplier bdSupplier = new BdSupplier();
                     bdSupplier.setFName(baseManufacturerDto.getManufacturerName());
                     bdSupplier.setFLocMobile(baseManufacturerDto.getContactMobile());
@@ -359,10 +359,10 @@ public class BaseManufacturerService extends MybatisBaseService<BaseManufacturer
                     finKingDeeFeign.draftBdSupplier(bdSupplier);
                 }
             }
-        }else if (StringUtils.isNotBlank(baseManufacturerDto.getCreateOrg())){
+        } else if (StringUtils.isNotBlank(baseManufacturerDto.getCreateOrg())) {
             SysOrganizationVo sysOrganizationVo = sysOrganizationFeign.fetchBySid(baseManufacturerDto.getCreateOrg()).getData();
             List<BasePurchaseSystemDetailsVo> data = basePurchaseSystemService.fetchOrgCodeByUseOrgSid(sysOrganizationVo.getSid()).getData();
-            if (data != null){
+            if (data != null) {
                 for (BasePurchaseSystemDetailsVo datum : data) {
                     BdSupplier bdSupplier = new BdSupplier();
                     bdSupplier.setFName(baseManufacturerDto.getManufacturerName());
@@ -371,7 +371,7 @@ public class BaseManufacturerService extends MybatisBaseService<BaseManufacturer
                     bdSupplier.setFNumber(baseManufacturerDto.getManufacturerCode());
                     finKingDeeFeign.draftBdSupplier(bdSupplier);
                 }
-            }else {
+            } else {
                 BdSupplier bdSupplier = new BdSupplier();
                 bdSupplier.setFName(baseManufacturerDto.getManufacturerName());
                 bdSupplier.setFLocMobile(baseManufacturerDto.getContactMobile());
@@ -398,14 +398,14 @@ public class BaseManufacturerService extends MybatisBaseService<BaseManufacturer
     private ResultBean saveBaseManufacturerBankDto(BaseManufacturerBankDto dto, String sid) {
         ResultBean rb = ResultBean.fireFail();
         String bankSid = dto.getSid();
-        if(StringUtils.isNotBlank(bankSid)){
+        if (StringUtils.isNotBlank(bankSid)) {
             BaseManufacturerBank baseManufacturerBank = baseManufacturerBankService.fetchBySid(bankSid);
-            BeanUtil.copyProperties(dto,baseManufacturerBank,"sid");
+            BeanUtil.copyProperties(dto, baseManufacturerBank, "sid");
             baseManufacturerBank.setManufacturerSid(sid);
             baseManufacturerBankService.updateById(baseManufacturerBank);
-        }else{
+        } else {
             BaseManufacturerBank baseManufacturerBank = new BaseManufacturerBank();
-            BeanUtil.copyProperties(dto,baseManufacturerBank,"sid");
+            BeanUtil.copyProperties(dto, baseManufacturerBank, "sid");
             baseManufacturerBank.setManufacturerSid(sid);
             baseManufacturerBankService.insert(baseManufacturerBank);
         }
@@ -436,7 +436,7 @@ public class BaseManufacturerService extends MybatisBaseService<BaseManufacturer
         }
         String name = dto.getManufacturerName();
         String createOrg = dto.getCreateOrg();
-        int count = this.selectCountByName(name,createOrg);
+        int count = this.selectCountByName(name, createOrg);
         if (count > 0) {
             return rb.setMsg("该厂商名称已存在");
         }
@@ -489,9 +489,9 @@ public class BaseManufacturerService extends MybatisBaseService<BaseManufacturer
         strings.add(sid);
 //        baseManufacturerBankService.updateBySidIsDelete(strings);
         List<BaseManufacturerBankDto> baseManufacturerBankDto = dto.getBaseManufacturerBankDto();
-        List<String> stringList = baseManufacturerBankDto.stream().map(v->v.getSid()).collect(Collectors.toList());
+        List<String> stringList = baseManufacturerBankDto.stream().map(v -> v.getSid()).collect(Collectors.toList());
         List<BaseManufacturerBank> baseManufacturerBankList = baseManufacturerBankService.selectByManSid(sid);
-         if (baseManufacturerBankDto.size() > 0) {
+        if (baseManufacturerBankDto.size() > 0) {
             for (BaseManufacturerBankDto manufacturerBankDto : baseManufacturerBankDto) {
                 ResultBean resultBean1 = saveBaseManufacturerBankDto(manufacturerBankDto, sid);
                 if (!resultBean1.getCode().equals("200")) {
@@ -499,25 +499,25 @@ public class BaseManufacturerService extends MybatisBaseService<BaseManufacturer
                 }
             }
         }
-         if(!baseManufacturerBankList.isEmpty()){
-             List<String> stringList1 = baseManufacturerBankList.stream().map(v->v.getSid()).collect(Collectors.toList());
-             stringList.removeAll(Collections.singleton(null));
-             for (int j = 0; j < stringList1.size(); j++) {
-                 if(!stringList.contains(stringList1.get(j))){
-                     baseManufacturerBankService.updateBySidIsDeletes(stringList1.get(j));
-                 }
-             }
-         }
+        if (!baseManufacturerBankList.isEmpty()) {
+            List<String> stringList1 = baseManufacturerBankList.stream().map(v -> v.getSid()).collect(Collectors.toList());
+            stringList.removeAll(Collections.singleton(null));
+            for (int j = 0; j < stringList1.size(); j++) {
+                if (!stringList.contains(stringList1.get(j))) {
+                    baseManufacturerBankService.updateBySidIsDeletes(stringList1.get(j));
+                }
+            }
+        }
         //BaseManufacturerFinance baseManufacturerFinance = baseManufacturerFinanceService.selectByBaseManufacturerSid(sid);
         //baseManufacturerFinanceService.updateBySid(dto.getBaseManufacturerFinanceDto().toMap(), baseManufacturerFinance.getSid());
-        if (StringUtils.isBlank(baseManufacturerDto.getCreateOrg())){
+        if (StringUtils.isBlank(baseManufacturerDto.getCreateOrg())) {
             //集团推送所有分公司的供应商
             //查询所有分公司，并向所有分公司中插入供应商信息
             ResultBean<List<SysOrganizationVo>> orgList = sysOrganizationFeign.selectOrgSidList();
             List<SysOrganizationVo> list = orgList.getData();
             for (SysOrganizationVo sysOrganizationVo : list) {
                 List<BasePurchaseSystemDetailsVo> data = basePurchaseSystemService.fetchOrgCodeByUseOrgSid(sysOrganizationVo.getSid()).getData();
-                if (data != null){
+                if (data != null) {
                     for (BasePurchaseSystemDetailsVo datum : data) {
                         BdSupplier bdSupplier = new BdSupplier();
                         bdSupplier.setFName(baseManufacturerDto.getManufacturerName());
@@ -526,7 +526,7 @@ public class BaseManufacturerService extends MybatisBaseService<BaseManufacturer
                         bdSupplier.setFNumber(baseManufacturerDto.getManufacturerCode());
                         finKingDeeFeign.updateBdSupplier(bdSupplier);
                     }
-                }else {
+                } else {
                     BdSupplier bdSupplier = new BdSupplier();
                     bdSupplier.setFName(baseManufacturerDto.getManufacturerName());
                     bdSupplier.setFLocMobile(baseManufacturerDto.getContactMobile());
@@ -535,10 +535,10 @@ public class BaseManufacturerService extends MybatisBaseService<BaseManufacturer
                     finKingDeeFeign.updateBdSupplier(bdSupplier);
                 }
             }
-        }else if (StringUtils.isNotBlank(baseManufacturerDto.getCreateOrg())){
+        } else if (StringUtils.isNotBlank(baseManufacturerDto.getCreateOrg())) {
             SysOrganizationVo sysOrganizationVo = sysOrganizationFeign.fetchBySid(baseManufacturerDto.getCreateOrg()).getData();
             List<BasePurchaseSystemDetailsVo> data = basePurchaseSystemService.fetchOrgCodeByUseOrgSid(sysOrganizationVo.getSid()).getData();
-            if (data != null){
+            if (data != null) {
                 for (BasePurchaseSystemDetailsVo datum : data) {
                     BdSupplier bdSupplier = new BdSupplier();
                     bdSupplier.setFName(baseManufacturerDto.getManufacturerName());
@@ -547,7 +547,7 @@ public class BaseManufacturerService extends MybatisBaseService<BaseManufacturer
                     bdSupplier.setFNumber(baseManufacturerDto.getManufacturerCode());
                     finKingDeeFeign.updateBdSupplier(bdSupplier);
                 }
-            }else {
+            } else {
                 BdSupplier bdSupplier = new BdSupplier();
                 bdSupplier.setFName(baseManufacturerDto.getManufacturerName());
                 bdSupplier.setFLocMobile(baseManufacturerDto.getContactMobile());
@@ -787,11 +787,11 @@ public class BaseManufacturerService extends MybatisBaseService<BaseManufacturer
             String useOrg = baseVehicleBrand.getUseOrg();
             String[] split = useOrg.split(",");
             for (String s : split) {
-                if (!s.equals(orgSid)){
+                if (!s.equals(orgSid)) {
                     SysOrganizationVo sysOrganizationVo = sysOrganizationFeign.fetchBySid(s).getData();
                     Map<String, String> map = new HashMap<>();
-                    map.put("sid",s);
-                    map.put("manufacturerName",sysOrganizationVo.getName());
+                    map.put("sid", s);
+                    map.put("manufacturerName", sysOrganizationVo.getName());
                     maps.add(map);
                 }
             }
@@ -805,16 +805,16 @@ public class BaseManufacturerService extends MybatisBaseService<BaseManufacturer
         return rb.success().setData(baseManufacturerVos);
     }
 
-    public ResultBean<List<BaseManufacturerVo>> getGysTypeByOrgSid(String orgSid,String supplierType) {
+    public ResultBean<List<BaseManufacturerVo>> getGysTypeByOrgSid(String orgSid, String supplierType) {
         ResultBean rb = ResultBean.fireFail();
-        List<BaseManufacturerVo> baseManufacturerVos = baseMapper.getGysTypeByOrgSid(orgSid,supplierType);
+        List<BaseManufacturerVo> baseManufacturerVos = baseMapper.getGysTypeByOrgSid(orgSid, supplierType);
         return rb.success().setData(baseManufacturerVos);
     }
 
     public ResultBean<List<ManufacturerVo>> getDetailsList(String orgSid) {
         ResultBean<List<ManufacturerVo>> rb = ResultBean.fireFail();
         List<ManufacturerVo> voList = baseMapper.getDetailsList(orgSid);
-        if(voList.size() == 0){
+        if (voList.size() == 0) {
             voList = new ArrayList<>();
         }
         return rb.success().setData(voList);
@@ -831,4 +831,10 @@ public class BaseManufacturerService extends MybatisBaseService<BaseManufacturer
         BaseManufacturerDetailsVo baseManufacturerDetailsVo = baseMapper.fetchByCode(supplierCode);
         return rb.success().setData(baseManufacturerDetailsVo);
     }
+
+    public ResultBean<List<BaseBankVo>> getKhhByOrgSid(String orgSid, String supplierType) {
+        ResultBean rb = ResultBean.fireFail();
+        List<BaseBankVo> baseBankVoList = baseMapper.getKhhByOrgSid(orgSid, supplierType);
+        return rb.success().setData(baseBankVoList);
+    }
 }

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

@@ -27,6 +27,7 @@ package com.yxt.anrui.buscenter.api.bussalesorder;
 
 
 import com.yxt.anrui.buscenter.api.busdepositfictitious.BusDepositFictitiousDetailsVo;
+import com.yxt.anrui.buscenter.api.bussalesorder.app.order.AppBusSalesOrderVehicleCostVo;
 import com.yxt.anrui.buscenter.api.bussalesorderdeposit.BusSalesOrderDepositDetailsVo;
 import com.yxt.anrui.buscenter.api.bussalesorderdiscount.BusSalesOrderDiscountDetailsVo;
 import com.yxt.anrui.buscenter.api.bussalesorderinsurance.BusSalesOrderInsuranceDetailsVo;
@@ -189,4 +190,7 @@ public class BusSalesOrderDetailsVo implements Vo {
     private String companyInvoicingName;
     @ApiModelProperty("开票单位sid")
     private String companyInvoicingSid;
+
+    @ApiModelProperty(value = "车辆成本信息")
+    private AppBusSalesOrderVehicleCostVo vehicleCostObj = new AppBusSalesOrderVehicleCostVo();
 }

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

@@ -36,7 +36,6 @@ import com.yxt.anrui.buscenter.api.bussalesorder.contract.AppRovalContractPageQu
 import com.yxt.anrui.buscenter.api.bussalesorder.contract.AppRovalContractPageVo;
 import com.yxt.anrui.buscenter.api.bussalesorder.flowable.*;
 import com.yxt.anrui.buscenter.api.bussalesorderprice.BusSalesOrderPrice;
-import com.yxt.anrui.buscenter.api.bussolutionschange.flow.flow.SolutionsChangeDelegateQuery;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
@@ -253,6 +252,12 @@ public interface BusSalesOrderFeign {
     @ResponseBody
     ResultBean<AppOrderDetailsVo> getSaleOrderDetails(@PathVariable(value = "sid") String sid);
 
+    @ApiOperation("销售订单详情2")
+    @GetMapping("/getSaleOrderDetails2/{sid}")
+    @ResponseBody
+    ResultBean<AppOrderDetailsVo> getSaleOrderDetails2(@PathVariable(value = "sid") String sid
+            ,@RequestParam(value = "userSid", required = false) String userSid);
+
     @ApiOperation("根据合同编号查询销售订单详情")
     @GetMapping("/getSaleOrderDetailsByContractNo/{contractNo}")
     @ResponseBody

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

@@ -227,6 +227,11 @@ public class BusSalesOrderFeignFallback implements BusSalesOrderFeign {
         return null;
     }
 
+    @Override
+    public ResultBean<AppOrderDetailsVo> getSaleOrderDetails2(String sid, String userSid) {
+        return null;
+    }
+
     @Override
     public ResultBean<AppOrderDetailsVo> getSaleOrderDetailsByContractNo(String contractNo) {
         return null;

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/AppBusSalesOrderVehicleCostVo.java

@@ -0,0 +1,19 @@
+package com.yxt.anrui.buscenter.api.bussalesorder.app.order;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class AppBusSalesOrderVehicleCostVo {
+
+    @ApiModelProperty("厂家合同（结算)价")
+    private String manufacturerSettleAmount;
+    @ApiModelProperty("政策合计金额")
+    private String policyAmount;
+    @ApiModelProperty("成本价")
+    private String cost;
+    @ApiModelProperty("政策明细")
+    private String policyDetails;
+    @ApiModelProperty("备注")
+    private String remarks;
+}

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/AppOrderDetailsVo.java

@@ -154,5 +154,7 @@ public class AppOrderDetailsVo implements Vo {
 
     private String orgSidPath;
 
+    @ApiModelProperty(value = "车辆成本信息")
+    private AppBusSalesOrderVehicleCostVo vehicleCostObj;
 
 }

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

@@ -44,4 +44,14 @@ public class OrderFlowableQuery implements Query {
     private String companyInvoicingName;
     @ApiModelProperty("开票单位sid")
     private String companyInvoicingSid;
+    @ApiModelProperty("厂家合同（结算)价")
+    private String manufacturerSettleAmount;
+    @ApiModelProperty("政策合计金额")
+    private String policyAmount;
+    @ApiModelProperty("成本价")
+    private String cost;
+    @ApiModelProperty("政策明细")
+    private String policyDetails;
+    @ApiModelProperty("备注")
+    private String remarks;
 }

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordervehiclecost/BusSalesOrderVehicleCost.java

@@ -0,0 +1,67 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.buscenter.api.bussalesordervehiclecost;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yxt.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * Project: anrui-buscenter(业务管理) <br/>
+ * File: BusSalesOrderVehicle.java <br/>
+ * Class: com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicle <br/>
+ * Description: 销售订单-车辆信息. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-04-27 13:39:04 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "销售订单-车辆成本信息", description = "销售订单-车辆成本信息")
+@TableName("bus_sales_order_vehicle_cost")
+public class BusSalesOrderVehicleCost extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty("销售订单sid")
+    private String salesOrderSid;
+    @ApiModelProperty("厂家合同（结算)价")
+    private String manufacturerSettleAmount;
+    @ApiModelProperty("政策合计金额")
+    private BigDecimal policyAmount;
+    @ApiModelProperty("成本价")
+    private BigDecimal cost;
+    @ApiModelProperty("政策明细")
+    private String policyDetails;
+
+
+}

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordervehiclecost/BusSalesOrderVehicleCostFeign.java

@@ -0,0 +1,60 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.buscenter.api.bussalesordervehiclecost;
+
+import com.yxt.common.core.result.ResultBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+/**
+ * Project: anrui-buscenter(业务管理) <br/>
+ * File: BusSalesOrderInsuranceFeign.java <br/>
+ * Class: com.yxt.anrui.buscenter.api.bussalesorderinsurance.BusSalesOrderInsuranceFeign <br/>
+ * Description: 销售订单-车辆成本信息. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-04-27 13:39:04 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Api(tags = "销售订单-车辆成本信息")
+@FeignClient(
+        contextId = "anrui-buscenter-BusSalesOrderVehicleCost",
+        name = "anrui-buscenter",
+        path = "v1/BusSalesOrderVehicleCost")
+public interface BusSalesOrderVehicleCostFeign {
+
+    @ApiOperation("根据销售订单sid查询车辆成本信息")
+    @GetMapping("/getVehicleCostVoByOrderSid")
+    @ResponseBody
+    public ResultBean<BusSalesOrderVehicleCostVo> getVehicleCostVoByOrderSid(@RequestParam("orderSid")String orderSid);
+}

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordervehiclecost/BusSalesOrderVehicleCostVo.java

@@ -0,0 +1,63 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.buscenter.api.bussalesordervehiclecost;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: anrui-buscenter(业务管理) <br/>
+ * File: BusSalesOrderVehicle.java <br/>
+ * Class: com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicle <br/>
+ * Description: 销售订单-车辆信息. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-04-27 13:39:04 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "销售订单-车辆成本信息", description = "销售订单-车辆成本信息")
+public class BusSalesOrderVehicleCostVo implements Vo {
+
+    @ApiModelProperty("销售订单sid")
+    private String salesOrderSid;
+    @ApiModelProperty("厂家合同（结算)价")
+    private String manufacturerSettleAmount;
+    @ApiModelProperty("政策合计金额")
+    private String policyAmount;
+    @ApiModelProperty("成本价")
+    private String cost;
+    @ApiModelProperty("政策明细")
+    private String policyDetails;
+    @ApiModelProperty("备注")
+    private String remarks;
+
+}

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

@@ -39,7 +39,6 @@ import com.yxt.anrui.buscenter.api.bussalesorder.contract.AppRovalContractPageQu
 import com.yxt.anrui.buscenter.api.bussalesorder.contract.AppRovalContractPageVo;
 import com.yxt.anrui.buscenter.api.bussalesorder.flowable.*;
 import com.yxt.anrui.buscenter.api.bussalesorderprice.BusSalesOrderPrice;
-import com.yxt.anrui.buscenter.api.bussolutionschange.flow.flow.SolutionsChangeDelegateQuery;
 import com.yxt.anrui.flowable.api.utils.ProcDefEnum;
 import com.yxt.anrui.flowable.sqloperationsymbol.BusinessVariables;
 import com.yxt.common.base.utils.PagerUtil;
@@ -51,7 +50,10 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
 
 import java.lang.reflect.InvocationTargetException;
 import java.util.List;
@@ -299,6 +301,11 @@ public class BusSalesOrderRest implements BusSalesOrderFeign {
         return busSalesOrderService.getSaleOrderDetails(sid);
     }
 
+    @Override
+    public ResultBean<AppOrderDetailsVo> getSaleOrderDetails2(String sid, String userSid) {
+        return busSalesOrderService.getSaleOrderDetails2(sid,userSid);
+    }
+
     @Override
     public ResultBean<AppOrderDetailsVo> getSaleOrderDetailsByContractNo(String contractNo) {
         return busSalesOrderService.getSaleOrderDetailsByContractNo(contractNo);

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

@@ -28,7 +28,6 @@ package com.yxt.anrui.buscenter.biz.bussalesorder;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.date.DateTime;
 import cn.hutool.core.date.DateUtil;
-import cn.hutool.core.lang.Console;
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -36,7 +35,6 @@ import com.google.common.util.concurrent.ThreadFactoryBuilder;
 import com.yxt.anrui.base.api.basebrandletpricepowimit.BaseBrandMitQuery;
 import com.yxt.anrui.base.api.basebrandletpricepowimit.BaseBrandletpricepowimitFeign;
 import com.yxt.anrui.base.api.basediscountpackage.BaseDiscountpackageFeign;
-import com.yxt.anrui.base.api.basedistributor.BaseDistributor;
 import com.yxt.anrui.base.api.basemiddleman.BaseMiddlemanDetailsVo;
 import com.yxt.anrui.base.api.basemiddleman.BaseMiddlemanFeign;
 import com.yxt.anrui.base.api.basemodelconfig.AppCarConfigSummaryVo;
@@ -52,7 +50,6 @@ import com.yxt.anrui.base.api.basevehiclemodelappendix.BaseVehicleModelAppendixF
 import com.yxt.anrui.base.api.basevehiclestate.BaseVehicleStateDto;
 import com.yxt.anrui.base.api.basevehiclestate.BaseVehicleStateEnum;
 import com.yxt.anrui.base.api.basevehiclestate.BaseVehicleStateFeign;
-import com.yxt.anrui.base.api.basevehicletempstate.BaseVehicleTempstate;
 import com.yxt.anrui.base.api.basevehicletempstate.BaseVehicleTempstateFeign;
 import com.yxt.anrui.base.api.basevehmodelconfig.BaseVehmodelConfigFeign;
 import com.yxt.anrui.base.api.busvehicleapplydetail.AppBusVehicleApplyListVo;
@@ -66,10 +63,8 @@ import com.yxt.anrui.base.api.commoncontract.CommonContractVo;
 import com.yxt.anrui.base.common.enums.BillTypeEnum;
 import com.yxt.anrui.base.common.enums.CommonContractEnum;
 import com.yxt.anrui.base.common.enums.VehicleState;
-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.busarrearscarryvehicleapply.BusArrearsCarryVehicleApply;
 import com.yxt.anrui.buscenter.api.busdeposit.BusDeposit;
 import com.yxt.anrui.buscenter.api.busdepositfictitious.BusDepositFictitious;
 import com.yxt.anrui.buscenter.api.busdepositfictitious.BusDepositFictitiousDetailsVo;
@@ -111,10 +106,10 @@ import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusBorrowVehicleVo;
 import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicle;
 import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicleDetailsVo;
 import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicleDto;
+import com.yxt.anrui.buscenter.api.bussalesordervehiclecost.BusSalesOrderVehicleCostVo;
 import com.yxt.anrui.buscenter.api.bussalesvehicleorder.BusSalesVehicleOrder;
 import com.yxt.anrui.buscenter.api.bussalesvehicleorder.BusSalesVehicleOrderDetailsVo;
 import com.yxt.anrui.buscenter.api.bussalesvehicleorder.BusSalesVehicleOrderDto;
-import com.yxt.anrui.buscenter.api.bussolutionschange.BusSolutionsChange;
 import com.yxt.anrui.buscenter.api.common.BusSalesOrderConstantUtils;
 import com.yxt.anrui.buscenter.biz.busarrearscarryvehicleapply.BusArrearsCarryVehicleApplyService;
 import com.yxt.anrui.buscenter.biz.busdeposit.BusDepositService;
@@ -131,6 +126,7 @@ import com.yxt.anrui.buscenter.biz.bussalesorderprice.BusSalesOrderPriceService;
 import com.yxt.anrui.buscenter.biz.bussalesordersubmit.BusSalesOrderSubmitService;
 import com.yxt.anrui.buscenter.biz.bussalesordertrailer.BusSalesOrderTrailerService;
 import com.yxt.anrui.buscenter.biz.bussalesordervehicle.BusSalesOrderVehicleService;
+import com.yxt.anrui.buscenter.biz.bussalesordervehiclecost.BusSalesOrderVehicleCostService;
 import com.yxt.anrui.buscenter.biz.bussalesvehicleorder.BusSalesVehicleOrderService;
 import com.yxt.anrui.buscenter.biz.bussolutionschange.BusSolutionsChangeService;
 import com.yxt.anrui.crm.api.crmcustomertemp.AppCrmCustomerTempInfoVo;
@@ -152,35 +148,36 @@ import com.yxt.anrui.flowable.api.flow.FlowableFeign;
 import com.yxt.anrui.flowable.api.flow.UpdateFlowFieldVo;
 import com.yxt.anrui.flowable.api.flow2.FlowDelegateQuery;
 import com.yxt.anrui.flowable.api.flow2.FlowFeign;
-import com.yxt.anrui.flowable.api.flowtask.*;
+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;
 import com.yxt.anrui.portal.api.dictcommon.DictCommonFeign;
 import com.yxt.anrui.portal.api.dictcommon.DictCommonVo;
 import com.yxt.anrui.portal.api.flow.PCHistTaskListAndCommentList;
+import com.yxt.anrui.portal.api.sysfunction.ButtonPermissionQuery;
+import com.yxt.anrui.portal.api.sysfunction.ButtonPermissionVo;
+import com.yxt.anrui.portal.api.sysfunction.SysFunctionFeign;
 import com.yxt.anrui.portal.api.sysorganization.SysOrganization;
 import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign;
 import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo;
 import com.yxt.anrui.portal.api.sysstaffinfo.SysStaffinfoFeign;
 import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrg;
 import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign;
-import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgVo;
 import com.yxt.anrui.portal.api.sysuser.PrivilegeQuery;
 import com.yxt.anrui.portal.api.sysuser.SysUser;
 import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
 import com.yxt.anrui.portal.api.sysuser.SysUserVo;
 import com.yxt.anrui.portal.api.sysuser.app.AppUserOrgInfoVo;
 import com.yxt.anrui.portal.config.DictCommonType;
-import com.yxt.anrui.riskcenter.api.loancreditappealapply.LoanCreditAppealApply;
 import com.yxt.anrui.riskcenter.api.loanfinpolicy.LoanFinPolicy;
 import com.yxt.anrui.riskcenter.api.loanhomevisitprep.HomeVisitDto;
-import com.yxt.anrui.riskcenter.api.loanhomevisitprep.LoanHomevisitPrepDto;
 import com.yxt.anrui.riskcenter.api.loanhomevisitprep.LoanHomevisitPrepFeign;
 import com.yxt.anrui.riskcenter.api.loanpreloancreditapply.LoanPreloanCreditApply;
-import com.yxt.anrui.riskcenter.api.loanpreloancreditapply.LoanPreloanCreditApplyVo;
 import com.yxt.anrui.riskcenter.api.loansolutions.LoanSolutions;
 import com.yxt.anrui.riskcenter.api.loansolutions.LoanSolutionsFeign;
-import com.yxt.anrui.riskcenter.api.loansolutions.LoanSolutionsVo;
 import com.yxt.anrui.riskcenter.api.loansolutions.app.SolutionListVo;
 import com.yxt.anrui.riskcenter.api.loansolutions.app.SolutionsDetailsVo;
 import com.yxt.anrui.riskcenter.api.loansolutions.app.SolutionssVo;
@@ -188,7 +185,6 @@ import com.yxt.anrui.riskcenter.api.loansolutionsdetail.LoanSolutionsDetail;
 import com.yxt.anrui.riskcenter.api.loansolutionsdetail.LoanSolutionsDetailFeign;
 import com.yxt.anrui.riskcenter.api.loansolutionsotherpolicy.LoanSolutionsOtherpolicy;
 import com.yxt.anrui.riskcenter.api.loansolutionsotherpolicy.LoanSolutionsOtherpolicyFeign;
-import com.yxt.anrui.scm.api.scmpurchasechannel.ScmPurchaseChannelDto;
 import com.yxt.anrui.scm.api.scmpurchasechannel.ScmPurchaseChannelFeign;
 import com.yxt.anrui.scm.api.scmpurchasechannel.ScmPurchaseChannelPush;
 import com.yxt.anrui.scm.api.scmwarehouse.ScmWarehouseFeign;
@@ -247,6 +243,10 @@ import static java.util.Comparator.comparing;
 public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper, BusSalesOrder> {
     public static final Logger log = LoggerFactory.getLogger(BusSalesOrderService.class);
 
+    @Autowired
+    private SysFunctionFeign sysFunctionFeign;
+    @Autowired
+    private BusSalesOrderVehicleCostService busSalesOrderVehicleCostService;
     @Autowired
     private BusSalesOrderModelService busSalesOrderModelService;
     @Autowired
@@ -428,6 +428,13 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
         vo.setCreateDate(DateUtil.formatDate(entity.getCreateDate()));
         SysOrganizationVo sysOrganizationVo = sysOrganizationFeign.fetchBySid(entity.getUseOrgSid()).getData();
         vo.setUseOrgName(sysOrganizationVo.getName());
+        /**************************车辆成本信息**********************************/
+        BusSalesOrderVehicleCostVo vehicleCostVo = busSalesOrderVehicleCostService.getVehicleCostVoByOrderSid(sid).getData();
+        if (null != vehicleCostVo) {
+            AppBusSalesOrderVehicleCostVo orderVehicleCostVo = new AppBusSalesOrderVehicleCostVo();
+            BeanUtil.copyProperties(vehicleCostVo,orderVehicleCostVo);
+            vo.setVehicleCostObj(orderVehicleCostVo);
+        }
         /***************************车型信息***************************************/
         AppOrderModelInfoVo modelInfo = busSalesOrderModelService.selectModel(sid);
         if (modelInfo != null) {
@@ -4278,6 +4285,519 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
         return rb.success().setData(vo);
     }
 
+
+    /**
+     * 销售订单的详情
+     *
+     * @param sid 销售订单sid
+     * @param userSid 用户sid
+     * @return
+     */
+    public ResultBean<AppOrderDetailsVo> getSaleOrderDetails2(String sid,String userSid) {
+        ResultBean<AppOrderDetailsVo> rb = ResultBean.fireFail();
+        BusSalesOrder busSalesOrder = fetchBySid(sid);
+        if (busSalesOrder == null) {
+            return rb.setMsg("该销售订单单据不存在");
+        }
+        AppOrderDetailsVo vo = new AppOrderDetailsVo();
+        vo = baseMapper.getSaleOrderDetails(sid);
+        if (StringUtils.isNotBlank(busSalesOrder.getNodeState())) {
+            vo.setShowShareAndComment(true);
+        }
+        vo.setBusSalesOrderSid(sid);
+        ResultBean<CommonContractVo> commonContractVoResultBean = commonContractFeign.getContractBySalesOrderSid(sid);
+        if (commonContractVoResultBean.getData() != null) {
+            vo.setContractId(commonContractVoResultBean.getData().getContractNo());
+        }
+        vo.setUserSid(busSalesOrder.getCreateBySid());
+        vo.setProcInsId(busSalesOrder.getProcInstId());
+        vo.setTaskId(busSalesOrder.getTaskId());
+        vo.setIsInsurance(busSalesOrder.getIsInsurance());
+        vo.setInsuranceState(StringUtils.isNotBlank(busSalesOrder.getIsInsurance()));
+        vo.setRemarksState(StringUtils.isNotBlank(busSalesOrder.getNotes()) || StringUtils.isNotBlank(vo.getImagesFile()));
+        String imagesFile = vo.getImagesFile();
+        if (StringUtils.isNotBlank(imagesFile)) {
+            List<String> imagess = Arrays.asList(imagesFile.split(","));
+            imagess.removeAll(Collections.singleton(null));
+            if (!imagess.isEmpty()) {
+                for (int i = 0; i < imagess.size(); i++) {
+                    if (!imagess.get(i).contains(fileUploadComponent.getUrlPrefix())) {
+                        imagess.set(i, fileUploadComponent.getUrlPrefix() + imagess.get(i));
+                    }
+                }
+            }
+            vo.setImages(imagess);
+        }
+        //根据销售部门sid查询分公司名称
+        ResultBean<String> resultBean = sysStaffOrgFeign.getOrgSidBySid(vo.getOrgSid());
+        if (!"0".equals(resultBean.getData())) {
+            //根据分公司sid查询分公司名称
+            ResultBean<SysOrganization> organizationResultBean = sysOrganizationFeign.selectBySid(resultBean.getData());
+            if (organizationResultBean.getSuccess()) {
+                vo.setSalesOrg(organizationResultBean.getData().getName());
+            }
+        }
+        /***************************保险信息***************************************/
+        BusSalesOrderInsuranceDetailsVo busSalesOrderInsurance = busSalesOrderInsuranceService.details(sid);
+        if (busSalesOrderInsurance != null) {
+            if (BusSalesOrderConstantUtils.InsuranceType.NO.getCode().equals(busSalesOrder.getIsInsurance())) {
+                vo.setInsuranceInfo("未在公司入保" + "\n\n" + "备注：" + busSalesOrderInsurance.getRemarks());
+            } else if (BusSalesOrderConstantUtils.InsuranceType.YES.getCode().equals(busSalesOrder.getIsInsurance())) {
+                String x = "、";
+                String x1 = "单台车保费预估金额（元）：";
+                String x2 = "公司入保期数：";
+                String info = "公司投保、保险公司名称：" + busSalesOrderInsurance.getInsuranceName() + x + x1 + busSalesOrderInsurance.getInsuranceCarMoney() + "元" + x + x2 + busSalesOrderInsurance.getInsuranceNum();
+                if (StringUtils.isNotBlank(busSalesOrderInsurance.getRemarks())) {
+                    info = info + "\n\n" + "备注：" + busSalesOrderInsurance.getRemarks();
+                }
+                vo.setInsuranceInfo(info);
+                String infoMessage = "公司投保、" + x2 + busSalesOrderInsurance.getInsuranceNum();
+                vo.setInsuranceInfoMessage(infoMessage);
+            }
+        } else {
+            if (BusSalesOrderConstantUtils.InsuranceType.NO.getCode().equals(busSalesOrder.getIsInsurance())) {
+                vo.setInsuranceInfo("未在公司入保");
+            }
+        }
+        /***************************车型信息***************************************/
+        AppOrderModelInfoVo modelInfo = busSalesOrderModelService.selectModel(sid);
+        if (modelInfo != null) {
+            modelInfo.setOrgPath(busSalesOrder.getOrgSidPath());
+            //若前端传值的订单类型为0则为现车，为1采购订单，为2排产
+            //数据库中1为现车，2为采购订单，3为排产
+            if ("0".equals(modelInfo.getType())) {
+                if (StringUtils.isNotBlank(busSalesOrder.getNowCarUnknownVinNum()) && !"0".equals(busSalesOrder.getNowCarUnknownVinNum())) {
+                    List<String> vinList = new ArrayList<>();
+                    vinList.add("不确定车架号(" + busSalesOrder.getNowCarUnknownVinNum() + ")");
+                    modelInfo.setVinList(vinList);
+                } else {
+                    //查询车架号
+                    List<VinListsVo> vinLists = busSalesOrderVehicleService.selectLists(sid);
+                    //包含采购系统的车架号
+                    List<String> vinList = vinLists.stream().map(v -> v.getVinNo()).collect(Collectors.toList());
+                    List<String> orderVinList = busSalesOrderVehicleService.selectList(sid);
+                    if (!vinList.isEmpty()) {
+                        for (int i = 0; i < vinLists.size(); i++) {
+                            VinListsVo vinListsVo = vinLists.get(i);
+                            BigDecimal initBigDecimalTwo = BigDecimal.ZERO;
+                            //根据sid去查询销售政策的sid，根据销售政策查询销售政策的金额
+                            ResultBean<List<String>> listResultBean = baseDiscountpackageFeign.getMoney(vinListsVo.getVinSid(), busSalesOrder.getUseOrgSid());
+                            if (listResultBean.getSuccess() && !listResultBean.getData().isEmpty()) {
+                                List<String> stringList = listResultBean.getData();
+                                initBigDecimalTwo = initBigDecimalTwo.add(stringList.stream().map(BigDecimal::new).reduce(BigDecimal.ZERO, BigDecimal::add));
+                            }
+                            if (initBigDecimalTwo.compareTo(BigDecimal.ZERO) != 0) {
+                                vinList.set(i, vinList.get(i) + "，促销(" + initBigDecimalTwo.toString() + "元)");
+                            }
+                        }
+                    }
+                    modelInfo.setVinList(vinList);
+                    modelInfo.setOrderVinList(orderVinList);
+                }
+            } else {
+                if ("1".equals(modelInfo.getType())) {
+                    //查询采购订单编号
+                    List<BusSalesVehicleOrder> stringLists = busSalesVehicleOrderService.selectLists(sid);
+                    //包含采购系统的采购订单编号
+                    List<String> stringList = stringLists.stream().map(v -> v.getLinkNo()).collect(Collectors.toList());
+                    List<String> orderStringList = busSalesVehicleOrderService.selectList(sid);
+                    modelInfo.setOrderList(stringList);
+                    modelInfo.setOrderStringList(orderStringList);
+                }
+            }
+            List<VinListsVo> vinListVoList = busSalesOrderVehicleService.selectByDetailsSid(sid);
+            modelInfo.setVinListsVos(vinListVoList);
+            ResultBean<String> images = baseVehicleModelAppendixFeign.selectImage(modelInfo.getModelSid());
+            if (images.getSuccess()) {
+                modelInfo.setModelImage(images.getData());
+            }
+            vo.setModelInfo(modelInfo);
+        }
+        /***************************挂车信息***************************************/
+        List<BusSalesOrderTrailerDetailsVo> busSalesOrderTrailerDetailsVos = busSalesOrderTrailerService.fetchAllByOrderSid(sid);
+        List<AppOrderTrailerInfoVo> appOrderTrailerInfoVos = new ArrayList<>();
+        for (BusSalesOrderTrailerDetailsVo busSalesOrderTrailerDetailsVo : busSalesOrderTrailerDetailsVos) {
+            AppOrderTrailerInfoVo appOrderTrailerInfoVo = new AppOrderTrailerInfoVo();
+            BeanUtil.copyProperties(busSalesOrderTrailerDetailsVo, appOrderTrailerInfoVo, "contractFile", "certFile");
+            List<BusSalesOrderTrailerFile> contractFile = busSalesOrderTrailerDetailsVo.getContractFile();
+            List<BusSalesOrderTrailerFile> certFile = busSalesOrderTrailerDetailsVo.getCertFile();
+            ArrayList<String> contractFileString = new ArrayList<>();
+            ArrayList<String> certFileString = new ArrayList<>();
+            for (BusSalesOrderTrailerFile busSalesOrderTrailerFile : contractFile) {
+                contractFileString.add(busSalesOrderTrailerFile.getUrl());
+            }
+            for (BusSalesOrderTrailerFile busSalesOrderTrailerFile : certFile) {
+                certFileString.add(busSalesOrderTrailerFile.getUrl());
+            }
+            appOrderTrailerInfoVo.setContractFile(contractFileString);
+            appOrderTrailerInfoVo.setCertFile(certFileString);
+            appOrderTrailerInfoVo.setAppearanceSizeLong("长" + appOrderTrailerInfoVo.getAppearanceSizeLong() + "m");
+            appOrderTrailerInfoVo.setTotalPrice(appOrderTrailerInfoVo.getSingleFinalPrice().multiply(new BigDecimal(appOrderTrailerInfoVo.getTrailerCount())));
+            appOrderTrailerInfoVos.add(appOrderTrailerInfoVo);
+        }
+        for (int i = 0; i < appOrderTrailerInfoVos.size(); i++) {
+            AppOrderTrailerInfoVo appOrderTrailerInfoVo = appOrderTrailerInfoVos.get(i);
+            if (appOrderTrailerInfoVos.size() == 1) {
+                appOrderTrailerInfoVo.setTrailerName("挂车");
+            } else {
+                appOrderTrailerInfoVo.setTrailerName("挂车" + (i + 1));
+            }
+        }
+        vo.setTrailerInfo(appOrderTrailerInfoVos);
+        /***************************价格信息***************************************/
+        AppOrderPriceInfoVo priceInfo = busSalesOrderPriceService.selectPrice(sid);
+        if (priceInfo != null) {
+            if (vo.getModelInfo() != null) {
+                priceInfo.setTransactionPrice(vo.getModelInfo().getPrice());
+            }
+            if (StringUtils.isNotBlank(priceInfo.getPlannedPickUpLocationKey())) {
+                ScmWarehouseVo scmWarehouseVo = scmWarehouseFeign.fetchBySid(priceInfo.getPlannedPickUpLocationKey()).getData();
+                if (StringUtils.isNotBlank(scmWarehouseVo.getCity()) && StringUtils.isNotBlank(scmWarehouseVo.getCounty())) {
+                    priceInfo.setAddress(priceInfo.getAddress() + "(" + scmWarehouseVo.getCity() + scmWarehouseVo.getCounty() + scmWarehouseVo.getWarehouseAttribute() + ")");
+                }
+            }
+            if (appOrderTrailerInfoVos.size() == 1) {
+                priceInfo.setGcOneConPrice(appOrderTrailerInfoVos.get(0).getSingleFinalPrice().toString());
+                priceInfo.setGcOneCount(appOrderTrailerInfoVos.get(0).getTrailerCount().toString());
+            } else if (appOrderTrailerInfoVos.size() == 2) {
+                priceInfo.setGcOneConPrice(appOrderTrailerInfoVos.get(0).getSingleFinalPrice().toString());
+                priceInfo.setGcOneCount(appOrderTrailerInfoVos.get(0).getTrailerCount().toString());
+                priceInfo.setGcTwoConPrice(appOrderTrailerInfoVos.get(1).getSingleFinalPrice().toString());
+                priceInfo.setGcTwoCount(appOrderTrailerInfoVos.get(1).getTrailerCount().toString());
+            } else {
+                priceInfo.setGcOneConPrice("");
+                priceInfo.setGcOneCount("");
+                priceInfo.setGcTwoConPrice("");
+                priceInfo.setGcTwoCount("");
+            }
+            vo.setPriceInfo(priceInfo);
+        }
+        /***************************上装信息***************************************/
+        String topPriice = "";
+        if (BusSalesOrderConstantUtils.TopType.YES.getCode().equals(busSalesOrder.getIsTop())) {
+            AppOrderTopInfoVo topInfo = busSalesOrderMakeupService.selectTop(sid);
+            if (topInfo != null) {
+                if (StringUtils.isNotBlank(topInfo.getContractPath())) {
+                    List<String> stringList = Arrays.asList(topInfo.getContractPath().split(","));
+                    if (!stringList.isEmpty()) {
+                        List<String> stringList1 = new ArrayList<>();
+                        stringList.stream().forEach(i -> {
+                            stringList1.add(fileUploadComponent.getUrlPrefix() + i);
+                        });
+                        topInfo.setContractImages(stringList1);
+                    }
+                }
+                if (StringUtils.isNotBlank(topInfo.getRemarks())) {
+                    topInfo.setTopBean(topInfo.getTopBean() + "\n\n" + "备注：" + topInfo.getRemarks());
+                }
+                vo.setTopInfo(topInfo);
+                topPriice = "￥" + topInfo.getTopPrice();
+            }
+            BusSalesOrderMakeup busSalesOrderMakeup = busSalesOrderMakeupService.detailsss(sid);
+            String topMessage = "";
+            if (busSalesOrderMakeup != null) {
+                //颜色
+                if (StringUtils.isNotBlank(busSalesOrderMakeup.getColor())) {
+                    topMessage = topMessage + busSalesOrderMakeup.getColor();
+                }
+                if (StringUtils.isNotBlank(busSalesOrderMakeup.getTopName())) {
+                    topMessage = topMessage + busSalesOrderMakeup.getTopName();
+                }
+                //板材厚度
+                String ssMessage = "";
+                if (StringUtils.isNotBlank(busSalesOrderMakeup.getThicknessBottom())) {
+                    ssMessage = "底" + busSalesOrderMakeup.getThicknessBottom() + "mm";
+                }
+                if (StringUtils.isNotBlank(busSalesOrderMakeup.getThicknessEdge())) {
+                    ssMessage = ssMessage + "边" + busSalesOrderMakeup.getThicknessEdge() + "mm";
+                }
+                if (StringUtils.isNotBlank(ssMessage)) {
+                    topMessage = topMessage + "、" + ssMessage;
+                }
+                if (StringUtils.isNotBlank(busSalesOrderMakeup.getPlateMaterial())) {
+                    topMessage = topMessage + "、" + busSalesOrderMakeup.getPlateMaterial();
+                }
+                //篷布滑道
+                if (StringUtils.isNotBlank(busSalesOrderMakeup.getTarpaulinSlide()) && !"-".equals(busSalesOrderMakeup.getTarpaulinSlide())) {
+                    topMessage = topMessage + "、" + busSalesOrderMakeup.getTarpaulinSlide();
+                }
+                //冷藏冷机
+                if (StringUtils.isNotBlank(busSalesOrderMakeup.getRefirgerator())) {
+                    topMessage = topMessage + "、" + busSalesOrderMakeup.getRefirgerator();
+                    if (!busSalesOrderMakeup.getRefirgerator().contains("机")) {
+                        topMessage = topMessage + "冷机";
+                    }
+                }
+                //自卸液压盖板
+                if (StringUtils.isNotBlank(busSalesOrderMakeup.getSelfUnHyCoPl()) && !"-".equals(busSalesOrderMakeup.getSelfUnHyCoPl())) {
+                    topMessage = topMessage + "、" + busSalesOrderMakeup.getSelfUnHyCoPl();
+                }
+                //底板加热
+                if (StringUtils.isNotBlank(busSalesOrderMakeup.getFloorHeating()) && !"-".equals(busSalesOrderMakeup.getFloorHeating())) {
+                    topMessage = topMessage + "、" + busSalesOrderMakeup.getFloorHeating();
+                }
+                //更多配置
+                if (StringUtils.isNotBlank(busSalesOrderMakeup.getMoreConfig()) && !"-".equals(busSalesOrderMakeup.getMoreConfig())) {
+                    topMessage = topMessage + "、" + busSalesOrderMakeup.getMoreConfig();
+                }
+            }
+
+            vo.setTopMessage(topMessage);
+        }
+        /***************************主车优惠***************************************/
+        List<AppOrderDiscountListVo> discountList = busSalesOrderDiscountService.selectDiscount(sid);
+        discountList.removeAll(Collections.singleton(null));
+        if (!discountList.isEmpty()) {
+            BigDecimal bigDecimalAll = new BigDecimal("0");
+            vo.setDiscountList(discountList);
+            for (AppOrderDiscountListVo v : discountList) {
+                bigDecimalAll = bigDecimalAll.add(new BigDecimal(v.getTotal()));
+            }
+            vo.setTotaldiscount(bigDecimalAll.toString());
+        }
+        /*************************返利信息*******************************************/
+        BigDecimal zjAll = BigDecimal.ZERO;
+        BusSalesOrderSubmit busSalesOrderSubmit = busSalesOrderSubmitService.selectBySaleOrderSid(sid);
+        if (busSalesOrderSubmit != null) {
+            //内部推荐人
+            if (StringUtils.isNotBlank(busSalesOrderSubmit.getName())) {
+                vo.setRecommender(busSalesOrderSubmit.getName());
+            }
+            if (StringUtils.isNotBlank(busSalesOrderSubmit.getUserSid())) {
+                vo.setRecommenderUserSid(busSalesOrderSubmit.getUserSid());
+            }
+            //中介返利（元/台）
+            String zjReturnPrice = "";
+            boolean isShow = false;
+            if (StringUtils.isNotBlank(busSalesOrderSubmit.getDistributorName())) {
+                SubmitVo submitVo = new SubmitVo();
+                submitVo.setIntermediaryName(busSalesOrderSubmit.getDistributorName());
+                submitVo.setIntermediaryMobile(busSalesOrderSubmit.getDistributorMobile());
+                submitVo.setIntermediarySid(busSalesOrderSubmit.getDistributorSid());
+                if (busSalesOrderSubmit.getDistributorPrice() != null) {
+                    isShow = true;
+                    zjAll = zjAll.add(busSalesOrderSubmit.getDistributorPrice());
+                    submitVo.setAgencyFee(busSalesOrderSubmit.getDistributorPrice().toString());
+                    if (priceInfo != null) {
+                        submitVo.setAgencyFeeTotal(busSalesOrderSubmit.getDistributorPrice().multiply(new BigDecimal(priceInfo.getNumber())).toString());
+                    }
+
+                }
+                vo.setIntermediary1(submitVo);
+            }
+            if (StringUtils.isNotBlank(busSalesOrderSubmit.getDistributorNameTwo())) {
+                SubmitVo submitVo = new SubmitVo();
+                submitVo.setIntermediaryName(busSalesOrderSubmit.getDistributorNameTwo());
+                submitVo.setIntermediaryMobile(busSalesOrderSubmit.getDistributorMobileTwo());
+                submitVo.setIntermediarySid(busSalesOrderSubmit.getDistributorSidTwo());
+                if (busSalesOrderSubmit.getDistributorPriceTwo() != null) {
+                    isShow = true;
+                    zjAll = zjAll.add(busSalesOrderSubmit.getDistributorPriceTwo());
+                    submitVo.setAgencyFee(busSalesOrderSubmit.getDistributorPriceTwo().toString());
+                    if (priceInfo != null) {
+                        submitVo.setAgencyFeeTotal(busSalesOrderSubmit.getDistributorPriceTwo().multiply(new BigDecimal(priceInfo.getNumber())).toString());
+                    }
+                }
+                vo.setIntermediary2(submitVo);
+            }
+            if (priceInfo != null) {
+                if (isShow) {
+                    if (zjAll.compareTo(BigDecimal.ZERO) > 0) {
+                        //如果中介返利小于0，乘以-1
+                        zjReturnPrice = "-￥" + zjAll.toString();
+                    } else {
+                        zjAll = zjAll.multiply(new BigDecimal(-1));
+                        zjReturnPrice = "￥" + zjAll.toString();
+                    }
+                    priceInfo.setZjReturnPrice(zjReturnPrice);
+                }
+
+            }
+
+        }
+        //计算单台折让
+        BigDecimal bigDecimalSing = new BigDecimal("0");
+        if (priceInfo != null) {
+            //销售指导价-成交价+单车优惠包成本+单车返利）：***元（单车优惠包成本是总优惠包价值除以台数）
+            if (StringUtils.isNotBlank(priceInfo.getSingleGuildPrice())) {
+                bigDecimalSing = bigDecimalSing.add(new BigDecimal(priceInfo.getSingleGuildPrice()));
+            }
+            //单台成交价
+            if (StringUtils.isNotBlank(priceInfo.getSingleFinalPrice())) {
+                bigDecimalSing = bigDecimalSing.subtract(new BigDecimal(priceInfo.getSingleFinalPrice()));
+            } else {
+                bigDecimalSing = bigDecimalSing.subtract(bigDecimalSing);
+            }
+        }
+        if (StringUtils.isNotBlank(vo.getTotaldiscount())) {
+            if (priceInfo != null) {
+                BigDecimal discountA = new BigDecimal(vo.getTotaldiscount()).divide(new BigDecimal(priceInfo.getNumber()), BigDecimal.ROUND_CEILING);
+                bigDecimalSing = bigDecimalSing.add(discountA);
+            }
+        }
+        if (busSalesOrderSubmit != null) {
+            BigDecimal agen = new BigDecimal("0");
+            if (busSalesOrderSubmit.getDistributorPrice() != null) {
+                agen = agen.add(busSalesOrderSubmit.getDistributorPrice());
+            }
+            if (busSalesOrderSubmit.getDistributorPriceTwo() != null) {
+                agen = agen.add(busSalesOrderSubmit.getDistributorPriceTwo());
+            }
+            bigDecimalSing = bigDecimalSing.add(agen);
+        }
+        if (priceInfo != null) {
+            priceInfo.setSingleCarDiscountPrice(bigDecimalSing.toString());
+        }
+        /***************************订金信息***************************************/
+        AppOrderDepositInfoVo depositInfo = busSalesOrderDepositService.selectDeposit(sid);
+        if (depositInfo != null) {
+            String a = "由";
+            if (BusSalesOrderConstantUtils.DepositType.DEPOSIT_CARRY_FORWARD.getCode().equals(depositInfo.getDepositTypeKey())) {
+                List<BusDepositFictitiousDetailsVo> list = busDepositFictitiousService.detailsList(depositInfo.getSid());
+                list.removeAll(Collections.singleton(null));
+                List<String> stringList = new ArrayList<>();
+                if (!list.isEmpty()) {
+                    for (int j = 0; j < list.size(); j++) {
+                        BusDepositFictitiousDetailsVo v = list.get(j);
+                        String b = "";
+                        if (j == list.size() - 1) {
+                            b = "编号为" + v.getDepositBillNo() + "简易订单订金转入" + v.getPrice() + "元。";
+                        } else {
+                            b = "编号为" + v.getDepositBillNo() + "简易订单订金转入" + v.getPrice() + "元，";
+                        }
+                        a = a + b;
+                        if (StringUtils.isNotBlank(v.getPayPath())) {
+                            List<String> payPathList = Arrays.asList(v.getPayPath().split(","));
+                            for (int i = 0; i < payPathList.size(); i++) {
+                                stringList.add(fileUploadComponent.getUrlPrefix() + payPathList.get(i));
+                            }
+                        }
+                    }
+//                    a = a + "原订金额度使用完后，其收据自动作废。";
+                    depositInfo.setDepositRemarks(a);
+                    depositInfo.setImages(stringList);
+                }
+            }
+            if (StringUtils.isNotBlank(depositInfo.getPayDepositDays())) {
+                depositInfo.setPayDepositDays(depositInfo.getPayDepositDays());
+            } else {
+                depositInfo.setPayDepositDays("/");
+            }
+            vo.setDepositInfo(depositInfo);
+        }
+        /****************************金融方案***************************************/
+        if ("2".equals(busSalesOrder.getPayTypeKey())) {
+            vo.setFinState(true);
+        } else {
+            if ("1".equals(busSalesOrder.getFinancePlan())) {
+                vo.setFinState(false);
+            } else {
+                vo.setFinState(true);
+            }
+        }
+//        vo = selectSolution(vo, sid);
+        vo = selectSolutions(vo, sid);
+        //===============================================
+        //挂车价格（金融方案中取）
+        ResultBean<SolutionsDetailsVo> solutionsDetailsVoResultBean = loanSolutionsFeign.selectDetailsss(sid);
+        List<OrderSolutionVo> list = new ArrayList<>();
+        if (solutionsDetailsVoResultBean.getData() != null) {
+            SolutionsDetailsVo solutionsDetailsVo = solutionsDetailsVoResultBean.getData();
+            //挂车
+            if (StringUtils.isNotBlank(solutionsDetailsVo.getTrailerAmount())) {
+                if (priceInfo != null) {
+//                    priceInfo.setGcPrice(solutionsDetailsVo.getTrailerAmount());
+                    BigDecimal finalPriceAll = BigDecimal.ZERO;
+                    if (StringUtils.isNotBlank(priceInfo.getSingleFinalPrice())) {
+                        finalPriceAll = finalPriceAll.add(new BigDecimal(priceInfo.getSingleFinalPrice()));
+                    }
+                }
+            }
+        }
+        if (priceInfo != null) {
+            if (StringUtils.isNotBlank(topPriice)) {
+                priceInfo.setSzPrice(topPriice);
+            }
+            //价格折让 = 销售合同价（整体成交价）-销售指导价（整体指导价）
+            //销售合同价-销售指导价
+            BigDecimal all = BigDecimal.ZERO;
+            if (StringUtils.isNotBlank(priceInfo.getSingleFinalPrice())) {
+                all = new BigDecimal(priceInfo.getSingleFinalPrice());
+            }
+            if (StringUtils.isNotBlank(priceInfo.getSingleGuildPrice())) {
+                all = all.subtract(new BigDecimal(priceInfo.getSingleGuildPrice()));
+            }
+            String priceAll = "";
+            if (all.compareTo(BigDecimal.ZERO) < 0) {
+                //如果价格折让小于0，乘以-1
+                all = all.multiply(new BigDecimal(-1));
+                priceAll = "-￥" + all.toString();
+            } else {
+                priceAll = "￥" + all.toString();
+            }
+            priceInfo.setPriceDiscount(priceAll);
+            //优惠套餐 = 优惠套餐总额/台数（保留到个位）
+            String pkgPrice = "";
+            BigDecimal oneAll = BigDecimal.ZERO;
+            if (StringUtils.isNotBlank(vo.getTotaldiscount())) {
+                //总优惠/台数
+                oneAll = new BigDecimal(vo.getTotaldiscount()).divide(new BigDecimal(priceInfo.getNumber()), BigDecimal.ROUND_CEILING);
+                if (oneAll.compareTo(BigDecimal.ZERO) > 0) {
+                    pkgPrice = "-￥" + oneAll.toString();
+                } else {
+                    //如果小于0，乘以-1
+                    oneAll = oneAll.multiply(new BigDecimal(-1));
+                    pkgPrice = "￥" + oneAll.toString();
+                }
+                priceInfo.setPkgPrice(pkgPrice);
+            }
+            //实际成交 = 销售指导价-价格折让-中介返利-优惠套餐
+            BigDecimal realAll = BigDecimal.ZERO;
+            if (StringUtils.isNotBlank(priceInfo.getSingleFinalPrice())) {
+                realAll = realAll.add(new BigDecimal(priceInfo.getSingleFinalPrice()));
+            }
+            realAll = realAll.subtract(zjAll).subtract(oneAll);
+            priceInfo.setRealPrice("￥" + realAll.toString());
+            //差额 = 实际成交价-销售指导价
+            BigDecimal diffAll = BigDecimal.ZERO;
+            diffAll = realAll.subtract(new BigDecimal(priceInfo.getSingleGuildPrice()));
+            if (diffAll.compareTo(BigDecimal.ZERO) < 0) {
+                //如果价格折让小于0，乘以-1
+                diffAll = diffAll.multiply(new BigDecimal(-1));
+                priceInfo.setDiffPrice("-￥" + diffAll.toString());
+            } else {
+                priceInfo.setDiffPrice("￥" + diffAll.toString());
+            }
+
+        }
+        /***************************车辆成本信息*************************************/
+        if (StringUtils.isNotBlank(userSid)) {
+            boolean vehCostShow = true;
+            ButtonPermissionQuery buttonPermissionQuery = new ButtonPermissionQuery();
+            buttonPermissionQuery.setUrl("/xiaoshouguanli/dingdanxinxi");
+            buttonPermissionQuery.setType("0");
+            buttonPermissionQuery.setUserSid(userSid);
+            List<ButtonPermissionVo> permissionVos = sysFunctionFeign.getButtonPermissions(buttonPermissionQuery).getData();
+            if (!permissionVos.isEmpty()) {
+                for (ButtonPermissionVo permissionVo : permissionVos) {
+                    if (permissionVo.getButtonId().equals("car_cost_detail")) {
+                        vehCostShow = false;
+                    }
+                }
+            }
+            if (vehCostShow) {
+                AppBusSalesOrderVehicleCostVo appBusSalesOrderVehicleCostVo = new AppBusSalesOrderVehicleCostVo();
+                BusSalesOrderVehicleCostVo data = busSalesOrderVehicleCostService.getVehicleCostVoByOrderSid(sid).getData();
+                if (null != data) {
+                    BeanUtil.copyProperties(data,appBusSalesOrderVehicleCostVo);
+                }
+                vo.setVehicleCostObj(appBusSalesOrderVehicleCostVo);
+            }
+        }
+        return rb.success().setData(vo);
+    }
+
+
     private AppOrderDetailsVo selectSolutions(AppOrderDetailsVo appOrderDetailsVo, String sid) {
        /* ResultBean<SolutionsDetailsVo> solutionsDetailsVoResultBean = loanSolutionsFeign.selectDetailsss(sid);
         List<OrderSolutionVo> list = new ArrayList<>();
@@ -7360,7 +7880,7 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
         bv.setModelId(busSalesOrder.getProcDefId());
         //若为贷款业务的，在金融服务经理审批环节可以调整开票单位信息。全款业务的，在销售支持部审批环节可以调整开票单位信息。
         if ("1".equals(busSalesOrder.getPayTypeKey())) {//全款
-            if ("Activity_10w0sy1".equals(bv.getTaskDefKey())) {//销售支持部经理审核
+            if ("Activity_10w0sy1".equals(bv.getTaskDefKey())) {//销售支持部经理审批
                 if (StringUtils.isBlank(orderFlowableQuery.getCompanyInvoicingSid())) {
                     return rb.setMsg("开票单位不能为空");
                 }
@@ -7376,7 +7896,7 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
         if (resultBean.getSuccess()) {
             busSalesOrder = fetchBySid(orderFlowableQuery.getBusinessSid());
             if ("1".equals(busSalesOrder.getPayTypeKey())) {//全款
-                if ("Activity_10w0sy1".equals(bv.getTaskDefKey())) {//销售支持部经理审核
+                if ("Activity_10w0sy1".equals(bv.getTaskDefKey())) {//销售支持部经理审批
                     String companyInvoicingName = orderFlowableQuery.getCompanyInvoicingName();
                     String companyInvoicingSid = orderFlowableQuery.getCompanyInvoicingSid();
                     busSalesOrder.setCompanyInvoicingSid(companyInvoicingSid);
@@ -7420,6 +7940,21 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
                     }
                 }
             }
+            if ("Activity_10w0sy1".equals(bv.getTaskDefKey()) || "Activity_0dcm1iu".equals(bv.getTaskDefKey())) { //销售支持部经理、事业部运营经理审核
+                //保存车辆成本信息
+                busSalesOrderVehicleCostService.delByOrderSid(orderFlowableQuery.getBusinessSid());
+                if (StringUtils.isNotBlank(orderFlowableQuery.getRemarks())
+                    || StringUtils.isNotBlank(orderFlowableQuery.getPolicyDetails())
+                    || StringUtils.isNotBlank(orderFlowableQuery.getPolicyAmount())
+                    || StringUtils.isNotBlank(orderFlowableQuery.getCost())
+                    || StringUtils.isNotBlank(orderFlowableQuery.getManufacturerSettleAmount())
+                ) {
+                    BusSalesOrderVehicleCostVo vo = new BusSalesOrderVehicleCostVo();
+                    BeanUtil.copyProperties(orderFlowableQuery,vo);
+                    vo.setSalesOrderSid(orderFlowableQuery.getBusinessSid());
+                    busSalesOrderVehicleCostService.saveVehicleCost(vo);
+                }
+            }
             //销售订单在销售支持部经理审核后，自动生成应收，此时也可以生成合同，生成合同的同时生成合同审核待办。
             //查询应收是否已生成
            /* if ("Activity_10w0sy1".equals(bv.getTaskDefKey())) {//销售支持部经理审核

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehiclecost/BusSalesOrderVehicleCostMapper.java

@@ -0,0 +1,57 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.buscenter.biz.bussalesordervehiclecost;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yxt.anrui.buscenter.api.bussalesordervehiclecost.BusSalesOrderVehicleCost;
+import com.yxt.anrui.buscenter.api.bussalesordervehiclecost.BusSalesOrderVehicleCostVo;
+import org.apache.ibatis.annotations.Delete;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Select;
+
+/**
+ * Project: anrui-buscenter(业务管理) <br/>
+ * File: BusSalesOrderInsuranceMapper.java <br/>
+ * Class: com.yxt.anrui.buscenter.biz.bussalesorderinsurance.BusSalesOrderInsuranceMapper <br/>
+ * Description: 销售订单-保险信息. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-04-27 13:39:04 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Mapper
+public interface BusSalesOrderVehicleCostMapper extends BaseMapper<BusSalesOrderVehicleCost> {
+
+
+    @Select("select * from bus_sales_order_vehicle_cost where salesOrderSid=#{orderSid}")
+    BusSalesOrderVehicleCostVo getVehicleCostVoByOrderSid(String orderSid);
+
+    @Delete("delete from bus_sales_order_vehicle_cost where salesOrderSid=#{orderSid}")
+    void delByOrderSid(String orderSid);
+}

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehiclecost/BusSalesOrderVehicleCostMapper.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.yxt.anrui.buscenter.biz.bussalesordervehiclecost.BusSalesOrderVehicleCostMapper">
+    <!--    <where> ${ew.sqlSegment} </where>-->
+    <!--    ${ew.customSqlSegment} -->
+
+
+</mapper>

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehiclecost/BusSalesOrderVehicleCostRest.java

@@ -0,0 +1,61 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.buscenter.biz.bussalesordervehiclecost;
+
+import com.yxt.anrui.buscenter.api.bussalesordervehiclecost.BusSalesOrderVehicleCostFeign;
+import com.yxt.anrui.buscenter.api.bussalesordervehiclecost.BusSalesOrderVehicleCostVo;
+import com.yxt.common.core.result.ResultBean;
+import io.swagger.annotations.Api;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * Project: anrui-buscenter(业务管理) <br/>
+ * File: BusSalesOrderInsuranceFeignFallback.java <br/>
+ * Class: com.yxt.anrui.buscenter.biz.bussalesorderinsurance.BusSalesOrderInsuranceRest <br/>
+ * Description: 销售订单-保险信息. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-04-27 13:39:04 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Api(tags = "销售订单-车辆成本信息")
+@RestController("com.yxt.anrui.buscenter.biz.bussalesordervehiclecost.BusSalesOrderVehicleCostRest")
+@RequestMapping("v1/BusSalesOrderVehicleCost")
+public class BusSalesOrderVehicleCostRest implements BusSalesOrderVehicleCostFeign {
+
+    @Autowired
+    private BusSalesOrderVehicleCostService busSalesOrderVehicleCostService;
+
+    @Override
+    public ResultBean<BusSalesOrderVehicleCostVo> getVehicleCostVoByOrderSid(String orderSid) {
+        return busSalesOrderVehicleCostService.getVehicleCostVoByOrderSid(orderSid);
+    }
+}

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehiclecost/BusSalesOrderVehicleCostService.java

@@ -0,0 +1,74 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.buscenter.biz.bussalesordervehiclecost;
+
+import cn.hutool.core.bean.BeanUtil;
+import com.yxt.anrui.buscenter.api.bussalesordervehiclecost.BusSalesOrderVehicleCost;
+import com.yxt.anrui.buscenter.api.bussalesordervehiclecost.BusSalesOrderVehicleCostVo;
+import com.yxt.anrui.buscenter.biz.bussalesorder.BusSalesOrderService;
+import com.yxt.common.base.service.MybatisBaseService;
+import com.yxt.common.core.result.ResultBean;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+/**
+ * Project: anrui-buscenter(业务管理) <br/>
+ * File: BusSalesOrderInsuranceService.java <br/>
+ * Class: com.yxt.anrui.buscenter.biz.bussalesorderinsurance.BusSalesOrderInsuranceService <br/>
+ * Description: 销售订单-保险信息 业务逻辑. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-04-27 13:39:04 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Service
+public class BusSalesOrderVehicleCostService extends MybatisBaseService<BusSalesOrderVehicleCostMapper, BusSalesOrderVehicleCost> {
+
+    @Autowired
+    private BusSalesOrderService busSalesOrderService;
+
+
+    public ResultBean<BusSalesOrderVehicleCostVo> getVehicleCostVoByOrderSid(String orderSid) {
+        ResultBean rb = ResultBean.fireFail();
+        BusSalesOrderVehicleCostVo vo = baseMapper.getVehicleCostVoByOrderSid(orderSid);
+        return rb.success().setData(vo);
+    }
+
+    public void delByOrderSid(String orderSid) {
+        baseMapper.delByOrderSid(orderSid);
+    }
+
+    public int saveVehicleCost(BusSalesOrderVehicleCostVo vo) {
+        BusSalesOrderVehicleCost cost = new BusSalesOrderVehicleCost();
+        BeanUtil.copyProperties(vo,cost);
+        int insert = baseMapper.insert(cost);
+        return insert;
+    }
+
+}

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

@@ -33,19 +33,6 @@ import lombok.Data;
 
 import java.math.BigDecimal;
 
-/**
- * Project: anrui-fin(销售相关) <br/>
- * File: FinCollectionConfirmation.java <br/>
- * Class: com.yxt.anrui.fin.api.fincollectionconfirmation.FinCollectionConfirmation <br/>
- * Description: 收款确认表. <br/>
- * Copyright: Copyright (c) 2011 <br/>
- * Company: https://gitee.com/liuzp315 <br/>
- * Makedate: 2022-04-12 17:57:01 <br/>
- *
- * @author liupopo
- * @version 1.0
- * @since 1.0
- */
 @ApiModel(value = "收款确认表", description = "收款确认表")
 @Data
 @TableName("fin_collection_confirmation")

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedDto.java

@@ -25,52 +25,38 @@
  *********************************************************/
 package com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed;
 
-
 import com.yxt.common.core.dto.Dto;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-/**
- * Project: anrui-fin(销售相关) <br/>
- * File: FinUncollectedReceivablesDetailedDto.java <br/>
- * Class: com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.FinUncollectedReceivablesDetailedDto <br/>
- * Description: 应收未收款项明细表 数据传输对象. <br/>
- * Copyright: Copyright (c) 2011 <br/>
- * Company: https://gitee.com/liuzp315 <br/>
- * Makedate: 2022-04-12 17:57:01 <br/>
- *
- * @author liupopo
- * @version 1.0
- * @since 1.0
- */
 @ApiModel(value = "应收未收款项明细表 数据传输对象", description = "应收未收款项明细表 数据传输对象")
 @Data
 public class FinUncollectedReceivablesDetailedDto implements Dto {
 
     @ApiModelProperty("应收未收款项sid")
     private String sid; // 应收未收款项sid
-	@ApiModelProperty("创建人接口")
+    @ApiModelProperty("创建人接口")
     private String createByName; // 创建人接口
     @ApiModelProperty("创建人sid")
     private String createBySid; // 创建人sid
-	@ApiModelProperty("合同sid")
+    @ApiModelProperty("合同sid")
     private String contractSid; // 合同sid
-	@ApiModelProperty("合同编号")
+    @ApiModelProperty("合同编号")
     private String contractNo; // 合同编号
-	@ApiModelProperty("客户sid")
+    @ApiModelProperty("客户sid")
     private String customerSid; // 客户sid
-	@ApiModelProperty("客户名称")
+    @ApiModelProperty("客户名称")
     private String customerName; // 客户名称
-	@ApiModelProperty("车架号")
+    @ApiModelProperty("车架号")
     private String VIN; // 车架号
-	@ApiModelProperty("分公司sid")
+    @ApiModelProperty("分公司sid")
     private String useOrgSid; // 分公司sid
-	@ApiModelProperty("联系电话")
+    @ApiModelProperty("联系电话")
     private String customerPhone; // 联系电话
-	@ApiModelProperty("应收项目名称")
+    @ApiModelProperty("应收项目名称")
     private String receivablesName; // 应收项目名称
-	@ApiModelProperty("当前应收金额")
+    @ApiModelProperty("当前应收金额")
     private String currentReceivableMoney; // 当前应收金额
     @ApiModelProperty("应收金额（不变）")
     private String reveivableMoney;

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedFeign.java

@@ -34,23 +34,9 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.*;
-
 import java.math.BigDecimal;
 import java.util.List;
 
-/**
- * Project: anrui-fin(应收未收款项明细表) <br/>
- * File: FinUncollectedReceivablesDetailedFeign.java <br/>
- * Class: com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.FinUncollectedReceivablesDetailedFeign <br/>
- * Description: 应收未收款项明细表. <br/>
- * Copyright: Copyright (c) 2011 <br/>
- * Company: https://gitee.com/liuzp315 <br/>
- * Makedate: 2022-04-12 17:57:01 <br/>
- *
- * @author liupopo
- * @version 1.0
- * @since 1.0
- */
 @Api(tags = "应收未收款项明细表")
 @FeignClient(
         contextId = "anrui-fin-FinUncollectedReceivablesDetailed",

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailedjr/FinUncollectedReceivablesDetailedJR.java

@@ -33,19 +33,6 @@ import lombok.Data;
 
 import java.math.BigDecimal;
 
-/**
- * Project: anrui-fin(销售相关) <br/>
- * File: FinUncollectedReceivablesDetailed.java <br/>
- * Class: com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.FinUncollectedReceivablesDetailed <br/>
- * Description: 应收未收款项明细表. <br/>
- * Copyright: Copyright (c) 2011 <br/>
- * Company: https://gitee.com/liuzp315 <br/>
- * Makedate: 2022-04-12 17:57:01 <br/>
- *
- * @author liupopo
- * @version 1.0
- * @since 1.0
- */
 @ApiModel(value = "金融认款应收未收款项明细表", description = "金融认款应收未收款项明细表")
 @Data
 @TableName("fin_uncollected_receivables_detailed_jr")

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailedjr/FinUncollectedReceivablesDetailedJRFeign.java

@@ -38,19 +38,6 @@ import org.springframework.web.bind.annotation.*;
 import java.math.BigDecimal;
 import java.util.List;
 
-/**
- * Project: anrui-fin(应收未收款项明细表) <br/>
- * File: FinUncollectedReceivablesDetailedFeign.java <br/>
- * Class: com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.FinUncollectedReceivablesDetailedFeign <br/>
- * Description: 应收未收款项明细表. <br/>
- * Copyright: Copyright (c) 2011 <br/>
- * Company: https://gitee.com/liuzp315 <br/>
- * Makedate: 2022-04-12 17:57:01 <br/>
- *
- * @author liupopo
- * @version 1.0
- * @since 1.0
- */
 @Api(tags = "金融认款应收未收款项明细表")
 @FeignClient(
         contextId = "anrui-fin-FinUncollectedReceivablesDetailedJR",

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/appaybill/ApPayBill.java

@@ -3,9 +3,7 @@ import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
-import java.text.SimpleDateFormat;
 import java.util.ArrayList;
-import java.util.Date;
 import java.util.List;
 
 /**
@@ -117,6 +115,10 @@ public class ApPayBill {
         @NotBlank(message = "FPAYTOTALAMOUNTFOR不能为空")
         //表体-应付金额:FPAYTOTALAMOUNTFOR
         public double FPAYTOTALAMOUNTFOR;
+
+         @JsonProperty("FREALPAYAMOUNTFOR_D")//表体-实付金额:FREALPAYAMOUNTFOR_D
+         public double FREALPAYAMOUNTFOR_D;
+
          @JsonProperty("FACCOUNTID")
          @NotBlank(message = "FACCOUNTID不能为空")
          //我方银行账号:FACCOUNTID 第1行分录，银行业务的结算方式，我方银行相关信息必录

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

@@ -150,19 +150,6 @@ import java.util.concurrent.*;
 import java.util.function.Predicate;
 import java.util.stream.Collectors;
 
-/**
- * Project: anrui-fin(销售相关) <br/>
- * File: FinCollectionConfirmationService.java <br/>
- * Class: com.yxt.anrui.fin.biz.fincollectionconfirmation.FinCollectionConfirmationService <br/>
- * Description: 收款确认表 业务逻辑. <br/>
- * Copyright: Copyright (c) 2011 <br/>
- * Company: https://gitee.com/liuzp315 <br/>
- * Makedate: 2022-04-12 17:57:01 <br/>
- *
- * @author liupopo
- * @version 1.0
- * @since 1.0
- */
 @Service
 public class FinCollectionConfirmationService extends MybatisBaseService<FinCollectionConfirmationMapper, FinCollectionConfirmation> {
     public static final Logger log = LoggerFactory.getLogger(FinCollectionConfirmationService.class);
@@ -205,8 +192,6 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
     @Autowired
     private OtherReceivableBillCreditResultService creditResultService;
     @Autowired
-    private DictCommonFeign dictCommonFeign;
-    @Autowired
     private LoanRepaymentPlanDetailsFeign loanRepaymentPlanDetailsFeign;
     @Autowired
     private FinUncollectedReceivablesDetailedJRService finUncollectedReceivablesDetailedJRService;

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

@@ -688,11 +688,15 @@ public class FinPaymentrecordService extends MybatisBaseService<FinPaymentrecord
                 && finPaymentrecord.getCost().compareTo(BigDecimal.ZERO) > 0) {
             ApPayBill.FPAYBILLENTRY fpaybillentry = new ApPayBill.FPAYBILLENTRY();
             //手续费
+            BigDecimal FHANDLINGCHARGEFOR = BigDecimal.ZERO;
             if (null != finPaymentrecord.getPaymentCharges()) {
                 fpaybillentry.setFHANDLINGCHARGEFOR(finPaymentrecord.getPaymentCharges().doubleValue());
+                FHANDLINGCHARGEFOR = finPaymentrecord.getPaymentCharges();
             }
             //应付金额
             fpaybillentry.setFPAYTOTALAMOUNTFOR(finPaymentrecord.getCost().doubleValue());
+            //实付金额
+            fpaybillentry.setFREALPAYAMOUNTFOR_D(FHANDLINGCHARGEFOR.add(finPaymentrecord.getCost()).doubleValue());
             //登账日期
             fpaybillentry.setFPOSTDATE(DateUtil.formatDate(finPaymentrecord.getPayDate()));
             //我方银行账号

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedRest.java

@@ -25,7 +25,6 @@
  *********************************************************/
 package com.yxt.anrui.fin.biz.finuncollectedreceivablesdetailed;
 
-import com.yxt.anrui.crm.api.crmcustomertemp.CrmCustomerTempExportVo;
 import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.*;
 import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.as.AsDetailsOfReceivablesAndUncollectedItemsVo;
 import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.as.AsFinUncollectedReceivablesDetailedQuery;
@@ -37,28 +36,14 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
-
 import javax.servlet.http.HttpServletResponse;
 import java.io.UnsupportedEncodingException;
 import java.math.BigDecimal;
 import java.net.URLEncoder;
 import java.util.List;
 
-/**
- * Project: anrui-fin(销售相关) <br/>
- * File: FinUncollectedReceivablesDetailedFeignFallback.java <br/>
- * Class: com.yxt.anrui.fin.biz.finuncollectedreceivablesdetailed.FinUncollectedReceivablesDetailedRest <br/>
- * Description: 应收未收款项明细表. <br/>
- * Copyright: Copyright (c) 2011 <br/>
- * Company: https://gitee.com/liuzp315 <br/>
- * Makedate: 2022-04-12 17:57:01 <br/>
- *
- * @author liupopo
- * @version 1.0
- * @since 1.0
- */
 @Api(tags = "应收未收款项明细表")
-@RestController("com.yxt.anrui.fin.biz.finuncollectedreceivablesdetailed.FinUncollectedReceivablesDetailedRest")
+@RestController
 @RequestMapping("/finuncollectedreceivablesdetailed")
 public class FinUncollectedReceivablesDetailedRest implements FinUncollectedReceivablesDetailedFeign {
 

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/appaybill/data_FPAYBILLENTRY.json

@@ -9,7 +9,7 @@
   "FPAYTOTALAMOUNTFOR": @KD_FPAYTOTALAMOUNTFOR,
   "FPAYAMOUNTFOR_E": @KD_FPAYTOTALAMOUNTFOR,
   "FSETTLEPAYAMOUNTFOR": @KD_FPAYTOTALAMOUNTFOR,
-  "FREALPAYAMOUNTFOR_D": @KD_FPAYTOTALAMOUNTFOR,
+  "FREALPAYAMOUNTFOR_D": @KD_FREALPAYAMOUNTFOR_D,
   "FPAYAMOUNT_E": @KD_FPAYTOTALAMOUNTFOR,
   "FACCOUNTID": {"FNumber":"@KD_FACCOUNTID"},
   "FPOSTDATE": "@KD_FPOSTDATE",

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbecollectionveh/LoanBeCollectionVehFeign.java

@@ -25,8 +25,6 @@
  *********************************************************/
 package com.yxt.anrui.riskcenter.api.loanbecollectionveh;
 
-import com.yxt.anrui.riskcenter.api.loanbecollectionapply.LoanBeCollectionApplyDetailsVo;
-import com.yxt.anrui.riskcenter.api.loanbecollectionapply.LoanBeCollectionApplyDto;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import com.yxt.common.core.query.PagerQuery;
@@ -35,21 +33,6 @@ import com.yxt.common.core.vo.PagerVo;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.*;
 
-import java.util.List;
-
-/**
- * Project: anrui-riskcenter(催收措施申请) <br/>
- * File: LoanBeCollectionVehFeign.java <br/>
- * Class: com.yxt.anrui.riskcenter.api.loanbecollectionveh.LoanBeCollectionVehFeign <br/>
- * Description: 逾期催收车辆. <br/>
- * Copyright: Copyright (c) 2011 <br/>
- * Company: https://gitee.com/liuzp315 <br/>
- * Makedate: 2023-12-12 16:06:20 <br/>
- *
- * @author liupopo
- * @version 1.0
- * @since 1.0
- */
 @Api(tags = "逾期催收车辆")
 @FeignClient(
         contextId = "anrui-riskcenter-LoanBeCollectionVeh",
@@ -67,12 +50,12 @@ public interface LoanBeCollectionVehFeign {
     @PostMapping("/save")
     @ResponseBody
     public ResultBean save(@RequestBody LoanBeCollectionVehDto dto);
-        
+
     @ApiOperation("根据sid删除记录")
     @DeleteMapping("/delBySids")
     @ResponseBody
     public ResultBean delBySids(@RequestBody String[] sids);
-      
+
     @ApiOperation("根据SID获取一条记录")
     @GetMapping("/fetchDetailsBySid/{sid}")
     @ResponseBody

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanvehclearanceapply/LoanVehClearanceApply.java

@@ -31,48 +31,35 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-/**
- * Project: anrui-riskcenter(车辆远程解控申请) <br/>
- * File: LoanVehClearanceApply.java <br/>
- * Class: com.yxt.anrui.riskcenter.api.loanvehclearanceapply.LoanVehClearanceApply <br/>
- * Description: 车辆远程解控申请. <br/>
- * Copyright: Copyright (c) 2011 <br/>
- * Company: https://gitee.com/liuzp315 <br/>
- * Makedate: 2023-12-29 10:25:56 <br/>
- *
- * @author liupopo
- * @version 1.0
- * @since 1.0
- */
 @Data
 @ApiModel(value = "车辆远程解控申请", description = "车辆远程解控申请")
 @TableName("loan_veh_clearance_apply")
 public class LoanVehClearanceApply extends BaseEntity {
     private static final long serialVersionUID = 1L;
 
-	@ApiModelProperty("创建人")
+    @ApiModelProperty("创建人")
     private String createByName; // 创建人
-	@ApiModelProperty("申请编号")
+    @ApiModelProperty("申请编号")
     private String billNo; // 申请编号
-	@ApiModelProperty("申请部门sid")
+    @ApiModelProperty("申请部门sid")
     private String deptSid; // 申请部门sid
-	@ApiModelProperty("申请部门名称")
+    @ApiModelProperty("申请部门名称")
     private String deptName; // 申请部门名称
-	@ApiModelProperty("分公司sid")
+    @ApiModelProperty("分公司sid")
     private String useOrgSid; // 分公司sid
-	@ApiModelProperty("分公司名称")
+    @ApiModelProperty("分公司名称")
     private String useOrgName; // 分公司名称
-	@ApiModelProperty("组织全路径")
+    @ApiModelProperty("组织全路径")
     private String orgPath; // 组织全路径
-	@ApiModelProperty("流程定义的id")
+    @ApiModelProperty("流程定义的id")
     private String procDefId; // 流程定义的id
-	@ApiModelProperty("环节定义的sid")
+    @ApiModelProperty("环节定义的sid")
     private String nodeSid; // 环节定义的sid
-	@ApiModelProperty("流程实例的sid")
+    @ApiModelProperty("流程实例的sid")
     private String procInstSid; // 流程实例的sid
-	@ApiModelProperty("流程状态")
+    @ApiModelProperty("流程状态")
     private String nodeState; // 流程状态
-	@ApiModelProperty("任务id")
+    @ApiModelProperty("任务id")
     private String taskId; // 任务id
 
 }

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanvehclearanceapply/LoanVehClearanceApplyFeign.java

@@ -25,12 +25,9 @@
  *********************************************************/
 package com.yxt.anrui.riskcenter.api.loanvehclearanceapply;
 
-import com.yxt.anrui.riskcenter.api.loanbecollectionapply.LoanBeCollectionApplyDetailsVo;
-import com.yxt.anrui.riskcenter.api.loanbecollectionapply.flowable.*;
 import com.yxt.anrui.riskcenter.api.loanvehclearanceapply.flowable.*;
 import com.yxt.anrui.riskcenter.api.loanvehclearanceveh.LoanVehClearanceLockCarQuery;
 import com.yxt.anrui.riskcenter.api.loanvehclearanceveh.LoanVehClearanceLockCarVo;
-import com.yxt.anrui.riskcenter.api.loanvehclearanceveh.LoanVehClearanceVehDetailsVo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import com.yxt.common.core.query.PagerQuery;
@@ -39,23 +36,9 @@ import com.yxt.common.core.vo.PagerVo;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.cloud.openfeign.SpringQueryMap;
 import org.springframework.web.bind.annotation.*;
-
 import javax.validation.Valid;
 import java.util.List;
 
-/**
- * Project: anrui-riskcenter(车辆远程解控申请) <br/>
- * File: LoanVehClearanceApplyFeign.java <br/>
- * Class: com.yxt.anrui.riskcenter.api.loanvehclearanceapply.LoanVehClearanceApplyFeign <br/>
- * Description: 车辆远程解控申请. <br/>
- * Copyright: Copyright (c) 2011 <br/>
- * Company: https://gitee.com/liuzp315 <br/>
- * Makedate: 2023-12-29 10:25:56 <br/>
- *
- * @author liupopo
- * @version 1.0
- * @since 1.0
- */
 @Api(tags = "车辆远程解控申请")
 @FeignClient(
         contextId = "anrui-riskcenter-LoanVehClearanceApply",
@@ -78,7 +61,7 @@ public interface LoanVehClearanceApplyFeign {
     @PostMapping("/save")
     @ResponseBody
     public ResultBean save(@RequestBody LoanVehClearanceApplyDto dto);
-        
+
     @ApiOperation("根据sid删除记录")
     @DeleteMapping("/delBySids")
     @ResponseBody
@@ -88,7 +71,7 @@ public interface LoanVehClearanceApplyFeign {
     @PostMapping("/init")
     @ResponseBody
     public ResultBean<LoanVehClearanceApplyDetailsVo> init(@RequestBody LoanVehClearanceInitQuery loanVehClearanceInitQuery);
-      
+
     @ApiOperation("根据SID获取一条记录")
     @GetMapping("/fetchDetailsBySid/{sid}")
     @ResponseBody

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanvehclearanceveh/LoanVehClearanceVehDetailsVo.java

@@ -25,11 +25,8 @@
  *********************************************************/
 package com.yxt.anrui.riskcenter.api.loanvehclearanceveh;
 
-
 import com.fasterxml.jackson.annotation.JsonFormat;
-import com.yxt.anrui.riskcenter.api.loanbecollectionveh.LoanBeCollectionVehFile;
 import com.yxt.common.core.vo.Vo;
-
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -37,55 +34,42 @@ import lombok.Data;
 import java.util.Date;
 import java.util.List;
 
-/**
- * Project: anrui-riskcenter(车辆远程解控申请) <br/>
- * File: LoanVehClearanceVehVo.java <br/>
- * Class: com.yxt.anrui.riskcenter.api.loanvehclearanceveh.LoanVehClearanceVehVo <br/>
- * Description: 车辆远程解控车辆 视图数据对象. <br/>
- * Copyright: Copyright (c) 2011 <br/>
- * Company: https://gitee.com/liuzp315 <br/>
- * Makedate: 2023-12-29 10:25:57 <br/>
- *
- * @author liupopo
- * @version 1.0
- * @since 1.0
- */
 @Data
 @ApiModel(value = "车辆远程解控车辆 视图数据详情", description = "车辆远程解控车辆 视图数据详情")
 public class LoanVehClearanceVehDetailsVo implements Vo {
 
     private String sid; // sid
 
-	@ApiModelProperty("贷款合同编号")
+    @ApiModelProperty("贷款合同编号")
     private String loanContractNo; // 贷款合同编号
-	@ApiModelProperty("车架号")
+    @ApiModelProperty("车架号")
     private String vinNo; // 车架号
-	@ApiModelProperty("车牌号")
+    @ApiModelProperty("车牌号")
     private String carNum; // 车牌号
-	@ApiModelProperty("资方")
+    @ApiModelProperty("资方")
     private String bankName; // 资方
-	@ApiModelProperty("资方合同号")
+    @ApiModelProperty("资方合同号")
     private String bankContractNo; // 资方合同号
-	@ApiModelProperty("客户姓名")
+    @ApiModelProperty("客户姓名")
     private String customerName; // 客户姓名
-	@ApiModelProperty("贷款人姓名")
+    @ApiModelProperty("贷款人姓名")
     private String borrowerName; // 贷款人姓名
     @ApiModelProperty("首次逾期日期")
     @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     private Date firstBeDate;
-	@ApiModelProperty("逾期期数")
+    @ApiModelProperty("逾期期数")
     private String beOverduePeriod; // 逾期期数
-	@ApiModelProperty("逾期金额")
+    @ApiModelProperty("逾期金额")
     private String beOverdueMoney; // 逾期金额
-	@ApiModelProperty("逾期金额换算期数")
+    @ApiModelProperty("逾期金额换算期数")
     private String beOverdueMoneyAndPeriod; // 逾期金额换算期数
-	@ApiModelProperty("远程控制费用")
+    @ApiModelProperty("远程控制费用")
     private String lockCarMoney; // 远程控制费用
-	@ApiModelProperty("远程控制费实收")
+    @ApiModelProperty("远程控制费实收")
     private String lockCarRealityMoney; // 远程控制费实收
-	@ApiModelProperty("销售订单车辆sid")
+    @ApiModelProperty("销售订单车辆sid")
     private String saleVehSid; // 销售订单车辆sid
-	@ApiModelProperty("远程控制申请sid")
+    @ApiModelProperty("远程控制申请sid")
     private String mainSid; // 远程控制申请sid
 
     @ApiModelProperty

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbecollectionveh/LoanBeCollectionVehMapper.java

@@ -36,47 +36,31 @@ import com.yxt.anrui.riskcenter.api.loanbecollectionveh.LoanBeCollectionVehVo;
 
 import java.util.List;
 
-/**
- * Project: anrui-riskcenter(催收措施申请) <br/>
- * File: LoanBeCollectionVehMapper.java <br/>
- * Class: com.yxt.anrui.riskcenter.biz.loanbecollectionveh.LoanBeCollectionVehMapper <br/>
- * Description: 逾期催收车辆. <br/>
- * Copyright: Copyright (c) 2011 <br/>
- * Company: https://gitee.com/liuzp315 <br/>
- * Makedate: 2023-12-12 16:06:20 <br/>
- *
- * @author liupopo
- * @version 1.0
- * @since 1.0
- */
 @Mapper
 public interface LoanBeCollectionVehMapper extends BaseMapper<LoanBeCollectionVeh> {
 
-	//@Update("update loan_be_collection_veh set name=#{msg} where id=#{id}")
-	//IPage<LoanBeCollectionVehVo> voPage(IPage<LoanBeCollectionVeh> page, @Param(Constants.WRAPPER) QueryWrapper<LoanBeCollectionVeh> qw);
-	
-	IPage<LoanBeCollectionVehVo> selectPageVo(IPage<LoanBeCollectionVeh> page, @Param(Constants.WRAPPER) Wrapper<LoanBeCollectionVeh> qw);
-	
-	List<LoanBeCollectionVehVo> selectListAllVo(@Param(Constants.WRAPPER) Wrapper<LoanBeCollectionVeh> qw);
-	
-	@Select("select * from loan_be_collection_veh")
-	List<LoanBeCollectionVehVo> selectListVo();
+    IPage<LoanBeCollectionVehVo> selectPageVo(IPage<LoanBeCollectionVeh> page, @Param(Constants.WRAPPER) Wrapper<LoanBeCollectionVeh> qw);
 
-	@Delete("delete from loan_be_collection_veh where mainSid = #{dtoSid}")
+    List<LoanBeCollectionVehVo> selectListAllVo(@Param(Constants.WRAPPER) Wrapper<LoanBeCollectionVeh> qw);
+
+    @Select("select * from loan_be_collection_veh")
+    List<LoanBeCollectionVehVo> selectListVo();
+
+    @Delete("delete from loan_be_collection_veh where mainSid = #{dtoSid}")
     void delByMainSid(String dtoSid);
 
-	@Select("select *,customerName as custName,customerPhone as custPhone from loan_be_collection_veh where mainSid = #{sid}")
-	List<LoanBeCollectionVehDetailsVo> selByMainSid(String sid);
+    @Select("select *,customerName as custName,customerPhone as custPhone from loan_be_collection_veh where mainSid = #{sid}")
+    List<LoanBeCollectionVehDetailsVo> selByMainSid(String sid);
 
-	@Update("update loan_be_collection_veh set lockCarState = '0' where mainSid = #{businessSid}")
+    @Update("update loan_be_collection_veh set lockCarState = '0' where mainSid = #{businessSid}")
     void updateByMainSid(String businessSid);
 
     int selBjBySaleVehSid(String saleVehSid);
 
-	int selKzStateBySaleVehSid(@Param("saleVehSid") String saleVehSid,@Param("mainSid") String mainSid);
+    int selKzStateBySaleVehSid(@Param("saleVehSid") String saleVehSid, @Param("mainSid") String mainSid);
 
-	String selSidBySaleVehSidAndLockState(@Param("saleVehSid") String saleVehSid,@Param("c") String c);
+    String selSidBySaleVehSidAndLockState(@Param("saleVehSid") String saleVehSid, @Param("c") String c);
 
-	@Update("update loan_be_collection_veh set lockCarState = #{s} where saleVehSid = #{saleVehSid} and lockCarState = #{x}")
-    void updateLockState(@Param("saleVehSid") String saleVehSid,@Param("s") String s,@Param("x") String x);
+    @Update("update loan_be_collection_veh set lockCarState = #{s} where saleVehSid = #{saleVehSid} and lockCarState = #{x}")
+    void updateLockState(@Param("saleVehSid") String saleVehSid, @Param("s") String s, @Param("x") String x);
 }

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbeoverdueveh/LoanBeOverdueVehMapper.xml

@@ -33,7 +33,8 @@
         MAX(a1.reaRepaymentName) AS repaymentName,
         MAX(a1.createTime) AS createTime,
         a1.orgSidPath,
-        MAX(a1.lockCarState) AS lockCarState  -- 保证聚合正确性
+        MAX(a1.lockCarState) AS lockCarState,  -- 保证聚合正确性
+        a1.nowOverdue
         FROM (
         SELECT
         lrpd.sid,

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbeoverdueveh/LoanBeOverdueVehService.java

@@ -106,6 +106,7 @@ public class LoanBeOverdueVehService {
         if (StringUtils.isNotBlank(query.getVinNo())) {
             qw.like("a1.vinNo", query.getVinNo());
         }
+        qw.eq("a1.nowOverdue", "0");
         String collectionStartDate = query.getCollectionStartDate();
         String collectionEndDate = query.getCollectionEndDate();
         qw.apply(StringUtils.isNotBlank(collectionStartDate), "date_format (a1.createTime,'%Y-%m-%d') >= date_format('" + collectionStartDate + "','%Y-%m-%d')").

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanvehclearanceapply/LoanVehClearanceApplyMapper.java

@@ -41,33 +41,17 @@ import com.yxt.anrui.riskcenter.api.loanvehclearanceapply.LoanVehClearanceApplyV
 import java.util.List;
 import java.util.Map;
 
-/**
- * Project: anrui-riskcenter(车辆远程解控申请) <br/>
- * File: LoanVehClearanceApplyMapper.java <br/>
- * Class: com.yxt.anrui.riskcenter.biz.loanvehclearanceapply.LoanVehClearanceApplyMapper <br/>
- * Description: 车辆远程解控申请. <br/>
- * Copyright: Copyright (c) 2011 <br/>
- * Company: https://gitee.com/liuzp315 <br/>
- * Makedate: 2023-12-29 10:25:56 <br/>
- *
- * @author liupopo
- * @version 1.0
- * @since 1.0
- */
 @Mapper
 public interface LoanVehClearanceApplyMapper extends BaseMapper<LoanVehClearanceApply> {
 
-	//@Update("update loan_veh_clearance_apply set name=#{msg} where id=#{id}")
-	//IPage<LoanVehClearanceApplyVo> voPage(IPage<LoanVehClearanceApply> page, @Param(Constants.WRAPPER) QueryWrapper<LoanVehClearanceApply> qw);
-	
-	IPage<LoanVehClearanceApplyVo> selectPageVo(IPage<LoanVehClearanceApply> page, @Param(Constants.WRAPPER) Wrapper<LoanVehClearanceApply> qw);
-	
-	List<LoanVehClearanceApplyVo> selectListAllVo(@Param(Constants.WRAPPER) Wrapper<LoanVehClearanceApply> qw);
-	
-	@Select("select * from loan_veh_clearance_apply")
-	List<LoanVehClearanceApplyVo> selectListVo();
+    IPage<LoanVehClearanceApplyVo> selectPageVo(IPage<LoanVehClearanceApply> page, @Param(Constants.WRAPPER) Wrapper<LoanVehClearanceApply> qw);
 
-	String selectNum(String billNo);
+    List<LoanVehClearanceApplyVo> selectListAllVo(@Param(Constants.WRAPPER) Wrapper<LoanVehClearanceApply> qw);
+
+    @Select("select * from loan_veh_clearance_apply")
+    List<LoanVehClearanceApplyVo> selectListVo();
+
+    String selectNum(String billNo);
 
     IPage<LoanVehClearanceLockCarVo> lockCarList(IPage<LoanVehClearanceApply> page, @Param(Constants.WRAPPER) QueryWrapper<LoanVehClearanceApply> qw);
 
@@ -75,5 +59,5 @@ public interface LoanVehClearanceApplyMapper extends BaseMapper<LoanVehClearance
 
     int selectBySid(String join);
 
-	LoanVehClearanceVehInit initVehListBySaleVehSidYCJK(String saleVehSid);
+    LoanVehClearanceVehInit initVehListBySaleVehSidYCJK(String saleVehSid);
 }

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanvehclearanceapply/LoanVehClearanceApplyRest.java

@@ -32,7 +32,6 @@ import com.yxt.anrui.riskcenter.api.loanvehclearanceapply.*;
 import com.yxt.anrui.riskcenter.api.loanvehclearanceapply.flowable.*;
 import com.yxt.anrui.riskcenter.api.loanvehclearanceveh.LoanVehClearanceLockCarQuery;
 import com.yxt.anrui.riskcenter.api.loanvehclearanceveh.LoanVehClearanceLockCarVo;
-import com.yxt.anrui.riskcenter.api.loanvehclearanceveh.LoanVehClearanceVehDetailsVo;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
@@ -43,116 +42,103 @@ import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
 
-/**
- * Project: anrui-riskcenter(车辆远程解控申请) <br/>
- * File: LoanVehClearanceApplyFeignFallback.java <br/>
- * Class: com.yxt.anrui.riskcenter.biz.loanvehclearanceapply.LoanVehClearanceApplyRest <br/>
- * Description: 车辆远程解控申请. <br/>
- * Copyright: Copyright (c) 2011 <br/>
- * Company: https://gitee.com/liuzp315 <br/>
- * Makedate: 2023-12-29 10:25:56 <br/>
- *
- * @author liupopo
- * @version 1.0
- * @since 1.0
- */
 @Api(tags = "车辆远程解控申请")
-@RestController("com.yxt.anrui.riskcenter.biz.loanvehclearanceapply.LoanVehClearanceApplyRest")
+@RestController
 @RequestMapping("v1/loanvehclearanceapply")
 public class LoanVehClearanceApplyRest implements LoanVehClearanceApplyFeign {
 
-	@Autowired
-	private LoanVehClearanceApplyService loanVehClearanceApplyService;
-
-	@Override
-	@ApiOperation("根据条件分页查询数据的列表")
-	@PostMapping("/listPage")
-	public ResultBean<PagerVo<LoanVehClearanceApplyVo>> listPage(@RequestBody PagerQuery<LoanVehClearanceApplyQuery> pq){
-		ResultBean rb = ResultBean.fireFail();
-		PagerVo<LoanVehClearanceApplyVo> pv = loanVehClearanceApplyService.listPageVo(pq);
-		return rb.success().setData(pv);
-	}
-
-	@Override
-	public ResultBean<PagerVo<LoanVehClearanceLockCarVo>> lockCarList(PagerQuery<LoanVehClearanceLockCarQuery> pq) {
-		ResultBean rb = ResultBean.fireFail();
-		PagerVo<LoanVehClearanceLockCarVo> pv = loanVehClearanceApplyService.lockCarList(pq);
-		return rb.success().setData(pv);
-	}
-
-	@Override
-	@ApiOperation("新增或修改")
-	@PostMapping("/save")
-	public ResultBean save(@RequestBody LoanVehClearanceApplyDto dto){
-		ResultBean rb = ResultBean.fireFail();
-		loanVehClearanceApplyService.saveOrUpdateDto(dto);
-		return rb.success();
-	}
-
-	@Override
-	@ApiOperation("根据sid批量删除")
+    @Autowired
+    private LoanVehClearanceApplyService loanVehClearanceApplyService;
+
+    @Override
+    @ApiOperation("根据条件分页查询数据的列表")
+    @PostMapping("/listPage")
+    public ResultBean<PagerVo<LoanVehClearanceApplyVo>> listPage(@RequestBody PagerQuery<LoanVehClearanceApplyQuery> pq) {
+        ResultBean rb = ResultBean.fireFail();
+        PagerVo<LoanVehClearanceApplyVo> pv = loanVehClearanceApplyService.listPageVo(pq);
+        return rb.success().setData(pv);
+    }
+
+    @Override
+    public ResultBean<PagerVo<LoanVehClearanceLockCarVo>> lockCarList(PagerQuery<LoanVehClearanceLockCarQuery> pq) {
+        ResultBean rb = ResultBean.fireFail();
+        PagerVo<LoanVehClearanceLockCarVo> pv = loanVehClearanceApplyService.lockCarList(pq);
+        return rb.success().setData(pv);
+    }
+
+    @Override
+    @ApiOperation("新增或修改")
+    @PostMapping("/save")
+    public ResultBean save(@RequestBody LoanVehClearanceApplyDto dto) {
+        ResultBean rb = ResultBean.fireFail();
+        loanVehClearanceApplyService.saveOrUpdateDto(dto);
+        return rb.success();
+    }
+
+    @Override
+    @ApiOperation("根据sid批量删除")
     @DeleteMapping("/delBySids")
-    public ResultBean delBySids(@RequestBody String[] sids){
-		return loanVehClearanceApplyService.delAllBySids(sids);
-	}
-
-	@Override
-	public ResultBean<LoanVehClearanceApplyDetailsVo> init(LoanVehClearanceInitQuery loanVehClearanceInitQuery) {
-		ResultBean rb = ResultBean.fireFail();
-		LoanVehClearanceApplyDetailsVo loanVehClearanceApplyDetailsVo = loanVehClearanceApplyService.init(loanVehClearanceInitQuery);
-		return rb.success().setData(loanVehClearanceApplyDetailsVo);
-	}
-
-	@Override
-	@ApiOperation("根据SID获取一条记录")
+    public ResultBean delBySids(@RequestBody String[] sids) {
+        return loanVehClearanceApplyService.delAllBySids(sids);
+    }
+
+    @Override
+    public ResultBean<LoanVehClearanceApplyDetailsVo> init(LoanVehClearanceInitQuery loanVehClearanceInitQuery) {
+        ResultBean rb = ResultBean.fireFail();
+        LoanVehClearanceApplyDetailsVo loanVehClearanceApplyDetailsVo = loanVehClearanceApplyService.init(loanVehClearanceInitQuery);
+        return rb.success().setData(loanVehClearanceApplyDetailsVo);
+    }
+
+    @Override
+    @ApiOperation("根据SID获取一条记录")
     @GetMapping("/fetchDetailsBySid/{sid}")
-    public ResultBean<LoanVehClearanceApplyDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid){
-		ResultBean rb = ResultBean.fireFail();
-		LoanVehClearanceApplyDetailsVo vo = loanVehClearanceApplyService.fetchDetailsVoBySid(sid);
-		return rb.success().setData(vo);
-	}
-
-	@Override
-	public ResultBean submit(SubmitLoanVehClearanceApplyDto dto) {
-		return loanVehClearanceApplyService.submit(dto);
-	}
-
-	@Override
-	public ResultBean complete(LoanVehClearanceApplyCompleteDto query) {
-		BusinessVariables bv = new BusinessVariables();
-		BeanUtil.copyProperties(query, bv);
-		bv.setModelId(ProcDefEnum.LOANVEHCLEARANCEAPPLY.getProDefId());
-		return loanVehClearanceApplyService.complete(bv);
-	}
-
-	@Override
-	public ResultBean<List<LoanVehClearanceApplyNodeVo>> getPreviousNodesForReject(LoanVehClearanceApplyNodeQuery query) {
-		return loanVehClearanceApplyService.getPreviousNodesForReject(query);
-	}
-
-	@Override
-	public ResultBean<List<LoanVehClearanceApplyNodeVo>> getNextNodesForSubmit(LoanVehClearanceApplyNodeQuery query) {
-		return loanVehClearanceApplyService.getNextNodesForSubmit(query);
-	}
-
-	@Override
-	public ResultBean reject(LoanVehClearanceApplyTaskQuery query) {
-		return loanVehClearanceApplyService.reject(query);
-	}
-
-	@Override
-	public ResultBean revokeProcess(LoanVehClearanceApplyTaskQuery query) {
-		return loanVehClearanceApplyService.revokeProcess(query);
-	}
-
-	@Override
-	public ResultBean breakProcess(LoanVehClearanceApplyTaskQuery query) {
-		return loanVehClearanceApplyService.breakProcess(query);
-	}
-
-	@Override
-	public ResultBean delegate(LoanVehClearanceApplyDelegateQuery query) {
-		return loanVehClearanceApplyService.delegate(query);
-	}
+    public ResultBean<LoanVehClearanceApplyDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid) {
+        ResultBean rb = ResultBean.fireFail();
+        LoanVehClearanceApplyDetailsVo vo = loanVehClearanceApplyService.fetchDetailsVoBySid(sid);
+        return rb.success().setData(vo);
+    }
+
+    @Override
+    public ResultBean submit(SubmitLoanVehClearanceApplyDto dto) {
+        return loanVehClearanceApplyService.submit(dto);
+    }
+
+    @Override
+    public ResultBean complete(LoanVehClearanceApplyCompleteDto query) {
+        BusinessVariables bv = new BusinessVariables();
+        BeanUtil.copyProperties(query, bv);
+        bv.setModelId(ProcDefEnum.LOANVEHCLEARANCEAPPLY.getProDefId());
+        return loanVehClearanceApplyService.complete(bv);
+    }
+
+    @Override
+    public ResultBean<List<LoanVehClearanceApplyNodeVo>> getPreviousNodesForReject(LoanVehClearanceApplyNodeQuery query) {
+        return loanVehClearanceApplyService.getPreviousNodesForReject(query);
+    }
+
+    @Override
+    public ResultBean<List<LoanVehClearanceApplyNodeVo>> getNextNodesForSubmit(LoanVehClearanceApplyNodeQuery query) {
+        return loanVehClearanceApplyService.getNextNodesForSubmit(query);
+    }
+
+    @Override
+    public ResultBean reject(LoanVehClearanceApplyTaskQuery query) {
+        return loanVehClearanceApplyService.reject(query);
+    }
+
+    @Override
+    public ResultBean revokeProcess(LoanVehClearanceApplyTaskQuery query) {
+        return loanVehClearanceApplyService.revokeProcess(query);
+    }
+
+    @Override
+    public ResultBean breakProcess(LoanVehClearanceApplyTaskQuery query) {
+        return loanVehClearanceApplyService.breakProcess(query);
+    }
+
+    @Override
+    public ResultBean delegate(LoanVehClearanceApplyDelegateQuery query) {
+        return loanVehClearanceApplyService.delegate(query);
+    }
 
 }

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanvehclearanceapply/LoanVehClearanceApplyService.java

@@ -31,13 +31,14 @@ import cn.hutool.core.date.DateUtil;
 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.commoncontract.CommonContractFeign;
 import com.yxt.anrui.base.common.utils.Rule;
 import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrder;
 import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrderFeign;
 import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicle;
 import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicleFeign;
-import com.yxt.anrui.fin.api.finvehicleinvoice.FinVehicleInvoice;
-import com.yxt.anrui.fin.api.finvehicleinvoice.FinVehicleInvoiceFeign;
+import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailedjr.FinUncollectedReceivablesDetailedJR;
+import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailedjr.FinUncollectedReceivablesDetailedJRFeign;
 import com.yxt.anrui.flowable.api.flow.FlowProcessMapQuery;
 import com.yxt.anrui.flowable.api.flow.FlowableFeign;
 import com.yxt.anrui.flowable.api.flow.UpdateFlowFieldVo;
@@ -54,10 +55,6 @@ 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.anrui.portal.api.sysuser.SysUserVo;
-import com.yxt.anrui.riskcenter.api.loanbecollectionapply.LoanBeCollectionApply;
-import com.yxt.anrui.riskcenter.api.loanbecollectionapply.LoanBeCollectionFileVo;
-import com.yxt.anrui.riskcenter.api.loanbecollectionapply.flowable.LoanBeCollectionApplyNodeVo;
-import com.yxt.anrui.riskcenter.api.loanbecollectionapply.flowable.SubmitLoanBeCollectionApplyDto;
 import com.yxt.anrui.riskcenter.api.loanfile.LoanFile;
 import com.yxt.anrui.riskcenter.api.loanfile.LoanFileEnum;
 import com.yxt.anrui.riskcenter.api.loansolutions.LoanSolutions;
@@ -88,19 +85,6 @@ import java.math.BigDecimal;
 import java.util.*;
 import java.util.stream.Collectors;
 
-/**
- * Project: anrui-riskcenter(车辆远程解控申请) <br/>
- * File: LoanVehClearanceApplyService.java <br/>
- * Class: com.yxt.anrui.riskcenter.biz.loanvehclearanceapply.LoanVehClearanceApplyService <br/>
- * Description: 车辆远程解控申请 业务逻辑. <br/>
- * Copyright: Copyright (c) 2011 <br/>
- * Company: https://gitee.com/liuzp315 <br/>
- * Makedate: 2023-12-29 10:25:56 <br/>
- *
- * @author liupopo
- * @version 1.0
- * @since 1.0
- */
 @Service
 public class LoanVehClearanceApplyService extends MybatisBaseService<LoanVehClearanceApplyMapper, LoanVehClearanceApply> {
 
@@ -121,8 +105,6 @@ public class LoanVehClearanceApplyService extends MybatisBaseService<LoanVehClea
     @Autowired
     private LoanSolutionsService loanSolutionsService;
     @Autowired
-    private FinVehicleInvoiceFeign finVehicleInvoiceFeign;
-    @Autowired
     private LoanHomevisitInvestigateService loanHomevisitInvestigateService;
     @Autowired
     SysStaffOrgFeign sysStaffOrgFeign;
@@ -136,6 +118,8 @@ public class LoanVehClearanceApplyService extends MybatisBaseService<LoanVehClea
     private FlowFeign flowFeign;
     @Autowired
     private LoanBeCollectionVehService loanBeCollectionVehService;
+    @Autowired
+    private FinUncollectedReceivablesDetailedJRFeign finUncollectedReceivablesDetailedJRFeign;
 
     public PagerVo<LoanVehClearanceApplyVo> listPageVo(PagerQuery<LoanVehClearanceApplyQuery> pq) {
         LoanVehClearanceApplyQuery query = pq.getParams();
@@ -511,9 +495,9 @@ public class LoanVehClearanceApplyService extends MybatisBaseService<LoanVehClea
             messageFlowableQuery.setUfVo(messageFlowVo);
             messageFlowableQuery.setAppMap(appMap);
             messageFlowableQuery.setBusinessSid(businessSid);
-            messageFlowableQuery.setModuleName("催收措施申请");
+            messageFlowableQuery.setModuleName("远程解控申请");
             messageFlowableQuery.setMsgContent(loanVehClearanceApply.getCreateByName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批");
-            messageFlowableQuery.setMsgTitle("催收措施申请");
+            messageFlowableQuery.setMsgTitle("远程解控申请");
             messageFeign.pushMessage(messageFlowableQuery);
             return voResultBean;
         }
@@ -597,7 +581,29 @@ public class LoanVehClearanceApplyService extends MybatisBaseService<LoanVehClea
             updateFlowFiled(BeanUtil.beanToMap(resultBean.getData()));
             if ("Event_end".equals(resultBean.getData().getTaskDefKey())) {
                 for (LoanVehClearanceVehDetailsVo loanVehClearanceVehDetailsVo : loanVehClearanceVehDetailsVoList) {
-                    loanBeCollectionVehService.updateLockState(loanVehClearanceVehDetailsVo.getSaleVehSid(), "4", "3");
+                    FinUncollectedReceivablesDetailedJR finUncollectedReceivablesDetailedJR = new FinUncollectedReceivablesDetailedJR();
+                    finUncollectedReceivablesDetailedJR.setCreateByName(loanVehClearanceApply.getCreateByName());
+                    finUncollectedReceivablesDetailedJR.setCreateBySid(loanVehClearanceApply.getCreateBySid());
+                    //查询销售订单信息
+                    BusSalesOrderVehicle busSalesOrderVehicle = busSalesOrderVehicleFeign.fetchBySalesOrderVehiclerSid(loanVehClearanceVehDetailsVo.getSaleVehSid()).getData();
+                    BusSalesOrder busSalesOrder = busSalesOrderFeign.fetchBySid(busSalesOrderVehicle.getSalesOrderSid()).getData();
+                    finUncollectedReceivablesDetailedJR.setApplySid(loanVehClearanceApply.getSid());
+                    finUncollectedReceivablesDetailedJR.setBusSid(loanVehClearanceVehDetailsVo.getSid());
+                    finUncollectedReceivablesDetailedJR.setPayCostTitleKey("015");
+                    finUncollectedReceivablesDetailedJR.setPayCostTitleValue("远程控制费");
+                    finUncollectedReceivablesDetailedJR.setReveivableMoney(new BigDecimal(loanVehClearanceVehDetailsVo.getLockCarRealityMoney()));
+                    finUncollectedReceivablesDetailedJR.setCurrentReceivableMoney(new BigDecimal(loanVehClearanceVehDetailsVo.getLockCarRealityMoney()));
+                    finUncollectedReceivablesDetailedJR.setPurchaseSystemSid(busSalesOrder.getPurchaseSystemSid());
+                    finUncollectedReceivablesDetailedJR.setPurchaseSystemName(busSalesOrder.getPurchaseSystemName());
+                    finUncollectedReceivablesDetailedJR.setStaffUserSid(busSalesOrder.getCreateBySid());
+                    finUncollectedReceivablesDetailedJR.setStaffName(busSalesOrder.getStaffName());
+                    finUncollectedReceivablesDetailedJR.setStaffDeptSid(busSalesOrder.getOrgSid());
+                    finUncollectedReceivablesDetailedJR.setStaffDeptName(busSalesOrder.getOrgName());
+                    finUncollectedReceivablesDetailedJR.setUseOrgSid(loanVehClearanceApply.getUseOrgSid());
+                    finUncollectedReceivablesDetailedJR.setUseOrgName(loanVehClearanceApply.getUseOrgName());
+                    finUncollectedReceivablesDetailedJR.setOrgSidPath(loanVehClearanceApply.getOrgPath());
+                    finUncollectedReceivablesDetailedJR.setKxState("01");
+                    finUncollectedReceivablesDetailedJRFeign.save(finUncollectedReceivablesDetailedJR);
                 }
             } else {
                 //极光推送
@@ -610,9 +616,9 @@ public class LoanVehClearanceApplyService extends MybatisBaseService<LoanVehClea
                 messageFlowableQuery.setUfVo(messageFlowVo);
                 messageFlowableQuery.setAppMap(appMap);
                 messageFlowableQuery.setBusinessSid(businessSid);
-                messageFlowableQuery.setModuleName("催收措施申请");
+                messageFlowableQuery.setModuleName("远程解控申请");
                 messageFlowableQuery.setMsgContent(loanVehClearanceApply.getCreateByName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批");
-                messageFlowableQuery.setMsgTitle("催收措施申请");
+                messageFlowableQuery.setMsgTitle("远程解控申请");
                 messageFeign.pushMessage(messageFlowableQuery);
             }
             return rb.success().setData(resultBean.getData());
@@ -685,7 +691,7 @@ public class LoanVehClearanceApplyService extends MybatisBaseService<LoanVehClea
                 messageFlowableQuery.setUfVo(messageFlowVo);
                 messageFlowableQuery.setAppMap(appMap);
                 messageFlowableQuery.setBusinessSid(businessSid);
-                messageFlowableQuery.setModuleName("催收措施申请");
+                messageFlowableQuery.setModuleName("远程解控申请");
                 ResultBean<List<LatestTaskVo>> listResultBean = flowTaskFeign.getLatestTasks(procId);
                 String nextNodeUserSids = listResultBean.getData().get(0).getASSIGNEE_();
                 List<String> receiveSidList = Arrays.asList(nextNodeUserSids.split(","));
@@ -694,7 +700,7 @@ public class LoanVehClearanceApplyService extends MybatisBaseService<LoanVehClea
                 } else {
                     messageFlowableQuery.setMsgContent(loanVehClearanceApply.getCreateByName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批");
                 }
-                messageFlowableQuery.setMsgTitle("催收措施申请");
+                messageFlowableQuery.setMsgTitle("远程解控申请");
                 messageFeign.pushMessage(messageFlowableQuery);
                 return rb.success();
             }

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/AppBusSalesOrderFeign.java

@@ -46,7 +46,6 @@ import com.yxt.anrui.terminal.api.autoservice.saleOrders.trailer.AppSalesOrderTr
 import com.yxt.anrui.terminal.api.autoservice.saleOrders.trailer.AppSalesOrderTrailerDto;
 import com.yxt.anrui.terminal.api.autoservice.saleOrders.trailer.TrailerVo;
 import com.yxt.anrui.terminal.api.autoservice.saleOrders.vininput.*;
-import com.yxt.anrui.terminal.api.autoservice.solutionsChange.flow.AppSolutionsChangeDelegateQuery;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
@@ -279,6 +278,12 @@ public interface AppBusSalesOrderFeign {
     @ResponseBody
     ResultBean<OrderDetailsVo> getSaleOrderDetail(@PathVariable(value = "saleOrderSid") String sid);
 
+    @ApiOperation("销售订单详情2")
+    @GetMapping("/getSaleOrderDetail2/{saleOrderSid}")
+    @ResponseBody
+    ResultBean<OrderDetailsVo> getSaleOrderDetail2(@PathVariable(value = "saleOrderSid") String sid,
+                                                  @RequestParam(value = "userSid", required = false) String userSid
+    );
     /*-----------------------------------------流程------------------------------------------*/
 
     @ApiOperation(value = "加签")

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/AppBusSalesOrderFeignFallback.java

@@ -244,6 +244,11 @@ public class AppBusSalesOrderFeignFallback implements AppBusSalesOrderFeign {
         return null;
     }
 
+    @Override
+    public ResultBean<OrderDetailsVo> getSaleOrderDetail2(String sid, String userSid) {
+        return null;
+    }
+
     @Override
     public ResultBean delegate(AppOrderDelegateQuery delegateQuery) {
         return null;

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/flowable/SaleOrderQueryBy.java

@@ -44,4 +44,15 @@ public class SaleOrderQueryBy implements Query {
     private String companyInvoicingName;
     @ApiModelProperty("开票单位sid")
     private String companyInvoicingSid;
+    @ApiModelProperty("厂家合同（结算)价")
+    private String manufacturerSettleAmount;
+    @ApiModelProperty("政策合计金额")
+    private String policyAmount;
+    @ApiModelProperty("成本价")
+    private String cost;
+    @ApiModelProperty("政策明细")
+    private String policyDetails;
+    @ApiModelProperty("备注")
+    private String remarks;
+
 }

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/order/FlowOrderVo.java

@@ -33,4 +33,15 @@ public class FlowOrderVo implements Vo {
     private String companyInvoicingName;
     @ApiModelProperty("开票单位sid")
     private String companyInvoicingSid;
+    @ApiModelProperty("厂家合同（结算)价")
+    private String manufacturerSettleAmount;
+    @ApiModelProperty("政策合计金额")
+    private String policyAmount;
+    @ApiModelProperty("成本价")
+    private String cost;
+    @ApiModelProperty("政策明细")
+    private String policyDetails;
+    @ApiModelProperty("备注")
+    private String remarks;
+
 }

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/order/OrderDetailsVo.java

@@ -122,6 +122,7 @@ public class OrderDetailsVo implements Vo {
     private String companyInvoicingSid;
     @JsonProperty("orgPath")
     private String orgSidPath;
-
+    @ApiModelProperty(value = "车辆成本信息")
+    private OrderVehicleCostVo vehicleCostObj;
 
 }

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/order/OrderVehicleCostVo.java

@@ -0,0 +1,19 @@
+package com.yxt.anrui.terminal.api.autoservice.saleOrders.order;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class OrderVehicleCostVo {
+
+    @ApiModelProperty("厂家合同（结算)价")
+    private String manufacturerSettleAmount;
+    @ApiModelProperty("政策合计金额")
+    private String policyAmount;
+    @ApiModelProperty("成本价")
+    private String cost;
+    @ApiModelProperty("政策明细")
+    private String policyDetails;
+    @ApiModelProperty("备注")
+    private String remarks;
+}

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/saleOrders/AppBusSalesOrderRest.java

@@ -25,8 +25,6 @@
  *********************************************************/
 package com.yxt.anrui.terminal.biz.autoservice.saleOrders;
 
-import com.yxt.anrui.riskcenter.api.loanpreloancreditapply.LoanPreloanQuery;
-import com.yxt.anrui.riskcenter.api.loanpreloancreditapply.LoanPreloanVo;
 import com.yxt.anrui.terminal.api.autoservice.saleOrders.*;
 import com.yxt.anrui.terminal.api.autoservice.saleOrders.depositinfo.DepositInfoDto;
 import com.yxt.anrui.terminal.api.autoservice.saleOrders.depositinfo.DepositInfoQuery;
@@ -56,7 +54,6 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
 
 import java.lang.reflect.InvocationTargetException;
@@ -333,6 +330,10 @@ public class AppBusSalesOrderRest implements AppBusSalesOrderFeign {
         return appBusSalesOrderService.getSubmitInfo(sid);
     }
 
+    @Override
+    public ResultBean<OrderDetailsVo> getSaleOrderDetail2(String sid,String userSid) {
+        return appBusSalesOrderService.getSaleOrderDetail2(sid,userSid);
+    }
     @Override
     public ResultBean<OrderDetailsVo> getSaleOrderDetail(String sid) {
         return appBusSalesOrderService.getSaleOrderDetail(sid);

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/saleOrders/AppBusSalesOrderService.java

@@ -27,8 +27,6 @@ package com.yxt.anrui.terminal.biz.autoservice.saleOrders;
 
 import cn.hutool.core.bean.BeanUtil;
 import com.alibaba.fastjson.JSON;
-import com.yxt.anrui.base.api.basemiddleman.BaseMiddlemanQuery;
-import com.yxt.anrui.base.api.basemiddleman.BaseMiddlemanVo;
 import com.yxt.anrui.base.api.basepurchasesystem.AppBasePurchSystemVo;
 import com.yxt.anrui.base.api.basepurchasesystem.BasePurchaseSystemFeign;
 import com.yxt.anrui.base.api.basevehicle.BaseVehicleFeign;
@@ -73,12 +71,12 @@ import com.yxt.anrui.buscenter.api.bussalesorderprice.app.AppBusSalesOrderPriceV
 import com.yxt.anrui.buscenter.api.bussalesordertrailer.*;
 import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicleFeign;
 import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusVehicleBorrowVo;
-import com.yxt.anrui.buscenter.api.bussolutionschange.flow.flow.SolutionsChangeDelegateQuery;
+import com.yxt.anrui.buscenter.api.bussalesordervehiclecost.BusSalesOrderVehicleCostFeign;
+import com.yxt.anrui.buscenter.api.bussalesordervehiclecost.BusSalesOrderVehicleCostVo;
 import com.yxt.anrui.crm.api.crmvehicledemand.AppCrmOrderVehicleDemandQuery;
 import com.yxt.anrui.crm.api.crmvehicledemand.AppOrderCrmVehicleDemandVo;
 import com.yxt.anrui.crm.api.crmvehicledemand.CrmVehicledemandFeign;
 import com.yxt.anrui.fin.api.fincompanyinvoicing.CompanyInvoicingVo;
-import com.yxt.anrui.fin.api.fincompanyinvoicing.FinCompanyInvoicing;
 import com.yxt.anrui.fin.api.fincompanyinvoicing.FinCompanyInvoicingFeign;
 import com.yxt.anrui.portal.api.appsubsetversion.AppSubVersionVo;
 import com.yxt.anrui.portal.api.appsubsetversion.AppSubsetVersionFeign;
@@ -90,10 +88,7 @@ import com.yxt.anrui.riskcenter.api.loanpreloancreditapply.LoanOrderPreloanVo;
 import com.yxt.anrui.riskcenter.api.loanpreloancreditapply.LoanPreloanCreditApplyFeign;
 import com.yxt.anrui.riskcenter.api.loanpreloancreditapply.LoanPreloanQuery;
 import com.yxt.anrui.riskcenter.api.loanpreloancreditapply.LoanPreloanVo;
-import com.yxt.anrui.terminal.api.autoservice.intermediary.MiddlemanVo;
 import com.yxt.anrui.terminal.api.autoservice.saleOrders.*;
-import com.yxt.anrui.terminal.api.autoservice.saleOrders.flowable.*;
-import com.yxt.anrui.terminal.api.autoservice.saleOrders.order.FlowOrderVo;
 import com.yxt.anrui.terminal.api.autoservice.saleOrders.depositinfo.DepositInfoDto;
 import com.yxt.anrui.terminal.api.autoservice.saleOrders.depositinfo.DepositInfoQuery;
 import com.yxt.anrui.terminal.api.autoservice.saleOrders.depositinfo.DepositInfoVo;
@@ -101,6 +96,7 @@ import com.yxt.anrui.terminal.api.autoservice.saleOrders.depositinfo.DepositList
 import com.yxt.anrui.terminal.api.autoservice.saleOrders.discount.DiscountDto;
 import com.yxt.anrui.terminal.api.autoservice.saleOrders.discount.DiscountListVo;
 import com.yxt.anrui.terminal.api.autoservice.saleOrders.discount.DiscountVo;
+import com.yxt.anrui.terminal.api.autoservice.saleOrders.flowable.*;
 import com.yxt.anrui.terminal.api.autoservice.saleOrders.insurance.InsuranceDto;
 import com.yxt.anrui.terminal.api.autoservice.saleOrders.insurance.InsuranceInfoDto;
 import com.yxt.anrui.terminal.api.autoservice.saleOrders.insurance.InsuranceInfoVo;
@@ -117,7 +113,6 @@ import com.yxt.anrui.terminal.api.autoservice.saleOrders.trailer.TrailerVo;
 import com.yxt.anrui.terminal.api.autoservice.saleOrders.vininput.*;
 import com.yxt.anrui.terminal.api.base.common.CarModelVo;
 import com.yxt.anrui.terminal.api.base.common.SystemVo;
-import com.yxt.anrui.terminal.api.risk.loanhomevisitinvestigate.AppLoanHomeVisitVo;
 import com.yxt.anrui.terminal.biz.base.common.CommonService;
 import com.yxt.anrui.terminal.config.CoverUtils;
 import com.yxt.common.base.config.component.FileUploadComponent;
@@ -153,6 +148,8 @@ import java.util.stream.Collectors;
 @Service
 public class AppBusSalesOrderService {
 
+    @Autowired
+    private BusSalesOrderVehicleCostFeign busSalesOrderVehicleCostFeign;
     @Autowired
     BusSalesOrderFeign busSalesOrderFeign;
     @Autowired
@@ -500,6 +497,15 @@ public class AppBusSalesOrderService {
         return rb.success().setData(orderDetailsVo);
     }
 
+    public ResultBean<OrderDetailsVo> getSaleOrderDetail2(String sid,String userSid) {
+        ResultBean<OrderDetailsVo> rb = ResultBean.fireFail();
+        OrderDetailsVo orderDetailsVo = new OrderDetailsVo();
+        ResultBean<AppOrderDetailsVo> resultBean = busSalesOrderFeign.getSaleOrderDetails2(sid,userSid);
+        AppOrderDetailsVo appOrderDetailsVo = resultBean.getData();
+        BeanUtil.copyProperties(appOrderDetailsVo, orderDetailsVo);
+        return rb.success().setData(orderDetailsVo);
+    }
+
     public ResultBean submitSaleOrderInfo(SubmitOrderDto dto) {
         ResultBean rb = ResultBean.fireFail();
         SubmitSalesOrderDto submitSalesOrderDto = new SubmitSalesOrderDto();
@@ -776,12 +782,18 @@ public class AppBusSalesOrderService {
                 if ("Activity_10w0sy1".equals(query.getTaskDefKey())) {//销售支持部经理审核
                     flowOrderVo.setShow(true);
                 }
-
             } else {//贷款
                 if ("Activity_1ckx8lq".equals(query.getTaskDefKey())) {//金融服务部经理审批
                     flowOrderVo.setShow(true);
                 }
             }
+            if ("Activity_10w0sy1".equals(query.getTaskDefKey()) || "Activity_0dcm1iu".equals(query.getTaskDefKey())) {//销售支持部经理、事业部运营经理审核
+                //车辆成本信息
+                BusSalesOrderVehicleCostVo costVo = busSalesOrderVehicleCostFeign.getVehicleCostVoByOrderSid(query.getBusinessSid()).getData();
+                if (null != costVo) {
+                    BeanUtil.copyProperties(costVo,flowOrderVo);
+                }
+            }
            /* if ("3".equals(busSalesOrder.getType()) || (StringUtils.isNotBlank(busSalesOrder.getNowCarUnknownVinNum()) && !"0".equals(busSalesOrder.getNowCarUnknownVinNum()))) {
                 flowOrderVo.setShow(true);
             } else {