销售订单车辆风控状态和资金占用费状态

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordervehicle/BusSalesOrderVehicle.java

@@ -93,5 +93,11 @@ public class BusSalesOrderVehicle extends BaseEntity {
     private String vehMark;
     @ApiModelProperty("结清申请提交时间")
     private Date settleApplyDate;
+    //风控状态（0正常，1交回，2赎回，3转租，4不追偿，5处置损失，6亏损立案，7亏损执行，8亏损结案）
+    @ApiModelProperty("风控状态")
+    private Integer riskState;
+    //是否生成资金占用费（1生成,0不生成.默认生成，交回后改为不生成，若赎回改为生成）
+    @ApiModelProperty("是否生成资金占用费")
+    private Integer fundState;
 
 }

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordervehicle/BusSalesOrderVehicleFeign.java

@@ -192,4 +192,12 @@ public interface BusSalesOrderVehicleFeign {
     @ApiOperation("根据车架号后八位关联查询车辆及订单信息")
     @PostMapping("/selVehOrderInfoByVinNo")
     ResultBean<BusOrderAndVehInfo> selVehOrderInfoByVinNo(@RequestParam("vinNo") String vinNo);
+
+    @ApiOperation("将销售订单车辆设置风控状态")
+    @PostMapping("/setRiskState")
+    ResultBean setRiskState(@RequestBody BusVinStateSetQuery busVinStateSetQuery);
+
+    @ApiOperation("将销售订单车辆设置资金占用费状态")
+    @PostMapping("/setFundState")
+    ResultBean setFundState(@RequestBody BusVinStateSetQuery busVinStateSetQuery);
 }

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordervehicle/BusSalesOrderVehicleFeignFallback.java

@@ -193,4 +193,14 @@ public class BusSalesOrderVehicleFeignFallback implements BusSalesOrderVehicleFe
         return null;
     }
 
+    @Override
+    public ResultBean setRiskState(BusVinStateSetQuery busVinStateSetQuery) {
+        return null;
+    }
+
+    @Override
+    public ResultBean setFundState(BusVinStateSetQuery busVinStateSetQuery) {
+        return null;
+    }
+
 }

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordervehicle/BusVinStateSetQuery.java

@@ -0,0 +1,18 @@
+package com.yxt.anrui.buscenter.api.bussalesordervehicle;
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @description:
+ * @author: dimengzhe
+ * @date: 2025/4/25
+ **/
+@Data
+public class BusVinStateSetQuery {
+
+    private List<String> busVinSidList;
+
+    private Integer state;
+}

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleMapper.java

@@ -33,6 +33,7 @@ import com.yxt.anrui.base.api.basevehicle.BaseVehicle;
 import com.yxt.anrui.buscenter.api.bussalesorder.app.model.AppNowCarListVo;
 import com.yxt.anrui.buscenter.api.bussalesorder.app.vin.VinListsVo;
 import com.yxt.anrui.buscenter.api.bussalesordervehicle.*;
+import com.yxt.common.core.result.ResultBean;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
@@ -105,7 +106,9 @@ public interface BusSalesOrderVehicleMapper extends BaseMapper<BusSalesOrderVehi
     int updateTemporaryNo(@Param("sid") String sid, @Param("temporaryNo") String temporaryNo, @Param("temporaryName") String temporaryName);
 
     List<BusSalesOrderVehicle> selectByOrderSid(@Param("salesOrderSid") String salesOrderSid);
-    List<BusBorrowVehicleVo> selectByOrderSid2(@Param("salesOrderSid") String salesOrderSid,@Param("borrowSid") String borrowSid);
+
+    List<BusBorrowVehicleVo> selectByOrderSid2(@Param("salesOrderSid") String salesOrderSid, @Param("borrowSid") String borrowSid);
+
     List<BusBorrowVehicleVo> selectByOrderSid3(@Param("salesOrderSid") String salesOrderSid);
 
     @Select("select * from bus_sales_order_vehicle where sid = #{busVinSid}")
@@ -116,7 +119,9 @@ public interface BusSalesOrderVehicleMapper extends BaseMapper<BusSalesOrderVehi
     List<BusSalesOrderVehicle> selectByNoAndVinSids(String contractNo);
 
     List<BusSalesOrderVehicle> selectByNoAndVinSidsNew(String contractNo);
+
     List<BusSalesOrderVehicle> selectByNoAndVinSidsNew1(String contractNo);
+
     List<BusSalesOrderVehicle> selectByNoAndVinSidsNew2(String contractNo);
 
     List<BusVehicleQKKPVo> appVehicleQKKPList(@Param(Constants.WRAPPER) QueryWrapper<BaseVehicle> qw);
@@ -152,24 +157,27 @@ public interface BusSalesOrderVehicleMapper extends BaseMapper<BusSalesOrderVehi
     BusSalesOrderVehicleDetailsVo selectVinNoBySid(String sid);
 
     List<BusBorrowVehicleVo> selectListByOrdersSid(String saleOrderSid);
+
     List<BusBorrowVehicleVo> selectListByOrdersSid2(String saleOrderSid);
 
     BusSalesOrderVehicle selectByBorrowSid(String sid);
-    List<BusSalesOrderVehicle> selectByBorrowSid2(@Param("sid") String sid,@Param("orderSid") String orderSid);
+
+    List<BusSalesOrderVehicle> selectByBorrowSid2(@Param("sid") String sid, @Param("orderSid") String orderSid);
 
     @Select("select * from bus_sales_order_vehicle where linkSid = #{vehSid} and salesOrderSid = #{sid}")
-    BusSalesOrderVehicle selectByOrderSidAndVehSid(@Param("sid") String sid,@Param("vehSid") String vehSid);
+    BusSalesOrderVehicle selectByOrderSidAndVehSid(@Param("sid") String sid, @Param("vehSid") String vehSid);
 
     List<BusVehicleBorrowVo> saleOrderInputLenderVins(String sale0rderSid);
 
     BusSalesOrderVehicle selectBySidAndOrderBo(@Param("saleOrderSid") String saleOrderSid, @Param("pos") String pos);
 
-    List<BusSalesOrderVehicle> selectListByOrderSidAndDkrSid(@Param("saleOrderSid") String saleOrderSid,@Param("borrowerSid") String borrowerSid);
-    List<BusSalesOrderVehicle> selectListByOrderSidAndDkrSidAndLoanContractSid(@Param("saleOrderSid") String saleOrderSid,@Param("borrowerSid") String borrowerSid,@Param("loanContractSid") String loanContractSid);
+    List<BusSalesOrderVehicle> selectListByOrderSidAndDkrSid(@Param("saleOrderSid") String saleOrderSid, @Param("borrowerSid") String borrowerSid);
+
+    List<BusSalesOrderVehicle> selectListByOrderSidAndDkrSidAndLoanContractSid(@Param("saleOrderSid") String saleOrderSid, @Param("borrowerSid") String borrowerSid, @Param("loanContractSid") String loanContractSid);
 
     List<String> selectVinNos(@Param("borrowSid") String sid, @Param("saleOrderSid") String saleOrderSid);
 
-    List<BusSalesOrderVehicle> selectListByOrderSidAndXdConSid(@Param("saleOrderSid") String saleOrderSid,@Param("loanContractSid") String loanContractSid);
+    List<BusSalesOrderVehicle> selectListByOrderSidAndXdConSid(@Param("saleOrderSid") String saleOrderSid, @Param("loanContractSid") String loanContractSid);
 
 
     List<BusSalesOrderVehicle> selByLoanContractSid(String loanContractSid);
@@ -178,7 +186,7 @@ public interface BusSalesOrderVehicleMapper extends BaseMapper<BusSalesOrderVehi
     List<BusSalesOrderVehicle> selectByBorrowerSid(String borrowerSid);
 
     @Update("update bus_sales_order_vehicle set reaRepaymentName = #{reaRepaymentName},reaRepaymentPhone = #{reaRepaymentPhone} where sid = #{saleVehSid}")
-    void maintReaRepayment(@Param("saleVehSid") String saleVehSid,@Param("reaRepaymentName") String reaRepaymentName,@Param("reaRepaymentPhone") String reaRepaymentPhone);
+    void maintReaRepayment(@Param("saleVehSid") String saleVehSid, @Param("reaRepaymentName") String reaRepaymentName, @Param("reaRepaymentPhone") String reaRepaymentPhone);
 
     @Select("select sid from bus_sales_order_vehicle where salesOrderSid = #{saleOrderSid}")
     List<String> selectBySalesOrderSid2(String saleOrderSid);
@@ -192,4 +200,8 @@ public interface BusSalesOrderVehicleMapper extends BaseMapper<BusSalesOrderVehi
     void updateVehiclesList(@Param("list") List<BusSalesOrderVehicle> list);
 
     BusOrderAndVehInfo selVehOrderInfoByVinNo(@Param("vinNo") String vinNo);
+
+    ResultBean setRiskState(@Param("list") List<String> busVinSidList, @Param("riskState") Integer riskState);
+
+    ResultBean setFundState(@Param("list")List<String> busVinSidList, @Param("fundState") Integer fundState);
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleMapper.xml

@@ -442,4 +442,23 @@
                              LEFT JOIN anrui_base.base_vehicle_state as bvs ON bv.sid = bvs.busSid
         where bv.loanContractSid = #{loanContractSid} AND bvs.busState != '602'
     </select>
+
+    <update id="setRiskState">
+        UPDATE bus_sales_order_vehicle
+        SET riskState = #{riskState}
+        WHERE sid IN
+        <foreach collection="list" item="sid" open="(" separator="," close=")">
+            #{sid}
+        </foreach>
+
+    </update>
+
+    <update id="setFundState">
+        UPDATE bus_sales_order_vehicle
+        SET fundState = #{fundState}
+        WHERE sid IN
+        <foreach collection="list" item="sid" open="(" separator="," close=")">
+            #{sid}
+        </foreach>
+    </update>
 </mapper>

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleRest.java

@@ -226,4 +226,14 @@ public class BusSalesOrderVehicleRest implements BusSalesOrderVehicleFeign {
     public ResultBean<BusOrderAndVehInfo> selVehOrderInfoByVinNo(String vinNo) {
         return busSalesOrderVehicleService.selVehOrderInfoByVinNo(vinNo);
     }
+
+    @Override
+    public ResultBean setRiskState(BusVinStateSetQuery busVinStateSetQuery) {
+        return busSalesOrderVehicleService.setRiskState(busVinStateSetQuery);
+    }
+
+    @Override
+    public ResultBean setFundState(BusVinStateSetQuery busVinStateSetQuery) {
+        return busSalesOrderVehicleService.setFundState(busVinStateSetQuery);
+    }
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleService.java

@@ -681,4 +681,18 @@ public class BusSalesOrderVehicleService extends MybatisBaseService<BusSalesOrde
         return rb.success().setData(busOrderAndVehInfo);
 
     }
+
+    public ResultBean setRiskState(BusVinStateSetQuery busVinStateSetQuery) {
+        ResultBean rb = ResultBean.fireFail();
+        List<String> busVinSidList = busVinStateSetQuery.getBusVinSidList();
+        Integer riskState = busVinStateSetQuery.getState();
+        return baseMapper.setRiskState(busVinSidList,riskState);
+    }
+
+    public ResultBean setFundState(BusVinStateSetQuery busVinStateSetQuery) {
+        ResultBean rb = ResultBean.fireFail();
+        List<String> busVinSidList = busVinStateSetQuery.getBusVinSidList();
+        Integer fundState = busVinStateSetQuery.getState();
+        return baseMapper.setFundState(busVinSidList,fundState);
+    }
 }

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanoutboundapply/LoanOutboundApplyService.java

@@ -10,6 +10,7 @@ import com.yxt.anrui.base.api.basepurchasesystem.BasePurchaseSystemFeign;
 import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrderFeign;
 import com.yxt.anrui.buscenter.api.bussalesorderborrower.BusSalesOrderBorrowerFeign;
 import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicleFeign;
+import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusVinStateSetQuery;
 import com.yxt.anrui.fin.api.kingdee.FinKingDeeFeign;
 import com.yxt.anrui.flowable.api.flow.FlowableFeign;
 import com.yxt.anrui.flowable.api.flow.UpdateFlowFieldVo;
@@ -585,6 +586,27 @@ public class LoanOutboundApplyService extends MybatisBaseService<LoanOutboundApp
             UpdateFlowFieldVo ufVo = resultBean.getData();
             int i = updateFlowFiled(BeanUtil.beanToMap(resultBean.getData()));
             if ("Event_end".equals(resultBean.getData().getTaskDefKey())) {
+                //修改销售订单车辆表风控状态和资金占用费状态
+                BusVinStateSetQuery busVinStateSetQuery = new BusVinStateSetQuery();
+                List<String> busVinSidList = loanOutboundVehService.selectByMainSid(businessSid);
+                if(busVinSidList.isEmpty()){
+                    busVinStateSetQuery.setBusVinSidList(busVinSidList);
+                    if("客户赎回".equals(loanOutboundApply.getDisposal())){
+                        busVinStateSetQuery.setState(2);
+                        ResultBean resultBean1 = busSalesOrderVehicleFeign.setRiskState(busVinStateSetQuery);
+                        busVinStateSetQuery.setState(1);
+                        ResultBean resultBean2 = busSalesOrderVehicleFeign.setFundState(busVinStateSetQuery);
+
+                    }else if("二次转租".equals(loanOutboundApply.getDisposal())){
+                        busVinStateSetQuery.setState(3);
+                        ResultBean resultBean1 = busSalesOrderVehicleFeign.setRiskState(busVinStateSetQuery);
+                    }else if("二次销售".equals(loanOutboundApply.getDisposal())){
+
+                    }
+
+
+
+                }
                 LoanOutboundApply outboundApply = fetchBySid(businessSid);
                 outboundApply.setClosingDate(new DateTime());
                 outboundApply.setOutboundDate(new Date());

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanoutboundveh/LoanOutboundVehMapper.java

@@ -17,4 +17,6 @@ public interface LoanOutboundVehMapper extends BaseMapper<LoanOutboundVeh> {
     int deleteByMainSid(@Param("mainSid") String mainSid);
 
     List<OutboundVinList> selByMainSid(@Param("mainSid") String mainSid);
+
+    List<String> selectByMainSid(String businessSid);
 }

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanoutboundveh/LoanOutboundVehMapper.xml

@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.yxt.anrui.riskcenter.biz.loanoutboundveh.LoanOutboundVehMapper">
-
     <delete id="deleteByMainSid">
         DELETE
         FROM loan_sublet_veh
@@ -13,4 +12,10 @@
         FROM loan_out_bound_veh
         WHERE mainSid = #{mainSid}
     </select>
+
+    <select id="selectByMainSid" resultType="java.lang.String">
+        select busVinSid
+        from loan_out_bound_veh
+        where mainSid = #{businessSid}
+    </select>
 </mapper>

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanoutboundveh/LoanOutboundVehService.java

@@ -25,4 +25,8 @@ public class LoanOutboundVehService extends MybatisBaseService<LoanOutboundVehMa
     public List<OutboundVinList> selByMainSid(String sid) {
         return baseMapper.selByMainSid(sid);
     }
+
+    public List<String> selectByMainSid(String businessSid) {
+        return baseMapper.selectByMainSid(businessSid);
+    }
 }

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanreturninboundapply/LoanReturnInboundApplyService.java

@@ -9,6 +9,8 @@ import com.google.common.util.concurrent.ThreadFactoryBuilder;
 import com.yxt.anrui.base.api.basevehmodelconfig.BaseVehmodelConfigFeign;
 import com.yxt.anrui.base.api.basevehmodelconfig.BaseVehmodelVo;
 import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrder;
+import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicleFeign;
+import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusVinStateSetQuery;
 import com.yxt.anrui.flowable.api.flow.FlowableFeign;
 import com.yxt.anrui.flowable.api.flow.UpdateFlowFieldVo;
 import com.yxt.anrui.flowable.api.flow2.FlowDelegateQuery;
@@ -85,6 +87,8 @@ public class LoanReturnInboundApplyService extends MybatisBaseService<LoanReturn
     private BaseVehmodelConfigFeign baseVehmodelConfigFeign;
     @Autowired
     private LoanReturnVehLedgerService loanReturnVehLedgerService;
+    @Autowired
+    private BusSalesOrderVehicleFeign busSalesOrderVehicleFeign;
 
     public PagerVo<LoanReturnInboundApplyVo> listPageVo(PagerQuery<LoanReturnInboundApplyQuery> pq) {
         LoanReturnInboundApplyQuery query = pq.getParams();
@@ -558,6 +562,19 @@ public class LoanReturnInboundApplyService extends MybatisBaseService<LoanReturn
                 baseMapper.updateById(loanReturnInboundApply);
                 //推送到交回车辆台账
                 loanReturnVehLedgerService.saveVehLedger(businessSid);
+                
+                //修改风控状态为交回：1
+                String busVinSid = loanReturnInboundApply.getBusVinSid();
+
+                List<String> busVinSidList = new ArrayList<>();
+                busVinSidList.add(busVinSid);
+                BusVinStateSetQuery busVinStateSetQuery = new BusVinStateSetQuery();
+                busVinStateSetQuery.setBusVinSidList(busVinSidList);
+                busVinStateSetQuery.setState(1);
+                ResultBean resultBean1 = busSalesOrderVehicleFeign.setRiskState(busVinStateSetQuery);
+                //将资金占用费状态修改为0
+                busVinStateSetQuery.setState(0);
+                ResultBean resultBean2 = busSalesOrderVehicleFeign.setFundState(busVinStateSetQuery);
 
             } else {
                 //极光推送

doc/databases/统计报表/返利报表.sql

@@ -0,0 +1,36 @@
+DROP TABLE IF EXISTS `report_rebat`;
+CREATE TABLE `report_set`
+(
+    `id`                 int(32)     NOT NULL AUTO_INCREMENT COMMENT 'id',
+    `sid`                varchar(64) NOT NULL COMMENT 'sid',
+    `lockVersion`        int(32)              DEFAULT '0' COMMENT '版本锁',
+    `createTime`         timestamp   NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+    `modifyTime`         timestamp   NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '修改时间',
+    `isEnable`           int(32)              DEFAULT '1' COMMENT '是否可用：1可用，0不可用',
+    `state`              int(32)              DEFAULT '1' COMMENT '状态',
+    `isDelete`           int(32)              DEFAULT '0' COMMENT '是否删除：0未删除，1已删除',
+    `remarks`            varchar(255)         DEFAULT NULL COMMENT '备注',
+    `createBySid`        varchar(64)          DEFAULT NULL COMMENT '创建人sid',
+    `updateBySid`        varchar(64)          DEFAULT NULL COMMENT '修改人sid',
+    `busOrgSid`          varchar(64)          DEFAULT NULL COMMENT '事业部sid',
+    `busOrgName`         varchar(64)          DEFAULT NULL COMMENT '事业部名称',
+    `brandSid`           varchar(64)          DEFAULT NULL COMMENT '品牌sid',
+    `brandName`          varchar(64)          DEFAULT NULL COMMENT '品牌名称',
+    `useOrgSid`          varchar(64)          DEFAULT NULL COMMENT '分公司sid',
+    `useOrgName`         varchar(64)          DEFAULT NULL COMMENT '分公司名称',
+    `vehModelSid`        varchar(64)          DEFAULT NULL COMMENT '车型sid',
+    `vehMConfigSid`      varchar(64)          DEFAULT NULL COMMENT '车型配置sid',
+    `purchaseSystemSid`  varchar(64)          DEFAULT NULL COMMENT '采购系统sid',
+    `purchaseSystemName` varchar(64)          DEFAULT NULL COMMENT '采购系统名称',
+    `type`               varchar(64)          DEFAULT NULL COMMENT '返利项目类型',
+    `estimateRebate`     decimal(10, 2)       DEFAULT NULL COMMENT '预计返利',
+    `uploadMoney`        decimal(10, 2)       DEFAULT NULL COMMENT '上传金额',
+    `adjustmentMoney`    decimal(10, 2)       DEFAULT NULL COMMENT '调整金额',
+    `notUploadMoney`     decimal(10, 2)       DEFAULT NULL COMMENT '未上传金额',
+    `notUploadMoney`     decimal(10, 2)       DEFAULT NULL COMMENT '支出金额',
+    `notUploadMoney`     decimal(10, 2)       DEFAULT NULL COMMENT '待支付金额',
+    `notUploadMoney`     decimal(10, 2)       DEFAULT NULL COMMENT '抵顶金额',
+    PRIMARY KEY (`id`),
+    KEY `id` (`id`)
+) ENGINE = INNODB
+  DEFAULT CHARSET = utf8 COMMENT ='返利报表';