From 8c1aa3c082e337316bc611754b4de6ef0353f8e0 Mon Sep 17 00:00:00 2001 From: ligaode Date: Fri, 7 Feb 2025 15:01:11 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/basevehicle/BaseVehicleFeign.java | 5 ++++ .../basevehicle/BaseVehicleFeignFallback.java | 5 ++++ .../biz/basevehicle/BaseVehicleMapper.java | 29 ++++++++++--------- .../biz/basevehicle/BaseVehicleMapper.xml | 8 +++++ .../base/biz/basevehicle/BaseVehicleRest.java | 7 ++++- .../biz/basevehicle/BaseVehicleService.java | 6 ++++ .../FinPaymentapplyService.java | 26 ++++++++++++----- 7 files changed, 64 insertions(+), 22 deletions(-) diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeign.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeign.java index 59a99ad733..1e27768d50 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeign.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeign.java @@ -543,4 +543,9 @@ public interface BaseVehicleFeign { @PostMapping("/selectVinNo") @ResponseBody ResultBean selectVinNo(String vinNo); + + @ApiOperation("根据车辆sid修改买断状态为预买断") + @PostMapping("/updateVehicleYmd") + @ResponseBody + ResultBean updateVehicleYmd(String vehiSid, String settlementStatus, String settlementStatusValue); } diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeignFallback.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeignFallback.java index 15a65470aa..ebfe53a2eb 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeignFallback.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeignFallback.java @@ -442,6 +442,11 @@ public class BaseVehicleFeignFallback implements BaseVehicleFeign { return null; } + @Override + public ResultBean updateVehicleYmd(String vehiSid, String settlementStatus, String settlementStatusValue) { + return null; + } + @Override public ResultBean> selectAppListOne(String modelSid, String configSid, String orgSid,List list) { return null; diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.java index 528a92fb15..81fa44c7a4 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.java @@ -208,7 +208,7 @@ public interface BaseVehicleMapper extends BaseMapper { * @param configSid * @return */ - List getVins(@Param("modelSid") String modelSid, @Param("configSid") String configSid, @Param("state") String state, @Param("orgSid") String orgSid,@Param("name")String name); + List getVins(@Param("modelSid") String modelSid, @Param("configSid") String configSid, @Param("state") String state, @Param("orgSid") String orgSid, @Param("name") String name); /** * 现车分页列表（新） @@ -325,7 +325,7 @@ public interface BaseVehicleMapper extends BaseMapper { */ IPage vehicleActualPageList(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); - IPage selectVo(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw,@Param("list") List list); + IPage selectVo(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw, @Param("list") List list); /** * 手机端-配置列表获取现车列表 @@ -343,7 +343,7 @@ public interface BaseVehicleMapper extends BaseMapper { * @param qw 查询条件 * @return */ - Integer selectVehicleCount(@Param(Constants.WRAPPER) QueryWrapper qw,@Param("list")List list); + Integer selectVehicleCount(@Param(Constants.WRAPPER) QueryWrapper qw, @Param("list") List list); /** * 根据车型sid配置sid分公司sid查询车型名称等 @@ -381,7 +381,8 @@ public interface BaseVehicleMapper extends BaseMapper { * @return */ List selectAppList(@Param("modelSid") String modelSid, @Param("configSid") String configSid, @Param("orgSid") String orgSid, @Param("state") String state); - List selectAppListOne(@Param("modelSid") String modelSid, @Param("configSid") String configSid, @Param("orgSid") String orgSid, @Param("state") String state,@Param("list")List list); + + List selectAppListOne(@Param("modelSid") String modelSid, @Param("configSid") String configSid, @Param("orgSid") String orgSid, @Param("state") String state, @Param("list") List list); String selectImage(String vehicleSid); @@ -448,7 +449,7 @@ public interface BaseVehicleMapper extends BaseMapper { IPage vehicleRebatePageList(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); @Update("update base_vehicle set vehicleState = #{vehicleState},vehicleStateValue = #{vehicleStateValue},salePrice = #{salePrice},salesDate = NOW() where vinNo = #{vinNo} and createOrgSid = #{callOutOrgSid} and vehicleState != '0004'") - void updateCallOutVehicleState(@Param("vehicleState") String vehicleState, @Param("vehicleStateValue") String vehicleStateValue, @Param("salePrice") Integer salePrice, @Param("vinNo") String vinNo,@Param("callOutOrgSid") String callOutOrgSid); + void updateCallOutVehicleState(@Param("vehicleState") String vehicleState, @Param("vehicleStateValue") String vehicleStateValue, @Param("salePrice") Integer salePrice, @Param("vinNo") String vinNo, @Param("callOutOrgSid") String callOutOrgSid); @Update("update base_vehicle set vinNo = #{vinNo} where sid = #{vehicleSid}") void updateVinNoByVehSid(@Param("vinNo") String vinNo, @Param("vehicleSid") String vehicleSid); @@ -470,18 +471,18 @@ public interface BaseVehicleMapper extends BaseMapper { IPage selectPayVehicleList(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); @Update("update base_vehicle set salePrice = #{witPinMoney} where vinNo = #{vinNo} and useOrgSid = #{callOutOrgSid}") - void updateSalePrice(@Param("witPinMoney") String witPinMoney,@Param("vinNo") String vinNo,@Param("callOutOrgSid") String callOutOrgSid); + void updateSalePrice(@Param("witPinMoney") String witPinMoney, @Param("vinNo") String vinNo, @Param("callOutOrgSid") String callOutOrgSid); @Update("update base_vehicle set contractPrice = #{witPinMoney},costPrice = #{witPinMoney} where vinNo = #{vinNo} and useOrgSid = #{callInOrgSid}") - void updateConAndCostPrice(@Param("witPinMoney") String witPinMoney,@Param("vinNo") String vinNo,@Param("callInOrgSid") String callInOrgSid); + void updateConAndCostPrice(@Param("witPinMoney") String witPinMoney, @Param("vinNo") String vinNo, @Param("callInOrgSid") String callInOrgSid); - IPage vehicleCrmPageList(IPage page,@Param(Constants.WRAPPER) QueryWrapper qw); + IPage vehicleCrmPageList(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); - IPage baseDisCountPackageGetVeh(IPage page,@Param(Constants.WRAPPER) QueryWrapper qw); + IPage baseDisCountPackageGetVeh(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); - IPage vehicleCollectionPageList(IPage page,@Param(Constants.WRAPPER) QueryWrapper qw); + IPage vehicleCollectionPageList(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); - IPage getStockModelList(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw, @Param("useOrgSid") String useOrgSid, @Param("lockedStateKey") String lockedStateKey,@Param("lable") String lable); + IPage getStockModelList(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw, @Param("useOrgSid") String useOrgSid, @Param("lockedStateKey") String lockedStateKey, @Param("lable") String lable); List getStockModelNowCarList(@Param(Constants.WRAPPER) QueryWrapper qw); @@ -495,16 +496,18 @@ public interface BaseVehicleMapper extends BaseMapper { void updateVehicleStateAndSaleDate(String sid); @Update("update base_vehicle set lockedState = #{code},lockedStateValue = #{remarks} where sid = #{vehSid}") - ResultBean updateLockedState(@Param("vehSid") String vehSid,@Param("code") String code,@Param("remarks") String remarks); + ResultBean updateLockedState(@Param("vehSid") String vehSid, @Param("code") String code, @Param("remarks") String remarks); //导出车辆台账信息 List selByExcel(@Param(Constants.WRAPPER) QueryWrapper qw); - IPage vehicleQKKPPageList(IPage page,@Param(Constants.WRAPPER) QueryWrapper qw); + IPage vehicleQKKPPageList(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); void updateStateForReturnVeh(String vehSid); int selectVinNo(String vinNo); BaseVehicle selOneByVinNo(@Param("substringVinNo") String substringVinNo); + + void updateVehicleYmd(@Param("vehiSid") String vehiSid, @Param("settlementStatus") String settlementStatus, @Param("settlementStatusValue") String settlementStatusValue); } diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.xml b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.xml index 36e0000112..6994a39462 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.xml +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.xml @@ -1826,4 +1826,12 @@ WHERE bv.isDelete = '0' AND bv.vinNo LIKE CONCAT('%', #{substringVinNo}, '%') + + + UPDATE + base_vehicle + SET settlementStatus = #{settlementStatus}, + settlementStatusValue = #{settlementStatusValue} + WHERE sid = #{vehiSid} + diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleRest.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleRest.java index 34d84d645b..3f1398bf8c 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleRest.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleRest.java @@ -644,7 +644,7 @@ public class BaseVehicleRest implements BaseVehicleFeign { return rb.setMsg("已存在该车架号的车辆信息"); }*/ BeanUtil.copyProperties(dto, baseVehicle); - if (StringUtils.isBlank(dto.getSalesDate())){ + if (StringUtils.isBlank(dto.getSalesDate())) { baseVehicle.setSalesDate(null); } //修改存放地点编码 @@ -1517,6 +1517,11 @@ public class BaseVehicleRest implements BaseVehicleFeign { return baseVehicleService.selectVinNo(vinNo); } + @Override + public ResultBean updateVehicleYmd(String vehiSid, String settlementStatus, String settlementStatusValue) { + return baseVehicleService.updateVehicleYmd(vehiSid, settlementStatus, settlementStatusValue); + } + @Override public ResultBean> selectAppListOne(String modelSid, String configSid, String orgSid, List list) { return baseVehicleService.selectAppListOne(modelSid, configSid, orgSid, list); diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java index c13859b4b9..cbd13f36b2 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java @@ -4431,4 +4431,10 @@ public class BaseVehicleService extends MybatisBaseService listPageVo(PagerQuery pq) { FinPaymentapplyQuery query = pq.getParams(); @@ -277,11 +279,11 @@ public class FinPaymentapplyService extends MybatisBaseService detailsList = dto.getDetailsList(); if (detailsList != null && detailsList.size() > 0) { - String i = finPaymentapplyDetailsService.saveDetailsList(detailsList, finPaymentapply.getSid(),finPaymentapply); + String i = finPaymentapplyDetailsService.saveDetailsList(detailsList, finPaymentapply.getSid(), finPaymentapply); finPaymentapply.setPaymentTotal(new BigDecimal(i)); } - if ("004".equals(dto.getCostTypeKey())){//融资付款 + if ("004".equals(dto.getCostTypeKey())) {//融资付款 List eveList = dto.getEveList(); for (FinPaymentapplyEveDto finPaymentapplyEveDto : eveList) { finPaymentapplyEveDto.setApplySid(finPaymentapply.getSid()); @@ -299,7 +301,7 @@ public class FinPaymentapplyService extends MybatisBaseService trailerList = dto.getTrailerList(); for (FinPaymentapplyTrailerDto finPaymentapplyTrailerDto : trailerList) { finPaymentapplyTrailerDto.setApplySid(finPaymentapply.getSid()); @@ -307,7 +309,7 @@ public class FinPaymentapplyService extends MybatisBaseService topList = dto.getTopList(); for (FinPaymentapplyTopDto finPaymentapplyTopDto : topList) { finPaymentapplyTopDto.setApplySid(finPaymentapply.getSid()); @@ -326,7 +328,7 @@ public class FinPaymentapplyService extends MybatisBaseService detailsList = dto.getDetailsList(); if (detailsList != null && detailsList.size() > 0) { - String i = finPaymentapplyDetailsService.saveDetailsList(detailsList, finPaymentapply.getSid(),finPaymentapply); + String i = finPaymentapplyDetailsService.saveDetailsList(detailsList, finPaymentapply.getSid(), finPaymentapply); finPaymentapply.setPaymentTotal(new BigDecimal(i)); } @@ -344,7 +346,7 @@ public class FinPaymentapplyService extends MybatisBaseService eveList = dto.getEveList(); for (FinPaymentapplyEveDto finPaymentapplyEveDto : eveList) { finPaymentapplyEveDto.setApplySid(dtoSid); @@ -352,7 +354,7 @@ public class FinPaymentapplyService extends MybatisBaseService trailerList = dto.getTrailerList(); for (FinPaymentapplyTrailerDto finPaymentapplyTrailerDto : trailerList) { finPaymentapplyTrailerDto.setApplySid(dtoSid); @@ -360,7 +362,7 @@ public class FinPaymentapplyService extends MybatisBaseService topList = dto.getTopList(); for (FinPaymentapplyTopDto finPaymentapplyTopDto : topList) { finPaymentapplyTopDto.setApplySid(dtoSid); @@ -725,6 +727,14 @@ public class FinPaymentapplyService extends MybatisBaseService vehicleList = vo.getVehicleList(); + if (vehicleList.size() > 0) { + for (FinPaymentapplyVehicleVo finPaymentapplyVehicleVo : vehicleList) { + if ("1".equals(finPaymentapplyVehicleVo.getIsSettle())) { + baseVehicleFeign.updateVehicleYmd(finPaymentapplyVehicleVo.getVehiSid(), "1", "预买断"); + } + } + } } else { //极光推送 UpdateFlowFieldVo ufVo = resultBean.getData();