From f3cb4ac0e4a419dffd86b508a642dd05ba4a5241 Mon Sep 17 00:00:00 2001 From: dimengzhe Date: Thu, 29 Jun 2023 18:03:17 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/bussalesorder/BusSalesOrderFeign.java | 25 +++++++----- .../BusSalesOrderFeignFallback.java | 5 +++ .../biz/bussalesorder/BusSalesOrderRest.java | 5 +++ .../bussalesorder/BusSalesOrderService.java | 39 +++++++++++++++++++ .../SysFlowableConfigFeign.java | 4 ++ .../SysFlowableConfigRest.java | 5 +++ .../SysFlowableConfigService.java | 4 ++ .../saleOrders/AppBusSalesOrderFeign.java | 2 +- .../saleOrders/price/PriceDto.java | 3 ++ 9 files changed, 81 insertions(+), 11 deletions(-) diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderFeign.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderFeign.java index 497117cf42..4f09b8d304 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderFeign.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderFeign.java @@ -98,16 +98,16 @@ public interface BusSalesOrderFeign { @PostMapping("/updateOneBillMoneyByOrderSid") ResultBean updateOneBillMoneyByOrderSid(@RequestParam("orderSid") String orderSid, @RequestParam("oneBillMoney") String oneBillMoney); - /* @ApiOperation("提交") - @PostMapping("/submit") - @ResponseBody - ResultBean submit(@RequestBody SubmitAllOrderDto dto); - - @ApiOperation("pc端是否允许提交") - @PostMapping("/pcIsSubmit") - @ResponseBody - ResultBean pcIsSubmit(@RequestBody SubmitAllOrderDto dto); -*/ + /* @ApiOperation("提交") + @PostMapping("/submit") + @ResponseBody + ResultBean submit(@RequestBody SubmitAllOrderDto dto); + + @ApiOperation("pc端是否允许提交") + @PostMapping("/pcIsSubmit") + @ResponseBody + ResultBean pcIsSubmit(@RequestBody SubmitAllOrderDto dto); + */ @ApiOperation(value = "办理（同意）") @PutMapping("/complete") @ResponseBody @@ -324,4 +324,9 @@ public interface BusSalesOrderFeign { @PostMapping("/selNewComSaleByVehSid") @ResponseBody ResultBean selNewComSaleByVehSid(@RequestParam("vehSid") String vehSid); + + @ApiOperation("已办结的订单未生成合同及应收未收的生成") + @PostMapping("/saveContract") + @ResponseBody + ResultBean saveContract(@RequestParam("sid") String sid); } \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderFeignFallback.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderFeignFallback.java index 0cff452782..5945383d43 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderFeignFallback.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderFeignFallback.java @@ -300,4 +300,9 @@ public class BusSalesOrderFeignFallback implements BusSalesOrderFeign { public ResultBean selNewComSaleByVehSid(String vehSid) { return null; } + + @Override + public ResultBean saveContract(String sid) { + return null; + } } \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderRest.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderRest.java index 1d06da76b9..bfc5ef2ca5 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderRest.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderRest.java @@ -381,4 +381,9 @@ public class BusSalesOrderRest implements BusSalesOrderFeign { public ResultBean selNewComSaleByVehSid(String vehSid) { return busSalesOrderService.selNewComSaleByVehSid(vehSid); } + + @Override + public ResultBean saveContract(String sid) { + return busSalesOrderService.saveContractOne(sid); + } } diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java index dd00ec7900..40b0aba717 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java @@ -6790,4 +6790,43 @@ public class BusSalesOrderService extends MybatisBaseService details = getSaleOrderDetails(sid); + AppOrderDetailsVo vo = details.getData(); + //为三方金融和担保贷款 + if ("2".equals(busSalesOrder.getFinancePlan()) || "2".equals(busSalesOrder.getPayTypeKey())) { + //根据销售订单sid查询金融方案 + ResultBean solutionsDetailsVoResultBean = loanSolutionsFeign.selectDetailsss(sid); + SolutionsDetailsVo solutionsDetailsVo = solutionsDetailsVoResultBean.getData(); + if (solutionsDetailsVo != null) { + if (StringUtils.isNotBlank(solutionsDetailsVo.getTypeKey())) { + //推送车款 + if ("02".equals(solutionsDetailsVo.getTypeKey())) { + //外部金融 + createFin(vo, busSalesOrder, solutionsDetailsVo); + } else { + //自营非担保 + createFinTwo(vo, busSalesOrder, solutionsDetailsVo); + } + } else {//担保贷款 + createFinTwo(vo, busSalesOrder, solutionsDetailsVo); + } + } else { + //推送车款 + createCarFin(vo, busSalesOrder); + } + } else { + //推送车款 + createCarFin(vo, busSalesOrder); + } + return rb.success(); + } } \ No newline at end of file diff --git a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysflowableconfig/SysFlowableConfigFeign.java b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysflowableconfig/SysFlowableConfigFeign.java index 8dc5ebe573..f267fd4045 100644 --- a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysflowableconfig/SysFlowableConfigFeign.java +++ b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysflowableconfig/SysFlowableConfigFeign.java @@ -36,4 +36,8 @@ public interface SysFlowableConfigFeign { @ApiOperation("保存修改") @PostMapping("/saveOrUpdate") ResultBean saveOrUpdate(@Valid @RequestBody SysFlowableConfigDto dto); + + @ApiOperation("置空") + @PostMapping("/setBlank") + ResultBean setBlank(@RequestParam("userSid")String userSid); } diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysflowableconfig/SysFlowableConfigRest.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysflowableconfig/SysFlowableConfigRest.java index 08f0a21b6f..961a71af66 100644 --- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysflowableconfig/SysFlowableConfigRest.java +++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysflowableconfig/SysFlowableConfigRest.java @@ -34,4 +34,9 @@ public class SysFlowableConfigRest implements SysFlowableConfigFeign { public ResultBean saveOrUpdate(SysFlowableConfigDto dto) { return sysFlowableConfigService.saveOrUpdateDto(dto); } + + @Override + public ResultBean setBlank(String userSid) { + return sysFlowableConfigService.setBlank(userSid); + } } diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysflowableconfig/SysFlowableConfigService.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysflowableconfig/SysFlowableConfigService.java index 66c7fca53f..a203b8dc14 100644 --- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysflowableconfig/SysFlowableConfigService.java +++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysflowableconfig/SysFlowableConfigService.java @@ -48,4 +48,8 @@ public class SysFlowableConfigService extends MybatisBaseService