From 48fafad6f39696697e3f2bfacaa438fa60be326b Mon Sep 17 00:00:00 2001 From: fanzongzhe0036 Date: Thu, 12 Dec 2024 11:06:34 +0800 Subject: [PATCH] =?UTF-8?q?=E8=BF=94=E5=88=A9=E5=87=AD=E8=AF=81=E5=AF=B9?= =?UTF-8?q?=E6=8E=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BusDeliveredApplyFeign.java | 6 +- .../BusDeliveredApplyFeignFallback.java | 5 + .../BusOrderAndVehInfo.java | 11 + .../BusSalesOrderVehicleFeign.java | 9 +- .../BusSalesOrderVehicleFeignFallback.java | 5 + .../BusDeliveredApplyMapper.java | 2 + .../BusDeliveredApplyMapper.xml | 9 + .../BusDeliveredApplyRest.java | 7 + .../BusDeliveredApplyService.java | 4 + .../BusSalesOrderVehicleMapper.java | 2 + .../BusSalesOrderVehicleMapper.xml | 14 + .../BusSalesOrderVehicleRest.java | 5 + .../BusSalesOrderVehicleService.java | 15 +- .../fin/biz/kingdee/FinKingDeeFeignRest.java | 12 +- anrui-scm/anrui-scm-biz/pom.xml | 6 +- .../yxt/anrui/scm/AnruiScmApplication.java | 2 +- .../ScmVehrebateCheckapplyService.java | 270 +++++++++++++++--- 17 files changed, 326 insertions(+), 58 deletions(-) create mode 100644 anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordervehicle/BusOrderAndVehInfo.java diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/BusDeliveredApplyFeign.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/BusDeliveredApplyFeign.java index 8bafc00452..b06513d986 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/BusDeliveredApplyFeign.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/BusDeliveredApplyFeign.java @@ -26,7 +26,6 @@ package com.yxt.anrui.buscenter.api.busdeliveredapply; import com.yxt.anrui.buscenter.api.busdelivered.AppDeliveredDetailsVo; -import com.yxt.anrui.buscenter.api.bussalesorder.flowable.BusSalesOrderDelegateQuery; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; @@ -35,7 +34,6 @@ import io.swagger.annotations.ApiOperation; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.cloud.openfeign.SpringQueryMap; import org.springframework.web.bind.annotation.*; -import springfox.documentation.annotations.ApiIgnore; import javax.validation.Valid; import java.util.List; @@ -247,4 +245,8 @@ public interface BusDeliveredApplyFeign { @ApiOperation("根据车辆sid和已办结流程状态查询是否为欠款出库") @GetMapping("/selByVinSidAndYBJ/{vinSid}") ResultBean selByVinSidAndYBJ(@RequestParam("vinSid") String vinSid); + + @ApiOperation("根据销售订单车辆sid查询客户sid") + @PostMapping("/selCustomerByBusVinSid") + ResultBean selCustomerByBusVinSid(@RequestParam("busVinSid") String busVinSid); } \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/BusDeliveredApplyFeignFallback.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/BusDeliveredApplyFeignFallback.java index 14177f6704..b758241ccf 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/BusDeliveredApplyFeignFallback.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/BusDeliveredApplyFeignFallback.java @@ -201,6 +201,11 @@ public class BusDeliveredApplyFeignFallback implements BusDeliveredApplyFeign { return null; } + @Override + public ResultBean selCustomerByBusVinSid(String busVinSid) { + return null; + } + @Override public ResultBean complete(BusDeliveredApplyCompleteDto query) { return null; diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordervehicle/BusOrderAndVehInfo.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordervehicle/BusOrderAndVehInfo.java new file mode 100644 index 0000000000..a380f97e7a --- /dev/null +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordervehicle/BusOrderAndVehInfo.java @@ -0,0 +1,11 @@ +package com.yxt.anrui.buscenter.api.bussalesordervehicle; + +import lombok.Data; + +@Data +public class BusOrderAndVehInfo { + + private String busVinSid; //销售订单车辆sid + private String orderSid; //销售订单sid + private String deptSid;//销售部门sid +} diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordervehicle/BusSalesOrderVehicleFeign.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordervehicle/BusSalesOrderVehicleFeign.java index 15afaab0f6..8c03c9a005 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordervehicle/BusSalesOrderVehicleFeign.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordervehicle/BusSalesOrderVehicleFeign.java @@ -33,7 +33,6 @@ import io.swagger.annotations.ApiOperation; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.*; -import javax.validation.constraints.Max; import java.util.List; /** @@ -152,7 +151,7 @@ public interface BusSalesOrderVehicleFeign { @ApiOperation("根据销售订单sid和贷款人sid和贷款合同sid查车辆信息") @PostMapping("/selectListByOrderSidAndDkrSidAndLoanContractSid") @ResponseBody - ResultBean> selectListByOrderSidAndDkrSidAndLoanContractSid(@RequestParam("saleOrderSid") String saleOrderSid, @RequestParam("borrowerSid") String borrowerSid,@RequestParam("loanContractSid") String loanContractSid); + ResultBean> selectListByOrderSidAndDkrSidAndLoanContractSid(@RequestParam("saleOrderSid") String saleOrderSid, @RequestParam("borrowerSid") String borrowerSid, @RequestParam("loanContractSid") String loanContractSid); @ApiOperation("根据销售订单sid和消贷合同sid查车辆信息") @@ -180,7 +179,7 @@ public interface BusSalesOrderVehicleFeign { @ApiOperation("根据订单sid车架号查询") @GetMapping("/selByOrderSidAndVinNo") - ResultBean selByOrderSidAndVinNo(@RequestParam("salesOrderSid")String salesOrderSid, @RequestParam("vinNo")String vinNo); + ResultBean selByOrderSidAndVinNo(@RequestParam("salesOrderSid") String salesOrderSid, @RequestParam("vinNo") String vinNo); @ApiOperation("批量保存") @PostMapping("/saveList") @@ -189,4 +188,8 @@ public interface BusSalesOrderVehicleFeign { @ApiOperation("批量修改") @PostMapping("/updateVehiclesList") ResultBean updateVehiclesList(@RequestBody List updateVehicles); + + @ApiOperation("根据车架号后八位关联查询车辆及订单信息") + @PostMapping("/selVehOrderInfoByVinNo") + ResultBean selVehOrderInfoByVinNo(@RequestParam("vinNo") String vinNo); } diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordervehicle/BusSalesOrderVehicleFeignFallback.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordervehicle/BusSalesOrderVehicleFeignFallback.java index b8df78b675..c4b9ace2a8 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordervehicle/BusSalesOrderVehicleFeignFallback.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordervehicle/BusSalesOrderVehicleFeignFallback.java @@ -188,4 +188,9 @@ public class BusSalesOrderVehicleFeignFallback implements BusSalesOrderVehicleFe return null; } + @Override + public ResultBean selVehOrderInfoByVinNo(String vinNo) { + return null; + } + } diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyMapper.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyMapper.java index a30103adb0..9b4f3e2cfb 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyMapper.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyMapper.java @@ -124,4 +124,6 @@ public interface BusDeliveredApplyMapper extends BaseMapper { int selectCountByVinSid(@Param("vinSid") String vinSid,@Param("contractNo") String contractNo); int selByVinSidAndYBJ(String vinSid); + + String selCustomerByBusVinSid(@Param("busVinSid") String busVinSid); } \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyMapper.xml b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyMapper.xml index 80f3a163e0..e27964d574 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyMapper.xml +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyMapper.xml @@ -209,4 +209,13 @@ WHERE bdad.`vinSid` = #{vinSid} AND bda.`nodeState` = '已办结' + \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyRest.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyRest.java index 2d391a1c66..a188b553c5 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyRest.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyRest.java @@ -272,6 +272,13 @@ public class BusDeliveredApplyRest implements BusDeliveredApplyFeign { return busDeliveredApplyService.selByVinSidAndYBJ(vinSid); } + @Override + public ResultBean selCustomerByBusVinSid(String busVinSid) { + ResultBean rb = ResultBean.fireFail(); + String customerSid = busDeliveredApplyService.selCustomerByBusVinSid(busVinSid); + return rb.success().setData(customerSid); + } + @Override public ResultBean complete(BusDeliveredApplyCompleteDto query) { BusinessVariables bv = new BusinessVariables(); 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 f5197f6868..737027f35c 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 @@ -4928,4 +4928,8 @@ public class BusDeliveredApplyService extends MybatisBaseService list); void updateVehiclesList(@Param("list") List list); + + BusOrderAndVehInfo selVehOrderInfoByVinNo(@Param("vinNo") String vinNo); } diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleMapper.xml b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleMapper.xml index 887caa459f..f5aaa8921d 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleMapper.xml +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleMapper.xml @@ -420,4 +420,18 @@ where bv.`salesOrderSid` = #{salesOrderSid} and bv.linkNo LIKE CONCAT( '%', #{vinNo}, '%' ) + diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleRest.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleRest.java index 3ca278c261..a5e6b89975 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleRest.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleRest.java @@ -221,4 +221,9 @@ public class BusSalesOrderVehicleRest implements BusSalesOrderVehicleFeign { busSalesOrderVehicleService.updateVehiclesList(updateVehicles); return rb.success(); } + + @Override + public ResultBean selVehOrderInfoByVinNo(String vinNo) { + return busSalesOrderVehicleService.selVehOrderInfoByVinNo(vinNo); + } } diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleService.java index 90dbbc2127..84b6a82a8d 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleService.java @@ -29,26 +29,19 @@ import cn.hutool.core.bean.BeanUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.yxt.anrui.base.api.basepurchasesystem.BasePurchSystemVo; -import com.yxt.anrui.base.api.basetrailer.BaseTrailerDetailsVo; import com.yxt.anrui.base.api.basetrailer.BaseTrailerFeign; import com.yxt.anrui.base.api.basetrailer.TrailerVo; import com.yxt.anrui.base.api.basetrailer.TraliveredVo; import com.yxt.anrui.base.api.basevehicle.BaseVehicle; import com.yxt.anrui.base.api.basevehicle.BaseVehicleFeign; -import com.yxt.anrui.base.api.basevehicle.BaseVehicleQKKPVo; import com.yxt.anrui.base.api.basevehicleappendix.BaseVehicleAppendixFeign; import com.yxt.anrui.base.api.basevehiclecertificate.BaseVehicleCertificateFeign; import com.yxt.anrui.base.api.basevehiclecertificate.BaseVehicleCertificateVo; -import com.yxt.anrui.base.api.basevehiclestate.BaseVehicleState; import com.yxt.anrui.base.api.basevehiclestate.BaseVehicleStateFeign; -import com.yxt.anrui.base.api.basevehicletempstate.BaseVehicleTempstate; import com.yxt.anrui.base.api.basevehicletempstate.BaseVehicleTempstateFeign; -import com.yxt.anrui.base.api.commoncontract.ContractPageVo; -import com.yxt.anrui.base.common.enums.VehicleStateTempOrLast; import com.yxt.anrui.buscenter.api.busarrearscarryvehicleapply.AdCarListVo; import com.yxt.anrui.buscenter.api.busarrearscarryvehicleapply.BusArrearsCarryVehicleApply; import com.yxt.anrui.buscenter.api.busarrearscarryvehicleapply.GCarListVo; -import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrder; import com.yxt.anrui.buscenter.api.bussalesorder.app.model.AppNowCarListVo; import com.yxt.anrui.buscenter.api.bussalesorder.app.vin.VinListsVo; import com.yxt.anrui.buscenter.api.bussalesordervehicle.*; @@ -71,7 +64,6 @@ import org.springframework.stereotype.Service; import java.util.ArrayList; import java.util.Collections; import java.util.List; -import java.util.stream.Collectors; /** * Project: anrui-buscenter(业务管理)
@@ -682,4 +674,11 @@ public class BusSalesOrderVehicleService extends MybatisBaseService updateVehicles) { baseMapper.updateVehiclesList(updateVehicles); } + + public ResultBean selVehOrderInfoByVinNo(String vinNo) { + ResultBean rb = ResultBean.fireFail(); + BusOrderAndVehInfo busOrderAndVehInfo = baseMapper.selVehOrderInfoByVinNo(vinNo); + return rb.success().setData(busOrderAndVehInfo); + + } } diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/FinKingDeeFeignRest.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/FinKingDeeFeignRest.java index 2ae30cd25b..ea6806b458 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/FinKingDeeFeignRest.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/FinKingDeeFeignRest.java @@ -305,7 +305,8 @@ public class FinKingDeeFeignRest implements FinKingDeeFeign { dto1.setCredit(String.valueOf(voucherDetail.getAmount())); resultDetails.add(dto1); } - } else { + } + if (voucherDetail.getRemarks().equals("返利上传")) { if (voucherDetail.getSceneCode().equals("1161.01.16")) { Voucher.VoucherResultDetailDto dto1 = new Voucher.VoucherResultDetailDto(); dto1.setSummary(voucherDetail.getTimeFlag() + "单车返利上传"); @@ -316,8 +317,8 @@ public class FinKingDeeFeignRest implements FinKingDeeFeign { resultDetails.add(dto1); } if (voucherDetail.getSceneCode().equals("1161.02.15") || - voucherDetail.getSceneCode().equals("1161.01.15") || - voucherDetail.getSceneCode().equals("1161.04.00")) { + voucherDetail.getSceneCode().equals("1161.01.15") || + voucherDetail.getSceneCode().equals("1161.04.00")) { Voucher.VoucherResultDetailDto dto1 = new Voucher.VoucherResultDetailDto(); dto1.setSummary(voucherDetail.getTimeFlag() + "单车返利上传"); dto1.setSubjectNo(voucherDetail.getSceneCode()); @@ -326,6 +327,9 @@ public class FinKingDeeFeignRest implements FinKingDeeFeign { dto1.setCredit(String.valueOf(voucherDetail.getAmount())); resultDetails.add(dto1); } + } + + if (voucherDetail.getRemarks().equals("预留费用调整")) { if (voucherDetail.getSceneCode().equals("1161.02.15") || voucherDetail.getSceneCode().equals("1161.01.15")) { Voucher.VoucherResultDetailDto dto1 = new Voucher.VoucherResultDetailDto(); dto1.setSummary(voucherDetail.getTimeFlag() + "返利上传预留费用调整"); @@ -344,6 +348,8 @@ public class FinKingDeeFeignRest implements FinKingDeeFeign { resultDetails.add(dto1); } } + + } newVoucher.setResultDetails(resultDetails); } diff --git a/anrui-scm/anrui-scm-biz/pom.xml b/anrui-scm/anrui-scm-biz/pom.xml index 9aad1f3ece..8c5c8bbbc5 100644 --- a/anrui-scm/anrui-scm-biz/pom.xml +++ b/anrui-scm/anrui-scm-biz/pom.xml @@ -83,7 +83,11 @@ message-center-api 0.0.1-SNAPSHOT - + + anrui-crm-api + com.yxt.anrui + 0.0.1-SNAPSHOT + com.sun.xml.ws diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/AnruiScmApplication.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/AnruiScmApplication.java index 3a740b87ea..68d5222943 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/AnruiScmApplication.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/AnruiScmApplication.java @@ -50,7 +50,7 @@ import org.springframework.cloud.openfeign.EnableFeignClients; }) @EnableFeignClients(basePackages = {"com.yxt.anrui.buscenter", "com.yxt.anrui.portal","com.yxt.anrui.flowable","com.yxt.anrui.base" - ,"com.yxt.anrui.fin","com.yxt.messagecenter"}) + ,"com.yxt.anrui.fin","com.yxt.messagecenter", "com.yxt.anrui.crm"}) public class AnruiScmApplication { public static void main(String[] args) { diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatecheckapply/ScmVehrebateCheckapplyService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatecheckapply/ScmVehrebateCheckapplyService.java index 09a9fbd372..c26f7c9441 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatecheckapply/ScmVehrebateCheckapplyService.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatecheckapply/ScmVehrebateCheckapplyService.java @@ -31,6 +31,11 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.yxt.anrui.base.api.basevehicle.BaseVehicle; import com.yxt.anrui.base.api.basevehicle.BaseVehicleFeign; +import com.yxt.anrui.buscenter.api.busdeliveredapply.BusDeliveredApplyFeign; +import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusOrderAndVehInfo; +import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicleFeign; +import com.yxt.anrui.crm.api.crmcustomertemp.CrmCustomerTemp; +import com.yxt.anrui.crm.api.crmcustomertemp.CrmCustomerTempFeign; import com.yxt.anrui.fin.api.kingdee.FinKingDeeFeign; import com.yxt.anrui.fin.api.kingdee.voucher.GeneralVoucher; import com.yxt.anrui.flowable.api.flow.FlowableFeign; @@ -89,6 +94,10 @@ import java.util.stream.Collectors; @Service public class ScmVehrebateCheckapplyService extends MybatisBaseService { + @Autowired + private CrmCustomerTempFeign crmCustomerTempFeign; + @Autowired + private BusDeliveredApplyFeign busDeliveredApplyFeign; @Autowired ScmVehrebateCheckapplydetailService scmVehrebateCheckapplydetailService; @Autowired @@ -109,6 +118,8 @@ public class ScmVehrebateCheckapplyService extends MybatisBaseService listPageVo(PagerQuery pq) { ScmVehrebateCheckapplyQuery query = pq.getParams(); QueryWrapper qw = new QueryWrapper<>(); @@ -417,6 +428,8 @@ public class ScmVehrebateCheckapplyService extends MybatisBaseService