Merge remote-tracking branch 'origin/master'

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

@@ -795,10 +795,10 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
                             new LinkedBlockingQueue<Runnable>(1024), namedThreadFactory, new ThreadPoolExecutor.AbortPolicy());
                     Future future1 = pool.submit(() -> {
                         List<BaseVehicleStateDto> dtoList = new ArrayList<>();
-                        List<String> stringList = busDeliveredApplyDetailsService.selectVinByApplySid(bv.getBusinessSid());
-                        stringList.removeAll(Collections.singleton(null));
-                        if (!stringList.isEmpty()) {
-                            stringList.stream().forEach(v -> {
+                        List<String> vinSidList = busDeliveredApplyDetailsService.selectVinSidByApplySid(bv.getBusinessSid());
+                        vinSidList.removeAll(Collections.singleton(null));
+                        if (!vinSidList.isEmpty()) {
+                            vinSidList.stream().forEach(v -> {
                                 BaseVehicleStateDto baseVehicleStateDto = new BaseVehicleStateDto();
                                 baseVehicleStateDto.setOperateType(BaseVehicleStateEnum.OperateTypeEnum.CKKP_PASS.getTypeKey());
                                 baseVehicleStateDto.setBusSid(v);
@@ -865,7 +865,7 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
             } else {
                 if ("重新提交".equals(bv.getComment())) {
                     //将待出库中的车辆更改状态为出库申请0
-                    List<String> stringList = busDeliveredApplyDetailsService.selectVinByApplySid(bv.getBusinessSid());
+                    List<String> vinSidList = busDeliveredApplyDetailsService.selectVinSidByApplySid(bv.getBusinessSid());
                     //==============================新增车辆的持久状态组装数据
                     try {
                         ThreadFactory namedThreadFactory = new ThreadFactoryBuilder()
@@ -876,9 +876,9 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
                         BusDeliveredApply finalBusDeliveredApply1 = busDeliveredApply;
                         Future future1 = pool.submit(() -> {
                             List<BaseVehicleStateDto> dtoList = new ArrayList<>();
-                            stringList.removeAll(Collections.singleton(null));
-                            if (!stringList.isEmpty()) {
-                                stringList.stream().forEach(v -> {
+                            vinSidList.removeAll(Collections.singleton(null));
+                            if (!vinSidList.isEmpty()) {
+                                vinSidList.stream().forEach(v -> {
                                     BaseVehicleStateDto baseVehicleStateDto = new BaseVehicleStateDto();
                                     baseVehicleStateDto.setOperateType(BaseVehicleStateEnum.OperateTypeEnum.CKTJ.getTypeKey());
                                     baseVehicleStateDto.setBusSid(v);

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

@@ -139,4 +139,6 @@ public interface BusMainDepositMapper extends BaseMapper<BusMainDeposit> {
     String selectNum(String bill);
 
     int updateModify(@Param("date") Date date, @Param("sid") String businessSid);
+
+    String selectUseMainMoney(String busMainSid);
 }

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

@@ -381,4 +381,8 @@
         set modifyTime = #{date}
         where sid = #{sid}
     </update>
+
+    <select id="selectUseMainMoney" resultType="java.lang.String">
+
+    </select>
 </mapper>

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

@@ -1879,4 +1879,10 @@ public class BusMainDepositService extends MybatisBaseService<BusMainDepositMapp
         return rb.setMsg("操作失败!提交的数据不一致!");
     }
 
+    public String getUseFin(String busMainSid){
+        //根据已审核通过的简易订单订金查询已款项结转通过的
+        String useMainMoney = baseMapper.selectUseMainMoney(busMainSid);
+        return null;
+    }
+
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderdeposit/BusSalesOrderDepositService.java

@@ -435,4 +435,7 @@ public class BusSalesOrderDepositService extends MybatisBaseService<BusSalesOrde
     public List<BusSalesOrderDeposit> getListByOrderSid(String saleOrderSid) {
         return baseMapper.getListByOrderSid(saleOrderSid);
     }
+
+
+
 }