Merge remote-tracking branch 'origin/master'

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclecertificate/BaseVehicleCertificateService.java

@@ -289,6 +289,10 @@ public class BaseVehicleCertificateService extends MybatisBaseService<BaseVehicl
                 busTransferRecordsDto.setReceiveRoleSid("89d7f310-a221-405b-858e-dd650e0993d5");
                 busTransferRecordsDto.setReceiveSid(sysUserVo1.getSid());
                 busTransferRecordsDto.setReceiveName(sysUserVo1.getName());
+                //获取接口部门信息
+                SysOrganizationVo sysOrganizationVo1 = sysOrganizationFeign.selectByOrgSidPath(busSalesOrderDetailsVo.getOrgSidPath()).getData();
+                busTransferRecordsDto.setReceiveDeptSid(sysOrganizationVo1.getSid());
+                busTransferRecordsDto.setReceiveDept(sysOrganizationVo1.getName());
                 busTransferRecordsDto.setUseOrgSid(baseVehicleCertificate.getCreateOrgSid());
                 busTransferRecordsDto.setUseOrgName(baseVehicleCertificate.getCreateOrgName());
                 busTransferRecordsDto.setGoodsTypeKey(BusTransferRecordEnum.HGZ.getCode());

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutService.java

@@ -1461,6 +1461,8 @@ public class BaseVehicleOutService extends MybatisBaseService<BaseVehicleOutMapp
         }
         //主车
         for (BaseVehicleZSOutDto dto : zcDtos) {
+            String vinSid = dto.getVinSid();
+            BaseVehicle baseVehicle1 = baseVehicleService.fetchBySid(vinSid);
             //获取主车sid
             List<BdCustomer> bdCustomers = new ArrayList<>();
             BdCustomer bdCustomer = new BdCustomer();
@@ -1583,14 +1585,14 @@ public class BaseVehicleOutService extends MybatisBaseService<BaseVehicleOutMapp
             baseMapper.insert(baseVehicleOut);
             //更新车辆台账的出库状态等值，库存状态修改为出库，销售日期修改为当天，成交价，备注
             String remarks = baseVehicleZSOutApplyDto.getContractNo() + baseVehicleZSOutApplyDto.getSaleTypeValue();
-            baseVehicle.setRemarks(remarks);
-            baseVehicle.setVehicleState(VehicleState.StockEnum.OUT_STOCK.getCode());
-            baseVehicle.setVehicleStateValue(VehicleState.StockEnum.OUT_STOCK.getRemarks());
-            baseVehicle.setSalesDate(new Date());
+            baseVehicle1.setRemarks(remarks);
+            baseVehicle1.setVehicleState(VehicleState.StockEnum.OUT_STOCK.getCode());
+            baseVehicle1.setVehicleStateValue(VehicleState.StockEnum.OUT_STOCK.getRemarks());
+            baseVehicle1.setSalesDate(new Date());
             if (StringUtils.isNotBlank(dto.getPrice())) {
-                baseVehicle.setSalePrice(Integer.valueOf(dto.getPrice()));
+                baseVehicle1.setSalePrice(Integer.valueOf(dto.getPrice()));
             }
-            baseVehicleService.updateById(baseVehicle);
+            baseVehicleService.updateById(baseVehicle1);
             if (!"001".equals(payTypeKey)) {//贷款
                 try {
                     //推送主车销售出库单

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

@@ -287,7 +287,7 @@ public class BusSalesOrderFeignFallback implements BusSalesOrderFeign {
     }
 
     @Override
-    public ResultBean<List<String>> selectBusinessSidByQKKP(String userSid, String orgPath) {
+    public ResultBean<List<String>> selectBusinessSidByQKKP(String userSid, String useOrgSid) {
         return null;
     }
 

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finvehicleinvoice/FinVehicleInvoiceService.java

@@ -451,10 +451,16 @@ public class FinVehicleInvoiceService extends MybatisBaseService<FinVehicleInvoi
                     busTransferRecordsDto.setReceiveRoleSid(dto.getReceiveRoleSid());
                     busTransferRecordsDto.setReceiveSid(sysUserVo1.getSid());
                     busTransferRecordsDto.setReceiveName(sysUserVo1.getName());
+                    //获取接口部门信息
+                    SysOrganizationVo sysOrganizationVo1 = sysOrganizationFeign.selectByOrgSidPath(busSalesOrderDetailsVo.getOrgSidPath()).getData();
+                    busTransferRecordsDto.setReceiveDeptSid(sysOrganizationVo1.getSid());
+                    busTransferRecordsDto.setReceiveDept(sysOrganizationVo1.getName());
+                    //消息设置接收人信息
                     messagePushTransferDto.setReceiveSids(sysUserVo1.getSid());
                     messagePushTransferDto.setReceiveNames(sysUserVo1.getName());
                 }else {
                     busTransferRecordsDto.setReceiveRoleSid(dto.getReceiveRoleSid());
+                    //消息设置接收人信息
                     String receiveRoleSid = dto.getReceiveRoleSid();
                     String useOrgSid = finVehicleInvoice.getUseOrgSid();
                     SysOrganizationVo sysOrganizationVo1 = sysOrganizationFeign.fetchBySid(useOrgSid).getData();