From c172b69813c76b86ed15fd4631dcdb3909d00d87 Mon Sep 17 00:00:00 2001 From: God <10745413@qq.com> Date: Mon, 18 Sep 2023 11:41:40 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/loanpreloancreditapply/LoanPreloanCreditApplyVo.java | 2 +- .../loanpreloancreditapply/LoanPreloanCreditApplyService.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanpreloancreditapply/LoanPreloanCreditApplyVo.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanpreloancreditapply/LoanPreloanCreditApplyVo.java index 1cb5116ff6..05e53cb5aa 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanpreloancreditapply/LoanPreloanCreditApplyVo.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanpreloancreditapply/LoanPreloanCreditApplyVo.java @@ -76,7 +76,7 @@ public class LoanPreloanCreditApplyVo implements Vo { @ApiModelProperty("资方风控结果") private String zffkjg; @ApiModelProperty("申诉结果") - private String isSsjg; + private String ssjg; @ApiModelProperty("是否可以办理") private Boolean isEdit = false; @ApiModelProperty("是否可以删除") diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanpreloancreditapply/LoanPreloanCreditApplyService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanpreloancreditapply/LoanPreloanCreditApplyService.java index a5202863ac..19607655c9 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanpreloancreditapply/LoanPreloanCreditApplyService.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanpreloancreditapply/LoanPreloanCreditApplyService.java @@ -169,7 +169,7 @@ public class LoanPreloanCreditApplyService extends MybatisBaseService Date: Mon, 18 Sep 2023 16:41:54 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E5=AE=8C=E5=96=84=E7=A7=BB=E5=8A=A8?= =?UTF-8?q?=E7=AB=AF=E6=8A=B5=E6=8A=BC=E5=8A=9E=E7=90=86=E3=80=81=E8=BF=98?= =?UTF-8?q?=E6=AC=BE=E8=AE=A1=E5=88=92=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AppRepaymentPlanDetailsVo.java | 4 ++-- ...oanMortgageInformationTransactService.java | 23 +++++++++++++++---- .../LoanRepaymentScheduleService.java | 5 ++-- .../repaymentplan/RepaymentPlanDetailsVo.java | 5 ++-- 4 files changed, 26 insertions(+), 11 deletions(-) diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymentschedule/AppRepaymentPlanDetailsVo.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymentschedule/AppRepaymentPlanDetailsVo.java index 002084bf20..d20781371b 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymentschedule/AppRepaymentPlanDetailsVo.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymentschedule/AppRepaymentPlanDetailsVo.java @@ -25,9 +25,9 @@ public class AppRepaymentPlanDetailsVo implements Vo { @ApiModelProperty("车辆台数") private String carNumber; @ApiModelProperty("车架号") - private String vinNo; + private List vinNo; @ApiModelProperty("资方") - private String managementName; + private String management; @ApiModelProperty("金融产品") private String financial; @ApiModelProperty("销售专员") diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanmortgageinformationtransact/LoanMortgageInformationTransactService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanmortgageinformationtransact/LoanMortgageInformationTransactService.java index b58fd95a5a..889e02c490 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanmortgageinformationtransact/LoanMortgageInformationTransactService.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanmortgageinformationtransact/LoanMortgageInformationTransactService.java @@ -116,7 +116,7 @@ public class LoanMortgageInformationTransactService extends MybatisBaseService getMortgageInfo(String busVinSid) { ResultBean rb = ResultBean.fireFail(); - LoanMortgageInformationTransactDetailsVo vo = baseMapper.getMortgageInfo(busVinSid); - if (StringUtils.isBlank(vo.getMortgageDate())) { - vo.setMortgageDate("-"); - } + LoanMortgageInformationTransactDetailsVo fetchVo = baseMapper.getMortgageInfo(busVinSid); + LoanMortgageInformationTransactDetailsVo vo = new LoanMortgageInformationTransactDetailsVo(); //根据业务车辆sid查询 销售订单业务车辆表 BusSalesOrderVehicle orderVehicle = busSalesOrderVehicleFeign.details(busVinSid).getData(); if (null != orderVehicle) { @@ -616,6 +614,21 @@ public class LoanMortgageInformationTransactService extends MybatisBaseService stringList = Arrays.asList(schedule.getVinNo().split(",")); + vo.setVinNo(stringList); } if (StringUtils.isNotBlank(schedule.getBankName())) { - vo.setManagementName(schedule.getBankName()); + vo.setManagement(schedule.getBankName()); } if (StringUtils.isNotBlank(schedule.getPolicyName())) { vo.setFinancial(schedule.getPolicyName()); diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/repaymentplan/RepaymentPlanDetailsVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/repaymentplan/RepaymentPlanDetailsVo.java index 1ab3093eb2..17ddcc513e 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/repaymentplan/RepaymentPlanDetailsVo.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/repaymentplan/RepaymentPlanDetailsVo.java @@ -24,9 +24,10 @@ public class RepaymentPlanDetailsVo implements Vo { @ApiModelProperty("车辆台数") private String carNumber; @ApiModelProperty("车架号") - private String vinNo; +// private String vinNo; + private List vinNo = new ArrayList<>(); @ApiModelProperty("资方") - private String managementName; + private String management; @ApiModelProperty("金融产品") private String financial; @ApiModelProperty("销售专员") From 0a650ef9fc7f7e14e95b288899e8b73119e02243 Mon Sep 17 00:00:00 2001 From: God <10745413@qq.com> Date: Mon, 18 Sep 2023 17:43:43 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../basevehicleout/BaseVehicleOutService.java | 16 ++++++++++++---- .../BusBillApplicationDto.java | 6 ------ .../busdeliveredapply/BusDeliveredApplyDto.java | 3 +++ .../BusBillApplicationMapper.java | 3 +++ .../BusBillApplicationService.java | 14 ++++++++++++++ .../biz/busbillfile/BusBillFileMapper.java | 3 +++ .../biz/busbillfile/BusBillFileService.java | 4 ++++ .../BusDeliveredApplyService.java | 11 +++++++++++ 8 files changed, 50 insertions(+), 10 deletions(-) diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutService.java index d69f94ffec..b885b09f8e 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutService.java @@ -1834,11 +1834,19 @@ public class BaseVehicleOutService extends MybatisBaseService @Update("update bus_bill_application set nodeState = '终止' where sid = #{businessSid}") void updateZZ(String businessSid); + + @Select("select * from bus_bill_application where cksqSid = #{ckSid}") + BusBillApplicationVo selectByCkSid(String ckSid); } \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busbillapplication/BusBillApplicationService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busbillapplication/BusBillApplicationService.java index a5b420c2c3..6d8a23ddb8 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busbillapplication/BusBillApplicationService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busbillapplication/BusBillApplicationService.java @@ -382,4 +382,18 @@ public class BusBillApplicationService extends MybatisBaseService { List fetchclmmhtBySid(String sid); List fetchFileByBillSid(@Param("sid") String sid); + + @Delete("delete from bus_bill_file where billAppSid = #{dtoSid}") + void deleteByFinAppSid(String dtoSid); } \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busbillfile/BusBillFileService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busbillfile/BusBillFileService.java index e5f9bf3e37..f9cdf39e3e 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busbillfile/BusBillFileService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busbillfile/BusBillFileService.java @@ -163,4 +163,8 @@ public class BusBillFileService extends MybatisBaseService fetchclmmhtBySid(String sid) { return baseMapper.fetchclmmhtBySid(sid); } + + public void deleteByFinAppSid(String dtoSid) { + baseMapper.deleteByFinAppSid(dtoSid); + } } \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java index a7198251ad..aaad4a01c0 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java @@ -52,6 +52,7 @@ import com.yxt.anrui.base.api.commoncontract.CommonContractFeign; import com.yxt.anrui.base.common.enums.CertificState; import com.yxt.anrui.base.common.utils.Rule; import com.yxt.anrui.buscenter.api.busarrearscarryvehicleapply.BusArrearsCarryVehicleApply; +import com.yxt.anrui.buscenter.api.busbillapplication.BusBillApplicationDto; import com.yxt.anrui.buscenter.api.busdelivered.AppDeliveredDetailsVo; import com.yxt.anrui.buscenter.api.busdelivered.BusDelivered; import com.yxt.anrui.buscenter.api.busdelivered.DeliveredDictVo; @@ -76,6 +77,7 @@ import com.yxt.anrui.buscenter.api.bussalesordersubmit.SubmitVo; import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicle; import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicleDetailsVo; import com.yxt.anrui.buscenter.api.busvehicleinformationhandover.BusVehicleInformationHandoverDto; +import com.yxt.anrui.buscenter.biz.busbillapplication.BusBillApplicationService; import com.yxt.anrui.buscenter.biz.busdelivered.BusDeliveredService; import com.yxt.anrui.buscenter.biz.busdeliveredapplydetails.BusDeliveredApplyDetailsService; import com.yxt.anrui.buscenter.biz.busdelivereddetailsdiscount.BusDeliveredDetailsDiscountService; @@ -226,6 +228,8 @@ public class BusDeliveredApplyService extends MybatisBaseService 0) { busDeliveredApplyDetailsService.saveList(dtoList, busDeliveredApply.getSid()); } + busBillApplicationService.delAllByCkSid(dtoSid); + if ("0".equals(dto.getIsInvoicing())){//开票 + busBillApplicationService.saveOrUpdateDto(dto.getBusBillApplicationDto()); + } } return rb.success().setData(dtoSid); } From 68845a91e9fdcfa39c7713f6f51c3cb3e9fb94e2 Mon Sep 17 00:00:00 2001 From: God <10745413@qq.com> Date: Tue, 19 Sep 2023 10:32:07 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/basemodelconfig/BaseModelConfig.java | 17 +++++++++++++ .../basemodelconfig/BaseModelConfigDto.java | 16 +++++++++++++ .../BaseModelConfigSelectVo.java | 16 +++++++++++++ .../basemodelconfig/BaseModelConfigVo.java | 16 +++++++++++++ .../basevehicleout/BaseVehicleOutRest.java | 3 +++ .../basevehicleout/BaseVehicleOutService.java | 24 +++++++++++++++---- .../BusDeliveredApplyDetailVo.java | 3 +++ .../BusBillApplicationService.java | 4 ++++ .../BusDeliveredApplyService.java | 7 ++++++ 9 files changed, 101 insertions(+), 5 deletions(-) diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemodelconfig/BaseModelConfig.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemodelconfig/BaseModelConfig.java index 5cbeea92f5..def0529ff9 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemodelconfig/BaseModelConfig.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemodelconfig/BaseModelConfig.java @@ -207,6 +207,23 @@ public class BaseModelConfig extends BaseEntity { @ApiModelProperty("蓄电池value") private String storagBatteryValue; + @ApiModelProperty("舒适包key") + private String comfortPackKey; + @ApiModelProperty("舒适包value") + private String comfortPackValue; + @ApiModelProperty("危化品基础包key") + private String cheBasePackKey; + @ApiModelProperty("危化品基础包value") + private String cheBasePackValue; + @ApiModelProperty("节油包key") + private String savingPackKey; + @ApiModelProperty("节油包value") + private String savingPackValue; + @ApiModelProperty("便捷包key") + private String conPackKey; + @ApiModelProperty("便捷包value") + private String conPackValue; + @ApiModelProperty("品牌名称") private String brandName; diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemodelconfig/BaseModelConfigDto.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemodelconfig/BaseModelConfigDto.java index 782a528905..1037edc6f7 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemodelconfig/BaseModelConfigDto.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemodelconfig/BaseModelConfigDto.java @@ -208,6 +208,22 @@ public class BaseModelConfigDto implements Dto { private String storagBatteryKey; @ApiModelProperty("蓄电池value") private String storagBatteryValue; + @ApiModelProperty("舒适包key") + private String comfortPackKey; + @ApiModelProperty("舒适包value") + private String comfortPackValue; + @ApiModelProperty("危化品基础包key") + private String cheBasePackKey; + @ApiModelProperty("危化品基础包value") + private String cheBasePackValue; + @ApiModelProperty("节油包key") + private String savingPackKey; + @ApiModelProperty("节油包value") + private String savingPackValue; + @ApiModelProperty("便捷包key") + private String conPackKey; + @ApiModelProperty("便捷包value") + private String conPackValue; @ApiModelProperty("品牌名称") private String brandName; diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemodelconfig/BaseModelConfigSelectVo.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemodelconfig/BaseModelConfigSelectVo.java index 1641ca30e7..b9e9fca8bc 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemodelconfig/BaseModelConfigSelectVo.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemodelconfig/BaseModelConfigSelectVo.java @@ -187,6 +187,22 @@ public class BaseModelConfigSelectVo implements Vo { private String storagBatteryKey; @ApiModelProperty("蓄电池value") private String storagBatteryValue; + @ApiModelProperty("舒适包key") + private String comfortPackKey; + @ApiModelProperty("舒适包value") + private String comfortPackValue; + @ApiModelProperty("危化品基础包key") + private String cheBasePackKey; + @ApiModelProperty("危化品基础包value") + private String cheBasePackValue; + @ApiModelProperty("节油包key") + private String savingPackKey; + @ApiModelProperty("节油包value") + private String savingPackValue; + @ApiModelProperty("便捷包key") + private String conPackKey; + @ApiModelProperty("便捷包value") + private String conPackValue; @ApiModelProperty("品牌名称") private String brandName; diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemodelconfig/BaseModelConfigVo.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemodelconfig/BaseModelConfigVo.java index e0d2e3819b..54c98f3b6b 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemodelconfig/BaseModelConfigVo.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemodelconfig/BaseModelConfigVo.java @@ -147,6 +147,22 @@ public class BaseModelConfigVo implements Vo { private String storagBatteryKey; @ApiModelProperty("蓄电池value") private String storagBatteryValue; + @ApiModelProperty("舒适包key") + private String comfortPackKey; + @ApiModelProperty("舒适包value") + private String comfortPackValue; + @ApiModelProperty("危化品基础包key") + private String cheBasePackKey; + @ApiModelProperty("危化品基础包value") + private String cheBasePackValue; + @ApiModelProperty("节油包key") + private String savingPackKey; + @ApiModelProperty("节油包value") + private String savingPackValue; + @ApiModelProperty("便捷包key") + private String conPackKey; + @ApiModelProperty("便捷包value") + private String conPackValue; @ApiModelProperty("品牌名称") private String brandName; @ApiModelProperty("是否可以删除（1是，0否）") diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutRest.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutRest.java index 15cd437c1a..0302663abf 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutRest.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutRest.java @@ -144,6 +144,9 @@ public class BaseVehicleOutRest implements BaseVehicleOutFeign { public ResultBean createjrbjdPdf(String sid) { ResultBean rb = ResultBean.fireFail(); PdfPath pdf = baseVehicleOutService.createjrbjdPdf(sid); + if ("1".equals(pdf.getPdfPath())){ + return rb.setMsg("申请单车辆中缺少消贷合同信息"); + } return rb.success().setData(pdf); } } diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutService.java index b885b09f8e..3bde0fae7c 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutService.java @@ -2202,8 +2202,10 @@ public class BaseVehicleOutService extends MybatisBaseService resultBean = selectQuotation(sid); + if (!resultBean.getSuccess()) { + pdfPath.setPdfPath("1"); + return pdfPath; + } + BaseQuotationVo baseQuotationVo = resultBean.getData(); + BaseJRFAVo baseJRFAVo = baseQuotationVo.getBaseJRFAVo(); //查询出库申请 BusDeliveredApply busDeliveredApply = busDeliveredApplyFeign.fetchBySid(sid).getData(); //查询出库申请车辆表 @@ -2559,7 +2569,11 @@ public class BaseVehicleOutService extends MybatisBaseService resultBean = selectQuotation(sid); + if (!resultBean.getSuccess()) { + return "1"; + } + BaseQuotationVo baseQuotationVo = resultBean.getData(); BaseJRFAVo baseJRFAVo = baseQuotationVo.getBaseJRFAVo(); //查询车辆信息 BaseVehicle baseVehicle = baseVehicleService.fetchBySid(vehSid); diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/BusDeliveredApplyDetailVo.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/BusDeliveredApplyDetailVo.java index f92da318a3..0027febe26 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/BusDeliveredApplyDetailVo.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/BusDeliveredApplyDetailVo.java @@ -26,6 +26,7 @@ package com.yxt.anrui.buscenter.api.busdeliveredapply; +import com.yxt.anrui.buscenter.api.busbillapplication.BusBillApplicationDetailsVo; import com.yxt.anrui.buscenter.api.busdeliveredapplydetails.BusDeliveredApplyDetailsVo; import com.yxt.common.core.vo.Vo; import io.swagger.annotations.ApiModel; @@ -109,4 +110,6 @@ public class BusDeliveredApplyDetailVo implements Vo { private String distributorPriceTwo; @ApiModelProperty("是否开票（0开票，1不开票）") private String isInvoicing; + @ApiModelProperty("开票信息") + private BusBillApplicationDetailsVo busBillApplicationDetailsVo; } \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busbillapplication/BusBillApplicationService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busbillapplication/BusBillApplicationService.java index 6d8a23ddb8..cd470a34f9 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busbillapplication/BusBillApplicationService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busbillapplication/BusBillApplicationService.java @@ -396,4 +396,8 @@ public class BusBillApplicationService extends MybatisBaseService Date: Tue, 19 Sep 2023 10:41:27 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=BD=95=E5=85=A5?= =?UTF-8?q?=E8=B4=B7=E6=AC=BE=E4=BA=BA=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../buscenter/biz/bussalesorder/BusSalesOrderService.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java index 6868423348..5492bcbb86 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java @@ -7368,9 +7368,9 @@ public class BusSalesOrderService extends MybatisBaseService