From 0fe75d519f67ae6789491d298d75a7678c6b4d36 Mon Sep 17 00:00:00 2001
From: God <10745413@qq.com>
Date: Thu, 11 May 2023 10:58:07 +0800
Subject: [PATCH] =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../basedistributor/BaseDistributorFeign.java |  2 +-
 .../BaseDistributorListVo.java                |  2 +-
 .../BaseDistributorMapper.java                |  2 +-
 .../basedistributor/BaseDistributorMapper.xml |  1 +
 .../basedistributor/BaseDistributorRest.java  |  4 +--
 .../BaseDistributorService.java               | 30 +++++++++++++++----
 .../crmcustomertemp/CrmCustomerTempFeign.java |  1 -
 .../CrmCustomerTempListQuery.java             |  1 +
 .../CrmCustomerTempListVo.java                |  1 +
 .../crmcustomertemp/CrmCustomerTempMapper.xml |  2 +-
 .../CrmCustomerTempService.java               |  3 ++
 .../FinBillApplicationService.java            |  3 +-
 .../autoservice/invoiced/InvoicedService.java |  5 +++-
 13 files changed, 42 insertions(+), 15 deletions(-)

diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributor/BaseDistributorFeign.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributor/BaseDistributorFeign.java
index b19d8a1ca5..adc90b45e4 100644
--- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributor/BaseDistributorFeign.java
+++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributor/BaseDistributorFeign.java
@@ -142,7 +142,7 @@ public interface BaseDistributorFeign {
 
     @ApiOperation("查询所有经销商信息")
     @GetMapping("/selectAllDisList")
-    ResultBean<List<BaseDistributorListVo>> selectAllDisList();
+    ResultBean<List<BaseDistributorListVo>> selectAllDisList(@RequestParam("orgSid") String orgSid,@RequestParam("staffSid") String staffSid);
 
     @ApiOperation("根据sid查询所有经销商信息")
     @GetMapping("/selectDisListBySid/{sid}")
diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributor/BaseDistributorListVo.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributor/BaseDistributorListVo.java
index 3bd19551e1..bbc27ca1e1 100644
--- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributor/BaseDistributorListVo.java
+++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributor/BaseDistributorListVo.java
@@ -23,5 +23,5 @@ public class BaseDistributorListVo implements Vo {
 
     private String openTickRemarks;
 
-
+    private String idCard;//客户身份证号
 }
diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorMapper.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorMapper.java
index c0347b02a7..8ee5f4c655 100644
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorMapper.java
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorMapper.java
@@ -131,7 +131,7 @@ public interface BaseDistributorMapper extends BaseMapper<BaseDistributor> {
     @Select("select * from base_distributor where disName = #{disName} and createOrg = #{createOrg} and isDelete = 0 and sid != #{sid}")
     BaseDistributorsListVo selByNameAndOrgSidAndSid(@Param("disName") String disName,@Param("createOrg") String createOrg,@Param("sid") String sid);
 
-    List<BaseDistributorListVo> selectAllDisList();
+    List<BaseDistributorListVo> selectAllDisList(String orgSid);
 
     BaseDistributorListVo selectDisListBySid(String sid);
 }
\ No newline at end of file
diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorMapper.xml b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorMapper.xml
index ad4dc03788..db7ab5b44a 100644
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorMapper.xml
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorMapper.xml
@@ -233,6 +233,7 @@
                invoBankNum
         FROM base_distributor
         WHERE isDelete = 0
+        AND createOrg = #{orgSid}
     </select>
 
     <select id="selectDisListBySid" resultType="com.yxt.anrui.base.api.basedistributor.BaseDistributorListVo">
diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorRest.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorRest.java
index 8c64bc8926..c3d6642662 100644
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorRest.java
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorRest.java
@@ -263,8 +263,8 @@ public class BaseDistributorRest implements BaseDistributorFeign {
     }
 
     @Override
-    public ResultBean<List<BaseDistributorListVo>> selectAllDisList() {
-        return baseDistributorService.selectAllDisList();
+    public ResultBean<List<BaseDistributorListVo>> selectAllDisList(String orgSid, String staffSid) {
+        return baseDistributorService.selectAllDisList(orgSid, staffSid);
     }
 
     @Override
diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorService.java
index 6efefb235e..f3c183e2e9 100644
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorService.java
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorService.java
@@ -14,6 +14,9 @@ import com.yxt.anrui.base.api.basedistributorstaff.BaseDistributorStaffVo;
 import com.yxt.anrui.base.api.basemiddleman.BaseMiddleman;
 import com.yxt.anrui.base.biz.basedistributorappendix.BaseDistributorAppendixService;
 import com.yxt.anrui.base.biz.basedistributorstaff.BaseDistributorStaffService;
+import com.yxt.anrui.crm.api.crmcustomertemp.CrmCustomerTempFeign;
+import com.yxt.anrui.crm.api.crmcustomertemp.CrmCustomerTempListQuery;
+import com.yxt.anrui.crm.api.crmcustomertemp.CrmCustomerTempListVo;
 import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign;
 import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo;
 import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign;
@@ -63,6 +66,8 @@ public class BaseDistributorService extends MybatisBaseService<BaseDistributorMa
     private BaseDistributorAppendixService baseDistributorAppendixService;
     @Autowired
     private SysOrganizationFeign sysOrganizationFeign;
+    @Autowired
+    private CrmCustomerTempFeign crmCustomerTempFeign;
 
     /**
      * 经销商分页列表
@@ -852,28 +857,41 @@ public class BaseDistributorService extends MybatisBaseService<BaseDistributorMa
         return rb.success().setData(list);
     }
 
-    public ResultBean<List<BaseDistributorListVo>> selectAllDisList() {
+    public ResultBean<List<BaseDistributorListVo>> selectAllDisList(String orgSid, String staffSid) {
         ResultBean rb = ResultBean.fireFail();
-        List<BaseDistributorListVo> baseDistributorListVos = baseMapper.selectAllDisList();
+        List<BaseDistributorListVo> baseDistributorListVos = baseMapper.selectAllDisList(orgSid);
         for (BaseDistributorListVo baseDistributorListVo : baseDistributorListVos) {
             String openTickRemarks = "";
             if (StringUtils.isNotBlank(openTickRemarks + baseDistributorListVo.getRegistNum())){
                 openTickRemarks = openTickRemarks + baseDistributorListVo.getRegistNum() + "；";
             }
             if (StringUtils.isNotBlank(baseDistributorListVo.getRegistDetailAddress())){
-                openTickRemarks = baseDistributorListVo.getRegistDetailAddress() + "；";
+                openTickRemarks = openTickRemarks + baseDistributorListVo.getRegistDetailAddress() + "；";
             }
             if (StringUtils.isNotBlank(baseDistributorListVo.getInvoPhone())){
-                openTickRemarks = baseDistributorListVo.getInvoPhone() + "；";
+                openTickRemarks = openTickRemarks + baseDistributorListVo.getInvoPhone() + "；";
             }
             if (StringUtils.isNotBlank(baseDistributorListVo.getInvoBank())){
-                openTickRemarks = baseDistributorListVo.getInvoBank() + "；";
+                openTickRemarks = openTickRemarks + baseDistributorListVo.getInvoBank() + "；";
             }
             if (StringUtils.isNotBlank(baseDistributorListVo.getInvoBankNum())){
-                openTickRemarks = baseDistributorListVo.getInvoBankNum() + "；";
+                openTickRemarks = openTickRemarks + baseDistributorListVo.getInvoBankNum() + "；";
             }
             baseDistributorListVo.setOpenTickRemarks(openTickRemarks);
         }
+        CrmCustomerTempListQuery crmCustomerTempListQuery = new CrmCustomerTempListQuery();
+        crmCustomerTempListQuery.setStaffSid(staffSid);
+        SysOrganizationVo sysOrganizationVo = sysOrganizationFeign.fetchBySid(orgSid).getData();
+        crmCustomerTempListQuery.setOrgPath(sysOrganizationVo.getOrgSidPath());
+        crmCustomerTempListQuery.setCertificateTypeKey("01");
+        List<CrmCustomerTempListVo> crmCustomerTempListVos = crmCustomerTempFeign.selectCustomerList(crmCustomerTempListQuery).getData();
+        for (CrmCustomerTempListVo crmCustomerTempListVo : crmCustomerTempListVos) {
+            BaseDistributorListVo baseDistributorListVo = new BaseDistributorListVo();
+            baseDistributorListVo.setName(crmCustomerTempListVo.getName());
+            baseDistributorListVo.setSid(crmCustomerTempListVo.getSid());
+            baseDistributorListVo.setIdCard(crmCustomerTempListVo.getIdCard());
+            baseDistributorListVos.add(baseDistributorListVo);
+        }
         return rb.success().setData(baseDistributorListVos);
     }
 
diff --git a/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/CrmCustomerTempFeign.java b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/CrmCustomerTempFeign.java
index 1d38062c39..334b452dec 100644
--- a/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/CrmCustomerTempFeign.java
+++ b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/CrmCustomerTempFeign.java
@@ -179,5 +179,4 @@ public interface CrmCustomerTempFeign {
     @PostMapping("/saveFileCustomer")
     @ApiOperation("合同审核通过后更新客户档案证件")
     ResultBean saveFileCustomer(@RequestBody CrmCustomerFileDDto dto);
-
 }
\ No newline at end of file
diff --git a/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/CrmCustomerTempListQuery.java b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/CrmCustomerTempListQuery.java
index e4851d32df..2f41675842 100644
--- a/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/CrmCustomerTempListQuery.java
+++ b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/CrmCustomerTempListQuery.java
@@ -17,4 +17,5 @@ public class CrmCustomerTempListQuery implements Query {
     private String staffSid;
     @ApiModelProperty("组织机构全路径sid")
     private String orgPath;
+    private String certificateTypeKey; //证件类型
 }
diff --git a/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/CrmCustomerTempListVo.java b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/CrmCustomerTempListVo.java
index a13654f345..d8e849c0c5 100644
--- a/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/CrmCustomerTempListVo.java
+++ b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/CrmCustomerTempListVo.java
@@ -16,6 +16,7 @@ public class CrmCustomerTempListVo implements Vo {
     private String name;
     private String sid;
     private String mobile;
+    private String idCard; //身份证号
     @ApiModelProperty("客户编码")
     private String customerNo;
 
diff --git a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempMapper.xml b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempMapper.xml
index 39e41227c6..65250e44fe 100644
--- a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempMapper.xml
+++ b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempMapper.xml
@@ -201,7 +201,7 @@
     </select>
 
     <select id="selectCustomerList" resultType="com.yxt.anrui.crm.api.crmcustomertemp.CrmCustomerTempListVo">
-        select ct.name, ct.sid, ct.mobile, ct.customerNo
+        select ct.name, ct.sid, ct.mobile, ct.customerNo, ct.IDNumber as idCard
         from crm_customer_temp ct
         <where>
             ${ew.sqlSegment}
diff --git a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempService.java b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempService.java
index 004d70142f..87ab2b1d10 100644
--- a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempService.java
+++ b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempService.java
@@ -992,6 +992,9 @@ public class CrmCustomerTempService extends MybatisBaseService<CrmCustomerTempMa
             orgSid = sysStaffOrgFeign.getOrgSidByPath(query.getOrgPath()).getData();
             qw.eq("ct.createOrgSid", orgSid);
         }
+        if (StringUtils.isNotBlank(query.getCertificateTypeKey())){
+            qw.eq("ct.certificateTypeKey", query.getCertificateTypeKey());
+        }
         qw.eq("ct.staffSid", staffSid);
         List<CrmCustomerTempListVo> list = baseMapper.selectCustomerList(qw);
         list.removeAll(Collections.singleton(null));
diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationService.java
index 96ed60fcc6..84abf9a07c 100644
--- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationService.java
+++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationService.java
@@ -404,17 +404,18 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
 
     public FinBillApplicationDetailsVo fetchDetailsVoBySid(String sid) {
         FinBillApplication entity = fetchBySid(sid);
+        List<FinBillVehicleVo> finBillVehicleVos = finBillVehicleService.fetchVehBySid(sid);
         String contractNo = entity.getContractNo();
         List<FinBillApplicationDetailsVo> finBillApplicationVos = baseMapper.selectByContractNo(contractNo);
         if (finBillApplicationVos != null && finBillApplicationVos.size() > 0) {
             FinBillApplicationDetailsVo finBillApplicationVo = finBillApplicationVos.get(0);
             if (StringUtils.isNotBlank(finBillApplicationVo.getOneBillMoney())) {
                 entity.setOneBillMoney(new BigDecimal(finBillApplicationVo.getOneBillMoney()));
+                entity.setTotalBillMoney(new BigDecimal(finBillApplicationVo.getOneBillMoney()).multiply(new BigDecimal(finBillVehicleVos.size())));
             }
         }
         FinBillApplicationDetailsVo vo = new FinBillApplicationDetailsVo();
         BeanUtil.copyProperties(entity, vo);
-        List<FinBillVehicleVo> finBillVehicleVos = finBillVehicleService.fetchVehBySid(sid);
         for (FinBillVehicleVo finBillVehicleVo : finBillVehicleVos) {
             BaseVehicleCertificateVo baseVehicleCertificateVo = baseVehicleCertificateFeign.selStateByVehicleSid(finBillVehicleVo.getVehSid()).getData();
             if (baseVehicleCertificateVo != null){
diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/invoiced/InvoicedService.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/invoiced/InvoicedService.java
index 5b26abb0f6..14d05bffa7 100644
--- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/invoiced/InvoicedService.java
+++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/invoiced/InvoicedService.java
@@ -72,6 +72,7 @@ public class InvoicedService {
             billApplicationPageVo.setContractNo(record.getContractNo());
             billApplicationPageVo.setSid(record.getSid());
             billApplicationPageVo.setBillState(record.getBillStateValue());
+            billApplicationPageVo.setNodeState(record.getNodeState());
             if (record.getNodeState().equals("待提交")){
                 billApplicationPageVo.setShowUpData(true);
             }else {
@@ -190,7 +191,7 @@ public class InvoicedService {
         String useOrgSid = sysStaffOrgFeign.getOrgSidByPath(dto.getOrgPath()).getData();
         finBillApplicationDto.setUseOrgSid(useOrgSid);
         finBillApplicationDto.setCreateBySid(dto.getUserSid());
-        finBillApplicationDto.setTotalBillMoney(dto.getInvoiceMoney());
+        finBillApplicationDto.setTotalBillMoney(dto.getInvoiceTotal());
         finBillApplicationDto.setOrgSidPath(dto.getOrgPath());
         finBillApplicationDto.setSaleTypeValue(dto.getSaleType());
         finBillApplicationDto.setSaleDeptName(dto.getSellerName());
@@ -219,6 +220,7 @@ public class InvoicedService {
         for (VinListDto vinListDto : vinList) {
             FinBillVehicleDto finBillVehicleDto = new FinBillVehicleDto();
             finBillVehicleDto.setVinNo(vinListDto.getVin());
+            finBillVehicleDto.setVehSid(vinListDto.getVinSid());
             finBillVehicleDto.setCertificateStateKey(vinListDto.getCertificateStateKey());
             finBillVehicleDto.setCertificateStateValue(vinListDto.getCertificateState());
             finBillVehicleDto.setBillTypeKey(vinListDto.getInvoiceTypeKey());
@@ -395,6 +397,7 @@ public class InvoicedService {
         for (VinListDto vinListDto : vinList) {
             FinBillVehicleDto finBillVehicleDto = new FinBillVehicleDto();
             finBillVehicleDto.setVinNo(vinListDto.getVin());
+            finBillVehicleDto.setVehSid(vinListDto.getVinSid());
             finBillVehicleDto.setCertificateStateKey(vinListDto.getCertificateStateKey());
             finBillVehicleDto.setCertificateStateValue(vinListDto.getCertificateState());
             finBillVehicleDto.setBillTypeKey(vinListDto.getInvoiceTypeKey());