From e85f7a43c390e82736d6a2eb32813f83bdec03e6 Mon Sep 17 00:00:00 2001 From: dimengzhe Date: Tue, 15 Aug 2023 17:43:13 +0800 Subject: [PATCH 1/7] =?UTF-8?q?=E9=94=80=E5=94=AE=E8=AE=A2=E5=8D=95?= =?UTF-8?q?=E9=87=91=E8=9E=8D=E6=96=B9=E6=A1=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/loansolutions/LoanSolutionsFeign.java | 7 +- .../LoanSolutionsFeignFallback.java | 7 +- .../api/loansolutions/app/SolutionssDto.java | 162 +++++++++++++++++ .../biz/loansolutions/LoanSolutionsRest.java | 7 +- .../loansolutions/LoanSolutionsService.java | 13 +- .../api/risk/solutions/AppSolutionsDto.java | 1 + .../api/risk/solutions/AppSolutionssDto.java | 165 ++++++++++++++++++ .../api/risk/solutions/SolutionsFeign.java | 7 +- .../biz/risk/solutions/SolutionsRest.java | 5 + .../biz/risk/solutions/SolutionsService.java | 16 +- 10 files changed, 364 insertions(+), 26 deletions(-) create mode 100644 anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutions/app/SolutionssDto.java create mode 100644 anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/solutions/AppSolutionssDto.java diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutions/LoanSolutionsFeign.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutions/LoanSolutionsFeign.java index 5ab039d819..ec2d10d761 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutions/LoanSolutionsFeign.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutions/LoanSolutionsFeign.java @@ -1,9 +1,6 @@ package com.yxt.anrui.riskcenter.api.loansolutions; -import com.yxt.anrui.riskcenter.api.loansolutions.app.SolutionsDetailsVo; -import com.yxt.anrui.riskcenter.api.loansolutions.app.SolutionsDto; -import com.yxt.anrui.riskcenter.api.loansolutions.app.SolutionssQuery; -import com.yxt.anrui.riskcenter.api.loansolutions.app.SolutionssVo; +import com.yxt.anrui.riskcenter.api.loansolutions.app.*; import com.yxt.anrui.riskcenter.api.loansolutions.calculate.CalculateQuery; import com.yxt.anrui.riskcenter.api.loansolutions.calculate.CalculateVo; import com.yxt.common.core.result.ResultBean; @@ -45,7 +42,7 @@ public interface LoanSolutionsFeign { @ApiOperation("保存金融方案2") @PostMapping("/save2") - ResultBean save2(@RequestBody SolutionsDto dto); + ResultBean save2(@RequestBody SolutionssDto dto); @ApiOperation("根据销售订单sid查询金融方案") @GetMapping("/selectDetailss") diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutions/LoanSolutionsFeignFallback.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutions/LoanSolutionsFeignFallback.java index d79f643583..fc24b59a3a 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutions/LoanSolutionsFeignFallback.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutions/LoanSolutionsFeignFallback.java @@ -1,9 +1,6 @@ package com.yxt.anrui.riskcenter.api.loansolutions; -import com.yxt.anrui.riskcenter.api.loansolutions.app.SolutionsDetailsVo; -import com.yxt.anrui.riskcenter.api.loansolutions.app.SolutionsDto; -import com.yxt.anrui.riskcenter.api.loansolutions.app.SolutionssQuery; -import com.yxt.anrui.riskcenter.api.loansolutions.app.SolutionssVo; +import com.yxt.anrui.riskcenter.api.loansolutions.app.*; import com.yxt.anrui.riskcenter.api.loansolutions.calculate.CalculateQuery; import com.yxt.anrui.riskcenter.api.loansolutions.calculate.CalculateVo; import com.yxt.common.core.result.ResultBean; @@ -37,7 +34,7 @@ public class LoanSolutionsFeignFallback implements LoanSolutionsFeign { } @Override - public ResultBean save2(SolutionsDto dto) { + public ResultBean save2(SolutionssDto dto) { return null; } diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutions/app/SolutionssDto.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutions/app/SolutionssDto.java new file mode 100644 index 0000000000..75d87d55f6 --- /dev/null +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutions/app/SolutionssDto.java @@ -0,0 +1,162 @@ +package com.yxt.anrui.riskcenter.api.loansolutions.app; + +import com.yxt.common.core.dto.Dto; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; + +/** + * @description: + * @author: dimengzhe + * @date: 2023/8/15 + **/ +@Data +public class SolutionssDto implements Dto { + private static final long serialVersionUID = -4329637976311165379L; + + @ApiModelProperty("关联sid") + private String busSid; + @ApiModelProperty("是否打包：1是0否") + private String isPack; + @ApiModelProperty("产品政策名称") + private String policyName; + @ApiModelProperty("产品政策sid") + private String policySid; + @ApiModelProperty("主车发票价") + private String mainVehicleAmount; + @ApiModelProperty("融资票据") + private String accessoriesAmount; + @ApiModelProperty("是否有融资票据") + private boolean accessoriesAmountCb; + @ApiModelProperty("挂车金额") + private String trailerAmount; + @ApiModelProperty("是否有挂车") + private boolean trailerAmountCb; + @ApiModelProperty("保险金额") + private String premium; + @ApiModelProperty("是否有保险") + private boolean premiumCb; + @ApiModelProperty("购置税") + private String purchaseTax; + @ApiModelProperty("是否有购置税") + private boolean purchaseTaxCb; + @ApiModelProperty("融资项目总额") + private String loanTotal; + @ApiModelProperty("首付款比例") + private String downPayRatio; + @ApiModelProperty("首付金额") + @NotBlank(message = "首付金额不能为空") + private String downPayAmount; + @ApiModelProperty("贷款金额") + private String loanAmount; + @ApiModelProperty("贷款期数") + @NotBlank(message = "产品期数不能为空") + private String loanPeriod; + @ApiModelProperty("贷款保证金比例") + private String bondRatio; + @ApiModelProperty("贷款保证金金额") + @NotBlank(message = "贷款保证金不能为空") + private String bondAmount; + @ApiModelProperty("厂家贴息") + @NotBlank(message = "厂家贴息不能为空") + private String factoryDiscount; + @ApiModelProperty("厂家贴息用途") + private String factoryDiscountUse; + @ApiModelProperty("厂家贴息用途") + private String factoryDiscountUseKey; + @ApiModelProperty("年利率") + private String policyYearRatio; + @ApiModelProperty("月还金额") + @NotBlank(message = "月还金额不能为空") + private String loanPayMoney; + @ApiModelProperty("利息总额") + private String loanInterest; + @ApiModelProperty("是否勾选其它融") + private boolean otherPolicyState; + + @ApiModelProperty("贴息抵车款") + private String discountCar; + + /*************************其他融和方案汇总*********************************/ + @ApiModelProperty("其它融名称") + private String otherPolicyName; + @ApiModelProperty("其他融sid") + private String otherPolicySid; + @ApiModelProperty("其它融贷款金额") + private String otherPolicyAmount; + @ApiModelProperty("其它融期数") + private String otherPolicyPeriod; + @ApiModelProperty("其它融月还") + private String otherPolicyMonthlyRepay; + @ApiModelProperty("其它融利息总额") + private String otherPolicyInterest; + @ApiModelProperty("其它融年利率") + private String otherPolicyYearRatio; + + @ApiModelProperty("'融资首付") + private String loanDownPay; + @ApiModelProperty("实际首付比例") + private String downPayAmountsRatio; + @ApiModelProperty("总贷款金额") + private String loanAmountTotal; + @ApiModelProperty("期数") + private String period; + @ApiModelProperty("月还金额") + private String monthlyRepay; + @ApiModelProperty("利息总额") + private String interest; + @ApiModelProperty("预计首期还款日") + private String returnTime; + + + /*********************************金融方案费用明细*****************************/ + + @ApiModelProperty("融资首付") + private String downPayAmounts; + @ApiModelProperty("贷款保证金") + private String bondAmounts; + @ApiModelProperty("保险保证金") + private String depositPremium; + @ApiModelProperty("落户保证金") + private String depositSettle; + @ApiModelProperty("服务费") + @NotBlank(message = "服务费不能为空") + private String serviceAmount; + @ApiModelProperty("代收意外险") + private String proxyAccidentPremium; + @ApiModelProperty("上牌费") + private String registerAmount; + @ApiModelProperty("运管费") + private String operationAmount; + @ApiModelProperty("补车价") + private String vehOtherPrice; + @ApiModelProperty("其它费用") + private String otherAmount; + @ApiModelProperty("其它费用说明") + private String otherAmountRemark; + @ApiModelProperty("办理方式选择") + private String dealWay; + @ApiModelProperty("办理方式选择key") + private String dealWayKey; + @ApiModelProperty("代收合计") + private String proxyTotal; + @ApiModelProperty("代收首年保险费") + private String proxyPremium; + @ApiModelProperty("代收购置费") + private String proxyPurchasetax; + @ApiModelProperty("抵顶首年保险费") + private String offsetPremium; + @ApiModelProperty("抵顶购置税") + private String offsetPurchasetax; + @ApiModelProperty("抵顶费用合计") + private String offsetTotal; + @ApiModelProperty("应收合计") + private String receivableTotal; + @ApiModelProperty("实收合计") + private String realTotal; + @ApiModelProperty("车辆总价") + private String vehTotalPrice; + @ApiModelProperty("名义留购价") + private String nominalPrice; +} diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansolutions/LoanSolutionsRest.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansolutions/LoanSolutionsRest.java index 4d0850b2fa..17b543d1a5 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansolutions/LoanSolutionsRest.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansolutions/LoanSolutionsRest.java @@ -2,10 +2,7 @@ package com.yxt.anrui.riskcenter.biz.loansolutions; import com.yxt.anrui.riskcenter.api.loansolutions.LoanSolutions; import com.yxt.anrui.riskcenter.api.loansolutions.LoanSolutionsFeign; -import com.yxt.anrui.riskcenter.api.loansolutions.app.SolutionsDetailsVo; -import com.yxt.anrui.riskcenter.api.loansolutions.app.SolutionsDto; -import com.yxt.anrui.riskcenter.api.loansolutions.app.SolutionssQuery; -import com.yxt.anrui.riskcenter.api.loansolutions.app.SolutionssVo; +import com.yxt.anrui.riskcenter.api.loansolutions.app.*; import com.yxt.anrui.riskcenter.api.loansolutions.calculate.CalculateQuery; import com.yxt.anrui.riskcenter.api.loansolutions.calculate.CalculateVo; import com.yxt.common.core.result.ResultBean; @@ -48,7 +45,7 @@ public class LoanSolutionsRest implements LoanSolutionsFeign { } @Override - public ResultBean save2(SolutionsDto dto) { + public ResultBean save2(SolutionssDto dto) { return loanSolutionsService.save2(dto); } diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansolutions/LoanSolutionsService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansolutions/LoanSolutionsService.java index c161d0f9bc..8797478e00 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansolutions/LoanSolutionsService.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansolutions/LoanSolutionsService.java @@ -837,15 +837,16 @@ public class LoanSolutionsService extends MybatisBaseService selectDetailsVo2(@RequestParam("saleOrderSid") String busSid); @ApiOperation("计算") - @GetMapping("/detailsVo2") + @PostMapping("/calc") @ResponseBody ResultBean detailsVo2(@RequestBody AppSolutionQuery query); diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/solutions/SolutionsRest.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/solutions/SolutionsRest.java index 909e03dca1..a9e4dc75fa 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/solutions/SolutionsRest.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/solutions/SolutionsRest.java @@ -28,6 +28,11 @@ public class SolutionsRest implements SolutionsFeign { return solutionsService.save(dto); } + @Override + public ResultBean save2(AppSolutionssDto dto) { + return solutionsService.save2(dto); + } + @Override public ResultBean selectDetailsVo(String saleOrderSid) { return solutionsService.selectDetailsVo(saleOrderSid); diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/solutions/SolutionsService.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/solutions/SolutionsService.java index e5b7366c93..a845646475 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/solutions/SolutionsService.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/solutions/SolutionsService.java @@ -6,10 +6,7 @@ import com.yxt.anrui.riskcenter.api.loanfinotherPolicy.OtherPolicyVo; import com.yxt.anrui.riskcenter.api.loanfinpolicy.LoanFinPolicyFeign; import com.yxt.anrui.riskcenter.api.loanfinpolicy.PolicyVo; import com.yxt.anrui.riskcenter.api.loansolutions.LoanSolutionsFeign; -import com.yxt.anrui.riskcenter.api.loansolutions.app.SolutionsDetailsVo; -import com.yxt.anrui.riskcenter.api.loansolutions.app.SolutionsDto; -import com.yxt.anrui.riskcenter.api.loansolutions.app.SolutionssQuery; -import com.yxt.anrui.riskcenter.api.loansolutions.app.SolutionssVo; +import com.yxt.anrui.riskcenter.api.loansolutions.app.*; import com.yxt.anrui.terminal.api.risk.solutions.*; import com.yxt.common.core.result.ResultBean; import org.springframework.beans.factory.annotation.Autowired; @@ -124,4 +121,15 @@ public class SolutionsService { BeanUtil.copyProperties(solutionssVo, appSolutionVo); return rb.success().setData(appSolutionVo); } + + public ResultBean save2(AppSolutionssDto dto) { + ResultBean rb = ResultBean.fireFail(); + SolutionssDto solutionsDto = new SolutionssDto(); + BeanUtil.copyProperties(dto, solutionsDto); + ResultBean resultBean = loanSolutionsFeign.save2(solutionsDto); + if (!resultBean.getSuccess()) { + return rb.setMsg(resultBean.getMsg()); + } + return rb.success(); + } } From ec29194e8bff25ae793bda375ca4f794f507b352 Mon Sep 17 00:00:00 2001 From: yunuo970428 <405378304@qq.com> Date: Tue, 15 Aug 2023 17:47:53 +0800 Subject: [PATCH 2/7] =?UTF-8?q?=E5=AE=8C=E5=96=84=E5=BC=80=E7=A5=A8?= =?UTF-8?q?=E7=AE=A1=E7=90=86--=E6=9F=A5=E7=9C=8B=E6=AC=BE=E7=A5=A8?= =?UTF-8?q?=E6=83=85=E5=86=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../anruifinmanagement/finwaitinvoiceapply.js | 16 ++++++++++++++-- .../billingmanagement/relation/coupon.vue | 4 ++-- .../acknowledgementReceiptAdd.vue | 2 +- 3 files changed, 17 insertions(+), 5 deletions(-) diff --git a/anrui-buscenter/anrui-finmanage-ui/src/api/anruifinmanagement/finwaitinvoiceapply.js b/anrui-buscenter/anrui-finmanage-ui/src/api/anruifinmanagement/finwaitinvoiceapply.js index 8ec55c904e..f1e9755bce 100644 --- a/anrui-buscenter/anrui-finmanage-ui/src/api/anruifinmanagement/finwaitinvoiceapply.js +++ b/anrui-buscenter/anrui-finmanage-ui/src/api/anruifinmanagement/finwaitinvoiceapply.js @@ -158,8 +158,8 @@ export function saveGeren(data) { }) } -// 查看款、票情况详情 -export function deliveredFinSelect(data) { +// 查看款、票情况详情--开票管理 +export function deliveredByFinSelect(data) { return request({ url: '/fin/v1/finvehicleinvoice/deliveredFinSelect', method: 'get', @@ -170,3 +170,15 @@ export function deliveredFinSelect(data) { }) } +// 查看款、票情况详情 -- 开票申请、欠款开票申请等 +export function deliveredFinSelect(data) { + return request({ + url: '/buscenter/v1/busdeliveredapply/deliveredFinSelect', + method: 'get', + params: data, + headers: { + 'Content-Type': 'application/json' + } + }) +} + diff --git a/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/finginvoiceapply/billingmanagement/relation/coupon.vue b/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/finginvoiceapply/billingmanagement/relation/coupon.vue index 8b2e7bad36..bdd7ddfcff 100644 --- a/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/finginvoiceapply/billingmanagement/relation/coupon.vue +++ b/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/finginvoiceapply/billingmanagement/relation/coupon.vue @@ -168,7 +168,7 @@