修复销售订单问题及合同审核的状态问题

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeign.java

@@ -329,6 +329,10 @@ public interface BaseVehicleFeign {
     @ApiOperation("app销售订单-根据车型和配置sid查询现车列表")
     @GetMapping("/selectAppList")
     ResultBean<List<AppBaseVehicleOrderVo>> selectAppList(@RequestParam(value = "modelSid") String modelSid, @RequestParam(value = "configSid") String configSid, @RequestParam("orgSid") String orgSid);
+    @ApiOperation("app销售订单-根据车型和配置sid查询现车列表")
+    @GetMapping("/selectAppListOne")
+    ResultBean<List<AppBaseVehicleOrderVo>> selectAppListOne(@RequestParam(value = "modelSid") String modelSid, @RequestParam(value = "configSid") String configSid, @RequestParam("orgSid") String orgSid);
+
 
     @ApiOperation("费用申请选择现车分页列表")
     @PostMapping("/selectCostVehicleList")
@@ -450,4 +454,5 @@ public interface BaseVehicleFeign {
     @PostMapping("/saleOrderVin")
     @ResponseBody
     public ResultBean<PagerVo<InputVinListVo>> saleOrderVin(@RequestBody PagerQuery<InputVinListQuery> query);
+
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeignFallback.java

@@ -356,4 +356,9 @@ public class BaseVehicleFeignFallback implements BaseVehicleFeign {
         return null;
     }
 
+    @Override
+    public ResultBean<List<AppBaseVehicleOrderVo>> selectAppListOne(String modelSid, String configSid, String orgSid) {
+        return null;
+    }
+
 }

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

@@ -980,7 +980,7 @@
         where bv.modelSid = #{modelSid}
           and bv.modelConfigSid = #{configSid}
           and bv.useOrgSid = #{orgSid}
-          and bv.lockedState = #{state}
+        and bv.lockedState = #{state}
           AND (
                 bv.vehicleStateValue = '库存'
                         or bv.vehicleStateValue = '在途'

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

@@ -1182,4 +1182,9 @@ public class BaseVehicleRest implements BaseVehicleFeign {
         return rb.success().setData(pv);
     }
 
+    @Override
+    public ResultBean<List<AppBaseVehicleOrderVo>> selectAppListOne(String modelSid, String configSid, String orgSid) {
+        return baseVehicleService.selectAppListOne(modelSid, configSid, orgSid);
+    }
+
 }

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

@@ -2061,6 +2061,25 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
         }
         return rb.success().setData(orderVoList);
     }
+    public ResultBean<List<AppBaseVehicleOrderVo>> selectAppListOne(String modelSid, String configSid, String orgSid) {
+        ResultBean<List<AppBaseVehicleOrderVo>> rb = ResultBean.fireFail();
+        List<AppBaseVehicleOrderVo> orderVoList = new ArrayList<>();
+        orderVoList = baseMapper.selectAppList(modelSid, configSid, orgSid, VehicleState.LockEnum.LOCK.getCode());
+        if (orderVoList.isEmpty()) {
+            return rb.setData(orderVoList);
+        }
+        for (int i = 0; i < orderVoList.size(); i++) {
+            orderVoList.get(i).setVirtual(orderVoList.get(i).getIsFictitious());
+            BaseVehicleCertificate baseVehicleCertificate = baseVehicleCertificateService.selectByVehicleSid(orderVoList.get(i).getCarSid());
+            if (baseVehicleCertificate == null) {
+                orderVoList.get(i).setCertificate(false);
+            } else {
+                orderVoList.get(i).setCertificate(true);
+            }
+        }
+        return rb.success().setData(orderVoList);
+    }
+
 
     public ResultBean selectImage(String vehicleSid) {
         ResultBean rb = ResultBean.fireFail();

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java

@@ -1206,7 +1206,7 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
             return rb.setMsg(resultBean.getMsg());
         }
         String businessSid = resultBean.getData();
-        baseMapper.updateBySidAndState(businessSid, "2");
+
         //创建BusinessVariables实体对象
         BusinessVariables bv = new BusinessVariables();
         //流程中的参数赋值
@@ -1231,6 +1231,10 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
             ResultBean<UpdateFlowFieldVo> voResultBean = flowableFeign.startProcess(bv);
             UpdateFlowFieldVo ufVo = voResultBean.getData();
             updateFlowFiled(BeanUtil.beanToMap(ufVo));
+            if(!voResultBean.getSuccess()){
+                return rb.setMsg(voResultBean.getMsg());
+            }
+            baseMapper.updateBySidAndState(businessSid, "2");
             //极光推送
             commonContract = fetchBySid(businessSid);
             MessageFlowableQuery messageFlowableQuery = new MessageFlowableQuery();

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdepositvehicle/BusDepositVehicleMapper.java

@@ -75,4 +75,6 @@ public interface BusDepositVehicleMapper extends BaseMapper<BusDepositVehicle> {
     List<String> selByUserSid(@Param("createBySid") String createBySid);
 
     List<BusMainDeposit> selectListByState(@Param("date") String tomorrow,@Param("nodeState") String nodeState, @Param("key") String key);
+
+    int selectByCustomerSidModel(@Param("customerSid") String customerSid, @Param("modelSid") String modelSid, @Param("configSid") String configSid, @Param("orgSid") String orgSid);
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdepositvehicle/BusDepositVehicleMapper.xml

@@ -67,16 +67,12 @@
         WHERE bdv.billSid = #{virtualOrderSid}
     </select>
     <select id="selByUserSid" resultType="java.lang.String">
-        SELECT
-            bdv.sid
-        FROM
-            bus_deposit_vehicle bdv
-                LEFT JOIN bus_main_deposit bmd ON bmd.sid = bdv.billSid
-        WHERE
-            bdv.createBySid = #{createBySid}
-          AND  bmd.nodeState = '已办结'
-        GROUP BY
-            bdv.vinNo
+        SELECT bdv.sid
+        FROM bus_deposit_vehicle bdv
+                 LEFT JOIN bus_main_deposit bmd ON bmd.sid = bdv.billSid
+        WHERE bdv.createBySid = #{createBySid}
+          AND bmd.nodeState = '已办结'
+        GROUP BY bdv.vinNo
     </select>
 
     <update id="updateFlowFiled">
@@ -102,4 +98,15 @@
           and depositBillTypeKey = #{key}
           and DATE_FORMAT(modifyTime, '%Y-%m-%d') = #{date}
     </select>
+
+    <select id="selectByCustomerSidModel" resultType="int">
+        select count(*)
+        from bus_main_deposit bmd
+                 left join bus_deposit_vehicle bdv on bmd.sid = bdv.billSid
+                 left join bus_deposit_vehicle_customer bdc on bdv.billSid = bmd.sid
+        where bmd.orgSid = #{orgSid}
+          and bdv.modelSid = #{modelSid}
+          and bdv.modelConfigSid = #{configSid}
+          and bdc.customerSid = #{customerSid}
+    </select>
 </mapper>

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdepositvehicle/BusDepositVehicleService.java

@@ -300,7 +300,11 @@ public class BusDepositVehicleService extends MybatisBaseService<BusDepositVehic
     public List<BusMainDeposit> selectListByState(String tomorrow) {
         String nodeState = "已办结";
         String key = DictCommonEnum.DepositBillType.JYDD_DC.getCode();
-        return baseMapper.selectListByState(tomorrow, nodeState,key);
+        return baseMapper.selectListByState(tomorrow, nodeState, key);
+    }
+
+    public int selectByCustomerSidModel(String customerSid, String modelSid, String configSid, String orgSid) {
+        return baseMapper.selectByCustomerSidModel(customerSid, modelSid, configSid, orgSid);
     }
 
    /* public ResultBean submitVirtualOrderVehicle(SubmitVirtualOrderVehicleDto dto) {

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

@@ -93,6 +93,7 @@ import com.yxt.anrui.buscenter.api.bussalesvehicleorder.BusSalesVehicleOrderDeta
 import com.yxt.anrui.buscenter.api.bussalesvehicleorder.BusSalesVehicleOrderDto;
 import com.yxt.anrui.buscenter.biz.busdeposit.BusDepositService;
 import com.yxt.anrui.buscenter.biz.busdepositfictitious.BusDepositFictitiousService;
+import com.yxt.anrui.buscenter.biz.busdepositvehicle.BusDepositVehicleService;
 import com.yxt.anrui.buscenter.biz.bussalesorderdeposit.BusSalesOrderDepositService;
 import com.yxt.anrui.buscenter.biz.bussalesorderdiscount.BusSalesOrderDiscountService;
 import com.yxt.anrui.buscenter.biz.bussalesorderinsurance.BusSalesOrderInsuranceService;
@@ -229,6 +230,8 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
     private MessageFeign messageFeign;
     @Autowired
     private BusDepositService busDepositService;
+    @Autowired
+    private BusDepositVehicleService busDepositVehicleService;
 
     /**
      * 构造查询条件
@@ -1554,8 +1557,30 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
                     vinNoList.add(vehicleOrderVo.getVin());
                     appNowCars.add(appNowCarVo);
                 }
-                appCarInfo.setNowCar(appNowCars);
+
+            }
+            //=================================================================添加
+            //根据客户sid、车型sid、配置sid、分公司sid查询已被简易订单锁定的车型
+            //=================================================================添加简易订单的
+            //查询该客户和车型是否存在简易订单
+            int count = busDepositVehicleService.selectByCustomerSidModel(customerSid, modelSid, configSid, orgSid);
+            if (count > 0) {
+                orderVoResultBean = baseVehicleFeign.selectAppListOne(modelSid, configSid, orgSid);
+                if (orderVoResultBean.getSuccess()) {
+                    List<AppBaseVehicleOrderVo> voList = orderVoResultBean.getData();
+                    voList.removeAll(Collections.singleton(null));
+                    if (!voList.isEmpty()) {
+                        for (AppBaseVehicleOrderVo vehicleOrderVo : voList) {
+                            AppNowCarVo appNowCarVo = new AppNowCarVo();
+                            BeanUtil.copyProperties(vehicleOrderVo, appNowCarVo);
+                            vinNoList.add(vehicleOrderVo.getVin());
+                            appNowCars.add(appNowCarVo);
+                        }
+                    }
+                }
             }
+            appCarInfo.setNowCar(appNowCars);
+            //===========================================================================
             //根据车型查询的排产采购订单列表
             ResultBean<List<AppBusVehicleApplyListVo>> applyListResultBean = busVehicleApplyDetailFeign.getAppApplyList(modelSid, configSid);
             if (applyListResultBean.getSuccess()) {
@@ -1756,8 +1781,28 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
                     appNowCars.add(appNowCarVo);
                 }
             }
-            appCarInfo.setNowCar(appNowCars);
         }
+        //根据客户sid、车型sid、配置sid、分公司sid查询已被简易订单锁定的车型
+        //=================================================================添加简易订单的
+        //查询该客户和车型是否存在简易订单
+        int count = busDepositVehicleService.selectByCustomerSidModel(customerSid, modelSid, configSid, orgSid);
+        if (count > 0) {
+            orderVoResultBean = baseVehicleFeign.selectAppListOne(modelSid, configSid, orgSid);
+            if (orderVoResultBean.getSuccess()) {
+                List<AppBaseVehicleOrderVo> voList = orderVoResultBean.getData();
+                voList.removeAll(Collections.singleton(null));
+                if (!voList.isEmpty()) {
+                    for (AppBaseVehicleOrderVo vehicleOrderVo : voList) {
+                        AppNowCarVo appNowCarVo = new AppNowCarVo();
+                        BeanUtil.copyProperties(vehicleOrderVo, appNowCarVo);
+                        appNowCars.add(appNowCarVo);
+                    }
+                }
+            }
+        }
+        appNowCars = appNowCars.stream().sorted(Comparator.comparing(AppNowCarVo::getVirtual).reversed()).collect(Collectors.toList());
+        //=================================================================
+        appCarInfo.setNowCar(appNowCars);
         //查询该车型下的排产采购订单列表
         ResultBean<List<AppBusVehicleApplyListVo>> applyListResultBean = busVehicleApplyDetailFeign.getAppApplyList(modelSid, configSid);
         if (applyListResultBean.getSuccess()) {
@@ -2200,6 +2245,24 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
                 }
 
             }
+            //=================================================================添加
+            //根据客户sid、车型sid、配置sid、分公司sid查询已被简易订单锁定的车型
+            //=================================================================添加简易订单的
+            //查询该客户和车型是否存在简易订单
+            int count = busDepositVehicleService.selectByCustomerSidModel(busSalesOrder.getCustomerSid(), modelSid, configSid, orgSid);
+            if (count > 0) {
+                orderVoResultBean = baseVehicleFeign.selectAppListOne(modelSid, configSid, orgSid);
+                if (orderVoResultBean.getSuccess()) {
+                    List<AppBaseVehicleOrderVo> voList = orderVoResultBean.getData();
+                    voList.removeAll(Collections.singleton(null));
+                    if (!voList.isEmpty()) {
+                        for (AppBaseVehicleOrderVo vehicleOrderVo : voList) {
+                            vinNoList.add(vehicleOrderVo.getVin());
+                        }
+                    }
+                }
+            }
+            //=========================================================================
             //该销售订单所选择的现车的列表
             List<AppNowCarListVo> nowCarList = busSalesOrderVehicleService.selectAppDetailsVoBySaleOrderSid(sid);
             nowCarList.removeAll(Collections.singleton(null));

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesvehicleorder/BusSalesVehicleOrderMapper.xml

@@ -43,7 +43,7 @@
     </select>
 
     <select id="selectListBySid" resultType="java.lang.String">
-        select linkNo
+        select concat(linkNo, '  x', usingNum)
         from bus_sales_vehicle_order
         where salesOrderSid = #{sid}
     </select>