优化

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclestate/BaseVehicleStateEnum.java

@@ -73,6 +73,9 @@ public class BaseVehicleStateEnum {
         FIN_WRQ("8", "认款未完成"),
         CKTJ("9", "出库提交"),
         CKZZ("10", "出库终止、驳回以及撤回到第一环节时"),
+        QKTCTJ("11", "欠款提车提交"),
+        QKTCZZ("12", "欠款提车终止"),
+        QKTCTG("12", "欠款提车审核通过"),
 
         ;
 

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

@@ -24,6 +24,7 @@ public class BaseVehicleStateService extends MybatisBaseService<BaseVehicleState
             String operateType = dto.getOperateType();
             String busSid = dto.getBusSid();
             BaseVehicleState baseVehicleState = baseMapper.selectOnes(busSid);
+            if(baseVehicleState != null){
                 if (BaseVehicleStateEnum.OperateTypeEnum.DDBA_SUBMIT.getTypeKey().equals(operateType)) {
                     //销售订单提交时
                     baseVehicleState = new BaseVehicleState();
@@ -34,6 +35,8 @@ public class BaseVehicleStateService extends MybatisBaseService<BaseVehicleState
                 } else if (BaseVehicleStateEnum.OperateTypeEnum.DDBA_PASS.getTypeKey().equals(operateType)) {
                     //销售订单办理通过后更新业务阶段为出库开票、小状态为待出库，款项状态为0
                     baseVehicleState.setFinState("0");
+                    baseVehicleState.setCarryVehicleState("0");
+                    baseVehicleState.setCarryInvoiceState("0");
                     baseVehicleState.setBusNo(BaseVehicleStateEnum.BusNoEnum.CKKP.getBusNoKey());
                     baseVehicleState.setBusName(BaseVehicleStateEnum.BusNoEnum.CKKP.getBusNoValue());
                     baseVehicleState.setBusState(BaseVehicleStateEnum.BusStateEnum.CKKP_STATE_1.getStateKey());
@@ -67,10 +70,19 @@ public class BaseVehicleStateService extends MybatisBaseService<BaseVehicleState
                 }else if(BaseVehicleStateEnum.OperateTypeEnum.CKZZ.getTypeKey().equals(operateType)){
                     //出库申请终止后，将小状态修改为401待出库
                     baseVehicleState.setBusState(BaseVehicleStateEnum.BusStateEnum.CKKP_STATE_1.getStateKey());
+                }else if(BaseVehicleStateEnum.OperateTypeEnum.QKTCTJ.getTypeKey().equals(operateType)){
+                    //欠款提车提交后，将提车状态修改为1,0为未提交过，1为审核通过，2为审核中
+                    baseVehicleState.setCarryVehicleState("2");
+                }else if(BaseVehicleStateEnum.OperateTypeEnum.QKTCZZ.getTypeKey().equals(operateType)){
+                    //欠款提车终止，将提车状态修改为0,0为未提交过，1为审核通过，2为审核中
+                    baseVehicleState.setCarryVehicleState("0");
+                }else if(BaseVehicleStateEnum.OperateTypeEnum.QKTCTG.getTypeKey().equals(operateType)){
+                    //欠款提车审核通过，将提车状态修改为1,0为未提交过，1为审核通过，2为审核中
+                    baseVehicleState.setCarryVehicleState("1");
                 }
-
-
                 baseMapper.updateById(baseVehicleState);
+            }
+
         });
 
 

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyMapper.java

@@ -84,4 +84,6 @@ public interface BusArrearsCarryVehicleApplyMapper extends BaseMapper<BusArrears
     BusArrearsCarryVehicleApply selSubmitLc(String vehSid);
 
     BusArrearsCarryVehicleApplyVo selComByVehSid(String vehSid);
+
+    List<String> selectByNo(String sid);
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyMapper.xml

@@ -143,4 +143,13 @@
         WHERE bacva.`nodeState` = "已办结"
           AND bacvd.`vinSid` = #{vehSid}
     </select>
+
+    <select id="selectByNo" resultType="java.lang.String">
+        select bv.sid
+        from bus_arrears_carry_vehicle_details bd
+        LEFT JOIN bus_arrears_carry_vehicle_apply ba on ba.sid = bd.applySid
+        left join bus_sales_order_vehicle bv on bv.linkSid = bd.vinSid
+        left join bus_sales_order bo on bo.sid = bv.salesOrderSid
+        where bd.applySid = #{sid} and bo.contractNo = ba.contractNo
+    </select>
 </mapper>

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyService.java

@@ -7,6 +7,7 @@ import cn.hutool.core.date.DateUtil;
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.google.common.util.concurrent.ThreadFactoryBuilder;
 import com.yxt.anrui.base.api.basemodelconfig.BaseModelConfigFeign;
 import com.yxt.anrui.base.api.basemodelconfig.BaseModelConfigSelectVo;
 import com.yxt.anrui.base.api.basetrailer.BaseTrailerFeign;
@@ -15,6 +16,9 @@ import com.yxt.anrui.base.api.basetrailer.TraliveredVo;
 import com.yxt.anrui.base.api.basevehicle.BaseVehicleFeign;
 import com.yxt.anrui.base.api.basevehiclemodel.BaseVehicleModel;
 import com.yxt.anrui.base.api.basevehiclemodel.BaseVehicleModelFeign;
+import com.yxt.anrui.base.api.basevehiclestate.BaseVehicleStateDto;
+import com.yxt.anrui.base.api.basevehiclestate.BaseVehicleStateEnum;
+import com.yxt.anrui.base.api.basevehiclestate.BaseVehicleStateFeign;
 import com.yxt.anrui.base.api.basevehicletempstate.BaseVehicleTempstate;
 import com.yxt.anrui.base.api.basevehicletempstate.BaseVehicleTempstateDto;
 import com.yxt.anrui.base.api.basevehicletempstate.BaseVehicleTempstateFeign;
@@ -87,6 +91,7 @@ import com.yxt.messagecenter.api.messagelist.MessageList;
 import com.yxt.messagecenter.api.messagelist.MessageListFeign;
 import org.apache.commons.collections4.comparators.NullComparator;
 import org.apache.commons.lang3.StringUtils;
+import org.apache.tomcat.util.threads.ThreadPoolExecutor;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
@@ -100,6 +105,7 @@ import java.net.URL;
 import java.net.URLEncoder;
 import java.text.SimpleDateFormat;
 import java.util.*;
+import java.util.concurrent.*;
 import java.util.stream.Collectors;
 
 /**
@@ -203,6 +209,8 @@ public class BusArrearsCarryVehicleApplyService extends MybatisBaseService<BusAr
     private com.yxt.anrui.portal.api.flow.FlowableFeign flowableFeignPro;
     @Autowired
     private MessageListFeign messageListFeign;
+    @Autowired
+    private BaseVehicleStateFeign baseVehicleStateFeign;
     private static final NullComparator<String> nullComparator = new NullComparator<>();
 
     /**
@@ -1759,6 +1767,7 @@ public class BusArrearsCarryVehicleApplyService extends MybatisBaseService<BusAr
             }
             UpdateFlowFieldVo ufVo = voResultBean.getData();
             updateFlowFiled(BeanUtil.beanToMap(ufVo));
+            busArrearsCarryVehicleApply = fetchBySid(businessSid);
             BaseVehicleTempstateDto baseVehicleTempstateDto = new BaseVehicleTempstateDto();
             baseVehicleTempstateDto.setBusSid(businessSid);
             baseVehicleTempstateDto.setTempStateKey(VehicleStateTempOrLast.PaymentEnum.ARREARS_CARRY_VEHICLE.getCode());
@@ -1772,8 +1781,40 @@ public class BusArrearsCarryVehicleApplyService extends MybatisBaseService<BusAr
                 baseVehicleTempstateFeign.save(baseVehicleTempstateDto);
             }
             baseMapper.updateType(businessSid);
+            //==============================修改车辆的持久状态组装数据
+            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());
+                BusArrearsCarryVehicleApply finalBusArrearsCarryVehicleApply = busArrearsCarryVehicleApply;
+                Future future1 = pool.submit(() -> {
+                    List<BaseVehicleStateDto> dtoList = new ArrayList<>();
+                    List<String> vinSidList = baseMapper.selectByNo(finalBusArrearsCarryVehicleApply.getSid());
+                    vinSidList.removeAll(Collections.singleton(null));
+                    if (!vinSidList.isEmpty()) {
+                        vinSidList.stream().forEach(v -> {
+                            BaseVehicleStateDto baseVehicleStateDto = new BaseVehicleStateDto();
+                            baseVehicleStateDto.setOperateType(BaseVehicleStateEnum.OperateTypeEnum.QKTCTJ.getTypeKey());
+                            baseVehicleStateDto.setBusSid(v);
+                            dtoList.add(baseVehicleStateDto);
+                        });
+                        ResultBean busVehicleStateResultBean = baseVehicleStateFeign.saveOrUpdate(dtoList);
+                    }
+                });
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+            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());
+                BusArrearsCarryVehicleApply finalBusArrearsCarryVehicleApply1 = busArrearsCarryVehicleApply;
+                Future future1 = pool.submit(() -> {
                     //极光推送
-            busArrearsCarryVehicleApply = fetchBySid(businessSid);
                     MessageFlowableQuery messageFlowableQuery = new MessageFlowableQuery();
                     MessageFlowVo messageFlowVo = new MessageFlowVo();
                     BeanUtil.copyProperties(ufVo, messageFlowVo);
@@ -1781,9 +1822,13 @@ public class BusArrearsCarryVehicleApplyService extends MybatisBaseService<BusAr
                     messageFlowableQuery.setAppMap(appMap);
                     messageFlowableQuery.setBusinessSid(businessSid);
                     messageFlowableQuery.setModuleName("欠款提车申请");
-            messageFlowableQuery.setMsgContent(busArrearsCarryVehicleApply.getApplyName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批");
+                    messageFlowableQuery.setMsgContent(finalBusArrearsCarryVehicleApply1.getApplyName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批");
                     messageFlowableQuery.setMsgTitle("欠款提车申请");
                     ResultBean<String> stringResultBean = messageFeign.pushMessage(messageFlowableQuery);
+                });
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
             return voResultBean;
         }
         if (r == 2) {
@@ -1926,8 +1971,33 @@ public class BusArrearsCarryVehicleApplyService extends MybatisBaseService<BusAr
                 }
                 //修改状态
                 baseMapper.updateType(bv.getBusinessSid());
+                //==============================修改车辆的持久状态组装数据
+                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());
+                    BusArrearsCarryVehicleApply finalBusArrearsCarryVehicleApply = busArrearsCarryVehicleApply;
+                    Future future1 = pool.submit(() -> {
+                        List<BaseVehicleStateDto> dtoList = new ArrayList<>();
+                        List<String> vinSidList = baseMapper.selectByNo(finalBusArrearsCarryVehicleApply.getSid());
+                        vinSidList.removeAll(Collections.singleton(null));
+                        if (!vinSidList.isEmpty()) {
+                            vinSidList.stream().forEach(v -> {
+                                BaseVehicleStateDto baseVehicleStateDto = new BaseVehicleStateDto();
+                                baseVehicleStateDto.setOperateType(BaseVehicleStateEnum.OperateTypeEnum.QKTCTG.getTypeKey());
+                                baseVehicleStateDto.setBusSid(v);
+                                dtoList.add(baseVehicleStateDto);
+                            });
+                            ResultBean busVehicleStateResultBean = baseVehicleStateFeign.saveOrUpdate(dtoList);
+                        }
+                    });
+                } catch (Exception e) {
+                    e.printStackTrace();
+                }
                 //推送出库申请
-                List<BusArrearsCarryVehicleDetailsVo> vehicleDetailsVos = busArrearsCarryVehicleDetailsService.selByArrearsSid(busArrearsCarryVehicleApply.getSid());
+                /*List<BusArrearsCarryVehicleDetailsVo> vehicleDetailsVos = busArrearsCarryVehicleDetailsService.selByArrearsSid(busArrearsCarryVehicleApply.getSid());
                 if (vehicleDetailsVos.size() > 0) {
                     for (BusArrearsCarryVehicleDetailsVo vehicleDetailsVo : vehicleDetailsVos) {
                         BusSalesOrderVehicle busSalesOrderVehicle = busSalesOrderVehicleService.selectByNoAndVinSid(busArrearsCarryVehicleApply.getContractNo(),vehicleDetailsVo.getVinSid());
@@ -1961,7 +2031,7 @@ public class BusArrearsCarryVehicleApplyService extends MybatisBaseService<BusAr
                             busDeliveredService.saveOrUpdateDto(busDeliveredDto);
                         }
                     }
-                }
+                }*/
             }
             return rb.success().setData(resultBean.getData());
         } else {
@@ -2166,6 +2236,31 @@ public class BusArrearsCarryVehicleApplyService extends MybatisBaseService<BusAr
                 if ("发起申请".equals(nextName)) {
                     messageFlowableQuery.setMsgContent("您提交的" + messageFlowableQuery.getModuleName() + "已被驳回,请重新提交");
                     baseVehicleTempstateFeign.delByBusSid(busArrearsCarryVehicleApply.getSid());
+                    //==============================修改车辆的持久状态组装数据
+                    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());
+                        BusArrearsCarryVehicleApply finalBusArrearsCarryVehicleApply = busArrearsCarryVehicleApply;
+                        Future future1 = pool.submit(() -> {
+                            List<BaseVehicleStateDto> dtoList = new ArrayList<>();
+                            List<String> vinSidList = baseMapper.selectByNo(finalBusArrearsCarryVehicleApply.getSid());
+                            vinSidList.removeAll(Collections.singleton(null));
+                            if (!vinSidList.isEmpty()) {
+                                vinSidList.stream().forEach(v -> {
+                                    BaseVehicleStateDto baseVehicleStateDto = new BaseVehicleStateDto();
+                                    baseVehicleStateDto.setOperateType(BaseVehicleStateEnum.OperateTypeEnum.QKTCZZ.getTypeKey());
+                                    baseVehicleStateDto.setBusSid(v);
+                                    dtoList.add(baseVehicleStateDto);
+                                });
+                                ResultBean busVehicleStateResultBean = baseVehicleStateFeign.saveOrUpdate(dtoList);
+                            }
+                        });
+                    } catch (Exception e) {
+                        e.printStackTrace();
+                    }
                 } else {
                     messageFlowableQuery.setMsgContent(busArrearsCarryVehicleApply.getApplyName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批");
                 }
@@ -2215,6 +2310,31 @@ public class BusArrearsCarryVehicleApplyService extends MybatisBaseService<BusAr
                 String nextName = listResultBean.getData().get(0).getName_();
                 if ("发起申请".equals(nextName)) {
                     baseVehicleTempstateFeign.delByBusSid(busArrearsCarryVehicleApply.getSid());
+                    //==============================修改车辆的持久状态组装数据
+                    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());
+                        BusArrearsCarryVehicleApply finalBusArrearsCarryVehicleApply = busArrearsCarryVehicleApply;
+                        Future future1 = pool.submit(() -> {
+                            List<BaseVehicleStateDto> dtoList = new ArrayList<>();
+                            List<String> vinSidList = baseMapper.selectByNo(finalBusArrearsCarryVehicleApply.getSid());
+                            vinSidList.removeAll(Collections.singleton(null));
+                            if (!vinSidList.isEmpty()) {
+                                vinSidList.stream().forEach(v -> {
+                                    BaseVehicleStateDto baseVehicleStateDto = new BaseVehicleStateDto();
+                                    baseVehicleStateDto.setOperateType(BaseVehicleStateEnum.OperateTypeEnum.QKTCZZ.getTypeKey());
+                                    baseVehicleStateDto.setBusSid(v);
+                                    dtoList.add(baseVehicleStateDto);
+                                });
+                                ResultBean busVehicleStateResultBean = baseVehicleStateFeign.saveOrUpdate(dtoList);
+                            }
+                        });
+                    } catch (Exception e) {
+                        e.printStackTrace();
+                    }
                 }
                 updateFlowFiled(BeanUtil.beanToMap(resultBean.getData()));
                 return rb.success().setData(resultBean.getData());
@@ -2260,6 +2380,31 @@ public class BusArrearsCarryVehicleApplyService extends MybatisBaseService<BusAr
                     return rb.success().setData(resultBean.getData());
                 }
             }
+            //==============================修改车辆的持久状态组装数据
+            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());
+                BusArrearsCarryVehicleApply finalBusArrearsCarryVehicleApply = busArrearsCarryVehicleApply;
+                Future future1 = pool.submit(() -> {
+                    List<BaseVehicleStateDto> dtoList = new ArrayList<>();
+                    List<String> vinSidList = baseMapper.selectByNo(finalBusArrearsCarryVehicleApply.getSid());
+                    vinSidList.removeAll(Collections.singleton(null));
+                    if (!vinSidList.isEmpty()) {
+                        vinSidList.stream().forEach(v -> {
+                            BaseVehicleStateDto baseVehicleStateDto = new BaseVehicleStateDto();
+                            baseVehicleStateDto.setOperateType(BaseVehicleStateEnum.OperateTypeEnum.QKTCZZ.getTypeKey());
+                            baseVehicleStateDto.setBusSid(v);
+                            dtoList.add(baseVehicleStateDto);
+                        });
+                        ResultBean busVehicleStateResultBean = baseVehicleStateFeign.saveOrUpdate(dtoList);
+                    }
+                });
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
 
         }
         return rb.setMsg("操作失败!提交的数据不一致!");

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdelivered/BusDeliveredMapper.xml

@@ -287,7 +287,7 @@
         RIGHT(bv.linkNo, 8) as vinNo,
         bv.linkSid vinSid,
         bv.sid busVinSid
-        from  (select busSid from anrui_base.base_vehicle_state where busState = '401' and finState = '1') as bs
+        from  (select busSid from anrui_base.base_vehicle_state where busState = '401' and (finState = '1' or carryVehicleState = '1')) as bs
         left join bus_sales_order_vehicle bv on bs.busSid = bv.sid
         left join bus_sales_order bo on bo.sid = bv.salesOrderSid
         left join anrui_base.base_vehicle bbv on bbv.sid = bv.linkSid

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

@@ -749,7 +749,6 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
         appMap.put("contractId", busDeliveredApply.getContractNo());
         appMap.put("contract_id", busDeliveredApply.getContractNo());
         variables.put("app", appMap);
-//        variables.put("isDanBao","2".equals(busDeliveredApply.getPaymentMethodKey()));
         //根据合同号查询销售订单
         if (!"2".equals(busDeliveredApply.getPaymentMethodKey())) {
             BusSalesOrder busSalesOrder = busSalesOrderService.selectByContractNos(busDeliveredApply.getContractNo());

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

@@ -70,7 +70,9 @@
     <select id="selectVinSidByApplySid" resultType="java.lang.String">
         select bv.sid
         from bus_delivered_apply_details bd
+        left join bus_delivered_apply ba on ba.sid = bd.applySid
         left join bus_sales_order_vehicle bv on bv.linkSid = bd.vinSid
-        where bd.applySid = #{sid}
+        left join bus_sales_order bo on bo.sid = bv.salesOrderSid
+        where bd.applySid = #{sid} and bo.contractNo = ba.contractNo
     </select>
 </mapper>

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdepositfictitious/BusDepositFictitiousMapper.xml

@@ -61,7 +61,7 @@
         and fc.busSid = #{depositBillNo}
         group by f.selectSid
         having usePrice>0
-        union all
+       <!-- union all
         SELECT
         COALESCE ( bf.price, 0 ) as usePrice,bso.billNo as contractId,bso.customerName as customer,'简易订单转订金' as purpose,bso.sid as salesOrderSid
         FROM
@@ -70,7 +70,7 @@
         LEFT JOIN bus_sales_order bso ON bso.sid = bsod.salesOrderSid
         where depositBillSid =#{depositBillNo}
         group by bso.billNo
-        having usePrice>0
+        having usePrice>0-->
     </select>
 
     <select id="getList"

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositMapper.xml

@@ -404,11 +404,11 @@
         and fc.busSid = #{busMainSid}
         GROUP BY
         d.`sid`
-        union all
+       <!-- union all
         SELECT
         COALESCE ( SUM(bf.price), 0 ) as useDeposit
         FROM
-        bus_deposit_fictitious bf where depositBillSid = #{busMainSid}) d
+        bus_deposit_fictitious bf where depositBillSid = #{busMainSid}-->) d
 
     </select>
 

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedMapper.xml

@@ -209,14 +209,59 @@
     </select>
 
     <select id="selectByCreateBySidOne" resultType="java.lang.String">
-        select fun.busVinSid
+        select d.busVinSid
-        from fin_uncollected_receivables_detailed fun
+        from (SELECT fun.busVinSid,
-                 left join fin_uncollected_receivables_detailed fun1 on fun.busVinSid = fun1.busVinSid
+                     (
-        where fun.createBySid = #{userSid}
+                         fun.`reveivableMoney` - COALESCE(SUM(df.dbalance), 0)) AS dblance
-          and (fun.currentReceivableMoney &lt; 0 or fun.currentReceivableMoney = 0)
+              FROM fin_uncollected_receivables_detailed fun
-          and fun.receivablesName = '订金'
+                       LEFT JOIN (
-          and (fun1.currentReceivableMoney &lt; 0 or fun1.currentReceivableMoney = 0)
+                  SELECT d.sid,
-          and (fun1.receivablesName = '首付款及费用' or fun1.receivablesName = '车款')
+                         d.`receivablesSid`,
+                         (
+                             d.`subscriptionMoney` - COALESCE(SUM(f.`thisUseMoney`), 0)) AS dbalance
+                  FROM fin_selected_receivables_detailed d
+                           LEFT JOIN (
+                      SELECT f.busSid,
+                             f.thisUseMoney
+                      FROM fin_funds_carried_forward_veh f
+                               JOIN `fin_funds_carried_forward_apply` fa ON f.mainSid = fa.sid
+                      WHERE fa.`nodeState` != '终止'
+                  ) f ON f.`busSid` = d.`sid`
+                  WHERE d.`auditState` = 3
+                     OR d.auditState = 1
+                  GROUP BY d.`sid`
+              ) df ON df.receivablesSid = fun.`sid`
+              WHERE fun.createBySid = #{userSid}
+                AND fun.receivablesName = '订金'
+              GROUP BY fun.sid
+              HAVING dblance &lt;= 0
+              union all
+              SELECT fun.busVinSid,
+                     (
+                         fun.`reveivableMoney` - COALESCE(SUM(df.dbalance), 0)) AS dblance
+              FROM fin_uncollected_receivables_detailed fun
+                       LEFT JOIN (
+                  SELECT d.sid,
+                         d.`receivablesSid`,
+                         (
+                             d.`subscriptionMoney` - COALESCE(SUM(f.`thisUseMoney`), 0)) AS dbalance
+                  FROM fin_selected_receivables_detailed d
+                           LEFT JOIN (
+                      SELECT f.busSid,
+                             f.thisUseMoney
+                      FROM fin_funds_carried_forward_veh f
+                               JOIN `fin_funds_carried_forward_apply` fa ON f.mainSid = fa.sid
+                      WHERE fa.`nodeState` != '终止'
+                  ) f ON f.`busSid` = d.`sid`
+                  WHERE d.`auditState` = 3
+                     OR d.auditState = 1
+                  GROUP BY d.`sid`
+              ) df ON df.receivablesSid = fun.`sid`
+              WHERE fun.createBySid = #{userSid}
+                AND (fun.receivablesName = '首付款及费用' or fun.receivablesName = '车款')
+              GROUP BY fun.sid
+              HAVING dblance &lt;= 0) d
+        group by d.busVinSid
     </select>
     <select id="selectSidBybusVinSidAndConNo" resultType="java.lang.String">
         SELECT sid