From ff0341d65a751fae332d4c7d610fa0fc615da60f Mon Sep 17 00:00:00 2001 From: God <10745413@qq.com> Date: Tue, 12 Sep 2023 11:19:30 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../biz/basevehicleout/BaseVehicleOutService.java | 15 ++++++++++++++- .../BusSalesOrderMakeupFeign.java | 4 ++++ .../BusSalesOrderMakeupFeignFallback.java | 5 +++++ .../BusSalesOrderMakeupMapper.java | 4 ++++ .../BusSalesOrderMakeupRest.java | 6 ++++++ .../BusSalesOrderMakeupService.java | 6 ++++++ .../biz/autoservice/invoiced/InvoicedService.java | 4 ++-- 7 files changed, 41 insertions(+), 3 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 73ea772e62..b7924d472d 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 @@ -42,6 +42,8 @@ import com.yxt.anrui.buscenter.api.bussalesorderborrower.BusSalesOrderBorrowerDe import com.yxt.anrui.buscenter.api.bussalesorderborrower.BusSalesOrderBorrowerFeign; import com.yxt.anrui.buscenter.api.bussalesorderloancontract.BusSalesOrderLoancontractDetailsVo; import com.yxt.anrui.buscenter.api.bussalesorderloancontract.BusSalesOrderLoancontractFeign; +import com.yxt.anrui.buscenter.api.bussalesordermakeup.BusSalesOrderMakeup; +import com.yxt.anrui.buscenter.api.bussalesordermakeup.BusSalesOrderMakeupFeign; import com.yxt.anrui.buscenter.api.bussalesordermodel.BusSalesOrderModel; import com.yxt.anrui.buscenter.api.bussalesordermodel.BusSalesOrderModelFeign; import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicle; @@ -137,6 +139,8 @@ public class BaseVehicleOutService extends MybatisBaseService vehicleOut(BaseVehicleOutDto dto) { log.info("BaseVehicleOutService-vehicleOut-95:{}", JSONObject.toJSONString(dto)); @@ -2316,7 +2320,16 @@ public class BaseVehicleOutService extends MybatisBaseService getTopInfo(@PathVariable(value = "sid") String sid); + @ApiOperation("根据上装sid和销售订单sid查询销售订单上装信息") + @PostMapping("/selectTop") + @ResponseBody + ResultBean selectTop(@RequestParam("topSid") String topSid,@RequestParam("orderSid") String orderSid); } \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordermakeup/BusSalesOrderMakeupFeignFallback.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordermakeup/BusSalesOrderMakeupFeignFallback.java index 6030bc30c1..7b551a57ad 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordermakeup/BusSalesOrderMakeupFeignFallback.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordermakeup/BusSalesOrderMakeupFeignFallback.java @@ -55,4 +55,9 @@ public class BusSalesOrderMakeupFeignFallback implements BusSalesOrderMakeupFeig public ResultBean getTopInfo(String sid) { return null; } + + @Override + public ResultBean selectTop(String topSid, String orderSid) { + return null; + } } \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordermakeup/BusSalesOrderMakeupMapper.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordermakeup/BusSalesOrderMakeupMapper.java index 48f78cca12..b6e65e9ea4 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordermakeup/BusSalesOrderMakeupMapper.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordermakeup/BusSalesOrderMakeupMapper.java @@ -32,6 +32,7 @@ import com.yxt.anrui.buscenter.api.bussalesordermakeup.BusSalesOrderMakeupDetail import com.yxt.anrui.buscenter.api.bussalesordermakeup.app.AppBusSalesOrderMakeUpVo; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; import java.util.List; @@ -90,4 +91,7 @@ public interface BusSalesOrderMakeupMapper extends BaseMapper selectListByOrderSid(@Param("saleOrderSid") String saleOrderSid); BusSalesOrderMakeup selectBySid(String sid); + + @Select("select * from bus_sales_order_makeup where topSid = #{topSid} and salesOrderSid = #{orderSid}") + BusSalesOrderMakeup selectTopNew(@Param("topSid") String topSid,@Param("orderSid") String orderSid); } \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordermakeup/BusSalesOrderMakeupRest.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordermakeup/BusSalesOrderMakeupRest.java index 6d939fcc82..89623ba5b4 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordermakeup/BusSalesOrderMakeupRest.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordermakeup/BusSalesOrderMakeupRest.java @@ -25,6 +25,7 @@ *********************************************************/ package com.yxt.anrui.buscenter.biz.bussalesordermakeup; +import com.yxt.anrui.buscenter.api.bussalesordermakeup.BusSalesOrderMakeup; import com.yxt.anrui.buscenter.api.bussalesordermakeup.BusSalesOrderMakeupFeign; import com.yxt.anrui.buscenter.api.bussalesordermakeup.app.AppBusSalesOrderMakeUpDto; import com.yxt.anrui.buscenter.api.bussalesordermakeup.app.AppBusSalesOrderMakeUpVo; @@ -64,4 +65,9 @@ public class BusSalesOrderMakeupRest implements BusSalesOrderMakeupFeign { public ResultBean getTopInfo(String sid) { return busSalesOrderMakeupService.getTopInfo(sid); } + + @Override + public ResultBean selectTop(String topSid, String orderSid) { + return busSalesOrderMakeupService.selectTopNew(topSid, orderSid); + } } diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordermakeup/BusSalesOrderMakeupService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordermakeup/BusSalesOrderMakeupService.java index 1bfa7ad97b..95af7f64a9 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordermakeup/BusSalesOrderMakeupService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordermakeup/BusSalesOrderMakeupService.java @@ -269,4 +269,10 @@ public class BusSalesOrderMakeupService extends MybatisBaseService selectTopNew(String topSid, String orderSid) { + ResultBean rb = ResultBean.fireFail(); + BusSalesOrderMakeup busSalesOrderMakeup = baseMapper.selectTopNew(topSid,orderSid); + return rb.success().setData(busSalesOrderMakeup); + } } \ No newline at end of file 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 38873e946f..39658d8f0d 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 @@ -320,7 +320,7 @@ public class InvoicedService { public ResultBean agreeInvoicedInfo(InvoicedDto dto) { ResultBean rb = ResultBean.fireFail(); FinBillCompleteDto finBillCompleteDto = new FinBillCompleteDto(); - BeanUtil.copyProperties(dto, finBillCompleteDto); + BeanUtil.copyProperties(dto, finBillCompleteDto, "carBuyContractImages"); finBillCompleteDto.setOrgSidPath(dto.getOrgPath()); ResultBean resultBean = finBillApplicationFeign.complete(finBillCompleteDto); if (!resultBean.getSuccess()) { @@ -510,7 +510,7 @@ public class InvoicedService { public ResultBean agreeInvoicedInfoKP(InvoicedDto dto) { ResultBean rb = ResultBean.fireFail(); FinBillCompleteDto finBillCompleteDto = new FinBillCompleteDto(); - BeanUtil.copyProperties(dto, finBillCompleteDto); + BeanUtil.copyProperties(dto, finBillCompleteDto, "carBuyContractImages"); finBillCompleteDto.setOrgSidPath(dto.getOrgPath()); //附件信息 List appCarBuyContractImages = dto.getCarBuyContractImages();//车辆买卖合同