修改问题

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutService.java

@@ -145,7 +145,7 @@ public class BaseVehicleOutService extends MybatisBaseService<BaseVehicleOutMapp
                 ResultBean<CommonContract> commonContract = commonContractService.selectByNo(dto.getConcatNo());
                 if(commonContract.getSuccess()){
                     //查询合同编号和车辆sid客户的临时编码
-                    ResultBean<String> stringResultBean = busSalesOrderFeign.selectTemporaryNo(dto.getCustomerNo(),dto.getVinSid());
+                    ResultBean<String> stringResultBean = busSalesOrderFeign.selectTemporaryNo(dto.getVinSid());
                     if(!stringResultBean.getSuccess()){
                         return rb.setMsg("请检查合同是否审核");
                     }

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

@@ -1038,6 +1038,12 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
                 vo.setType(appOrderDetailsVo.getInvoiceType());
                 invoicMessageContractVos.add(vo);
             }
+        }else{
+            for (int i = 0; i < Integer.parseInt(orderModelInfoVo.getTotal()); i++) {
+                InvoicMessageContractVo vo = new InvoicMessageContractVo();
+                vo.setType(appOrderDetailsVo.getInvoiceType());
+                invoicMessageContractVos.add(vo);
+            }
         }
         map.put("invoicList", invoicMessageContractVos);
         String ftl = "invoicApply";
@@ -1796,7 +1802,7 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
                     0L, TimeUnit.MILLISECONDS,
                     new LinkedBlockingQueue<Runnable>(1024), namedThreadFactory, new ThreadPoolExecutor.AbortPolicy());
             if("1".equals(appOrderDetailsVo.getPayTypeKey())){//全款
-               /* Future<String> future1 = pool.submit(() -> {
+                /*Future<String> future1 = pool.submit(() -> {
                     return genCarSaleContract(dto, map, appOrderDetailsVo);
                 });
                 Future<String> future1_2 = pool.submit(() -> {

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrdeVo.java

@@ -0,0 +1,19 @@
+package com.yxt.anrui.buscenter.api.bussalesorder;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Author dimengzhe
+ * @Date 2023/2/6 16:57
+ * @Description
+ */
+@Data
+public class BusSalesOrdeVo implements Vo {
+    private static final long serialVersionUID = -5062473459801930693L;
+    @ApiModelProperty("临时号")
+    private String temporaryNo;
+    @ApiModelProperty("合同编号")
+    private String contractNo;
+}

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderFeign.java

@@ -277,7 +277,7 @@ public interface BusSalesOrderFeign {
     @ApiOperation(value = "查询客户的临时编码")
     @GetMapping("/selectTemporaryNo")
     @ResponseBody
-    ResultBean<String> selectTemporaryNo(@RequestParam("contractNo")String contractNo,@RequestParam("vehSid")String vehSid);
+    ResultBean<String> selectTemporaryNo(@RequestParam("vehSid")String vehSid);
 
     @ApiOperation(value = "根据车辆sid查询销售订单是否存在，若存在返回相关数据")
     @GetMapping("/selectOrderOne")

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderFeignFallback.java

@@ -251,7 +251,7 @@ public class BusSalesOrderFeignFallback implements BusSalesOrderFeign {
     }
 
     @Override
-    public ResultBean<String> selectTemporaryNo(String contractNo, String vehSid) {
+    public ResultBean<String> selectTemporaryNo(String vehSid) {
         return null;
     }
 

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

@@ -30,10 +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.buscenter.api.bussalesorder.BusSaleOrderVehicleOutVo;
+import com.yxt.anrui.buscenter.api.bussalesorder.*;
-import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrder;
-import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrderDetailsVo;
-import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrderVo;
 import com.yxt.anrui.buscenter.api.bussalesorder.app.model.AppModelInfoVo;
 import com.yxt.anrui.buscenter.api.bussalesorder.app.order.*;
 import com.yxt.anrui.buscenter.api.bussalesorder.contract.AppRovalContractPageVo;
@@ -195,7 +192,7 @@ public interface BusSalesOrderMapper extends BaseMapper<BusSalesOrder> {
 
     OrderRemarksVo getOrderRemarksInfo(String saleOrderSid);
 
-    String selectTemporaryNo(@Param("contractNo") String contractNo, @Param("vehSid") String vehSid);
+    BusSalesOrdeVo selectTemporaryNo(@Param("vehSid") String vehSid);
 
     /**
      * 根据车辆sid查询销售订单的数据

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

@@ -327,12 +327,12 @@
         where sid = #{saleOrderSid}
     </select>
 
-    <select id="selectTemporaryNo" resultType="java.lang.String">
+    <select id="selectTemporaryNo" resultType="com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrdeVo">
-        select bv.temporaryNo
+        select bv.temporaryNo,bo.contractNo
         from bus_sales_order bo
                  left join bus_sales_order_vehicle bv on bo.sid = bv.salesOrderSid
-        where bo.contractNo = #{contractNo}
+        where bo.nodeState = '已办结'
-          and bv.linkSid = #{vehSid}
+          and bv.linkSid = #{vehSid} limit 1
     </select>
 
     <select id="selectOrderOne" resultType="com.yxt.anrui.buscenter.api.bussalesorder.BusSaleOrderVehicleOutVo">

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

@@ -330,8 +330,8 @@ public class BusSalesOrderRest implements BusSalesOrderFeign {
     }
 
     @Override
-    public ResultBean<String> selectTemporaryNo(String contractNo, String vehSid) {
+    public ResultBean<String> selectTemporaryNo(String vehSid) {
-        return busSalesOrderService.selectTemporaryNo(contractNo,vehSid);
+        return busSalesOrderService.selectTemporaryNo(vehSid);
     }
 
     @Override

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

@@ -3357,7 +3357,7 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
                 ResultBean<AppOrderDetailsVo> details = getSaleOrderDetails(bv.getBusinessSid());
                 AppOrderDetailsVo vo = details.getData();
                 if ("现车".equals(vo.getOrderType())) {
-                    //更新已选择的车架号的状态为审批中
+                    //更新已选择的车架号的状态为销售订单锁定
                     List<String> list = busSalesOrderVehicleService.selectVehicleSid(bv.getBusinessSid());
                     BusMainDepositUpdateQuery busMainDepositUpdateQuery = new BusMainDepositUpdateQuery();
                     busMainDepositUpdateQuery.setVinSidList(list);
@@ -3486,6 +3486,7 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
                 VinListVo vinListVo = new VinListVo();
                 vinListVo.setLinkNo(vv.getVin());
                 vinListVo.setLinkSid(vv.getCarSid());
+                if(StringUtils.isNotBlank(vv.getCarSid())){
                     //根据车架号查询是否已出库
                     ResultBean<BaseVehicleSelectVo> baseVehicleResultBean = baseVehicleFeign.details(vv.getCarSid());
                     if (baseVehicleResultBean.getSuccess()) {
@@ -3498,6 +3499,8 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
                             }
                         }
                     }
+                }
+
                 vinListVos.add(vinListVo);
             }
         } else {
@@ -3535,13 +3538,31 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
             busSalesOrderVehicle.setSalesOrderSid(dto.getSaleOrderSid());
             busSalesOrderVehicleService.insert(busSalesOrderVehicle);
         }*/
+        busSalesOrderVehicleDetailsVos.removeAll(Collections.singleton(null));
         if (busSalesOrderVehicleDetailsVos.size() > 0) {
+            //查询已选择的车辆
+            //将销售订单原本已选择的车辆的锁定状态修改为未锁定
+            List<String> stringList = busSalesOrderVehicleDetailsVos.stream().filter(v -> StringUtils.isNotBlank(v.getLinkSid())).map(v -> v.getLinkSid()).collect(Collectors.toList());
+            //将车辆状态修改为未锁定
+            BusMainDepositUpdateQuery busMainDepositUpdateQuery = new BusMainDepositUpdateQuery();
+            busMainDepositUpdateQuery.setVinSidList(stringList);
+            busMainDepositUpdateQuery.setLockedState(VehicleState.LockEnum.UN_LOCK.getCode());
+            busMainDepositUpdateQuery.setLockedStateValue(VehicleState.LockEnum.UN_LOCK.getRemarks());
+            baseVehicleFeign.updateMainDepositByVinNo(busMainDepositUpdateQuery);
             for (int i = 0; i < busSalesOrderVehicleDetailsVos.size(); i++) {
                 BusSalesOrderVehicle busSalesOrderVehicle = busSalesOrderVehicleService.fetchBySid(busSalesOrderVehicleDetailsVos.get(i).getSid());
                 busSalesOrderVehicle.setLinkNo(list.get(i).getLinkNo());
                 busSalesOrderVehicle.setLinkSid(list.get(i).getLinkSid());
                 busSalesOrderVehicleService.updateById(busSalesOrderVehicle);
             }
+            //将选择的车辆的锁定状态修改为已锁定
+            busMainDepositUpdateQuery = new BusMainDepositUpdateQuery();
+            List<String> vinStringList = list.stream().map(v->v.getLinkSid()).collect(Collectors.toList());
+            busMainDepositUpdateQuery.setVinSidList(vinStringList);
+            busMainDepositUpdateQuery.setLockedState(VehicleState.LockEnum.ORDER_LOCK.getCode());
+            busMainDepositUpdateQuery.setLockedStateValue(VehicleState.LockEnum.ORDER_LOCK.getRemarks());
+            baseVehicleFeign.updateMainDepositByVinNo(busMainDepositUpdateQuery);
+
         }
         return rb.success();
 
@@ -3878,13 +3899,19 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
         return rb.success();
     }
 
-    public ResultBean<String> selectTemporaryNo(String contractNo, String vehSid) {
+    public ResultBean<String> selectTemporaryNo(String vehSid) {
         ResultBean<String> rb = ResultBean.fireFail();
-        String temporaryNo = baseMapper.selectTemporaryNo(contractNo,vehSid);
+        BusSalesOrdeVo busSalesOrdeVo = baseMapper.selectTemporaryNo(vehSid);
-        if(StringUtils.isBlank(temporaryNo)){
+        if(busSalesOrdeVo != null){
+            String contractNo = busSalesOrdeVo.getContractNo();
+            if(StringUtils.isBlank(contractNo)){
+                return rb;
+            }
+            return rb.success().setData(busSalesOrdeVo.getTemporaryNo());
+
+        }else{
             return rb;
         }
-        return rb.success().setData(temporaryNo);
     }
 
     public ResultBean<BusSaleOrderVehicleOutVo> selectOrderOne(String vinSid) {
@@ -3912,7 +3939,7 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
                 List<AppOrderDiscountListVo> discountList = appOrderDetailsVo.getDiscountList();
                 discountList.removeAll(Collections.singleton(null));
                 if(discountList.size()>0){
-                    List<String> discountLists = discountList.stream().filter(v-> null != v.getDiscountExplain()).filter(v->!v.getDiscountExplain().isEmpty()).map(v->v.getDiscountExplain()).collect(Collectors.toList());
+                    List<String> discountLists = discountList.stream().filter(v->StringUtils.isNotBlank(v.getDiscountExplain())).map(v->v.getDiscountExplain()).collect(Collectors.toList());
                     busSaleOrderVehicleOutVo.setDiscountExplain(String.join(",",discountLists));
                 }
             }