修改13

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java

@@ -42,7 +42,6 @@ import com.yxt.anrui.base.api.basevehicleout.BaseVehicleOutFeign;
 import com.yxt.anrui.base.api.basevehicleout.BaseVehicleZSOutApplyDto;
 import com.yxt.anrui.base.api.basevehicleout.BaseVehicleZSOutDto;
 import com.yxt.anrui.base.api.commoncontract.CommonContractFeign;
-import com.yxt.anrui.base.common.enums.VehicleStateTempOrLast;
 import com.yxt.anrui.base.common.utils.Rule;
 import com.yxt.anrui.buscenter.api.busdelivered.AppDeliveredDetailsVo;
 import com.yxt.anrui.buscenter.api.busdelivered.DeliveredDictVo;
@@ -649,6 +648,8 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
                 finBillApplicationDto.setCustomerName(busDeliveredApply.getName());
                 finBillApplicationDto.setDeptSid(busDeliveredApply.getApplyDeptSid());
                 finBillApplicationDto.setDeptName(busDeliveredApply.getApplyDept());
+                finBillApplicationDto.setModelName(busDeliveredApply.getModelName());
+                finBillApplicationDto.setModelSid(busDeliveredApply.getModelSid());
                 //根据用户sid查询staffSid
                 ResultBean<SysUserVo> userVoResultBean = sysUserFeign.fetchBySid(busDeliveredApply.getStaffUserSid());
                 if (!userVoResultBean.getSuccess()) {
@@ -667,8 +668,8 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
                         finBillApplicationDto.setOpenTickUnitName(invoicingDetailsVoResultBean.getData().getName());
                     }
                 }
-                finBillApplicationDto.setBillStateKey(VehicleStateTempOrLast.PaymentEnum.NORMAL_INVOICING.getCode());
-                finBillApplicationDto.setBillStateValue(VehicleStateTempOrLast.PaymentEnum.NORMAL_INVOICING.getRemarks());
+                finBillApplicationDto.setBillStateKey("001");
+                finBillApplicationDto.setBillStateValue("正常开票");
                 List<FinBillVehicleDto> finBillVehicles = new ArrayList<>();
                 for (int i = 0; i < detailsList.size(); i++) {
                     FinBillVehicleDto finBillVehicleDto = new FinBillVehicleDto();
@@ -677,7 +678,7 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
                     finBillVehicleDto.setVehSid(busDeliveredApplyDetails.getVinSid());
                     //合格证状态
                     BaseVehicleCertificateVo baseVehicleCertificate = baseVehicleCertificateFeign.selStateByVehicleSid(busDeliveredApplyDetails.getVinSid()).getData();
-                    if (baseVehicleCertificate == null) {
+                    if (baseVehicleCertificate != null) {
                         finBillVehicleDto.setCertificateStateKey(baseVehicleCertificate.getCertificateState());
                         finBillVehicleDto.setCertificateStateValue(baseVehicleCertificate.getCertificateSituationValue());
                     }
@@ -685,6 +686,8 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
                 }
                 finBillApplicationDto.setFinBillVehicles(finBillVehicles);
                 finBillApplicationDto.setArrearsMoney("0");
+                finBillApplicationDto.setApplyDate(DateUtil.today());
+                finBillApplicationDto.setOrgSidPath(busDeliveredApply.getOrgSidPath());
                 ResultBean finBillResult = finBillApplicationFeign.save(finBillApplicationDto);
                 //====================推送开票结束
                 //推送优惠包待准备开始

doc/databases/bus-center_tables.sql

@@ -254,6 +254,9 @@ CREATE TABLE `bus_delivered_apply`
     `distributorPriceTwo` VARCHAR(200)         DEFAULT NULL COMMENT '返利金额2',
     `price`               varchar(200)         DEFAULT NULL COMMENT '成交价',
     `orgSidPath`          varchar(500)         DEFAULT NULL COMMENT 'orgSidPath',
+    `loanSid`             varchar(500)         DEFAULT NULL COMMENT '贷款人sid',
+    `typeKey`             varchar(500)         DEFAULT NULL COMMENT 'typeKey',
+    `customerSid`         varchar(500)         DEFAULT NULL COMMENT 'customerSid',
     PRIMARY KEY (`id`),
     KEY `id` (`id`)
 ) ENGINE = INNODB