Merge remote-tracking branch 'origin/master'

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemodelconfig/AppModelConfigDetailsVo.java

@@ -56,6 +56,26 @@ public class AppModelConfigDetailsVo implements Vo {
     @ApiModelProperty(value = "保险杠")
     private String bumper;
 
+    @ApiModelProperty("离合器value")
+    private String clutchValue;
+    @ApiModelProperty("方向机value")
+    private String dirMachineValue;
+    @ApiModelProperty("前桥value")
+    private String proponsValue;
+    @ApiModelProperty("门窗value")
+    private String doorAndWindowValue;
+    @ApiModelProperty("门锁value")
+    private String doorLockValue;
+    @ApiModelProperty("大灯value")
+    private String headlightValue;
+    @ApiModelProperty("上车踏板value")
+    private String boardPedalValue;
+    @ApiModelProperty("方向盘value")
+    private String steerWheelValue;
+    @ApiModelProperty("蓄电池value")
+    private String storagBatteryValue;
+
+
     @ApiModelProperty(value = "配置包")
     private String configuringBao;
 

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelconfig/BaseModelConfigMapper.xml

@@ -343,6 +343,15 @@
                bmc.saddle,
                bmc.wheelbase,
                bmc.bumper,
+               bmc.clutchValue,
+               bmc.dirMachineValue,
+               bmc.proponsValue,
+               bmc.doorAndWindowValue,
+               bmc.doorLockValue,
+               bmc.headlightValue,
+               bmc.boardPedalValue,
+               bmc.steerWheelValue,
+               bmc.storagBatteryValue,
                bmc.configuringBao,
                bmc.independentSources,
                bmc.fuelTank,

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java

@@ -1087,6 +1087,15 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
         list2.add(getConfigValueSpanSize("座椅", configVo.getSeat()));
         list2.add(getConfigValueSpanSize("多媒体", configVo.getMultimedia()));
         list2.add(getConfigValueSpanSize("配置包", configVo.getConfiguringBao()));
+        list2.add(getConfigValueSpanSize("离合器", configVo.getClutchValue()));
+        list2.add(getConfigValueSpanSize("方向机", configVo.getDirMachineValue()));
+        list2.add(getConfigValueSpanSize("前桥", configVo.getProponsValue()));
+        list2.add(getConfigValueSpanSize("门窗", configVo.getDoorAndWindowValue()));
+        list2.add(getConfigValueSpanSize("门锁", configVo.getDoorLockValue()));
+        list2.add(getConfigValueSpanSize("大灯", configVo.getHeadlightValue()));
+        list2.add(getConfigValueSpanSize("上车踏板", configVo.getBoardPedalValue()));
+        list2.add(getConfigValueSpanSize("方向盘", configVo.getSteerWheelValue()));
+        list2.add(getConfigValueSpanSize("蓄电池", configVo.getStoragBatteryValue()));
 
 
         configDetailVo.setConfigInfo(list2);

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclestate/BaseVehicleStateMapper.xml

@@ -5,7 +5,7 @@
         select *
         from base_vehicle_state
         where busSid = #{busSid}
-          and busState != '602'
+          and (busState is null or busState != '602')
         order by id desc limit 1
     </select>
 

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyMapper.java

@@ -30,6 +30,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Constants;
+import com.yxt.anrui.base.api.basevehiclestate.BaseVehicleState;
 import com.yxt.anrui.buscenter.api.busdeliveredapply.AppDeliveredApplyPageQuery;
 import com.yxt.anrui.buscenter.api.busdeliveredapply.AppDeliveredApplyPageVo;
 import com.yxt.anrui.buscenter.api.busdeliveredapply.BusDeliveredApply;
@@ -114,4 +115,6 @@ public interface BusDeliveredApplyMapper extends BaseMapper<BusDeliveredApply> {
     List<String> selectSid(@Param("contractId") String contractId,@Param("sid") String sid);
 
     List<String> selectBySid(@Param("contractNo") String contractId, @Param("list") List<String> vinNoLists);
+
+    BaseVehicleState selectByBusVinSid(String sid);
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyMapper.xml

@@ -155,4 +155,8 @@
             #{item}
         </foreach>
     </select>
+
+    <select id="selectByBusVinSid" resultType="com.yxt.anrui.base.api.basevehiclestate.BaseVehicleState">
+        select * from anrui_base.base_vehicle_state where busSid = #{sid} and busState != '602' order by id desc limit 1
+    </select>
 </mapper>

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java

@@ -42,6 +42,7 @@ import com.yxt.anrui.base.api.basevehiclecertificate.BaseVehicleCertificateVo;
 import com.yxt.anrui.base.api.basevehicleout.BaseVehicleOutFeign;
 import com.yxt.anrui.base.api.basevehicleout.BaseVehicleZSOutApplyDto;
 import com.yxt.anrui.base.api.basevehicleout.BaseVehicleZSOutDto;
+import com.yxt.anrui.base.api.basevehiclestate.BaseVehicleState;
 import com.yxt.anrui.base.api.basevehiclestate.BaseVehicleStateDto;
 import com.yxt.anrui.base.api.basevehiclestate.BaseVehicleStateEnum;
 import com.yxt.anrui.base.api.basevehiclestate.BaseVehicleStateFeign;
@@ -812,15 +813,13 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
             updateFlowFiled(BeanUtil.beanToMap(resultBean.getData()));
             if ("Event_end".equals(resultBean.getData().getTaskDefKey())) {
                 baseMapper.updateStateBySid(3, bv.getBusinessSid());
-
-                //==============================修改车辆的持久状态组装数据
                 try {
                     ThreadFactory namedThreadFactory = new ThreadFactoryBuilder()
                             .setNameFormat("demo-pool-%d").build();
-                    ExecutorService pool = new ThreadPoolExecutor(2, 100,
-                            0L, TimeUnit.MILLISECONDS,
+                    ExecutorService pool = new ThreadPoolExecutor(1, 10,
+                            1000, TimeUnit.MILLISECONDS,
                             new LinkedBlockingQueue<Runnable>(1024), namedThreadFactory, new ThreadPoolExecutor.AbortPolicy());
-                    Future future1 = pool.submit(() -> {
+                    Future future0 = pool.submit(() -> {
                         List<BaseVehicleStateDto> dtoList = new ArrayList<>();
                         List<String> vinSidList = busDeliveredApplyDetailsService.selectVinSidByApplySid(bv.getBusinessSid());
                         vinSidList.removeAll(Collections.singleton(null));
@@ -834,15 +833,6 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
                             ResultBean busVehicleStateResultBean = baseVehicleStateFeign.saveOrUpdate(dtoList);
                         }
                     });
-                } catch (Exception e) {
-                    e.printStackTrace();
-                }
-                try {
-                    ThreadFactory namedThreadFactory = new ThreadFactoryBuilder()
-                            .setNameFormat("demo-pool-%d").build();
-                    ExecutorService pool = new ThreadPoolExecutor(1, 10,
-                            1000, TimeUnit.MILLISECONDS,
-                            new LinkedBlockingQueue<Runnable>(1024), namedThreadFactory, new ThreadPoolExecutor.AbortPolicy());
                     List<BusDeliveredApplyDetails> detailsList = busDeliveredApplyDetailsService.selectByApplySid(busDeliveredApply.getSid());
                     ResultBean<AppOrderDetailsVo> orderDetailsVoResultBean = busSalesOrderService.getSaleOrderDetailsByContractNo(busDeliveredApply.getContractNo());
                     if (!orderDetailsVoResultBean.getSuccess()) {
@@ -1004,14 +994,32 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
                 appBusHandoverPrepareVehicleDto.setVinSid(details.getVinSid());
                 //根据合同编号和车辆sid查询
                 BusSalesOrderVehicle busSalesOrderVehicle = busSalesOrderVehicleService.selectByNoAndVinSid(busDeliveredApply.getContractNo(), details.getVinSid());
-                BusDelivered busDelivered = busDeliveredService.getState(busDeliveredApply.getContractNo(), busSalesOrderVehicle.getSid());
+                /*BusDelivered busDelivered = busDeliveredService.getState(busDeliveredApply.getContractNo(), busSalesOrderVehicle.getSid());
                 appBusHandoverPrepareVehicleDto.setSubscription(busDelivered.getSubscription());
-                appBusHandoverPrepareVehicleDto.setSubscriptionKey(busDelivered.getSubscriptionKey());
+                appBusHandoverPrepareVehicleDto.setSubscriptionKey(busDelivered.getSubscriptionKey());*/
+                BaseVehicleState baseVehicleState = baseMapper.selectByBusVinSid(busSalesOrderVehicle.getSid());
+                if(baseVehicleState != null){
+                    if(StringUtils.isNotBlank(baseVehicleState.getCarryVehicleState()) && "1".equals(baseVehicleState.getCarryVehicleState())){
+                        //欠款提车
+                        appBusHandoverPrepareVehicleDto.setSubscription("欠款提车");
+                        appBusHandoverPrepareVehicleDto.setSubscriptionKey("0001");
+
+                    }else{
+                        if(StringUtils.isNotBlank(baseVehicleState.getFinState()) && "1".equals(baseVehicleState.getFinState())){
+                            appBusHandoverPrepareVehicleDto.setSubscription("正常交款");
+                            appBusHandoverPrepareVehicleDto.setSubscriptionKey("0002");
+
+                        }
+                    }
+
+                }
+
                 dtos.add(appBusHandoverPrepareVehicleDto);
             }
         }
         dto.setAppBusHandoverPrepareVehicleDtos(dtos);
         busHandoverPrepareService.addHandoverPrepare(dto);
+        log.info("推送待交车准备数据结束啦~~~~~~~~~~~~~~~~~~~~~~~~==============================");
     }
 
     /**
@@ -2014,6 +2022,19 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
             }
             baseMapper.insert(busDeliveredApply);
             sid = busDeliveredApply.getSid();
+            List<BaseVehicleStateDto> stateDtoList = new ArrayList<>();
+            List<String> vinSidList = busDeliveredApplyDetailsService.selectVinSidByApplySid(sid);
+            vinSidList.removeAll(Collections.singleton(null));
+            if (!vinSidList.isEmpty()) {
+                vinSidList.stream().forEach(vv -> {
+                    BaseVehicleStateDto baseVehicleStateDto = new BaseVehicleStateDto();
+                    baseVehicleStateDto.setOperateType(BaseVehicleStateEnum.OperateTypeEnum.CKKP_SAVE.getTypeKey());
+                    baseVehicleStateDto.setBusSid(vv);
+                    stateDtoList.add(baseVehicleStateDto);
+                });
+                ResultBean busVehicleStateResultBean = baseVehicleStateFeign.saveOrUpdate(stateDtoList);
+            }
+
         } else {
             //根据出库申请sid查询出库申请是否存在
             BusDeliveredApply busDeliveredApply = fetchBySid(sid);
@@ -2058,6 +2079,21 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
                 }
                 busDeliveredApply.setDistributorNameTwo(intermediary2.getIntermediaryName());
             }
+            //==============================================================
+            List<BaseVehicleStateDto> stateDtoList = new ArrayList<>();
+            List<String> vinSidList = busDeliveredApplyDetailsService.selectVinSidByApplySid(sid);
+            vinSidList.removeAll(Collections.singleton(null));
+            if (!vinSidList.isEmpty()) {
+                List<BaseVehicleStateDto> finalStateDtoList1 = stateDtoList;
+                vinSidList.stream().forEach(vv -> {
+                    BaseVehicleStateDto baseVehicleStateDto = new BaseVehicleStateDto();
+                    baseVehicleStateDto.setOperateType(BaseVehicleStateEnum.OperateTypeEnum.CKKP_DELETE.getTypeKey());
+                    baseVehicleStateDto.setBusSid(vv);
+                    finalStateDtoList1.add(baseVehicleStateDto);
+                });
+                ResultBean busVehicleStateResultBean = baseVehicleStateFeign.saveOrUpdate(stateDtoList);
+            }
+            //=================================================================
             //删除
             busDeliveredApplyDetailsService.deleteByApplySid(sid);
             busDeliveredUseMessageService.deleteByApplySid(sid);
@@ -2162,6 +2198,19 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
                 busDeliveredApplyDetailsService.insert(busDeliveredApplyDetails);
             }
             baseMapper.updateById(busDeliveredApply);
+            stateDtoList = new ArrayList<>();
+            vinSidList = busDeliveredApplyDetailsService.selectVinSidByApplySid(sid);
+            vinSidList.removeAll(Collections.singleton(null));
+            if (!vinSidList.isEmpty()) {
+                List<BaseVehicleStateDto> finalStateDtoList = stateDtoList;
+                vinSidList.stream().forEach(vv -> {
+                    BaseVehicleStateDto baseVehicleStateDto = new BaseVehicleStateDto();
+                    baseVehicleStateDto.setOperateType(BaseVehicleStateEnum.OperateTypeEnum.CKKP_SAVE.getTypeKey());
+                    baseVehicleStateDto.setBusSid(vv);
+                    finalStateDtoList.add(baseVehicleStateDto);
+                });
+                ResultBean busVehicleStateResultBean = baseVehicleStateFeign.saveOrUpdate(stateDtoList);
+            }
         }
         return rb.success().setData(sid);
     }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapplydetails/BusDeliveredApplyDetailsService.java

@@ -168,29 +168,17 @@ public class BusDeliveredApplyDetailsService extends MybatisBaseService<BusDeliv
             }
         }
 
-        //==============================修改车辆的持久状态组装数据
-        try {
-            ThreadFactory namedThreadFactory = new ThreadFactoryBuilder()
-                    .setNameFormat("demo-pool-%d").build();
-            ExecutorService pool = new ThreadPoolExecutor(2, 100,
-                    0L, TimeUnit.MILLISECONDS,
-                    new LinkedBlockingQueue<Runnable>(1024), namedThreadFactory, new ThreadPoolExecutor.AbortPolicy());
-            Future future1 = pool.submit(() -> {
-                List<BaseVehicleStateDto> stateDtoList = new ArrayList<>();
-                List<String> vinSidList = selectVinSidByApplySid(sid);
-                vinSidList.removeAll(Collections.singleton(null));
-                if (!vinSidList.isEmpty()) {
-                    vinSidList.stream().forEach(v -> {
-                        BaseVehicleStateDto baseVehicleStateDto = new BaseVehicleStateDto();
-                        baseVehicleStateDto.setOperateType(BaseVehicleStateEnum.OperateTypeEnum.CKKP_SAVE.getTypeKey());
-                        baseVehicleStateDto.setBusSid(v);
-                        stateDtoList.add(baseVehicleStateDto);
-                    });
-                    ResultBean busVehicleStateResultBean = baseVehicleStateFeign.saveOrUpdate(stateDtoList);
-                }
+        List<BaseVehicleStateDto> stateDtoList = new ArrayList<>();
+        List<String> vinSidList = selectVinSidByApplySid(sid);
+        vinSidList.removeAll(Collections.singleton(null));
+        if (!vinSidList.isEmpty()) {
+            vinSidList.stream().forEach(v -> {
+                BaseVehicleStateDto baseVehicleStateDto = new BaseVehicleStateDto();
+                baseVehicleStateDto.setOperateType(BaseVehicleStateEnum.OperateTypeEnum.CKKP_SAVE.getTypeKey());
+                baseVehicleStateDto.setBusSid(v);
+                stateDtoList.add(baseVehicleStateDto);
             });
-        } catch (Exception e) {
-            e.printStackTrace();
+            ResultBean busVehicleStateResultBean = baseVehicleStateFeign.saveOrUpdate(stateDtoList);
         }
     }
 

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java

@@ -6622,7 +6622,11 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
     }
 
     public ResultBean<AppOrderDetailsVo> getSaleOrderDetailsByContractNo(String contractNo) {
+        ResultBean<AppOrderDetailsVo> rb = ResultBean.fireFail();
         BusSalesOrder busSalesOrder = baseMapper.selectOrderByContractNo(contractNo);
+        if(busSalesOrder == null){
+            return rb.setMsg("该合同号的订单不存在");
+        }
         ResultBean<AppOrderDetailsVo> resultBean = getSaleOrderDetails(busSalesOrder.getSid());
         return resultBean;
     }

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationService.java

@@ -366,7 +366,9 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
             record.setVinNo(vinNos.substring(0, vinNos.lastIndexOf(",")));
             String contractNo = record.getContractNo();
             BusSalesOrder busSalesOrder = busSalesOrderFeign.selectOrderByContractNo(contractNo).getData();
-            record.setOrderSid(busSalesOrder.getSid());
+            if (busSalesOrder != null){
+                record.setOrderSid(busSalesOrder.getSid());
+            }
             if (record.getCreateBySid().equals(query.getCreateBySid())){
                 record.setIsCZ(true);
             }else {

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedMapper.xml

@@ -543,7 +543,7 @@
                       FROM fin_funds_carried_forward_veh f
                                 left JOIN `fin_funds_carried_forward_apply` fa ON f.mainSid = fa.sid
                                <!-- left join fin_selected_receivables_detailed fd on fd.collSid = fa.sid-->
-                      WHERE fa.`nodeState` != '终止'<!-- and fd.auditState = 3-->
+                      WHERE fa.`nodeState` = '已办结'<!-- and fd.auditState = 3-->
                       ) f ON f.`busSid` = d.`sid`
               WHERE d.auditState = 3
               GROUP BY d.`sid`) d

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfinpolicy/LoanFinPolicyFeign.java

@@ -44,7 +44,7 @@ public interface LoanFinPolicyFeign {
     ResultBean setRiskState(@RequestBody LoanRiskStateQuery query);
 
     @ApiOperation("金融产品政策管理分页列表")
-    @PostMapping("pager/base/v1/commoncontract/fetcist")
+    @PostMapping("pagerList")
     ResultBean<PagerVo<LoanFinPolicyVos>> pagerList(@RequestBody PagerQuery<LoanFinPolicyQuery> pagerQuery);
 
     @ApiOperation("app金融产品资方常规")