From fdfa2acaecf23db8c51df2f99588bb52d5b93855 Mon Sep 17 00:00:00 2001 From: dimengzhe Date: Thu, 15 May 2025 09:36:19 +0800 Subject: [PATCH 1/9] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../anrui/base/api/busvehicleapply/BusVehicleApplyFeign.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/BusVehicleApplyFeign.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/BusVehicleApplyFeign.java index 5ccd8bd12c..010df6f4e1 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/BusVehicleApplyFeign.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/BusVehicleApplyFeign.java @@ -117,8 +117,8 @@ public interface BusVehicleApplyFeign { @ResponseBody ResultBean getBillNo(@RequestParam("pcApplicationCode") String pcApplicationCode); - @ApiOperation("rePushFin") - @PostMapping("/排产已办结没有推送财务出纳") + @PostMapping("rePushFin") + @ApiOperation("/排产已办结没有推送财务出纳") @ResponseBody ResultBean rePushFin(@RequestParam("sid")String sid); } \ No newline at end of file From e6e266a9494fa83379b7da7e5abcfee3cfd55c61 Mon Sep 17 00:00:00 2001 From: dimengzhe Date: Thu, 15 May 2025 10:09:26 +0800 Subject: [PATCH 2/9] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../LoanOutboundApplyService.java | 24 +++++++++---------- .../LoanSecondarySalesNotApplyService.java | 8 +++---- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanoutboundapply/LoanOutboundApplyService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanoutboundapply/LoanOutboundApplyService.java index 764521485d..83d4ddca32 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanoutboundapply/LoanOutboundApplyService.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanoutboundapply/LoanOutboundApplyService.java @@ -962,7 +962,7 @@ public class LoanOutboundApplyService extends MybatisBaseService0){//贷方 Voucher.VoucherResultDetailDto voucherResultDetailDtoDf = new Voucher.VoucherResultDetailDto(); - voucherResultDetailDtoDf.setSummary("**扣回车辆再次销售"); + voucherResultDetailDtoDf.setSummary(customerNumber+"扣回车辆再次销售"); voucherResultDetailDtoDf.setSubjectNo("1201.03.01"); //核算部门 voucherResultDetailDtoDf.setDimensionDept(deptVo.getOrgCode()); @@ -973,7 +973,7 @@ public class LoanOutboundApplyService extends MybatisBaseService0){//借方 Voucher.VoucherResultDetailDto voucherResultDetailDtoJf = new Voucher.VoucherResultDetailDto(); - voucherResultDetailDtoJf.setSummary("**扣回车辆再次销售-贷款保证金抵顶"); + voucherResultDetailDtoJf.setSummary(customerNumber+"扣回车辆再次销售-贷款保证金抵顶"); voucherResultDetailDtoJf.setSubjectNo("2182.01.01"); //核算部门 voucherResultDetailDtoJf.setDimensionDept(deptVo.getOrgCode()); @@ -984,7 +984,7 @@ public class LoanOutboundApplyService extends MybatisBaseService0){ Voucher.VoucherResultDetailDto voucherResultDetailDtoJf2 = new Voucher.VoucherResultDetailDto(); - voucherResultDetailDtoJf2.setSummary("**扣回车辆再次销售-保险保证金抵顶"); + voucherResultDetailDtoJf2.setSummary(customerNumber+"扣回车辆再次销售-保险保证金抵顶"); voucherResultDetailDtoJf2.setSubjectNo("2182.01.01"); //核算部门 voucherResultDetailDtoJf2.setDimensionDept(deptVo.getOrgCode()); @@ -995,7 +995,7 @@ public class LoanOutboundApplyService extends MybatisBaseService0){ Voucher.VoucherResultDetailDto voucherResultDetailDtoJf3 = new Voucher.VoucherResultDetailDto(); - voucherResultDetailDtoJf3.setSummary("**扣回车辆再次销售-车损失"); + voucherResultDetailDtoJf3.setSummary(customerNumber+"扣回车辆再次销售-车损失"); voucherResultDetailDtoJf3.setSubjectNo("1201.03.04.01"); //核算部门 voucherResultDetailDtoJf3.setDimensionDept(deptVo.getOrgCode()); @@ -1007,7 +1007,7 @@ public class LoanOutboundApplyService extends MybatisBaseService0){ Voucher.VoucherResultDetailDto voucherResultDetailDtoDf = new Voucher.VoucherResultDetailDto(); - voucherResultDetailDtoDf.setSummary("**扣回车辆再次销售-不追偿处理"); + voucherResultDetailDtoDf.setSummary(customerNumber+"扣回车辆再次销售-不追偿处理"); voucherResultDetailDtoDf.setSubjectNo("1201.03.04.01"); //核算部门 voucherResultDetailDtoDf.setDimensionDept(deptVo.getOrgCode()); @@ -1016,7 +1016,7 @@ public class LoanOutboundApplyService extends MybatisBaseService0){ Voucher.VoucherResultDetailDto voucherResultDetailDtoDf = new Voucher.VoucherResultDetailDto(); - voucherResultDetailDtoDf.setSummary("**扣回车辆再次销售-不追偿减免资金占用费"); + voucherResultDetailDtoDf.setSummary(customerNumber+"扣回车辆再次销售-不追偿减免资金占用费"); voucherResultDetailDtoDf.setSubjectNo("2191.05.00"); //核算部门 voucherResultDetailDtoDf.setDimensionDept(deptVo.getOrgCode()); @@ -1036,7 +1036,7 @@ public class LoanOutboundApplyService extends MybatisBaseService 0) { - voucherResultDetailDtoDf.setSummary("**扣回车辆赎回结转"); + voucherResultDetailDtoDf.setSummary(customerNumber+"扣回车辆赎回结转"); voucherResultDetailDtoDf.setSubjectNo("1201.03.01"); //核算部门 voucherResultDetailDtoDf.setDimensionDept(deptVo.getOrgCode()); @@ -1153,7 +1153,7 @@ public class LoanOutboundApplyService extends MybatisBaseService 0) { - voucherResultDetailDtoJf.setSummary("**扣回车辆赎回结转"); + voucherResultDetailDtoJf.setSummary(customerNumber+"扣回车辆赎回结转"); voucherResultDetailDtoJf.setSubjectNo("1201.02.03"); //核算部门 voucherResultDetailDtoJf.setDimensionDept(deptVo.getOrgCode()); @@ -1165,7 +1165,7 @@ public class LoanOutboundApplyService extends MybatisBaseService 0) { - voucherResultDetailDtoJf2.setSummary("**扣回车辆赎回结转"); + voucherResultDetailDtoJf2.setSummary(customerNumber+"扣回车辆赎回结转"); voucherResultDetailDtoJf2.setSubjectNo("1201.01.00"); //核算部门 voucherResultDetailDtoJf2.setDimensionDept(deptVo.getOrgCode()); @@ -1177,7 +1177,7 @@ public class LoanOutboundApplyService extends MybatisBaseService 0) { - voucherResultDetailDtoJf3.setSummary("**扣回车辆赎回结转"); + voucherResultDetailDtoJf3.setSummary(customerNumber+"扣回车辆赎回结转"); voucherResultDetailDtoJf3.setSubjectNo("1201.02.01"); //核算部门 voucherResultDetailDtoJf3.setDimensionDept(deptVo.getOrgCode()); diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansecondarysalesnotapply/LoanSecondarySalesNotApplyService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansecondarysalesnotapply/LoanSecondarySalesNotApplyService.java index bca1ff266f..cf90987005 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansecondarysalesnotapply/LoanSecondarySalesNotApplyService.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansecondarysalesnotapply/LoanSecondarySalesNotApplyService.java @@ -703,7 +703,7 @@ public class LoanSecondarySalesNotApplyService extends MybatisBaseService0){//贷方 Voucher.VoucherResultDetailDto voucherResultDetailDtoDf = new Voucher.VoucherResultDetailDto(); - voucherResultDetailDtoDf.setSummary("**扣回车辆再次销售-不追偿处理"); + voucherResultDetailDtoDf.setSummary(customerNumber+"扣回车辆再次销售-不追偿处理"); voucherResultDetailDtoDf.setSubjectNo("1201.03.04.01"); //核算部门 voucherResultDetailDtoDf.setDimensionDept(deptVo.getOrgCode()); @@ -712,7 +712,7 @@ public class LoanSecondarySalesNotApplyService extends MybatisBaseService0){ Voucher.VoucherResultDetailDto voucherResultDetailDtoDf = new Voucher.VoucherResultDetailDto(); - voucherResultDetailDtoDf.setSummary("**扣回车辆再次销售-不追偿减免资金占用费"); + voucherResultDetailDtoDf.setSummary(customerNumber+"扣回车辆再次销售-不追偿减免资金占用费"); voucherResultDetailDtoDf.setSubjectNo("2191.05.00"); //核算部门 voucherResultDetailDtoDf.setDimensionDept(deptVo.getOrgCode()); @@ -732,7 +732,7 @@ public class LoanSecondarySalesNotApplyService extends MybatisBaseService Date: Thu, 15 May 2025 13:33:42 +0800 Subject: [PATCH 3/9] =?UTF-8?q?=E5=87=BA=E5=BA=93=E7=94=B3=E8=AF=B7?= =?UTF-8?q?=E6=8E=A8=E9=80=81=E8=BD=A6=E8=BE=86=E5=88=A9=E6=B6=A6=E6=8A=A5?= =?UTF-8?q?=E8=A1=A8=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BusDeliveredApplyMapper.java | 5 ++ .../BusDeliveredApplyMapper.xml | 10 +++ .../BusDeliveredApplyService.java | 71 ++++++++++++++----- .../api/carsSoldProfit/CarsSoldProfit.java | 6 ++ .../api/carsSoldProfit/CarsSoldProfitDto.java | 6 ++ .../统计报表/车辆利润报表.sql | 3 + 6 files changed, 85 insertions(+), 16 deletions(-) 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 30b06790a8..b7fbfccace 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 @@ -39,6 +39,7 @@ import com.yxt.anrui.buscenter.api.busdeliveredapply.BusDeliveredApply; import com.yxt.anrui.buscenter.api.busdeliveredapply.BusDeliveredApplyVo; import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicle; import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigatecustomer.LoanHomevisitInvestigateCustomer; +import com.yxt.anrui.scm.api.scmvehiclegression.ScmVehicleGression; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -138,4 +139,8 @@ public interface BusDeliveredApplyMapper extends BaseMapper { List selectInstall(String linkNo); LoanHomevisitInvestigateCustomer getHomeVisitCustomerInfo(@Param("sid") String sid,@Param("loanSid") String loanSid); + + ScmVehicleGression selectByLocationAndVin(@Param("locationSid") String locationSid, @Param("vinSid") String sid); + + int selectCOuntByScmSid(String sid); } \ 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 e04ca535c3..5b13b46929 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 @@ -241,4 +241,14 @@ left join anrui_riskcenter.loan_homevisit_investigate_customer lc on lc.mainSid = li.sid where li.saleOrderSid = #{sid} and li.saleOrderBorrowerSid = #{loanSid} + + + + \ 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 9a5920f6ce..8941c3a932 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 @@ -79,6 +79,7 @@ import com.yxt.anrui.buscenter.api.bussalesorder.app.order.AppOrderDetailsVo; import com.yxt.anrui.buscenter.api.bussalesorderdiscount.BusSalesOrderDiscount; import com.yxt.anrui.buscenter.api.bussalesordermakeup.BusSalesOrderMakeup; import com.yxt.anrui.buscenter.api.bussalesorderprice.BusSalesOrderPrice; +import com.yxt.anrui.buscenter.api.bussalesordersubmit.BusSalesOrderSubmit; import com.yxt.anrui.buscenter.api.bussalesordersubmit.SubmitVo; import com.yxt.anrui.buscenter.api.bussalesordertrailer.BusSalesOrderTrailer; import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicle; @@ -99,6 +100,7 @@ import com.yxt.anrui.buscenter.biz.bussalesorder.BusSalesOrderService; import com.yxt.anrui.buscenter.biz.bussalesorderdiscount.BusSalesOrderDiscountService; import com.yxt.anrui.buscenter.biz.bussalesorderloancontract.BusSalesOrderLoancontractService; import com.yxt.anrui.buscenter.biz.bussalesordermakeup.BusSalesOrderMakeupService; +import com.yxt.anrui.buscenter.biz.bussalesordersubmit.BusSalesOrderSubmitService; import com.yxt.anrui.buscenter.biz.bussalesordertrailer.BusSalesOrderTrailerService; import com.yxt.anrui.buscenter.biz.bussalesordervehicle.BusSalesOrderVehicleService; import com.yxt.anrui.buscenter.biz.busvalcustfiling.BusValcustFilingService; @@ -137,6 +139,7 @@ import com.yxt.anrui.flowable.api.utils.ProcDefEnum; import com.yxt.anrui.flowable.sqloperationsymbol.BusinessVariables; import com.yxt.anrui.portal.api.dictcommon.DictCommonFeign; import com.yxt.anrui.portal.api.dictcommon.DictCommonVo; +import com.yxt.anrui.portal.api.sysorganization.SysOrganization; import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign; import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo; import com.yxt.anrui.portal.api.sysparameter.SysParameterFeign; @@ -154,8 +157,12 @@ import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigate.LoanHomevisitInvest import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigatecustomer.LoanHomevisitInvestigateCustomer; import com.yxt.anrui.riskcenter.api.loannoguaranteecreditreview.LoanNoGuaranteeCreditReviewDetailsVo; import com.yxt.anrui.riskcenter.api.loannoguaranteecreditreview.LoanNoGuaranteeCreditReviewFeign; +import com.yxt.anrui.riskcenter.api.loansolutions.LoanSolutions; +import com.yxt.anrui.riskcenter.api.loansolutions.LoanSolutionsDetailsVo; import com.yxt.anrui.riskcenter.api.loansolutions.LoanSolutionsFeign; +import com.yxt.anrui.riskcenter.api.loansolutions.LoanSolutionsVo; import com.yxt.anrui.riskcenter.api.loansolutions.app.SolutionsDetailsVo; +import com.yxt.anrui.scm.api.scmvehiclegression.ScmVehicleGression; import com.yxt.anrui.scm.api.scmvehrebate.ScmVehRebateDto; import com.yxt.anrui.scm.api.scmvehrebate.ScmVehRebateFeign; import com.yxt.anrui.scm.api.scmvehrebate.ScmVehRebateVehDto; @@ -178,6 +185,7 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import java.math.BigDecimal; +import java.math.RoundingMode; import java.time.YearMonth; import java.time.format.DateTimeFormatter; import java.util.*; @@ -307,6 +315,8 @@ public class BusDeliveredApplyService extends MybatisBaseService { pushOtherDocument(busDeliveredApply, detailsList); }); - /* Future future13 = pool.submit(() -> { + Future future13 = pool.submit(() -> { //推送车辆利润报表 pushCarSoldProfit(busDeliveredApply, detailsList); - });*/ + }); //推送单车返利管理 String concatNo = busDeliveredApply.getContractNo(); BusSalesOrder busSalesOrder = busSalesOrderService.selectOrderByContractNo(concatNo).getData(); @@ -1379,7 +1389,7 @@ public class BusDeliveredApplyService extends MybatisBaseService detailsList) { List dtoList = new ArrayList<>(); detailsList.removeAll(Collections.singleton(null)); - if(!detailsList.isEmpty()){ + if (!detailsList.isEmpty()) { BusSalesOrder busSalesOrder = busSalesOrderService.selectByContractNos(busDeliveredApply.getContractNo()); for (int i = 0; i < detailsList.size(); i++) { BusDeliveredApplyDetails busDeliveredApplyDetails = detailsList.get(i); @@ -1390,7 +1400,29 @@ public class BusDeliveredApplyService extends MybatisBaseService detailsVoResultBean = loanSolutionsFeign.selectDetailsss(busSalesOrder.getSid()); + if (detailsVoResultBean.getData() != null) { + SolutionsDetailsVo solutionsDetailsVo = detailsVoResultBean.getData(); + if (StringUtils.isNotBlank(solutionsDetailsVo.getServiceAmount())) { + carsSoldProfitDto.setFinanceServiceCharge(solutionsDetailsVo.getServiceAmount()); + } + } //中介返利 + BigDecimal zjAll = BigDecimal.ZERO; + BusSalesOrderSubmit busSalesOrderSubmit = busSalesOrderSubmitService.selectBySaleOrderSid(busSalesOrder.getSid()); + String zjReturnPrice = ""; + boolean isShow = false; + if (StringUtils.isNotBlank(busSalesOrderSubmit.getDistributorName())) { + if (busSalesOrderSubmit.getDistributorPrice() != null) { + zjAll = zjAll.add(busSalesOrderSubmit.getDistributorPrice()); + } + } + if (StringUtils.isNotBlank(busSalesOrderSubmit.getDistributorNameTwo())) { + if (busSalesOrderSubmit.getDistributorPriceTwo() != null) { + zjAll = zjAll.add(busSalesOrderSubmit.getDistributorPriceTwo()); + } + } + carsSoldProfitDto.setMediatorRebatePrice(zjAll.toString()); //车辆台账中取 carsSoldProfitDto.setOrgSidPath(baseVehicle.getOrgSidPath()); @@ -1407,6 +1439,7 @@ public class BusDeliveredApplyService extends MybatisBaseService stringList = Arrays.asList(carsSoldProfitDto.getOrgSidPath().split("/")); + String busSid = stringList.get(1); + SysOrganizationVo sysOrganization = sysOrganizationFeign.fetchBySid(busSid).getData(); + carsSoldProfitDto.setDivision(sysOrganization.getName()); + carsSoldProfitDto.setDivisionSid(busSid); dtoList.add(carsSoldProfitDto); - - - + //查询存放地点变更的申请经费以及台数 + ScmVehicleGression scmVehicleGression = baseMapper.selectByLocationAndVin(carsSoldProfitDto.getLocationSid(),baseVehicle.getSid()); + if(scmVehicleGression != null){ + BigDecimal allMon = BigDecimal.ZERO; + String applicantFunds = scmVehicleGression.getApplicantFunds(); + int vount = baseMapper.selectCOuntByScmSid(scmVehicleGression.getSid()); + if(StringUtils.isNotBlank(applicantFunds) && new BigDecimal(applicantFunds).compareTo(BigDecimal.ZERO)>0){ + allMon = new BigDecimal(applicantFunds).divide(new BigDecimal(vount),2, RoundingMode.HALF_UP); + } + carsSoldProfitDto.setMoveCarPrice(allMon.toString()); + } } - - - } - if(!dtoList.isEmpty()){ + if (!dtoList.isEmpty()) { ResultBean resultBean = carsSoldProfitFeign.saveOrUpdate(dtoList); } } diff --git a/anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/carsSoldProfit/CarsSoldProfit.java b/anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/carsSoldProfit/CarsSoldProfit.java index eeaaa6d50c..560aea445b 100644 --- a/anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/carsSoldProfit/CarsSoldProfit.java +++ b/anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/carsSoldProfit/CarsSoldProfit.java @@ -77,4 +77,10 @@ public class CarsSoldProfit extends BaseEntity { private Date createDate; @ApiModelProperty("更新日期") private Date updateDate; + @ApiModelProperty("入库价") + private BigDecimal costPrice; + + @ApiModelProperty("事业部") + private String division; + private String divisionSid; } diff --git a/anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/carsSoldProfit/CarsSoldProfitDto.java b/anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/carsSoldProfit/CarsSoldProfitDto.java index 75d0bab5e3..28279c0f5a 100644 --- a/anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/carsSoldProfit/CarsSoldProfitDto.java +++ b/anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/carsSoldProfit/CarsSoldProfitDto.java @@ -75,4 +75,10 @@ public class CarsSoldProfitDto { private Date createDate; @ApiModelProperty("更新日期") private Date updateDate; + + private String costPrice; + + @ApiModelProperty("事业部") + private String division; + private String divisionSid; } diff --git a/doc/databases/统计报表/车辆利润报表.sql b/doc/databases/统计报表/车辆利润报表.sql index 96d889cbae..35245d8f82 100644 --- a/doc/databases/统计报表/车辆利润报表.sql +++ b/doc/databases/统计报表/车辆利润报表.sql @@ -20,6 +20,8 @@ CREATE TABLE `car_sold_profit` `saleDate` varchar(64) DEFAULT NULL COMMENT '销售日期', `useOrgSid` varchar(64) DEFAULT NULL COMMENT '分公司sid', `useOrgName` varchar(64) DEFAULT NULL COMMENT '分公司名称', + `division` varchar(64) DEFAULT NULL COMMENT '事业部名称', + `divisionSid` varchar(64) DEFAULT NULL COMMENT '事业部sid', `vehModelSid` varchar(64) DEFAULT NULL COMMENT '车型sid', `vehModel` varchar(64) DEFAULT NULL COMMENT '车型', `vehMConfigSid` varchar(64) DEFAULT NULL COMMENT '车型配置sid', @@ -40,6 +42,7 @@ CREATE TABLE `car_sold_profit` `financeServiceCharge` decimal(10, 2) DEFAULT NULL COMMENT '金融服务费', `mediatorRebatePrice` decimal(10, 2) DEFAULT NULL COMMENT '中介返利费', `moveCarPrice` decimal(10, 2) DEFAULT NULL COMMENT '调车费', + `costPrice` decimal(10, 2) DEFAULT NULL COMMENT '入库价', `schedulingId` varchar(500) DEFAULT NULL COMMENT '排产订单编号', `gearbox` varchar(500) DEFAULT NULL COMMENT '变速箱', `createDate` date DEFAULT NULL COMMENT '数据日期', From 1e536c88f4f3245c9edfd95b1902df4f2bd1a2ad Mon Sep 17 00:00:00 2001 From: dimengzhe Date: Thu, 15 May 2025 15:20:45 +0800 Subject: [PATCH 4/9] =?UTF-8?q?=E5=87=BA=E5=BA=93=E7=94=B3=E8=AF=B7?= =?UTF-8?q?=E6=8E=A8=E9=80=81=E8=BD=A6=E8=BE=86=E5=88=A9=E6=B6=A6=E6=8A=A5?= =?UTF-8?q?=E8=A1=A8=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../biz/busdeliveredapply/BusDeliveredApplyRest.java | 10 ++++++---- .../busdeliveredapply/BusDeliveredApplyService.java | 8 ++++++++ .../biz/carsSoldProfit/CarsSoldProfitMapper.xml | 4 ++-- doc/databases/统计报表/车辆利润报表.sql | 4 ++-- 4 files changed, 18 insertions(+), 8 deletions(-) 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 a188b553c5..fc500741ce 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 @@ -36,10 +36,7 @@ import com.yxt.common.core.vo.PagerVo; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; import java.util.List; @@ -335,4 +332,9 @@ public class BusDeliveredApplyRest implements BusDeliveredApplyFeign { public ResultBean saveRetrievalApplyInfo(AppDeliveredApplyDto appDeliveredApplyDto) { return busDeliveredApplyService.saveRetrievalApplyInfo(appDeliveredApplyDto); } + @PostMapping("pushReport") + @ApiOperation("测试推送车辆利润报表") + ResultBean pushReport(@RequestParam("sid")String sid){ + return busDeliveredApplyService.pushReport(sid); + } } 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 8941c3a932..7025535c34 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 @@ -5352,4 +5352,12 @@ public class BusDeliveredApplyService extends MybatisBaseService detailsList = busDeliveredApplyDetailsService.selectByApplySid(busDeliveredApply.getSid()); + pushCarSoldProfit(busDeliveredApply,detailsList); + return rb.success(); + } } \ No newline at end of file diff --git a/anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/carsSoldProfit/CarsSoldProfitMapper.xml b/anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/carsSoldProfit/CarsSoldProfitMapper.xml index 43fa6c1961..650a8a5697 100644 --- a/anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/carsSoldProfit/CarsSoldProfitMapper.xml +++ b/anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/carsSoldProfit/CarsSoldProfitMapper.xml @@ -3,12 +3,12 @@ - select * from cars_sold_profit + select cp.staffName, + cp.customerName, + DATE_FORMAT(cp.saleDate,'%Y-%m-%d') as saleDate, + cp.useOrgName, + cp.division, + cp.purchaseSystemName, + cp.vinNo, + cp.exStockPrice, + cp.expectedMaori, + cp.rebatesAdjust, + cp.adjustedMaori, + cp.makersSettlementPrice, + cp.rebatesTotal, + cp.carCost, + cp.financeServiceCharge, + cp.mediatorRebatePrice, + cp.schedulingId, + cp.createDate, + cp.updateDate, + bm.gearboxTypeValue, + bm.vehicleAlias + from cars_sold_profit cp + left join anrui_base.base_vehicle_model bm on bm.sid = cp.vehModelSid ${ew.sqlSegment} diff --git a/anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/carsSoldProfit/CarsSoldProfitService.java b/anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/carsSoldProfit/CarsSoldProfitService.java index 86337e7292..58d58df50c 100644 --- a/anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/carsSoldProfit/CarsSoldProfitService.java +++ b/anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/carsSoldProfit/CarsSoldProfitService.java @@ -74,13 +74,13 @@ public class CarsSoldProfitService extends MybatisBaseService defaultIdReltBean = sysUserFeign.selectPrivilegeLevel(privilegeQuery); if (org.apache.commons.lang3.StringUtils.isNotBlank(defaultIdReltBean.getData())) { //数据权限ID(1集团、2事业部、3分公司、4部门、5个人) - String orgSidPath = query.getOrgSidPath(); + String orgSidPath = query.getOrgPath(); orgSidPath = orgSidPath + "/"; int i1 = orgSidPath.indexOf("/"); int i2 = orgSidPath.indexOf("/", i1 + 1); @@ -89,16 +89,16 @@ public class CarsSoldProfitService extends MybatisBaseService p = new PagerVo<>(); return p; @@ -113,21 +113,21 @@ public class CarsSoldProfitService extends MybatisBaseService wrapper.like("useOrgName", names) - .or().like("vinNo", names) - .or().like("model", names) - .or().like("schedulingId", names) - .or().like("staffName", names)); + qw.and(wrapper -> wrapper.like("cp.useOrgName", names) + .or().like("cp.vinNo", names) + .or().like("cp.vehModel", names) + .or().like("cp.schedulingId", names) + .or().like("cp.staffName", names)); } From 6eae133fe9bc897fd550e620b783cebbc352a364 Mon Sep 17 00:00:00 2001 From: dimengzhe Date: Thu, 15 May 2025 16:32:24 +0800 Subject: [PATCH 8/9] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../reportcenter/biz/carsSoldProfit/CarsSoldProfitService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/carsSoldProfit/CarsSoldProfitService.java b/anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/carsSoldProfit/CarsSoldProfitService.java index 58d58df50c..f7b89f10b7 100644 --- a/anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/carsSoldProfit/CarsSoldProfitService.java +++ b/anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/carsSoldProfit/CarsSoldProfitService.java @@ -125,7 +125,7 @@ public class CarsSoldProfitService extends MybatisBaseService wrapper.like("cp.useOrgName", names) .or().like("cp.vinNo", names) - .or().like("cp.vehModel", names) + .or().like("bm.vehicleAlias", names) .or().like("cp.schedulingId", names) .or().like("cp.staffName", names)); From f58f1f0ead811ee3f3dbf841559124b6635df56f Mon Sep 17 00:00:00 2001 From: dimengzhe Date: Thu, 15 May 2025 16:57:01 +0800 Subject: [PATCH 9/9] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=BD=A6=E8=BE=86?= =?UTF-8?q?=E5=88=A9=E6=B6=A6=E7=9B=B8=E5=85=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../carsSoldProfit/CarsSoldProfitFeign.java | 12 ++++++-- .../CarsSoldProfitRebateAllVo.java | 23 +++++++++++++++ .../CarsSoldProfitRebateDetailsVo.java | 28 +++++++++++++++++++ .../carsSoldProfit/CarsSoldProfitRest.java | 10 ++++--- .../carsSoldProfit/CarsSoldProfitService.java | 9 +++--- .../统计报表/车辆利润报表.sql | 3 -- 6 files changed, 71 insertions(+), 14 deletions(-) create mode 100644 anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/carsSoldProfit/CarsSoldProfitRebateAllVo.java create mode 100644 anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/carsSoldProfit/CarsSoldProfitRebateDetailsVo.java diff --git a/anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/carsSoldProfit/CarsSoldProfitFeign.java b/anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/carsSoldProfit/CarsSoldProfitFeign.java index 079bb52ac1..df9881dfcb 100644 --- a/anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/carsSoldProfit/CarsSoldProfitFeign.java +++ b/anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/carsSoldProfit/CarsSoldProfitFeign.java @@ -4,10 +4,9 @@ import com.yxt.anrui.reportcenter.api.dailyreport.DailyReportFeignFallback; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; +import io.swagger.annotations.ApiOperation; import org.springframework.cloud.openfeign.FeignClient; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.ResponseBody; +import org.springframework.web.bind.annotation.*; import java.util.List; @@ -25,9 +24,16 @@ public interface CarsSoldProfitFeign { @PostMapping("saveOrUpdate") @ResponseBody + @ApiOperation("保存或修改") ResultBean saveOrUpdate(@RequestBody List dtoList); @PostMapping("list") @ResponseBody + @ApiOperation("车辆利润报表分页") ResultBean> list(@RequestBody PagerQuery pagerQuery); + + @GetMapping("rebates") + @ResponseBody + @ApiOperation("返利明细") + ResultBean rebates(@RequestParam("sid")String sid); } diff --git a/anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/carsSoldProfit/CarsSoldProfitRebateAllVo.java b/anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/carsSoldProfit/CarsSoldProfitRebateAllVo.java new file mode 100644 index 0000000000..35a138a2b3 --- /dev/null +++ b/anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/carsSoldProfit/CarsSoldProfitRebateAllVo.java @@ -0,0 +1,23 @@ +package com.yxt.anrui.reportcenter.api.carsSoldProfit; + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +/** + * @description: + * @author: dimengzhe + * @date: 2025/5/15 + **/ +@Data +public class CarsSoldProfitRebateAllVo implements Vo { + private static final long serialVersionUID = -9016391824372444422L; + + private List list; + @ApiModelProperty("预提返利合计") + private String expectedRebateTotal; + @ApiModelProperty("调整返利合计") + private String adjustedRebateTotal; +} diff --git a/anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/carsSoldProfit/CarsSoldProfitRebateDetailsVo.java b/anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/carsSoldProfit/CarsSoldProfitRebateDetailsVo.java new file mode 100644 index 0000000000..a0914cf1ca --- /dev/null +++ b/anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/carsSoldProfit/CarsSoldProfitRebateDetailsVo.java @@ -0,0 +1,28 @@ +package com.yxt.anrui.reportcenter.api.carsSoldProfit; + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @description: + * @author: dimengzhe + * @date: 2025/5/15 + **/ +@Data +public class CarsSoldProfitRebateDetailsVo implements Vo { + private static final long serialVersionUID = -2059450221052046209L; + + @ApiModelProperty("政策方") + private String policy; + @ApiModelProperty("所属年月") + private String yearAndMonth; + @ApiModelProperty("返利类型") + private String rebateType; + @ApiModelProperty("返利名称") + private String rebateName; + @ApiModelProperty("预提返利") + private String expectedRebate; + @ApiModelProperty("返利调整") + private String rebatesAdjust; +} diff --git a/anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/carsSoldProfit/CarsSoldProfitRest.java b/anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/carsSoldProfit/CarsSoldProfitRest.java index b8d17fb77f..cd7f0e28c8 100644 --- a/anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/carsSoldProfit/CarsSoldProfitRest.java +++ b/anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/carsSoldProfit/CarsSoldProfitRest.java @@ -1,9 +1,6 @@ package com.yxt.anrui.reportcenter.biz.carsSoldProfit; -import com.yxt.anrui.reportcenter.api.carsSoldProfit.CarsSoldProfitDto; -import com.yxt.anrui.reportcenter.api.carsSoldProfit.CarsSoldProfitFeign; -import com.yxt.anrui.reportcenter.api.carsSoldProfit.CarsSoldProfitQuery; -import com.yxt.anrui.reportcenter.api.carsSoldProfit.CarsSoldProfitVo; +import com.yxt.anrui.reportcenter.api.carsSoldProfit.*; import com.yxt.anrui.reportcenter.api.dailyreport.DailyReportVo; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; @@ -39,4 +36,9 @@ public class CarsSoldProfitRest implements CarsSoldProfitFeign { PagerVo pv = carsSoldProfitService.listPage(pagerQuery); return rb.success().setData(pv); } + + @Override + public ResultBean rebates(String sid) { + return carsSoldProfitService.rebates(sid); + } } diff --git a/anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/carsSoldProfit/CarsSoldProfitService.java b/anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/carsSoldProfit/CarsSoldProfitService.java index f7b89f10b7..ec622f2801 100644 --- a/anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/carsSoldProfit/CarsSoldProfitService.java +++ b/anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/carsSoldProfit/CarsSoldProfitService.java @@ -5,10 +5,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.yxt.anrui.portal.api.sysuser.PrivilegeQuery; import com.yxt.anrui.portal.api.sysuser.SysUserFeign; -import com.yxt.anrui.reportcenter.api.carsSoldProfit.CarsSoldProfit; -import com.yxt.anrui.reportcenter.api.carsSoldProfit.CarsSoldProfitDto; -import com.yxt.anrui.reportcenter.api.carsSoldProfit.CarsSoldProfitQuery; -import com.yxt.anrui.reportcenter.api.carsSoldProfit.CarsSoldProfitVo; +import com.yxt.anrui.reportcenter.api.carsSoldProfit.*; import com.yxt.common.base.service.MybatisBaseService; import com.yxt.common.base.utils.PagerUtil; import com.yxt.common.base.utils.StringUtils; @@ -139,4 +136,8 @@ public class CarsSoldProfitService extends MybatisBaseService p = PagerUtil.pageToVo(pagging, null); return p; } + + public ResultBean rebates(String sid) { + return null; + } } diff --git a/doc/databases/统计报表/车辆利润报表.sql b/doc/databases/统计报表/车辆利润报表.sql index 1cecb5d622..5033f29d5e 100644 --- a/doc/databases/统计报表/车辆利润报表.sql +++ b/doc/databases/统计报表/车辆利润报表.sql @@ -23,7 +23,6 @@ CREATE TABLE `cars_sold_profit` `division` varchar(64) DEFAULT NULL COMMENT '事业部名称', `divisionSid` varchar(64) DEFAULT NULL COMMENT '事业部sid', `vehModelSid` varchar(64) DEFAULT NULL COMMENT '车型sid', - `vehModel` varchar(64) DEFAULT NULL COMMENT '车型', `vehMConfigSid` varchar(64) DEFAULT NULL COMMENT '车型配置sid', `purchaseSystemSid` varchar(64) DEFAULT NULL COMMENT '采购系统sid', `purchaseSystemName` varchar(64) DEFAULT NULL COMMENT '采购系统名称', @@ -31,7 +30,6 @@ CREATE TABLE `cars_sold_profit` `vinSid` varchar(200) DEFAULT NULL COMMENT '车辆sid', `locationSid` varchar(200) DEFAULT NULL COMMENT '存放地点sid', `locationName` varchar(200) DEFAULT NULL COMMENT '存放地点', - `type` varchar(200) DEFAULT NULL COMMENT '类型', `exStockPrice` decimal(10, 2) DEFAULT NULL COMMENT '出库价', `expectedMaori` decimal(10, 2) DEFAULT NULL COMMENT '预计毛利', `rebatesAdjust` decimal(10, 2) DEFAULT NULL COMMENT '返利调整', @@ -44,7 +42,6 @@ CREATE TABLE `cars_sold_profit` `moveCarPrice` decimal(10, 2) DEFAULT NULL COMMENT '调车费', `costPrice` decimal(10, 2) DEFAULT NULL COMMENT '入库价', `schedulingId` varchar(500) DEFAULT NULL COMMENT '排产订单编号', - `gearbox` varchar(500) DEFAULT NULL COMMENT '变速箱', `createDate` date DEFAULT NULL COMMENT '数据日期', `updateDate` date DEFAULT NULL COMMENT '更新日期', PRIMARY KEY (`id`),