From 7ab3972328ffe5797444e524d6ec76410630c305 Mon Sep 17 00:00:00 2001 From: dimengzhe Date: Wed, 14 May 2025 08:33:50 +0800 Subject: [PATCH 01/24] =?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?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- anrui-buscenter/anrui-buscenter-biz/pom.xml | 10 +++ .../anrui/buscenter/BusCenterApplication.java | 2 +- .../BusDeliveredApplyService.java | 69 +++++++++++++++++++ .../api/carsSoldProfit/CarsSoldProfitDto.java | 6 +- .../carsSoldProfit/CarsSoldProfitFeign.java | 4 +- .../carsSoldProfit/CarsSoldProfitRest.java | 6 +- .../carsSoldProfit/CarsSoldProfitService.java | 48 +++++++------ 7 files changed, 116 insertions(+), 29 deletions(-) diff --git a/anrui-buscenter/anrui-buscenter-biz/pom.xml b/anrui-buscenter/anrui-buscenter-biz/pom.xml index 1dc37c9f20..853e66826b 100644 --- a/anrui-buscenter/anrui-buscenter-biz/pom.xml +++ b/anrui-buscenter/anrui-buscenter-biz/pom.xml @@ -8,6 +8,11 @@ 0.0.1 + 4.0.0 @@ -16,6 +21,11 @@ 0.0.1 + + anrui-reportcenter-api + com.yxt.anrui + 0.0.1-SNAPSHOT + com.yxt.messagecenter message-center-api diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/BusCenterApplication.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/BusCenterApplication.java index 7b47105bd4..2d9f16a2af 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/BusCenterApplication.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/BusCenterApplication.java @@ -16,7 +16,7 @@ import org.springframework.scheduling.annotation.EnableScheduling; }) @EnableScheduling @EnableDiscoveryClient -@EnableFeignClients(basePackages = {"com.yxt.anrui.portal", "com.yxt.anrui.crm", "com.yxt.anrui.base", "com.yxt.anrui.riskcenter","com.yxt.anrui.flowable","com.yxt.messagecenter","com.yxt.anrui.fin","com.yxt.anrui.scm"}) +@EnableFeignClients(basePackages = {"com.yxt.anrui.portal", "com.yxt.anrui.crm", "com.yxt.anrui.base", "com.yxt.anrui.riskcenter","com.yxt.anrui.flowable","com.yxt.messagecenter","com.yxt.anrui.fin","com.yxt.anrui.scm","com.yxt.anrui.reportcenter"}) public class BusCenterApplication { public static void main(String[] args) { 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 bbc4c75ca2..c9242b6525 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 @@ -145,6 +145,8 @@ import com.yxt.anrui.portal.api.sysuser.PrivilegeQuery; import com.yxt.anrui.portal.api.sysuser.SysUserFeign; import com.yxt.anrui.portal.api.sysuser.SysUserVo; import com.yxt.anrui.portal.api.sysuser.UserQuery; +import com.yxt.anrui.reportcenter.api.carsSoldProfit.CarsSoldProfitDto; +import com.yxt.anrui.reportcenter.api.carsSoldProfit.CarsSoldProfitFeign; import com.yxt.anrui.riskcenter.api.loanfileexamine.LoanFileexamine; import com.yxt.anrui.riskcenter.api.loanfileexamine.LoanFileexamineFeign; import com.yxt.anrui.riskcenter.api.loanhomevisitfileexamine.LoanHomevisitFileexamineFeign; @@ -303,6 +305,9 @@ public class BusDeliveredApplyService extends MybatisBaseService { pushOtherDocument(busDeliveredApply, detailsList); }); + /*Future future13 = pool.submit(() -> { + pushCarSoldProfit(busDeliveredApply, detailsList); + });*/ //推送单车返利管理 String concatNo = busDeliveredApply.getContractNo(); BusSalesOrder busSalesOrder = busSalesOrderService.selectOrderByContractNo(concatNo).getData(); @@ -1367,6 +1375,67 @@ public class BusDeliveredApplyService extends MybatisBaseService detailsList) { + List dtoList = new ArrayList<>(); + detailsList.removeAll(Collections.singleton(null)); + if(!detailsList.isEmpty()){ + BusSalesOrder busSalesOrder = busSalesOrderService.selectByContractNos(busDeliveredApply.getContractNo()); + for (int i = 0; i < detailsList.size(); i++) { + BusDeliveredApplyDetails busDeliveredApplyDetails = detailsList.get(i); + BaseVehicle baseVehicle = baseVehicleFeign.fetchBySid(busDeliveredApplyDetails.getVinSid()).getData(); + CarsSoldProfitDto carsSoldProfitDto = new CarsSoldProfitDto(); + carsSoldProfitDto.setStaffSid(busSalesOrder.getStaffSid());//销售专员 + carsSoldProfitDto.setStaffName(busSalesOrder.getStaffName()); + carsSoldProfitDto.setCustomerSid(busSalesOrder.getCustomerSid()); + carsSoldProfitDto.setCustomerName(busSalesOrder.getCustomerName()); + //金融服务费 + //中介返利 + + //车辆台账中取 + carsSoldProfitDto.setOrgSidPath(baseVehicle.getOrgSidPath()); + //分公司 + carsSoldProfitDto.setUseOrgSid(baseVehicle.getUseOrgSid()); + carsSoldProfitDto.setUseOrgName(baseVehicle.getUseOrgName()); + //销售日期 + carsSoldProfitDto.setSaleDate(baseVehicle.getSalesDate()); + //车架号 + carsSoldProfitDto.setVinNo(baseVehicle.getVinNo()); + //车型 + carsSoldProfitDto.setVehModelSid(baseVehicle.getModelSid()); + carsSoldProfitDto.setVehMConfigSid(baseVehicle.getModelConfigSid()); + carsSoldProfitDto.setPurchaseSystemSid(baseVehicle.getPurchaseSystemSid()); + carsSoldProfitDto.setPurchaseSystemName(baseVehicle.getPurchaseSystemName()); + //入库价 + //出库价 + carsSoldProfitDto.setExStockPrice(baseVehicle.getContractPrice().toString()); + //存放地点 + carsSoldProfitDto.setLocationSid(baseVehicle.getLocation()); + carsSoldProfitDto.setLocationName(baseVehicle.getLocationName()); + //厂家结算价 + carsSoldProfitDto.setMakersSettlementPrice(baseVehicle.getSettlePrice().toString()); + + //排产订单编号 + + //变速箱 + + //数据日期 + carsSoldProfitDto.setCreateDate(new Date()); + + + dtoList.add(carsSoldProfitDto); + + + + } + + + + } + if(!dtoList.isEmpty()){ + ResultBean resultBean = carsSoldProfitFeign.saveOrUpdate(dtoList); + } + } + private void pushVehRebateAdjustBill(BusDeliveredApply busDeliveredApply, List detailsList, SolutionsDetailsVo solutionsDetailsVo) { BigDecimal cjtx = BigDecimal.ZERO;//厂家贴息 BigDecimal txdck = BigDecimal.ZERO;//贴息抵车款 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 83c1fb8da8..75d0bab5e3 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 @@ -24,7 +24,7 @@ public class CarsSoldProfitDto { @ApiModelProperty("客户名称") private String customerName; @ApiModelProperty("销售日期") - private String saleDate; + private Date saleDate; @ApiModelProperty("分公司sid") private String useOrgSid; @ApiModelProperty("分公司名称") @@ -72,7 +72,7 @@ public class CarsSoldProfitDto { @ApiModelProperty("变速箱") private String gearbox; @ApiModelProperty("数据日期") - private String createDate; + private Date createDate; @ApiModelProperty("更新日期") - private String updateDate; + private Date updateDate; } 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 a862ea8956..079bb52ac1 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 @@ -9,6 +9,8 @@ import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.ResponseBody; +import java.util.List; + /** * @description: * @author: dimengzhe @@ -23,7 +25,7 @@ public interface CarsSoldProfitFeign { @PostMapping("saveOrUpdate") @ResponseBody - ResultBean saveOrUpdate(@RequestBody CarsSoldProfitDto dto); + ResultBean saveOrUpdate(@RequestBody List dtoList); @PostMapping("list") @ResponseBody 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 64f519a85c..b8d17fb77f 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 @@ -13,6 +13,8 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import java.util.List; + /** * @description: * @author: dimengzhe @@ -27,8 +29,8 @@ public class CarsSoldProfitRest implements CarsSoldProfitFeign { private CarsSoldProfitService carsSoldProfitService; @Override - public ResultBean saveOrUpdate(CarsSoldProfitDto dto) { - return carsSoldProfitService.saveProfit(dto); + public ResultBean saveOrUpdate(List dtoList) { + return carsSoldProfitService.saveProfit(dtoList); } @Override 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 20c2ac625f..86337e7292 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 @@ -34,32 +34,36 @@ public class CarsSoldProfitService extends MybatisBaseService dtoList) { ResultBean rb = ResultBean.fireFail(); - CarsSoldProfit carsSoldProfit = baseMapper.selectByVinSid(dto.getVinSid()); - if (carsSoldProfit != null) { - //预计毛利 - if (StringUtils.isNotBlank(dto.getExpectedMaori())) { - carsSoldProfit.setExpectedMaori(new BigDecimal(dto.getExpectedMaori())); - } - //返利调整 - if (StringUtils.isNotBlank(dto.getRebatesAdjust())) { - carsSoldProfit.setRebatesAdjust(new BigDecimal(dto.getRebatesAdjust())); - } - //调整后毛利 - if (StringUtils.isNotBlank(dto.getAdjustedMaori())) { - carsSoldProfit.setAdjustedMaori(new BigDecimal(dto.getAdjustedMaori())); - } - // - carsSoldProfit.setUpdateDate(new Date()); - baseMapper.updateById(carsSoldProfit); + for (int i = 0; i < dtoList.size(); i++) { + CarsSoldProfitDto dto = dtoList.get(i); + CarsSoldProfit carsSoldProfit = baseMapper.selectByVinSid(dto.getVinSid()); + if (carsSoldProfit != null) { + //预计毛利 + if (StringUtils.isNotBlank(dto.getExpectedMaori())) { + carsSoldProfit.setExpectedMaori(new BigDecimal(dto.getExpectedMaori())); + } + //返利调整 + if (StringUtils.isNotBlank(dto.getRebatesAdjust())) { + carsSoldProfit.setRebatesAdjust(new BigDecimal(dto.getRebatesAdjust())); + } + //调整后毛利 + if (StringUtils.isNotBlank(dto.getAdjustedMaori())) { + carsSoldProfit.setAdjustedMaori(new BigDecimal(dto.getAdjustedMaori())); + } + // + carsSoldProfit.setUpdateDate(new Date()); + baseMapper.updateById(carsSoldProfit); - } else { - carsSoldProfit = new CarsSoldProfit(); - BeanUtil.copyProperties(dto, carsSoldProfit); - baseMapper.insert(carsSoldProfit); + } else { + carsSoldProfit = new CarsSoldProfit(); + BeanUtil.copyProperties(dto, carsSoldProfit); + baseMapper.insert(carsSoldProfit); + } } + return rb.success(); } From 48c0cd9ea5b2e7343a66ba329b9abc4d657382f8 Mon Sep 17 00:00:00 2001 From: dimengzhe Date: Wed, 14 May 2025 08:51:58 +0800 Subject: [PATCH 02/24] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../FinCollectionConfirmationService.java | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java index 55a2f2694c..2dc1990d55 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java @@ -4833,7 +4833,12 @@ public class FinCollectionConfirmationService extends MybatisBaseService Date: Wed, 14 May 2025 09:03:04 +0800 Subject: [PATCH 03/24] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../FinCollectionConfirmationService.java | 48 +++++++++++++++++++ 1 file changed, 48 insertions(+) diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java index 2dc1990d55..16c20ea057 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java @@ -4846,6 +4846,30 @@ public class FinCollectionConfirmationService extends MybatisBaseService0) { + BigDecimal paymentMoney = planDetails.getPaymentMoney(); + String subscriptionMoney = v.getSubscriptionMoney(); + BigDecimal subtract = paymentMoney.subtract(new BigDecimal(subscriptionMoney)); + planDetails.setPaymentMoney(subtract); + loanRepaymentPlanDetailsFeign.updateByEntity(planDetails); + } + } + }else{ + if(planDetails.getPaymentInterest() != null){ + if(planDetails.getPaymentInterest().compareTo(BigDecimal.ZERO)>0){ + BigDecimal paymentInterest = planDetails.getPaymentInterest(); + String subscriptionMoney = v.getSubscriptionMoney(); + BigDecimal subtract = paymentInterest.subtract(new BigDecimal(subscriptionMoney)); + planDetails.setPaymentInterest(subtract); + BigDecimal paymentMoney = planDetails.getPaymentMoney(); + BigDecimal subtract2 = paymentMoney.subtract(new BigDecimal(subscriptionMoney)); + planDetails.setPaymentMoney(subtract2); + loanRepaymentPlanDetailsFeign.updateByEntity(planDetails); + } + } + } } //应收贷款车欠款_到期欠款_逾期利息--资金占用费 @@ -4879,6 +4903,30 @@ public class FinCollectionConfirmationService extends MybatisBaseService0) { + BigDecimal paymentMoney = planDetails.getPaymentMoney(); + String subscriptionMoney = v.getSubscriptionMoney(); + BigDecimal subtract = paymentMoney.subtract(new BigDecimal(subscriptionMoney)); + planDetails.setPaymentMoney(subtract); + loanRepaymentPlanDetailsFeign.updateByEntity(planDetails); + } + } + }else{ + if(planDetails.getPaymentInterest() != null){ + if(planDetails.getPaymentInterest().compareTo(BigDecimal.ZERO)>0){ + BigDecimal paymentInterest = planDetails.getPaymentInterest(); + String subscriptionMoney = v.getSubscriptionMoney(); + BigDecimal subtract = paymentInterest.subtract(new BigDecimal(subscriptionMoney)); + planDetails.setPaymentInterest(subtract); + BigDecimal paymentMoney = planDetails.getPaymentMoney(); + BigDecimal subtract2 = paymentMoney.subtract(new BigDecimal(subscriptionMoney)); + planDetails.setPaymentMoney(subtract2); + loanRepaymentPlanDetailsFeign.updateByEntity(planDetails); + } + } + } } if ("资金占用费".equals(v.getReceivablesName())) { From 46c88cf6b2ab81778e1b720162e07b4dba281a62 Mon Sep 17 00:00:00 2001 From: yunuo970428 <405378304@qq.com> Date: Wed, 14 May 2025 09:17:25 +0800 Subject: [PATCH 04/24] =?UTF-8?q?=E5=AE=8C=E5=96=84=E4=BA=A4=E5=9B=9E?= =?UTF-8?q?=E8=BD=A6=E8=BE=86=E4=BA=8C=E6=AC=A1=E9=94=80=E5=94=AE=E7=AE=A1?= =?UTF-8?q?=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/views/secondarysales/secondarysalesAdd.vue | 2 +- .../src/views/secondarysales/secondarysalesInfo.vue | 2 +- .../src/views/workFlow/ercixiaoshouFlow/secondarysalesByPGJ.vue | 2 +- .../views/workFlow/ercixiaoshouFlow/secondarysalesDaiBan.vue | 2 +- .../src/views/workFlow/ercixiaoshouFlow/secondarysalesEdit.vue | 2 +- .../src/views/workFlow/ercixiaoshouFlow/secondarysalesYiBan.vue | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/anrui-riskcenter-ui/src/views/secondarysales/secondarysalesAdd.vue b/anrui-riskcenter-ui/src/views/secondarysales/secondarysalesAdd.vue index 730b533284..1720ed9578 100644 --- a/anrui-riskcenter-ui/src/views/secondarysales/secondarysalesAdd.vue +++ b/anrui-riskcenter-ui/src/views/secondarysales/secondarysalesAdd.vue @@ -301,7 +301,7 @@
是否追偿
- + 是 否 diff --git a/anrui-riskcenter-ui/src/views/secondarysales/secondarysalesInfo.vue b/anrui-riskcenter-ui/src/views/secondarysales/secondarysalesInfo.vue index f56d9b0480..1415d8916e 100644 --- a/anrui-riskcenter-ui/src/views/secondarysales/secondarysalesInfo.vue +++ b/anrui-riskcenter-ui/src/views/secondarysales/secondarysalesInfo.vue @@ -254,7 +254,7 @@ -
是否年检
+
是否追偿
{{ formobj.loanSecondarySalesCost.isRecovery }} diff --git a/anrui-riskcenter-ui/src/views/workFlow/ercixiaoshouFlow/secondarysalesByPGJ.vue b/anrui-riskcenter-ui/src/views/workFlow/ercixiaoshouFlow/secondarysalesByPGJ.vue index b1108307a9..4566ef5892 100644 --- a/anrui-riskcenter-ui/src/views/workFlow/ercixiaoshouFlow/secondarysalesByPGJ.vue +++ b/anrui-riskcenter-ui/src/views/workFlow/ercixiaoshouFlow/secondarysalesByPGJ.vue @@ -257,7 +257,7 @@ -
是否年检
+
是否追偿
{{ formobj.loanSecondarySalesCost.isRecovery }} diff --git a/anrui-riskcenter-ui/src/views/workFlow/ercixiaoshouFlow/secondarysalesDaiBan.vue b/anrui-riskcenter-ui/src/views/workFlow/ercixiaoshouFlow/secondarysalesDaiBan.vue index e6324a0503..e68ad7f7f9 100644 --- a/anrui-riskcenter-ui/src/views/workFlow/ercixiaoshouFlow/secondarysalesDaiBan.vue +++ b/anrui-riskcenter-ui/src/views/workFlow/ercixiaoshouFlow/secondarysalesDaiBan.vue @@ -257,7 +257,7 @@ -
是否年检
+
是否追偿
{{ formobj.loanSecondarySalesCost.isRecovery }} diff --git a/anrui-riskcenter-ui/src/views/workFlow/ercixiaoshouFlow/secondarysalesEdit.vue b/anrui-riskcenter-ui/src/views/workFlow/ercixiaoshouFlow/secondarysalesEdit.vue index b907588e6f..4305439809 100644 --- a/anrui-riskcenter-ui/src/views/workFlow/ercixiaoshouFlow/secondarysalesEdit.vue +++ b/anrui-riskcenter-ui/src/views/workFlow/ercixiaoshouFlow/secondarysalesEdit.vue @@ -300,7 +300,7 @@
是否追偿
- + 是 否 diff --git a/anrui-riskcenter-ui/src/views/workFlow/ercixiaoshouFlow/secondarysalesYiBan.vue b/anrui-riskcenter-ui/src/views/workFlow/ercixiaoshouFlow/secondarysalesYiBan.vue index 404c13f642..1c8a21a3b6 100644 --- a/anrui-riskcenter-ui/src/views/workFlow/ercixiaoshouFlow/secondarysalesYiBan.vue +++ b/anrui-riskcenter-ui/src/views/workFlow/ercixiaoshouFlow/secondarysalesYiBan.vue @@ -254,7 +254,7 @@ -
是否年检
+
是否追偿
{{ formobj.loanSecondarySalesCost.isRecovery }} From a5831229f0ebe79ea0de44020aeda3fe55149193 Mon Sep 17 00:00:00 2001 From: yunuo970428 <405378304@qq.com> Date: Wed, 14 May 2025 09:56:24 +0800 Subject: [PATCH 05/24] =?UTF-8?q?=E5=AE=8C=E5=96=84=E4=BA=A4=E5=9B=9E?= =?UTF-8?q?=E8=BD=A6=E8=BE=86=E4=BA=8C=E6=AC=A1=E9=94=80=E5=94=AE=E7=AE=A1?= =?UTF-8?q?=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/views/secondarysales/relation/generatecontract.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/anrui-riskcenter-ui/src/views/secondarysales/relation/generatecontract.vue b/anrui-riskcenter-ui/src/views/secondarysales/relation/generatecontract.vue index 43e146cb12..851f99ab16 100644 --- a/anrui-riskcenter-ui/src/views/secondarysales/relation/generatecontract.vue +++ b/anrui-riskcenter-ui/src/views/secondarysales/relation/generatecontract.vue @@ -82,7 +82,7 @@
附件
-
合同
+
二次销售合同
@@ -90,7 +90,7 @@ -
证件
+
其他证件
From 66f343db8fd018ce82cad4b55fe6f93312758eef Mon Sep 17 00:00:00 2001 From: dimengzhe Date: Wed, 14 May 2025 10:16:12 +0800 Subject: [PATCH 06/24] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=8C=E6=AC=A1?= =?UTF-8?q?=E9=94=80=E5=94=AE=E8=AF=A6=E6=83=85=E6=98=BE=E7=A4=BA=E7=AB=9E?= =?UTF-8?q?=E4=BB=B7=E7=BB=93=E6=9E=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BusDeliveredApplyService.java | 3 +- .../portal/api/sysnotice/SysNoticeVo.java | 2 ++ .../LoanSecondarySalesApplyDetailsVo.java | 2 ++ .../LoanSecondarySalesApplyService.java | 29 +++++++++++++++++-- .../LoanSecondarySalesBiddingMapper.java | 2 ++ .../LoanSecondarySalesBiddingMapper.xml | 5 ++++ .../LoanSecondarySalesBiddingService.java | 4 +++ 7 files changed, 44 insertions(+), 3 deletions(-) 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 c9242b6525..9a5920f6ce 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 @@ -1189,7 +1189,8 @@ public class BusDeliveredApplyService extends MybatisBaseService { pushOtherDocument(busDeliveredApply, detailsList); }); - /*Future future13 = pool.submit(() -> { + /* Future future13 = pool.submit(() -> { + //推送车辆利润报表 pushCarSoldProfit(busDeliveredApply, detailsList); });*/ //推送单车返利管理 diff --git a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysnotice/SysNoticeVo.java b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysnotice/SysNoticeVo.java index 605db06062..b5f2c20793 100644 --- a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysnotice/SysNoticeVo.java +++ b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysnotice/SysNoticeVo.java @@ -21,4 +21,6 @@ public class SysNoticeVo { private String stateValue; @ApiModelProperty("是否置顶") private String topping; + @ApiModelProperty("PC端页面地址") + private String pcUrl; } diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansecondarysalesapply/LoanSecondarySalesApplyDetailsVo.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansecondarysalesapply/LoanSecondarySalesApplyDetailsVo.java index 0b37dcee44..d1a710a8d2 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansecondarysalesapply/LoanSecondarySalesApplyDetailsVo.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansecondarysalesapply/LoanSecondarySalesApplyDetailsVo.java @@ -100,5 +100,7 @@ public class LoanSecondarySalesApplyDetailsVo { @ApiModelProperty("是否显示竞价按钮") private boolean validate; + private String result; + } diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansecondarysalesapply/LoanSecondarySalesApplyService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansecondarysalesapply/LoanSecondarySalesApplyService.java index a239c24489..f3dee134a9 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansecondarysalesapply/LoanSecondarySalesApplyService.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansecondarysalesapply/LoanSecondarySalesApplyService.java @@ -24,8 +24,7 @@ import com.yxt.anrui.flowable.api.flowtask.FlowTaskVo; import com.yxt.anrui.flowable.api.flowtask.LatestTaskVo; import com.yxt.anrui.flowable.api.utils.ProcDefEnum; import com.yxt.anrui.flowable.sqloperationsymbol.BusinessVariables; -import com.yxt.anrui.portal.api.sysnotice.PushNoticeQuery; -import com.yxt.anrui.portal.api.sysnotice.SysNoticeFeign; +import com.yxt.anrui.portal.api.sysnotice.*; import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign; import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo; import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign; @@ -46,6 +45,7 @@ import com.yxt.anrui.riskcenter.api.loanreturninboundtrailer.LoanReturnInboundTr import com.yxt.anrui.riskcenter.api.loanreturnvehledger.LoanReturnVehLedger; import com.yxt.anrui.riskcenter.api.loansecondarysalesapply.*; import com.yxt.anrui.riskcenter.api.loansecondarysalesapply.flowable.*; +import com.yxt.anrui.riskcenter.api.loansecondarysalesbidding.LoanSecondarySalesBidding; import com.yxt.anrui.riskcenter.api.loansecondarysalesbidding.LoanSecondarySalesBiddingDto; import com.yxt.anrui.riskcenter.api.loansecondarysalescost.LoanSecondarySalesCost; import com.yxt.anrui.riskcenter.api.loansecondarysalescost.LoanSecondarySalesCostVo; @@ -86,6 +86,9 @@ import java.math.BigDecimal; import java.text.DateFormat; import java.text.ParseException; import java.text.SimpleDateFormat; +import java.time.LocalDate; +import java.time.ZoneId; +import java.time.format.DateTimeFormatter; import java.util.*; import java.util.concurrent.*; import java.util.stream.Collectors; @@ -1194,6 +1197,28 @@ public class LoanSecondarySalesApplyService extends MybatisBaseService + + \ No newline at end of file diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansecondarysalesbidding/LoanSecondarySalesBiddingService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansecondarysalesbidding/LoanSecondarySalesBiddingService.java index 802eca0e2d..a521d33754 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansecondarysalesbidding/LoanSecondarySalesBiddingService.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansecondarysalesbidding/LoanSecondarySalesBiddingService.java @@ -128,4 +128,8 @@ public class LoanSecondarySalesBiddingService extends MybatisBaseService Date: Wed, 14 May 2025 10:29:08 +0800 Subject: [PATCH 07/24] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/yxt/anrui/flowable/biz/flowtask/FlowTaskService.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowtask/FlowTaskService.java b/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowtask/FlowTaskService.java index dff8a3db49..de69095c2f 100644 --- a/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowtask/FlowTaskService.java +++ b/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowtask/FlowTaskService.java @@ -301,7 +301,7 @@ public class FlowTaskService extends MybatisBaseService businessFlowRecord(String procInsId) { + public ResultBean businessFlowRecordOld(String procInsId) { long startTimes = System.currentTimeMillis(); // 记录开始时间 ResultBean rb = ResultBean.fireFail(); FlowRecordVo flowRecordVo = new FlowRecordVo(); @@ -437,7 +437,7 @@ public class FlowTaskService extends MybatisBaseService businessFlowRecordOld(String procInsId) { + public ResultBean businessFlowRecord(String procInsId) { ResultBean rb = ResultBean.fireFail(); FlowRecordVo flowRecordVo = new FlowRecordVo(); if (StringUtils.isNotBlank(procInsId)) { From a8b385a7d56deef8fc8ba6f856b80fdfad0b9970 Mon Sep 17 00:00:00 2001 From: dimengzhe Date: Wed, 14 May 2025 10:34:13 +0800 Subject: [PATCH 08/24] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/yxt/anrui/portal/biz/flow/FlowableRest.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/flow/FlowableRest.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/flow/FlowableRest.java index 75d6d874c5..885ab185ed 100644 --- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/flow/FlowableRest.java +++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/flow/FlowableRest.java @@ -167,7 +167,7 @@ public class FlowableRest implements FlowableFeign { } @Override - public ResultBean> flowRecordAndComment(String procInsId, String deployId) { + public ResultBean> flowRecordAndCommentOld(String procInsId, String deployId) { long startTimes = System.currentTimeMillis(); // 记录开始时间 // 并行调用外部服务 CompletableFuture> flowRecordFuture = @@ -274,7 +274,7 @@ public class FlowableRest implements FlowableFeign { return resultBean; } - public ResultBean> flowRecordAndCommentOld(String procInsId, String deployId) { + public ResultBean> flowRecordAndComment(String procInsId, String deployId) { ResultBean flowRecordVoResultBean = flowableService.flowRecord(procInsId, deployId); com.yxt.anrui.flowable.api.flowtask.FlowRecordVo flowRecordVo = flowRecordVoResultBean.getData(); List flowList = new ArrayList<>(); From 9515921d52c65fe2305a7aba85f36f9cd00a9f50 Mon Sep 17 00:00:00 2001 From: dimengzhe Date: Wed, 14 May 2025 10:34:48 +0800 Subject: [PATCH 09/24] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/yxt/anrui/portal/biz/flow/FlowableRest.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/flow/FlowableRest.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/flow/FlowableRest.java index 885ab185ed..4858e2d461 100644 --- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/flow/FlowableRest.java +++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/flow/FlowableRest.java @@ -166,7 +166,6 @@ public class FlowableRest implements FlowableFeign { return resultBean; } - @Override public ResultBean> flowRecordAndCommentOld(String procInsId, String deployId) { long startTimes = System.currentTimeMillis(); // 记录开始时间 // 并行调用外部服务 @@ -273,7 +272,7 @@ public class FlowableRest implements FlowableFeign { log.info("流程记录接口耗时 {} ms", endTime - startTimes); return resultBean; } - + @Override public ResultBean> flowRecordAndComment(String procInsId, String deployId) { ResultBean flowRecordVoResultBean = flowableService.flowRecord(procInsId, deployId); com.yxt.anrui.flowable.api.flowtask.FlowRecordVo flowRecordVo = flowRecordVoResultBean.getData(); From a13a050d1edf2a438849e6e132352c60b093c464 Mon Sep 17 00:00:00 2001 From: dimengzhe Date: Wed, 14 May 2025 12:00:26 +0800 Subject: [PATCH 10/24] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/yxt/anrui/portal/biz/flow/FlowableRest.java | 1 - 1 file changed, 1 deletion(-) diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/flow/FlowableRest.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/flow/FlowableRest.java index 4858e2d461..8c464ed81d 100644 --- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/flow/FlowableRest.java +++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/flow/FlowableRest.java @@ -165,7 +165,6 @@ public class FlowableRest implements FlowableFeign { resultBean.setData(flowRecordVo1); return resultBean; } - public ResultBean> flowRecordAndCommentOld(String procInsId, String deployId) { long startTimes = System.currentTimeMillis(); // 记录开始时间 // 并行调用外部服务 From 5747c1ee1833f405d045d6bf19a0246f308fa1c1 Mon Sep 17 00:00:00 2001 From: dimengzhe Date: Wed, 14 May 2025 13:38:26 +0800 Subject: [PATCH 11/24] =?UTF-8?q?=E4=BA=8C=E6=AC=A1=E9=94=80=E5=94=AE?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../LoanSecondarySalesApplyService.java | 22 +++++++++++++++++++ .../LoanSecondarySalesBiddingService.java | 2 +- 2 files changed, 23 insertions(+), 1 deletion(-) diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansecondarysalesapply/LoanSecondarySalesApplyService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansecondarysalesapply/LoanSecondarySalesApplyService.java index f3dee134a9..76e3d0778b 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansecondarysalesapply/LoanSecondarySalesApplyService.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansecondarysalesapply/LoanSecondarySalesApplyService.java @@ -503,6 +503,28 @@ public class LoanSecondarySalesApplyService extends MybatisBaseService 0) { variables.put("isTrue", true); + LoanSecondarySalesBidding loanSecondarySalesBidding = new LoanSecondarySalesBidding(); + loanSecondarySalesBidding.setCreateBySid(bv.getUserSid()); + loanSecondarySalesBidding.setMainSid(bv.getBusinessSid()); + loanSecondarySalesBidding.setOrgSidPath(loanSecondarySalesApply.getOrgSidPath()); + String useOrgSid = sysStaffOrgFeign.getOrgSidByPath(loanSecondarySalesApply.getOrgSidPath()).getData(); + loanSecondarySalesBidding.setUseOrgSid(useOrgSid); + //创建组织使用组织 + ResultBean organizationResultBean = sysOrganizationFeign.fetchBySid(useOrgSid); + if (organizationResultBean.getData() != null) { + loanSecondarySalesBidding.setUseOrgName(organizationResultBean.getData().getName()); + } + //根据用户sid查询人员姓名 + ResultBean userVoResultBean = sysUserFeign.fetchBySid(bv.getUserSid()); + if (!userVoResultBean.getSuccess()) { + return rb.setMsg(userVoResultBean.getMsg()); + } + loanSecondarySalesBidding.setCreateByName(userVoResultBean.getData().getName()); + loanSecondarySalesBidding.setPrice(new BigDecimal(price)); + loanSecondarySalesBiddingService.insert(loanSecondarySalesBidding); + + + } else { variables.put("isTrue", false); } diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansecondarysalesbidding/LoanSecondarySalesBiddingService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansecondarysalesbidding/LoanSecondarySalesBiddingService.java index a521d33754..1299e2db6c 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansecondarysalesbidding/LoanSecondarySalesBiddingService.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansecondarysalesbidding/LoanSecondarySalesBiddingService.java @@ -50,7 +50,7 @@ public class LoanSecondarySalesBiddingService extends MybatisBaseService Date: Wed, 14 May 2025 13:44:03 +0800 Subject: [PATCH 12/24] =?UTF-8?q?=E5=AE=8C=E5=96=84=E4=BA=A4=E5=9B=9E?= =?UTF-8?q?=E8=BD=A6=E8=BE=86=E4=BA=8C=E6=AC=A1=E9=94=80=E5=94=AE=E7=AE=A1?= =?UTF-8?q?=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/views/secondarysales/relation/generatecontract.vue | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/anrui-riskcenter-ui/src/views/secondarysales/relation/generatecontract.vue b/anrui-riskcenter-ui/src/views/secondarysales/relation/generatecontract.vue index 851f99ab16..fa46c3409f 100644 --- a/anrui-riskcenter-ui/src/views/secondarysales/relation/generatecontract.vue +++ b/anrui-riskcenter-ui/src/views/secondarysales/relation/generatecontract.vue @@ -171,8 +171,12 @@