diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdelivered/AppDeliveredDetailsVo.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdelivered/AppDeliveredDetailsVo.java index 2e2e2c7d7c..a7b8e65d5f 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdelivered/AppDeliveredDetailsVo.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdelivered/AppDeliveredDetailsVo.java @@ -106,6 +106,8 @@ public class AppDeliveredDetailsVo implements Vo { private String hasInvoiceKey; @ApiModelProperty("是否开票(1开票,0不开票)") private String hasInvoice; + @ApiModelProperty("是否开过票(1开票,0未开票)") + private int isKp; @ApiModelProperty("是否开票是否有禁止修改") private boolean forbidInvoiceChoice; diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdelivered/BusDeliveredVo.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdelivered/BusDeliveredVo.java index 0cc85759b0..73e4b521d5 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdelivered/BusDeliveredVo.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdelivered/BusDeliveredVo.java @@ -63,6 +63,9 @@ public class BusDeliveredVo implements Vo { private String busVinSid; @ApiModelProperty("车辆sid") private String vinSid; + + @ApiModelProperty("销售类型key") + private String paymentMethodKey; @ApiModelProperty("销售类型") private String paymentMethod; @@ -78,5 +81,6 @@ public class BusDeliveredVo implements Vo { private String loanName; private String loanSid; - + @ApiModelProperty("开票/未开票") + private String isKp; } diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/BusDeliveredApply.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/BusDeliveredApply.java index 60f8a026d3..e4c0de5c3d 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/BusDeliveredApply.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/BusDeliveredApply.java @@ -131,4 +131,6 @@ public class BusDeliveredApply extends BaseEntity { private String promiseFile; private String danFile; private String carFile; + @ApiModelProperty("是否开过票(1开票,0未开票)") + private int isKp; } diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/BusDeliveredApplyDetailVo.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/BusDeliveredApplyDetailVo.java index 5c855d7e45..40b5664c89 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/BusDeliveredApplyDetailVo.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/BusDeliveredApplyDetailVo.java @@ -112,6 +112,8 @@ public class BusDeliveredApplyDetailVo implements Vo { private String hasInvoiceKey; @ApiModelProperty("是否开票(1开票,0不开票)") private String hasInvoice; + @ApiModelProperty("是否开过票(1开票,0未开票)") + private int isKp; @ApiModelProperty("开票信息") private BusBillApplicationDetailsVo busBillApplicationDetailsVo; } \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/BusDeliveredApplyDto.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/BusDeliveredApplyDto.java index a09ea86dcb..1416bf4091 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/BusDeliveredApplyDto.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/BusDeliveredApplyDto.java @@ -105,6 +105,8 @@ public class BusDeliveredApplyDto implements Dto { private String distributorPriceTwo; @ApiModelProperty("是否开票(0开票,1不开票)") private String isInvoicing; + @ApiModelProperty("是否开过票(1开票,0未开票)") + private int isKp; @ApiModelProperty("开票信息") private BusBillApplicationDto busBillApplicationDto; } \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdelivered/BusDeliveredMapper.xml b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdelivered/BusDeliveredMapper.xml index 84d17362e0..465a0818d0 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdelivered/BusDeliveredMapper.xml +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdelivered/BusDeliveredMapper.xml @@ -284,16 +284,19 @@ bo.contractNo, bo.customerName as name, bo.payType paymentMethod, + bo.payTypeKey as paymentMethodKey, RIGHT(bv.linkNo, 8) as vinNo, bv.linkSid vinSid, bv.sid busVinSid, bv.borrowName loanName, - bv.borrowerSid loanSid + bv.borrowerSid loanSid, + IF(fi.VIN IS NULL,'0','1') AS isKp FROM bus_sales_order bo LEFT JOIN bus_sales_order_vehicle bv ON bo.sid = bv.salesOrderSid LEFT JOIN anrui_base.base_vehicle bbv ON bbv.sid = bv.linkSid LEFT JOIN anrui_base.base_vehicle_state bs ON bs.busSid = bv.sid + LEFT JOIN anrui_fin.fin_vehicle_invoice fi ON bv.linkSid = fi.vehicleSid ${ew.sqlSegment} and length(bv.linkSid) > 0 diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdelivered/BusDeliveredService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdelivered/BusDeliveredService.java index 2d16ccc4a3..c4c690c81d 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdelivered/BusDeliveredService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdelivered/BusDeliveredService.java @@ -62,6 +62,8 @@ import com.yxt.anrui.buscenter.biz.bussalesorderborrower.BusSalesOrderBorrowerSe import com.yxt.anrui.buscenter.biz.bussalesorderdiscount.BusSalesOrderDiscountService; import com.yxt.anrui.buscenter.biz.bussalesordervehicle.BusSalesOrderVehicleService; import com.yxt.anrui.fin.api.finbillapplication.FinBillApplication; +import com.yxt.anrui.fin.api.finvehicleinvoice.FinVehicleInvoice; +import com.yxt.anrui.fin.api.finvehicleinvoice.FinVehicleInvoiceFeign; import com.yxt.anrui.portal.api.dictcommon.DictCommonFeign; import com.yxt.anrui.portal.api.dictcommon.DictCommonVo; import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign; @@ -142,6 +144,8 @@ public class BusDeliveredService extends MybatisBaseService detailsList = dto.getDetailsList(); + for (BusDeliveredApplyDetailsDto busDeliveredApplyDetailsDto : detailsList) { + BusSalesOrderVehicle busSalesOrderVehicle = busSalesOrderVehicleService.selectByNoAndVinSid(dto.getContractNo(), busDeliveredApplyDetailsDto.getVinSid()); + BaseVehicleState baseVehicleState = baseVehicleStateFeign.selectByBusSid(busSalesOrderVehicle.getSid()).getData(); + if (!"1".equals(baseVehicleState.getFinState())){ + return rb.setMsg(busDeliveredApplyDetailsDto.getVinNo() + "款项未交清,保存失败"); + } + if ("3".equals(baseVehicleState.getFinSourceKey())){//非担保 + String investigateValue = loanHomevisitInvestigateFeign.selSaleOrderSid(busSalesOrderVehicle.getSalesOrderSid()).getData(); + if (!"通过".equals(investigateValue)){ + return rb.setMsg(busDeliveredApplyDetailsDto.getVinNo() + "家访考察未通过,保存失败"); + } + }else if ("4".equals(baseVehicleState.getFinSourceKey())){//担保 + String state = loanHomevisitFileexamineFeign.selSaleOrderSid(busSalesOrderVehicle.getSalesOrderSid()).getData(); + if (!"2".equals(state)){ + return rb.setMsg(busDeliveredApplyDetailsDto.getVinNo() + "家访资料审核未通过,保存失败"); + } + } + } + } //新增 BusDeliveredApply busDeliveredApply = new BusDeliveredApply(); BeanUtil.copyProperties(dto, busDeliveredApply, "sid"); @@ -856,6 +880,12 @@ public class BusDeliveredApplyService extends MybatisBaseService appMap = new HashMap<>(); //需和移动端沟通业务sid保存的属性具体值:appMap中sid不是固定的。移动端提供具体字段。 @@ -2128,6 +2158,12 @@ public class BusDeliveredApplyService extends MybatisBaseService appMap = new HashMap<>(); //需和移动端沟通业务sid保存的属性具体值:appMap中sid不是固定的。移动端提供具体字段。 @@ -2192,6 +2228,12 @@ public class BusDeliveredApplyService extends MybatisBaseService appMap = new HashMap<>(); //需和移动端沟通业务sid保存的属性具体值:appMap中sid不是固定的。移动端提供具体字段。 @@ -2259,6 +2301,12 @@ public class BusDeliveredApplyService extends MybatisBaseService appMap = new HashMap<>(); //需和移动端沟通业务sid保存的属性具体值:appMap中sid不是固定的。移动端提供具体字段。 @@ -3320,6 +3368,12 @@ public class BusDeliveredApplyService extends MybatisBaseService appMap = new HashMap<>(); //需和移动端沟通业务sid保存的属性具体值:appMap中sid不是固定的。移动端提供具体字段。 diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/resources/ftl/gd.ftl b/anrui-buscenter/anrui-buscenter-biz/src/main/resources/ftl/gd.ftl index e6a4251c64..54ee018094 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/resources/ftl/gd.ftl +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/resources/ftl/gd.ftl @@ -578,7 +578,7 @@ -         +        diff --git a/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java b/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java index e274d22ac8..3ca6d1a73b 100644 --- a/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java +++ b/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java @@ -34,7 +34,7 @@ public enum ProcDefEnum { BASEINTERNALPURCHASE("调车申请", "process_i6luw5xq:3:722516"), BASEACCADJAPPLY("调账申请", "process_r6pyzqoz:4:1362508"), // BUSDELIVEREDAPPLY("出库申请", "process_wgt1n66l:10:1700004"), - BUSDELIVEREDAPPLY("出库申请", "process_30ixry76:2:5357504"), + BUSDELIVEREDAPPLY("出库申请", "process_30ixry76:3:11372504"), QKBUSDELIVEREDAPPLY("欠款出库申请", "process_161otrwo:3:7192504"), BASESHUNINVOICAPPLY("调车开票申请", "process_u4xrvaso:1:400008"), BASEVEHINSTALLMODPRICE("上装调价申请", "process_s0a0svth:1:492508"), diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitfileexamine/LoanHomevisitFileexamineFeign.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitfileexamine/LoanHomevisitFileexamineFeign.java index 85116e9caa..00acb52d35 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitfileexamine/LoanHomevisitFileexamineFeign.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitfileexamine/LoanHomevisitFileexamineFeign.java @@ -82,4 +82,9 @@ public interface LoanHomevisitFileexamineFeign { @PostMapping("/pushMessageToSale") @ResponseBody ResultBean pushMessageToSale(@RequestBody SaleOrderPushMessage saleOrderPushMessage); + + @ApiOperation("根据销售订单sid查询家访资料审核结果") + @PostMapping("/selSaleOrderSid") + @ResponseBody + ResultBean selSaleOrderSid(@RequestParam("salesOrderSid") String salesOrderSid); } \ No newline at end of file diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitfileexamine/LoanHomevisitFileexamineFeignFallback.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitfileexamine/LoanHomevisitFileexamineFeignFallback.java index 49522c323a..5f6eb52ccd 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitfileexamine/LoanHomevisitFileexamineFeignFallback.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitfileexamine/LoanHomevisitFileexamineFeignFallback.java @@ -76,4 +76,9 @@ public class LoanHomevisitFileexamineFeignFallback implements LoanHomevisitFilee public ResultBean pushMessageToSale(SaleOrderPushMessage saleOrderPushMessage) { return null; } + + @Override + public ResultBean selSaleOrderSid(String salesOrderSid) { + return null; + } } \ No newline at end of file diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigate/LoanHomevisitInvestigateFeign.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigate/LoanHomevisitInvestigateFeign.java index be0f4db9a5..33dc6c41e4 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigate/LoanHomevisitInvestigateFeign.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigate/LoanHomevisitInvestigateFeign.java @@ -227,4 +227,9 @@ public interface LoanHomevisitInvestigateFeign { @PostMapping("/selSaleOrderSidAndBorrSid") @ResponseBody ResultBean selSaleOrderSidAndBorrSid(@RequestParam("orderSid") String orderSid,@RequestParam("borrowerSid") String borrowerSid); + + @ApiOperation("根据销售订单sid查询家访考察结果") + @PostMapping("/selSaleOrderSid") + @ResponseBody + ResultBean selSaleOrderSid(@RequestParam("salesOrderSid") String salesOrderSid); } \ No newline at end of file diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigate/LoanHomevisitInvestigateFeignFallback.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigate/LoanHomevisitInvestigateFeignFallback.java index 15a245df93..6a462526f4 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigate/LoanHomevisitInvestigateFeignFallback.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigate/LoanHomevisitInvestigateFeignFallback.java @@ -220,4 +220,9 @@ public class LoanHomevisitInvestigateFeignFallback implements LoanHomevisitInves public ResultBean selSaleOrderSidAndBorrSid(String orderSid, String borrowerSid) { return null; } + + @Override + public ResultBean selSaleOrderSid(String salesOrderSid) { + return null; + } } \ No newline at end of file diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitfileexamine/LoanHomevisitFileexamineMapper.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitfileexamine/LoanHomevisitFileexamineMapper.java index c104492d41..ba08d5ecdb 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitfileexamine/LoanHomevisitFileexamineMapper.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitfileexamine/LoanHomevisitFileexamineMapper.java @@ -63,4 +63,7 @@ public interface LoanHomevisitFileexamineMapper extends BaseMapper selectListVo(); String selectByOrderSid(String saleOrderSid); + + @Select("select state from loan_homevisit_fileexamine where saleOrderSid = #{salesOrderSid}") + String selSaleOrderSid(String salesOrderSid); } \ No newline at end of file diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitfileexamine/LoanHomevisitFileexamineRest.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitfileexamine/LoanHomevisitFileexamineRest.java index b2b319dfca..dc7f265415 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitfileexamine/LoanHomevisitFileexamineRest.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitfileexamine/LoanHomevisitFileexamineRest.java @@ -97,4 +97,9 @@ public class LoanHomevisitFileexamineRest implements LoanHomevisitFileexamineFei public ResultBean pushMessageToSale(SaleOrderPushMessage saleOrderPushMessage) { return loanHomevisitFileexamineService.pushMessageToSale(saleOrderPushMessage); } + + @Override + public ResultBean selSaleOrderSid(String salesOrderSid) { + return loanHomevisitFileexamineService.selSaleOrderSid(salesOrderSid); + } } diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitfileexamine/LoanHomevisitFileexamineService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitfileexamine/LoanHomevisitFileexamineService.java index 45d89d371b..ba01e72907 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitfileexamine/LoanHomevisitFileexamineService.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitfileexamine/LoanHomevisitFileexamineService.java @@ -698,4 +698,10 @@ public class LoanHomevisitFileexamineService extends MybatisBaseService selSaleOrderSid(String salesOrderSid) { + ResultBean rb = ResultBean.fireFail(); + String state = baseMapper.selSaleOrderSid(salesOrderSid); + return rb.success().setData(state); + } } \ No newline at end of file diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigate/LoanHomevisitInvestigateMapper.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigate/LoanHomevisitInvestigateMapper.java index a8e11b3385..dc346d500d 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigate/LoanHomevisitInvestigateMapper.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigate/LoanHomevisitInvestigateMapper.java @@ -98,4 +98,7 @@ public interface LoanHomevisitInvestigateMapper extends BaseMapper selSaleOrderSidAndBorrSid(String orderSid, String borrowerSid) { return loanHomevisitInvestigateService.selSaleOrderSidAndBorrSid(orderSid,borrowerSid); } + + @Override + public ResultBean selSaleOrderSid(String salesOrderSid) { + return loanHomevisitInvestigateService.selSaleOrderSid(salesOrderSid); + } } diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigate/LoanHomevisitInvestigateService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigate/LoanHomevisitInvestigateService.java index 0aedbf25f1..773f7dcc8d 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigate/LoanHomevisitInvestigateService.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigate/LoanHomevisitInvestigateService.java @@ -2164,4 +2164,10 @@ public class LoanHomevisitInvestigateService extends MybatisBaseService selSaleOrderSid(String salesOrderSid) { + ResultBean rb = ResultBean.fireFail(); + String investigateValue = baseMapper.selSaleOrderSid(salesOrderSid); + return rb.success().setData(investigateValue); + } } \ No newline at end of file