From db06d7c2404604ca5fc864387589900218f071b1 Mon Sep 17 00:00:00 2001
From: dimengzhe <251008545@qq.com>
Date: Sun, 9 Oct 2022 15:26:31 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8E=82=E5=AE=B6=E9=87=87=E8=B4=AD=E8=8E=B7?=
 =?UTF-8?q?=E5=8F=96=E9=94=80=E5=94=AE=E9=80=9A=E8=B7=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../api/basemanufacturer/BaseManufacturerListQuery.java   | 4 ++--
 .../api/basevehmodelconfig/BaseVehmodelConfigVos.java     | 4 ++++
 .../base/biz/basemanufacturer/BaseManufacturerMapper.java | 2 +-
 .../base/biz/basemanufacturer/BaseManufacturerMapper.xml  | 8 +++++++-
 .../biz/basemanufacturer/BaseManufacturerService.java     | 7 ++++---
 .../basemanufacturerbank/BaseManufacturerBankMapper.xml   | 2 +-
 .../biz/basevehmodelconfig/BaseVehmodelConfigMapper.xml   | 4 +++-
 .../base/biz/busvehicleapply/BusVehicleApplyService.java  | 8 ++++----
 8 files changed, 26 insertions(+), 13 deletions(-)

diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturer/BaseManufacturerListQuery.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturer/BaseManufacturerListQuery.java
index bdf7a9a58d..711519a4bf 100644
--- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturer/BaseManufacturerListQuery.java
+++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturer/BaseManufacturerListQuery.java
@@ -12,6 +12,6 @@ import lombok.Data;
 @Data
 public class BaseManufacturerListQuery implements Query {
     private static final long serialVersionUID = -8298971718012436562L;
-    @ApiModelProperty("分公司sid")
-    private String useOrgSid;
+    @ApiModelProperty("车型sid")
+    private String modelSid;
 }
diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehmodelconfig/BaseVehmodelConfigVos.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehmodelconfig/BaseVehmodelConfigVos.java
index ab37f95a5d..b10067e107 100644
--- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehmodelconfig/BaseVehmodelConfigVos.java
+++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehmodelconfig/BaseVehmodelConfigVos.java
@@ -34,4 +34,8 @@ public class BaseVehmodelConfigVos implements Vo {
     private Integer num;
     @ApiModelProperty(value = "内部编码")
     private String insideCode;
+    @ApiModelProperty("品牌sid")
+    private String brandSid;
+    @ApiModelProperty("品牌名称")
+    private String brandName;
 }
diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerMapper.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerMapper.java
index 0f684e0176..07e20bff99 100644
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerMapper.java
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerMapper.java
@@ -118,7 +118,7 @@ public interface BaseManufacturerMapper extends BaseMapper<BaseManufacturer> {
 
     List<Map<String, String>> bankNamesDown(String manufacturerSid);
 
-    List<BaseManufacturerListVo> selectNameByOrg(@Param("useOrgSid") String useOrgSid, @Param("supplierTypeValue") String supplierTypeValue);
+    List<BaseManufacturerListVo> selectNameByOrg(@Param("modelSid") String modelSid);
 
     BaseManufacturer fetchByManBankSid(String s);
 }
\ No newline at end of file
diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerMapper.xml b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerMapper.xml
index 5f3017221d..29c811f1f6 100644
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerMapper.xml
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerMapper.xml
@@ -166,7 +166,13 @@
     </select>
 
     <select id="selectNameByOrg" resultType="com.yxt.anrui.base.api.basemanufacturer.BaseManufacturerListVo">
-        select sid,manufacturerName as name from base_manufacturer where useOrg = #{useOrgSid} and supplierTypeValue=#{supplierTypeValue}
+        select bmb.sid, bmb.accountName name
+        from base_manufacturer_bank bmb
+        left join base_manufacturer bm on bm.sid = bmb.manufacturerSid
+        left join base_vehicle_brand bvb on bvb.manufacturerSid = bm.sid
+        left join base_vehicle_model bvm on bvm.carBrand = bvb.sid
+        where bvm.sid = #{modelSid}
+        and bmb.dueBankValue = '回款账户'
     </select>
 
     <select id="fetchByManBankSid" resultType="com.yxt.anrui.base.api.basemanufacturer.BaseManufacturer">
diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerService.java
index fccb39fd8b..57c978d5ad 100644
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerService.java
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerService.java
@@ -415,9 +415,10 @@ public class BaseManufacturerService extends MybatisBaseService<BaseManufacturer
 
     public ResultBean<List<BaseManufacturerListVo>> selectNameByOrg(BaseManufacturerListQuery query) {
         ResultBean<List<BaseManufacturerListVo>> rb = ResultBean.fireFail();
-        String useOrgSid = query.getUseOrgSid();
-        String supplierTypeValue = "主机厂";
-        List<BaseManufacturerListVo> list = baseMapper.selectNameByOrg(useOrgSid, supplierTypeValue);
+//        String useOrgSid = query.getUseOrgSid();
+//        String supplierTypeValue = "主机厂";
+        String sid = query.getModelSid();
+        List<BaseManufacturerListVo> list = baseMapper.selectNameByOrg(sid);
         return rb.success().setData(list);
     }
 
diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturerbank/BaseManufacturerBankMapper.xml b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturerbank/BaseManufacturerBankMapper.xml
index 4eff4667f5..27614bdb52 100644
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturerbank/BaseManufacturerBankMapper.xml
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturerbank/BaseManufacturerBankMapper.xml
@@ -65,7 +65,7 @@
                  left join base_vehicle_brand bvb on bvb.manufacturerSid = bm.sid
                  left join base_vehicle_model bvm on bvm.carBrand = bvb.sid
         where bvm.sid = #{modelSid}
-          and bmb.dueBankKey = '2'
+          and bmb.dueBankValue = '订金账户'
     </select>
 
     <select id="actualList" resultType="com.yxt.anrui.base.api.basemanufacturerbank.BaseManActualVo">
diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelconfig/BaseVehmodelConfigMapper.xml b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelconfig/BaseVehmodelConfigMapper.xml
index d9f3b900b2..817c9be2be 100644
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelconfig/BaseVehmodelConfigMapper.xml
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelconfig/BaseVehmodelConfigMapper.xml
@@ -309,7 +309,9 @@
         bvm.vehicleTypeCode,
         bmc.configCode,
         bvc.manufactorSettlementPrice,
-        bvc.insideCode
+        bvc.insideCode,
+        bvm.brandName,
+        bvm.carBrand brandSid
         FROM
         base_vehmodel_config bvc
         LEFT JOIN base_vehicle_model bvm
diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapply/BusVehicleApplyService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapply/BusVehicleApplyService.java
index 3c057c123f..59930caf5a 100644
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapply/BusVehicleApplyService.java
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapply/BusVehicleApplyService.java
@@ -517,7 +517,7 @@ public class BusVehicleApplyService extends MybatisBaseService<BusVehicleApplyMa
                     finPaymentrecordDto.setCostTypeKey(DictCommonEnum.costType.CG_TYPE.getCode());
                     finPaymentrecordDto.setCostTypeValue(DictCommonEnum.costType.CG_TYPE.getRemarks());
                     //查询收款单位和收款账号
-                   /* List<BusVehicleApplyDetailVo> busVehicleApplyDetailList = busVehicleApplyDetailService.fetchByApplySid(busVehicleApply.getSid());
+                   List<BusVehicleApplyDetailVo> busVehicleApplyDetailList = busVehicleApplyDetailService.fetchByApplySid(busVehicleApply.getSid());
                     String modelSid = busVehicleApplyDetailList.get(0).getVehicleSid();
                     //根据车型sid查询账户名称和银行账号
                     List<BusApplyVo> busApplyVo = baseManufacturerBankService.selectByApplySid(modelSid);
@@ -525,14 +525,14 @@ public class BusVehicleApplyService extends MybatisBaseService<BusVehicleApplyMa
                     if (!busApplyVo.isEmpty()) {
                         finPaymentrecordDto.setReceiveBankAccount(busApplyVo.get(0).getNum());
                         finPaymentrecordDto.setReceiveCompany(busApplyVo.get(0).getName());
-                    }*/
-                    List<BusApplyVo> busApplyVo = baseManufacturerBankService.selectBankByApplySid(busVehicleApply.getCreateOrgSid());
+                    }
+                  /*  List<BusApplyVo> busApplyVo = baseManufacturerBankService.selectBankByApplySid(busVehicleApply.getCreateOrgSid());
                     busApplyVo.removeAll(Collections.singleton(null));
                     if (!busApplyVo.isEmpty()) {
                         finPaymentrecordDto.setReceiveBankAccount(busApplyVo.get(0).getNum());
                         finPaymentrecordDto.setReceiveCompany(busApplyVo.get(0).getName());
                         finPaymentrecordDto.setPayCode(busApplyVo.get(0).getCode());
-                    }
+                    }*/
                     finPaymentrecordDto.setBusSid(r.getData());
                     finPaymentrecordFeign.save(finPaymentrecordDto);
                 }