简易订单问题修改

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

@@ -6,6 +6,9 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.ArrayList;
+import java.util.List;
+
 /**
  * 现车列表的查询条件
  */
@@ -13,6 +16,9 @@ import lombok.Data;
 @Data
 public class ExiCarQuery implements Query {
 
+    @ApiModelProperty(value = "用户sid")
+    private String userSid;
+
     @ApiModelProperty(value = "快速检索（根据车型名称）")
     private String modelName;
 
@@ -43,6 +49,18 @@ public class ExiCarQuery implements Query {
     @ApiModelProperty(value = "排放标准")
     private String emissionStandard;
 
+    @ApiModelProperty(value = "颜色")
+    private String carColorKey;
+
+    @ApiModelProperty(value = "车架号")
+    private String vinNo;
+
+    @ApiModelProperty(value = "存放地点")
+    private String location;
+
+    @ApiModelProperty(value = "车架号list")
+    private List<String> vinNoList = new ArrayList<>();
+
 
     /**
      * 虚拟订单选择车辆查询现车库存列表参数

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

@@ -447,6 +447,7 @@
         bv.locationName as location,
         <!--销售指导价-->
         <!-- bv.guidedPrice,-->
+        bv.costPrice as guidedPrice,
         <!--车型Sid-->
         bv.modelSid,
         <!--配置Sid-->

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

@@ -1009,36 +1009,73 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
      */
     private QueryWrapper<BaseVehicleListVo> exiCarBuildQueryWrapper(ExiCarQuery params) {
         QueryWrapper<BaseVehicleListVo> qw = new QueryWrapper<>();
-        if (StringUtils.isNotBlank(params.getModelName())) {
-            qw.like("bvm.vehicleAlias", params.getModelName());
-        }
-        if (StringUtils.isNotBlank(params.getCarbrand())) {//品牌sid
-            qw.eq("bvm.carBrand", params.getCarbrand());
-        }
-        if (StringUtils.isNotBlank(params.getVehicleType())) {//功能
-            qw.like("bvm.vehicleType", params.getVehicleType());
+        //本分公司
+        if (StringUtils.isNotBlank(params.getUserSid())) {
+            String orgSid = sysStaffOrgFeign.getPathSidByUserSid(params.getUserSid()).getData();
+            qw.eq("bv.createOrgSid", orgSid);
         }
-        if (StringUtils.isNotBlank(params.getProductLine())) {//系列
-            qw.like("bvm.productLine", params.getProductLine());
+        if (params.getVinNoList().size() > 0) {
+            qw.notIn("bv.vinNo", params.getVinNoList());
         }
-        if (StringUtils.isNotBlank(params.getDriveForm())) {//驱动
-            qw.eq("bvm.driveForm", params.getDriveForm());
-        }
-        if (StringUtils.isNotBlank(params.getPower())) {//马力
-            qw.eq("bvm.power", params.getPower());
+        //品牌
+        if (StringUtils.isNotBlank(params.getCarbrand())) {
+            qw.eq("bvm.carBrand", params.getCarbrand());
         }
-        if (StringUtils.isNotBlank(params.getVehicleVersion())) {//版本
-            qw.eq("bvm.vehicleVersion", params.getVehicleVersion());
+//车型
+        if (StringUtils.isNotBlank(params.getModelName())) {
+            qw.and(wrapper -> wrapper.like("bvm.modelName", params.getModelName()).or().like("bvm.vehicleTypeCode", params.getModelName()));
         }
-        if (StringUtils.isNotBlank(params.getFuelType())) {//燃料
-            qw.eq("bvm.fuelType", params.getFuelType());
+// 车架号
+        if (StringUtils.isNotBlank(params.getVinNo())) {
+            qw.like("bv.vinNo", params.getVinNo());
         }
-        if (StringUtils.isNotBlank(params.getGearboxType())) {//变速箱
-            qw.eq("bvm.gearboxType", params.getGearboxType());
+// 颜色
+        if (StringUtils.isNotBlank(params.getCarColorKey())) {
+            qw.eq("bmc.carColorKey", params.getCarColorKey());
         }
-        if (StringUtils.isNotBlank(params.getEmissionStandard())) {//排放标准
-            qw.eq("bvm.emissionStandard", params.getEmissionStandard());
+// 存放地点
+        if (StringUtils.isNotBlank(params.getLocation())) {
+            qw.eq("bv.location", params.getLocation());
         }
+//        if (StringUtils.isNotBlank(params.getModelName())) {
+//            qw.like("bvm.vehicleAlias", params.getModelName());
+//        }
+//        if (StringUtils.isNotBlank(params.getCarbrand())) {//品牌sid
+//            qw.eq("bvm.carBrand", params.getCarbrand());
+//        }
+//        if (StringUtils.isNotBlank(params.getVinNo())) {//品牌sid
+//            qw.like("bv.vinNo", params.getVinNo());
+//        }
+//        if (StringUtils.isNotBlank(params.getCarColorKey())) {//车身颜色
+//            qw.eq("bmc.carColorKey", params.getCarColorKey());
+//        }
+//        if (StringUtils.isNotBlank(params.getLocation())) {//存放地点
+//            qw.eq("bv.location", params.getLocation());
+//        }
+//        if (StringUtils.isNotBlank(params.getVehicleType())) {//功能
+//            qw.like("bvm.vehicleType", params.getVehicleType());
+//        }
+//        if (StringUtils.isNotBlank(params.getProductLine())) {//系列
+//            qw.like("bvm.productLine", params.getProductLine());
+//        }
+//        if (StringUtils.isNotBlank(params.getDriveForm())) {//驱动
+//            qw.eq("bvm.driveForm", params.getDriveForm());
+//        }
+//        if (StringUtils.isNotBlank(params.getPower())) {//马力
+//            qw.eq("bvm.power", params.getPower());
+//        }
+//        if (StringUtils.isNotBlank(params.getVehicleVersion())) {//版本
+//            qw.eq("bvm.vehicleVersion", params.getVehicleVersion());
+//        }
+//        if (StringUtils.isNotBlank(params.getFuelType())) {//燃料
+//            qw.eq("bvm.fuelType", params.getFuelType());
+//        }
+//        if (StringUtils.isNotBlank(params.getGearboxType())) {//变速箱
+//            qw.eq("bvm.gearboxType", params.getGearboxType());
+//        }
+//        if (StringUtils.isNotBlank(params.getEmissionStandard())) {//排放标准
+//            qw.eq("bvm.emissionStandard", params.getEmissionStandard());
+//        }
 
         // 虚拟订单选择车辆查询现车库存列表参数
         if (StringUtils.isNotBlank(params.getVehicleState())) { //车辆状态

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busmaindeposit/BusMainDepositListVo.java

@@ -59,4 +59,10 @@ public class BusMainDepositListVo implements Vo {
 
     @ApiModelProperty(value = "客户Sid")
     private String customerSid;
+
+    @ApiModelProperty("流程定义id")
+    private String procDefId;
+
+    @ApiModelProperty("流程实例id")
+    private String procInsId;
 }

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

@@ -17,7 +17,9 @@
         bd.usedDeposit,
         IF(bd.id IS NOT NULL, bd.draweeName, bdvc.customerName) name,
         IF(bd.id IS NOT NULL, bd.draweeMobile, bdvc.customerMobile) mobile,
-        IF(COUNT(bdv.id) = 0, '', COUNT(bdv.id)) depositVehicle
+        IF(COUNT(bdv.id) = 0, '', COUNT(bdv.id)) depositVehicle,
+        bmd.procDefId,
+        bmd.procInsId
         FROM bus_main_deposit bmd
         LEFT JOIN bus_deposit bd on bmd.sid = bd.billSid
         LEFT JOIN bus_deposit_vehicle_customer bdvc on bmd.sid = bdvc.billSid

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

@@ -116,7 +116,7 @@ public class BusMainDepositRest implements BusMainDepositFeign {
     public ResultBean deleteBySids(String[] sids) {
         ResultBean rb = ResultBean.fireFail();
         if (sids == null || sids.length == 0) {
-            return rb.setMsg("删除成功，虚拟订单sid不能为空");
+            return rb.setMsg("删除失败，虚拟订单sid不能为空!");
         }
         return busMainDepositService.deleteBySids(sids);
     }

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

@@ -457,7 +457,7 @@ public class BusMainDepositService extends MybatisBaseService<BusMainDepositMapp
     public ResultBean deleteBySids(String[] sids) {
         for (int i = 0; i < sids.length; i++) {
             if (checkCouldChange(sids[i])) {
-                return new ResultBean().fail().setMsg("存在不可删除的虚拟订单");
+                return new ResultBean().fail().setMsg("删除的数据中包含已经提交审批的数据，删除失败");
             }
             // 删除虚拟订单
             deleteBySid(sids[i]);
@@ -836,11 +836,7 @@ public class BusMainDepositService extends MybatisBaseService<BusMainDepositMapp
         busDeposit.setProBankAccValue(dto.getCollectionNumber());
         busDeposit.setProBankValue(dto.getCollectionBank());
         busDeposit.setProBankKey(dto.getCollectionBankKey());
-        if ("03".equals(dto.getPayTypeKey())) {
-            busDeposit.setPayBankAcc(dto.getPayNumber());
-        } else {
-            busDeposit.setPayBankAcc("");
-        }
+        busDeposit.setPayBankAcc(dto.getPayNumber());
         busDeposit.setPaymentDate(dto.getPayDate());
         busDeposit.setVehicleNum(dto.getCarNumber());
         busDeposit.setDraweeMobile(dto.getMobile());
@@ -1194,10 +1190,11 @@ public class BusMainDepositService extends MybatisBaseService<BusMainDepositMapp
             busMainDeposit.setDepositBillType("车辆预订");
             busMainDeposit.setDepositBillTypeKey("02");
             busMainDeposit.setCreateDate(dateFormat.format(new Date()));
-            baseMapper.insert(busMainDeposit);
+
             // 车辆客户信息
             BusDepositVehicleCustomer customer = new BusDepositVehicleCustomer();
-            BeanUtils.copyProperties(dto, customer, "sid");
+            customer.setCustomerName(dto.getCustomerName());
+            customer.setCustomerSid(dto.getCustomerSid());
             AppCrmCustomerTempInfoVo appCrmCustomerTempInfoVo = crmCustomerTempFeign.getAppCustomerTempDetailsBySid(customer.getCustomerSid()).getData();
             customer.setCustomerClass(appCrmCustomerTempInfoVo.getCustomerType());
             customer.setCustomerClassKey(appCrmCustomerTempInfoVo.getCustomerTypeKey());
@@ -1206,7 +1203,8 @@ public class BusMainDepositService extends MybatisBaseService<BusMainDepositMapp
             busDepositVehicleCustomerService.save(customer);
             //添加车辆信息
             appSetBusDepositVehicle(dto, busMainDeposit);
-            return rb.success().setData(busMainDeposit.getSid());
+            baseMapper.insert(busMainDeposit);
+            return rb.success().setData(busMainDeposit.getSid()).setMsg("操作成功");
         } else {//修改
             BusMainDeposit busMainDeposit = fetchBySid(dto.getVirtualOrderSid());
             BeanUtils.copyProperties(dto, busMainDeposit, "sid");