From 4845c40e173504375f0adfa46315a9c7e693b961 Mon Sep 17 00:00:00 2001 From: dimengzhe Date: Fri, 21 Feb 2025 09:49:13 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E9=80=9A=E7=94=A8=E5=AE=A1=E6=89=B9?= =?UTF-8?q?=E7=9B=B8=E5=85=B3=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/yxt/anrui/flowable/biz/flow4/Flow4Rest.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow4/Flow4Rest.java b/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow4/Flow4Rest.java index 005a0798f3..5cd998feeb 100644 --- a/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow4/Flow4Rest.java +++ b/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow4/Flow4Rest.java @@ -60,9 +60,9 @@ public class Flow4Rest { ResultBean submit2() { ResultBean rb = ResultBean.fireFail(); List userIds = new ArrayList<>(); - userIds.add("aaa"); - userIds.add("bbb"); - userIds.add("ccc"); + userIds.add("1d85d1fe-e527-4ec5-a5e4-c37a76a36518"); + userIds.add("64e289bc-80cd-487a-9498-5ae61e260f71"); + userIds.add("7ffcd76a-4fa0-4c9c-87ca-a0c2116bb2ed"); Map variables = new HashMap<>(); variables.put("approvers", userIds); From af13fa89c7fd4a353d4db67ea3b22f6bab036d80 Mon Sep 17 00:00:00 2001 From: yunuo970428 <405378304@qq.com> Date: Fri, 21 Feb 2025 10:39:32 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E5=AE=8C=E5=96=84=E5=8D=95=E8=BD=A6?= =?UTF-8?q?=E8=BF=94=E5=88=A9=E7=AE=A1=E7=90=86=E3=80=81=E4=B8=93=E9=A1=B9?= =?UTF-8?q?=E8=BF=94=E5=88=A9=E7=AE=A1=E7=90=86=20--=20=E5=85=B6=E4=B8=AD?= =?UTF-8?q?=E6=94=AF=E5=87=BA=E8=B4=B9=E7=94=A8=E3=80=81=E5=85=B6=E4=B8=AD?= =?UTF-8?q?=E5=BE=85=E6=94=AF=E4=BB=98=E8=B4=B9=E7=94=A8=E3=80=81=E5=85=B6?= =?UTF-8?q?=E4=B8=AD=E6=8A=B5=E9=A1=B6=E8=B4=B9=E7=94=A8=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E6=B3=A8=E9=87=8A=E8=AF=B4=E6=98=8E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bikerebatemanagement/bicyclerebatemanagementAdd.vue | 4 ++-- .../bikerebatemanagement/bicyclerebatemanagementEdit.vue | 4 ++-- .../specialrebatemanagement/specialrebatemanagementAdd.vue | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/anrui-scm/anrui-scm-ui/src/views/bikerebate/bikerebatemanagement/bicyclerebatemanagementAdd.vue b/anrui-scm/anrui-scm-ui/src/views/bikerebate/bikerebatemanagement/bicyclerebatemanagementAdd.vue index fc98b5c66c..fdcb3f6cc6 100644 --- a/anrui-scm/anrui-scm-ui/src/views/bikerebate/bikerebatemanagement/bicyclerebatemanagementAdd.vue +++ b/anrui-scm/anrui-scm-ui/src/views/bikerebate/bikerebatemanagement/bicyclerebatemanagementAdd.vue @@ -76,12 +76,12 @@ diff --git a/anrui-scm/anrui-scm-ui/src/views/bikerebate/bikerebatemanagement/bicyclerebatemanagementEdit.vue b/anrui-scm/anrui-scm-ui/src/views/bikerebate/bikerebatemanagement/bicyclerebatemanagementEdit.vue index 60911e589c..557e72e03c 100644 --- a/anrui-scm/anrui-scm-ui/src/views/bikerebate/bikerebatemanagement/bicyclerebatemanagementEdit.vue +++ b/anrui-scm/anrui-scm-ui/src/views/bikerebate/bikerebatemanagement/bicyclerebatemanagementEdit.vue @@ -74,11 +74,11 @@
其中待支付费用
- +
其中抵顶费用
- + diff --git a/anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatemanagement/specialrebatemanagementAdd.vue b/anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatemanagement/specialrebatemanagementAdd.vue index e52b9ae67e..6163cc2ba8 100644 --- a/anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatemanagement/specialrebatemanagementAdd.vue +++ b/anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatemanagement/specialrebatemanagementAdd.vue @@ -70,15 +70,15 @@
其中支出费用
- +
其中待支付费用
- +
其中抵顶费用
- + From 3456050b12c5e1f906fc87c50e3b0cf88e20e755 Mon Sep 17 00:00:00 2001 From: dimengzhe Date: Fri, 21 Feb 2025 10:52:48 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E9=80=9A=E7=94=A8=E5=AE=A1=E6=89=B9?= =?UTF-8?q?=E7=9B=B8=E5=85=B3=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/flowapprover/FlowApprover.java | 2 +- .../anrui/flowable/biz/flow4/Flow4Rest.java | 3 +- .../flowable/biz/flow4/Flow4Service.java | 42 +++++++++++-------- .../biz/flowapprover/FlowApproverMapper.java | 2 + .../biz/flowapprover/FlowApproverMapper.xml | 34 +++++++++++++++ .../biz/flowapprover/FlowApproverService.java | 6 +-- .../flowable/biz/flowcc/FlowCcMapper.java | 2 + .../flowable/biz/flowcc/FlowCcMapper.xml | 33 +++++++++++++++ .../flowable/biz/flowcc/FlowCcService.java | 4 ++ doc/databases/flowable.sql | 2 +- 10 files changed, 107 insertions(+), 23 deletions(-) diff --git a/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/flowapprover/FlowApprover.java b/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/flowapprover/FlowApprover.java index 7378438c5a..d111bd2c1c 100644 --- a/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/flowapprover/FlowApprover.java +++ b/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/flowapprover/FlowApprover.java @@ -19,5 +19,5 @@ public class FlowApprover extends BaseEntity { @ApiModelProperty("审批人sid") private String approverSid; @ApiModelProperty("审批人名称") - private String approvalName; + private String approverName; } diff --git a/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow4/Flow4Rest.java b/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow4/Flow4Rest.java index 5cd998feeb..658a5b531d 100644 --- a/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow4/Flow4Rest.java +++ b/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow4/Flow4Rest.java @@ -4,6 +4,7 @@ import cn.hutool.core.bean.BeanUtil; import com.alibaba.fastjson.JSONObject; import com.google.common.util.concurrent.ThreadFactoryBuilder; import com.yxt.anrui.flowable.api.flow.UpdateFlowFieldVo; +import com.yxt.anrui.flowable.api.flowcc.FlowCc; import com.yxt.anrui.flowable.biz.flow2.FlowRest; import com.yxt.anrui.flowable.feign.form.MessageFlowVo; import com.yxt.anrui.flowable.feign.form.MessageFlowableQuery; @@ -73,7 +74,7 @@ public class Flow4Rest { //启动流程 ResultBean voResultBean = startProcess(bv); System.out.println("voResultBean{}" + voResultBean); - return rb.success(); + return voResultBean; } public ResultBean handleProsess(BusinessVariables bv) { diff --git a/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow4/Flow4Service.java b/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow4/Flow4Service.java index 41c6389c4a..e576886108 100644 --- a/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow4/Flow4Service.java +++ b/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow4/Flow4Service.java @@ -245,21 +245,26 @@ public class Flow4Service extends MybatisBaseService { List approvers = (List) variables.get("approvers"); // 获取抄送人列表 List ccList = (List) variables.get("ccList"); + if (approvers != null) { + FlowApproverDto flowApproverDto = new FlowApproverDto(); + flowApproverDto.setBusinessSid(bv.getBusinessSid()); + flowApproverDto.setApproverSidList(approvers); + ResultBean resultBean = flowApproverService.saveFlowApprover(flowApproverDto); + } + + if (ccList != null) { + String ccSids = String.join(",", ccList); + ResultBean> listResultBean = sysUserFeign.fetchBySids(ccSids); + List ccNameList = listResultBean.getData().stream().map(v -> v.getName()).collect(Collectors.toList()); + // 将 List 转换为逗号分隔的字符串 + String result = String.join(",", ccNameList); + FlowCc flowCc = new FlowCc(); + flowCc.setBusinessSid(bv.getBusinessSid()); + flowCc.setCcSids(ccSids); + flowCc.setCcNames(result); + flowCcService.insertFlowCc(flowCc); + } - FlowApproverDto flowApproverDto = new FlowApproverDto(); - flowApproverDto.setBusinessSid(bv.getBusinessSid()); - flowApproverDto.setApproverSidList(approvers); - ResultBean resultBean = flowApproverService.saveFlowApprover(flowApproverDto); - String ccSids = String.join(",", ccList); - ResultBean> listResultBean = sysUserFeign.fetchBySids(ccSids); - List ccNameList = listResultBean.getData().stream().map(v -> v.getName()).collect(Collectors.toList()); - // 将 List 转换为逗号分隔的字符串 - String result = String.join(",", ccNameList); - FlowCc flowCc = new FlowCc(); - flowCc.setBusinessSid(bv.getBusinessSid()); - flowCc.setCcSids(ccSids); - flowCc.setCcNames(result); - flowCcService.insert(flowCc); } /** @@ -355,10 +360,13 @@ public class Flow4Service extends MybatisBaseService { UpdateFlowFieldVo uff = new UpdateFlowFieldVo(); BeanUtil.copyProperties(uff1, uff); uff.setTaskDefKey(taskDefKey); - + StringBuilder userSids = new StringBuilder(); + StringBuilder userName = new StringBuilder(); FlowCc flowCc = flowCcService.selectByBusinessSid(bv.getBusinessSid()); - StringBuilder userSids = new StringBuilder(flowCc.getCcSids()); - StringBuilder userName = new StringBuilder(flowCc.getCcNames()); + if(flowCc != null){ + userSids = new StringBuilder(flowCc.getCcSids()); + userName = new StringBuilder(flowCc.getCcNames()); + } //抄送的业务逻辑 MessageFlowableQuery mfq = new MessageFlowableQuery(); diff --git a/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowapprover/FlowApproverMapper.java b/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowapprover/FlowApproverMapper.java index 6149af4ece..e712aeff93 100644 --- a/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowapprover/FlowApproverMapper.java +++ b/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowapprover/FlowApproverMapper.java @@ -14,4 +14,6 @@ import org.apache.ibatis.annotations.Param; @Mapper public interface FlowApproverMapper extends BaseMapper { String selectApproverSid(@Param("businessSid") String businessSid, @Param("sortNo") Integer sortNo); + + int insertApprover(FlowApprover flowApprover); } diff --git a/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowapprover/FlowApproverMapper.xml b/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowapprover/FlowApproverMapper.xml index 223f2ea762..71963306b9 100644 --- a/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowapprover/FlowApproverMapper.xml +++ b/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowapprover/FlowApproverMapper.xml @@ -7,4 +7,38 @@ where businessSid = #{businessSid} and sortNo = #{sortNo} + + + insert into flow_approver + + sid, + + businessSid, + + + approverSid, + + + approverName, + + + sortNo, + + + + UUID(), + + #{businessSid}, + + + #{approverSid}, + + + #{approverName}, + + + #{sortNo}, + + + \ No newline at end of file diff --git a/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowapprover/FlowApproverService.java b/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowapprover/FlowApproverService.java index 41364483fe..7d5127d362 100644 --- a/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowapprover/FlowApproverService.java +++ b/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowapprover/FlowApproverService.java @@ -39,15 +39,15 @@ public class FlowApproverService extends MybatisBaseService sysUserVoResultBean = sysUserFeign.fetchBySid(approverSid); SysUserVo sysUser = sysUserVoResultBean.getData(); - flowApprover.setApprovalName(sysUser.getName()); + flowApprover.setApproverName(sysUser.getName()); flowApprover.setSortNo(sortNo); - baseMapper.insert(flowApprover); + baseMapper.insertApprover(flowApprover); } } return rb.success(); } public String selectApproverSid(String businessSid, Integer sortNo) { - return baseMapper.selectApproverSid(businessSid,sortNo); + return baseMapper.selectApproverSid(businessSid, sortNo); } } diff --git a/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowcc/FlowCcMapper.java b/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowcc/FlowCcMapper.java index 5aabe3925a..3306cea860 100644 --- a/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowcc/FlowCcMapper.java +++ b/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowcc/FlowCcMapper.java @@ -13,4 +13,6 @@ import org.apache.ibatis.annotations.Mapper; @Mapper public interface FlowCcMapper extends BaseMapper { FlowCc selectByBusinessSid(String businessSid); + + int insertFlowCc(FlowCc flowCc); } diff --git a/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowcc/FlowCcMapper.xml b/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowcc/FlowCcMapper.xml index 7d0742116e..46dcb001f4 100644 --- a/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowcc/FlowCcMapper.xml +++ b/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowcc/FlowCcMapper.xml @@ -1,4 +1,37 @@ + + + + insert into flow_cc + + sid, + + businessSid, + + + ccSids, + + + ccNames, + + + + UUID(), + + #{businessSid}, + + + #{ccSids}, + + + #{ccNames}, + + + \ No newline at end of file diff --git a/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowcc/FlowCcService.java b/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowcc/FlowCcService.java index 8ca47a60a3..8cdecd1f70 100644 --- a/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowcc/FlowCcService.java +++ b/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowcc/FlowCcService.java @@ -16,4 +16,8 @@ public class FlowCcService extends MybatisBaseService { public FlowCc selectByBusinessSid(String businessSid) { return baseMapper.selectByBusinessSid(businessSid); } + + public int insertFlowCc(FlowCc flowCc) { + return baseMapper.insertFlowCc(flowCc); + } } diff --git a/doc/databases/flowable.sql b/doc/databases/flowable.sql index fb3468a781..9fb5ca796a 100644 --- a/doc/databases/flowable.sql +++ b/doc/databases/flowable.sql @@ -15,7 +15,7 @@ CREATE TABLE `flow_approver` `businessSid` varchar(64) DEFAULT NULL COMMENT '申请sid', `sortNo` int(32) DEFAULT NULL COMMENT '序号', `approverSid` varchar(64) DEFAULT NULL COMMENT '审批人sid', - `approvalName` varchar(64) DEFAULT NULL COMMENT '审批人名称', + `approverName` varchar(64) DEFAULT NULL COMMENT '审批人名称', PRIMARY KEY (`id`), KEY `id` (`id`) ) ENGINE = INNODB From d2495fea6c2360b49293f38fc8df5ccca4236fc8 Mon Sep 17 00:00:00 2001 From: dimengzhe Date: Fri, 21 Feb 2025 11:33:33 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8E=A8=E9=80=81?= =?UTF-8?q?=E5=8D=95=E8=BD=A6=E8=BF=94=E5=88=A9=E6=9D=A1=E4=BB=B6=E4=B8=BA?= =?UTF-8?q?=E9=87=91=E9=A2=9D=E5=A4=A7=E4=BA=8E0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../FinCollectionConfirmationService.java | 143 +++++++++--------- .../biz/loandiff/LoanDiffService.java | 75 ++++----- 2 files changed, 114 insertions(+), 104 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 995492918a..8dea604160 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 @@ -2205,14 +2205,6 @@ public class FinCollectionConfirmationService extends MybatisBaseService scmVehRebateVehDtos = new ArrayList<>(); - ScmVehRebateVehDto scmVehRebateVehDto = new ScmVehRebateVehDto(); - scmVehRebateDto.setCreateBySid(confirmation.getCreateBySid()); - scmVehRebateDto.setRebateTypeKey("029"); - scmVehRebateDto.setRebateTypeValue("金融贴息"); - scmVehRebateDto.setRebateName("金融贴息"); BigDecimal all = BigDecimal.ZERO; if(loanSolutions.getActualDiscount() != null){ all = all.add(loanSolutions.getActualDiscount()); @@ -2220,33 +2212,44 @@ public class FinCollectionConfirmationService extends MybatisBaseService 0){ + //推送单车返利管理 + ScmVehRebateDto scmVehRebateDto = new ScmVehRebateDto(); + List scmVehRebateVehDtos = new ArrayList<>(); + ScmVehRebateVehDto scmVehRebateVehDto = new ScmVehRebateVehDto(); + scmVehRebateDto.setCreateBySid(confirmation.getCreateBySid()); + scmVehRebateDto.setRebateTypeKey("029"); + scmVehRebateDto.setRebateTypeValue("金融贴息"); + scmVehRebateDto.setRebateName("金融贴息"); + scmVehRebateDto.setCalculationStandard(all.toString()); + scmVehRebateDto.setPalceGenDate(DateUtil.format(new Date(), "yyyy-MM")); + scmVehRebateDto.setCalculationModeKey("002"); + scmVehRebateDto.setCalculationModeValue("固定金额"); + scmVehRebateDto.setOrgPath(confirmation.getOrgSidPath()); + scmVehRebateVehDto.setState("2"); + scmVehRebateVehDto.setBrandSid(baseVehicle.getCarBrandSid()); + scmVehRebateVehDto.setBrandName(baseVehicle.getCarBrandName()); + scmVehRebateVehDto.setVehModelSid(baseVehicle.getModelSid()); + scmVehRebateVehDto.setVehModelName(baseVehicle.getModelName()); + scmVehRebateVehDto.setVehSid(baseVehicle.getSid()); + scmVehRebateVehDto.setVinNo(baseVehicle.getVinNo().substring(baseVehicle.getVinNo().length() - 8)); + scmVehRebateVehDto.setManufactorSettlementPrice(baseVehicle.getCostPrice().toString()); + scmVehRebateVehDto.setFreight(baseVehicle.getFreight().toString()); + BigDecimal ll = BigDecimal.ZERO; + if(loanSolutions.getActualDiscount() != null){ + ll = ll.add(loanSolutions.getActualDiscount()); + } + if(loanSolutionsOtherpolicy != null && loanSolutionsOtherpolicy.getOtherActualDiscount() != null){ + ll = ll.add(loanSolutionsOtherpolicy.getOtherActualDiscount()); + } + scmVehRebateVehDto.setEstimateRebate(ll.toString()); + scmVehRebateVehDto.setPurchaseSystemSid(baseVehicle.getPurchaseSystemSid()); + scmVehRebateVehDto.setPurchaseSystemName(baseVehicle.getPurchaseSystemName()); + scmVehRebateVehDtos.add(scmVehRebateVehDto); + scmVehRebateDto.setScmVehRebateVehs(scmVehRebateVehDtos); + scmVehRebateFeign.save(scmVehRebateDto); } - scmVehRebateVehDto.setEstimateRebate(ll.toString()); - scmVehRebateVehDto.setPurchaseSystemSid(baseVehicle.getPurchaseSystemSid()); - scmVehRebateVehDto.setPurchaseSystemName(baseVehicle.getPurchaseSystemName()); - scmVehRebateVehDtos.add(scmVehRebateVehDto); - scmVehRebateDto.setScmVehRebateVehs(scmVehRebateVehDtos); - scmVehRebateFeign.save(scmVehRebateDto); + finUncollectedReceivablesDetailed.setReveivableMoney(finSelectedReceivablesDetailed.getSubscriptionMoney().toString()); finUncollectedReceivablesDetailedService.updateById(finUncollectedReceivablesDetailed); } @@ -2374,14 +2377,6 @@ public class FinCollectionConfirmationService extends MybatisBaseService scmVehRebateVehDtos = new ArrayList<>(); - ScmVehRebateVehDto scmVehRebateVehDto = new ScmVehRebateVehDto(); - scmVehRebateDto.setCreateBySid(confirmation.getCreateBySid()); - scmVehRebateDto.setRebateTypeKey("029"); - scmVehRebateDto.setRebateTypeValue("金融贴息"); - scmVehRebateDto.setRebateName("金融贴息"); BigDecimal all = BigDecimal.ZERO; if(loanSolutions.getActualDiscount() != null){ all = all.add(loanSolutions.getActualDiscount()); @@ -2389,33 +2384,45 @@ public class FinCollectionConfirmationService extends MybatisBaseService0){ + //推送单车返利管理 + ScmVehRebateDto scmVehRebateDto = new ScmVehRebateDto(); + List scmVehRebateVehDtos = new ArrayList<>(); + ScmVehRebateVehDto scmVehRebateVehDto = new ScmVehRebateVehDto(); + scmVehRebateDto.setCreateBySid(confirmation.getCreateBySid()); + scmVehRebateDto.setRebateTypeKey("029"); + scmVehRebateDto.setRebateTypeValue("金融贴息"); + scmVehRebateDto.setRebateName("金融贴息"); + + scmVehRebateDto.setCalculationStandard(all.toString()); + scmVehRebateDto.setPalceGenDate(DateUtil.format(new Date(), "yyyy-MM")); + scmVehRebateDto.setCalculationModeKey("002"); + scmVehRebateDto.setCalculationModeValue("固定金额"); + scmVehRebateDto.setOrgPath(confirmation.getOrgSidPath()); + scmVehRebateVehDto.setState("2"); + scmVehRebateVehDto.setBrandSid(baseVehicle.getCarBrandSid()); + scmVehRebateVehDto.setBrandName(baseVehicle.getCarBrandName()); + scmVehRebateVehDto.setVehModelSid(baseVehicle.getModelSid()); + scmVehRebateVehDto.setVehModelName(baseVehicle.getModelName()); + scmVehRebateVehDto.setVehSid(baseVehicle.getSid()); + scmVehRebateVehDto.setVinNo(baseVehicle.getVinNo().substring(baseVehicle.getVinNo().length() - 8)); + scmVehRebateVehDto.setManufactorSettlementPrice(baseVehicle.getCostPrice().toString()); + scmVehRebateVehDto.setFreight(baseVehicle.getFreight().toString()); + BigDecimal ll = BigDecimal.ZERO; + if(loanSolutions.getActualDiscount() != null){ + ll = ll.add(loanSolutions.getActualDiscount()); + } + if(loanSolutionsOtherpolicy != null && loanSolutionsOtherpolicy.getOtherActualDiscount() != null){ + ll = ll.add(loanSolutionsOtherpolicy.getOtherActualDiscount()); + } + scmVehRebateVehDto.setEstimateRebate(ll.toString()); + scmVehRebateVehDto.setPurchaseSystemSid(baseVehicle.getPurchaseSystemSid()); + scmVehRebateVehDto.setPurchaseSystemName(baseVehicle.getPurchaseSystemName()); + scmVehRebateVehDtos.add(scmVehRebateVehDto); + scmVehRebateDto.setScmVehRebateVehs(scmVehRebateVehDtos); + scmVehRebateFeign.save(scmVehRebateDto); } - scmVehRebateVehDto.setEstimateRebate(ll.toString()); - scmVehRebateVehDto.setPurchaseSystemSid(baseVehicle.getPurchaseSystemSid()); - scmVehRebateVehDto.setPurchaseSystemName(baseVehicle.getPurchaseSystemName()); - scmVehRebateVehDtos.add(scmVehRebateVehDto); - scmVehRebateDto.setScmVehRebateVehs(scmVehRebateVehDtos); - scmVehRebateFeign.save(scmVehRebateDto); + finUncollectedReceivablesDetailed.setReveivableMoney(finSelectedReceivablesDetailed.getSubscriptionMoney().toString()); finUncollectedReceivablesDetailedService.updateById(finUncollectedReceivablesDetailed); } diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loandiff/LoanDiffService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loandiff/LoanDiffService.java index b21c11ccc0..93542496ae 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loandiff/LoanDiffService.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loandiff/LoanDiffService.java @@ -421,48 +421,51 @@ public class LoanDiffService extends MybatisBaseService scmVehRebateVehDtos = new ArrayList<>(); - ScmVehRebateVehDto scmVehRebateVehDto = new ScmVehRebateVehDto(); - scmVehRebateDto.setCreateBySid(loanDiff.getCreateBySid()); - scmVehRebateDto.setRebateTypeKey("029"); - scmVehRebateDto.setRebateTypeValue("金融贴息"); - scmVehRebateDto.setRebateName("金融贴息"); BigDecimal all = BigDecimal.ZERO; - if(loanDiffDetails.getRealityDiscount() != null){ + if (loanDiffDetails.getRealityDiscount() != null) { all = all.add(loanDiffDetails.getRealityDiscount()); } - if(loanDiffDetails.getRealityOtherDiscount() != null){ + if (loanDiffDetails.getRealityOtherDiscount() != null) { all = all.add(loanDiffDetails.getRealityOtherDiscount()); } - scmVehRebateDto.setCalculationStandard(all.toString()); - scmVehRebateDto.setPalceGenDate(DateUtil.format(new Date(), "yyyy-MM")); - scmVehRebateDto.setCalculationModeKey("002"); - scmVehRebateDto.setCalculationModeValue("固定金额"); - scmVehRebateDto.setOrgPath(loanDiff.getOrgSidPath()); - scmVehRebateVehDto.setState("2"); - scmVehRebateVehDto.setBrandSid(baseVehicle.getCarBrandSid()); - scmVehRebateVehDto.setBrandName(baseVehicle.getCarBrandName()); - scmVehRebateVehDto.setVehModelSid(baseVehicle.getModelSid()); - scmVehRebateVehDto.setVehModelName(baseVehicle.getModelName()); - scmVehRebateVehDto.setVehSid(baseVehicle.getSid()); - scmVehRebateVehDto.setVinNo(baseVehicle.getVinNo().substring(baseVehicle.getVinNo().length() - 8)); - scmVehRebateVehDto.setManufactorSettlementPrice(baseVehicle.getCostPrice().toString()); - scmVehRebateVehDto.setFreight(baseVehicle.getFreight().toString()); - BigDecimal ll = BigDecimal.ZERO; - if(loanDiffDetails.getRealityDiscount() != null){ - ll = ll.add(loanDiffDetails.getRealityDiscount()); - } - if(loanDiffDetails.getRealityOtherDiscount() != null){ - ll = ll.add(loanDiffDetails.getRealityOtherDiscount()); + if (all.compareTo(BigDecimal.ZERO) > 0) { + //推送单车返利管理 + ScmVehRebateDto scmVehRebateDto = new ScmVehRebateDto(); + List scmVehRebateVehDtos = new ArrayList<>(); + ScmVehRebateVehDto scmVehRebateVehDto = new ScmVehRebateVehDto(); + scmVehRebateDto.setCreateBySid(loanDiff.getCreateBySid()); + scmVehRebateDto.setRebateTypeKey("029"); + scmVehRebateDto.setRebateTypeValue("金融贴息"); + scmVehRebateDto.setRebateName("金融贴息"); + scmVehRebateDto.setCalculationStandard(all.toString()); + scmVehRebateDto.setPalceGenDate(DateUtil.format(new Date(), "yyyy-MM")); + scmVehRebateDto.setCalculationModeKey("002"); + scmVehRebateDto.setCalculationModeValue("固定金额"); + scmVehRebateDto.setOrgPath(loanDiff.getOrgSidPath()); + scmVehRebateVehDto.setState("2"); + scmVehRebateVehDto.setBrandSid(baseVehicle.getCarBrandSid()); + scmVehRebateVehDto.setBrandName(baseVehicle.getCarBrandName()); + scmVehRebateVehDto.setVehModelSid(baseVehicle.getModelSid()); + scmVehRebateVehDto.setVehModelName(baseVehicle.getModelName()); + scmVehRebateVehDto.setVehSid(baseVehicle.getSid()); + scmVehRebateVehDto.setVinNo(baseVehicle.getVinNo().substring(baseVehicle.getVinNo().length() - 8)); + scmVehRebateVehDto.setManufactorSettlementPrice(baseVehicle.getCostPrice().toString()); + scmVehRebateVehDto.setFreight(baseVehicle.getFreight().toString()); + BigDecimal ll = BigDecimal.ZERO; + if (loanDiffDetails.getRealityDiscount() != null) { + ll = ll.add(loanDiffDetails.getRealityDiscount()); + } + if (loanDiffDetails.getRealityOtherDiscount() != null) { + ll = ll.add(loanDiffDetails.getRealityOtherDiscount()); + } + scmVehRebateVehDto.setEstimateRebate(ll.toString()); + scmVehRebateVehDto.setPurchaseSystemSid(baseVehicle.getPurchaseSystemSid()); + scmVehRebateVehDto.setPurchaseSystemName(baseVehicle.getPurchaseSystemName()); + scmVehRebateVehDtos.add(scmVehRebateVehDto); + scmVehRebateDto.setScmVehRebateVehs(scmVehRebateVehDtos); + scmVehRebateFeign.save(scmVehRebateDto); } - scmVehRebateVehDto.setEstimateRebate(ll.toString()); - scmVehRebateVehDto.setPurchaseSystemSid(baseVehicle.getPurchaseSystemSid()); - scmVehRebateVehDto.setPurchaseSystemName(baseVehicle.getPurchaseSystemName()); - scmVehRebateVehDtos.add(scmVehRebateVehDto); - scmVehRebateDto.setScmVehRebateVehs(scmVehRebateVehDtos); - scmVehRebateFeign.save(scmVehRebateDto); + int updateCount = baseMapper.selectByBusVnS(loanDiffDetails.getBusVinSid(), loanDiffDetails.getRealityLoan().toString()); } }