虚拟订单，车型报价bug修改

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelconfig/BaseModelConfigMapper.xml

@@ -519,7 +519,8 @@
         bvm.carBrand as brandSid,
         ( SELECT count( * ) FROM base_vehicle bv WHERE bv.modelSid = bvc.modelSid AND bv.modelConfigSid = bmc.sid AND
         lockedState = '03' ) AS nowCarNum,
-        ( SELECT count( * ) FROM bus_vehicle_apply_detail bvad WHERE bvad.vehicleSid = bvc.modelSid and bvad.configSid =
+        ( SELECT SUM(bvad.quantity) FROM bus_vehicle_apply_detail bvad WHERE bvad.vehicleSid = bvc.modelSid
+        and bvad.configSid =
         bmc.sid) AS produceCarNum
         FROM base_vehmodel_config bvc
         LEFT JOIN base_model_config bmc ON bvc.configurationItemsSid = bmc.sid
@@ -531,10 +532,10 @@
         nowCarNum DESC
     </select>
     <select id="getCompanyModelList" resultType="com.yxt.anrui.base.api.basevehicle.AppMoreConfigVo">
-        SELECT (SELECT count(*) FROM base_vehicle bv WHERE bv.modelSid = bvc.sid AND lockedState = '0004') AS nowCarNum,
+        SELECT (SELECT count(*) FROM base_vehicle bv WHERE bv.modelSid = bvc.sid AND lockedState = '03') AS nowCarNum,
                (SELECT count(*)
                 FROM bus_vehicle_apply_detail bvad
-                WHERE bvad.vehicleSid = bvc.sid)                                                           AS produceCarNum
+                WHERE bvad.vehicleSid = bvc.modelSid)                                                    AS produceCarNum
         FROM base_vehmodel_config bvc
         WHERE bvc.modelSid = #{modelSid}
           AND bvc.configurationItemsSid = #{configSid}

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

@@ -230,7 +230,7 @@ public interface BaseVehicleMapper extends BaseMapper<BaseVehicle> {
      * @param qw
      * @return
      */
-    IPage<AppVehicleModelPriceVo> getModelList(IPage<AppVehicleModelPriceQuery> page, @Param(Constants.WRAPPER) QueryWrapper<AppVehicleModelPriceVo> qw,@Param("useOrgSid") String useOrgSid);
+    IPage<AppVehicleModelPriceVo> getModelList(IPage<AppVehicleModelPriceQuery> page, @Param(Constants.WRAPPER) QueryWrapper<AppVehicleModelPriceVo> qw, @Param("useOrgSid") String useOrgSid);
 
     /**
      * 手机端查询不本公司的现车，排产车
@@ -257,7 +257,7 @@ public interface BaseVehicleMapper extends BaseMapper<BaseVehicle> {
      * @param qw
      * @return
      */
-    IPage<AppBaseVehicleNowModelVo> getNowModelList(IPage<AppBaseVehicleNowModelQuery> page, @Param(Constants.WRAPPER) QueryWrapper<AppBaseVehicleNowModelVo> qw);
+    IPage<AppBaseVehicleNowModelVo> getNowModelList(IPage<AppBaseVehicleNowModelQuery> page, @Param(Constants.WRAPPER) QueryWrapper<AppBaseVehicleNowModelVo> qw, @Param("useOrgSid") String useOrgSid);
 
     /**
      * 采购退库选择车辆分页列表
@@ -354,7 +354,7 @@ public interface BaseVehicleMapper extends BaseMapper<BaseVehicle> {
     AppBaseConfigOrderCarVo getModelSidAndConfigSid(@Param("modelSid") String modelSid, @Param("configSid") String configSid, @Param("useOrg") String useOrg);
 
     /**
-     *  手机端-配置列表获取现车列表
+     * 手机端-配置列表获取现车列表
      *
      * @param page
      * @param qw

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

@@ -495,7 +495,7 @@
         configNum,
         (SELECT count(*) FROM base_vehicle bv WHERE bv.modelSid = bvm.sid AND lockedState = '03' AND bv.useOrg =
         #{useOrgSid}) AS nowCarNum,
-        (SELECT count(*)
+        (SELECT SUM(bvad.quantity)
         FROM bus_vehicle_apply_detail bvad
         WHERE bvad.vehicleSid = bvm.sid) AS produceCarNum
         FROM base_vehicle_model bvm
@@ -552,8 +552,8 @@
                bvm.vehicleVersionValue                                                                   AS versionValue,
                bvm.fuelTypeValue,
                bvm.gearboxTypeValue,
-               bv.guidedPrice,
+               ( SELECT CONCAT(MIN(bv.guidedPrice), '-', MAX(bv.guidedPrice)) FROM base_vehicle bv  WHERE bv.modelSid = bvm.sid AND bv.useOrg = #{useOrgSid})                             AS guidedPrice,
-               (SELECT count(*) FROM base_vehmodel_config bvc WHERE bvc.modelSid = bvm.sid)              AS configNum,
+               (SELECT count(*) FROM base_vehicle bv WHERE bv.modelSid = bvm.sid AND bv.useOrg =  #{useOrgSid})      AS configNum,
                (SELECT count(*) FROM base_vehicle bv WHERE bv.modelSid = bvm.sid AND lockedState = '03') AS nowCarNum
         FROM base_vehicle bv
                  LEFT JOIN base_vehicle_model bvm ON bv.modelSid = bvm.sid

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

@@ -824,7 +824,7 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
         }
         IPage<AppBaseVehicleNowModelQuery> page = PagerUtil.queryToPage(pagerQuery);
         QueryWrapper<AppBaseVehicleNowModelVo> qw = nowModelQueryWrapper(pagerQuery.getParams());
-        IPage<AppBaseVehicleNowModelVo> nowModelList = baseMapper.getNowModelList(page, qw);
+        IPage<AppBaseVehicleNowModelVo> nowModelList = baseMapper.getNowModelList(page, qw ,data.getSid());
         List<AppBaseVehicleNowModelVo> records = nowModelList.getRecords();
         for (AppBaseVehicleNowModelVo record : records) {
             record.setModelImage("www.baidu.com");

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeposit/AppBusDepositBuscenterDetailVo.java

@@ -15,15 +15,12 @@ public class AppBusDepositBuscenterDetailVo implements Vo {
     @ApiModelProperty("单据编号")
     private String virtualOrderId;
 
+    @ApiModelProperty("客户列表")
+    private List<AppBusDepositCustomerListVo> customerList;
+
     @ApiModelProperty("制单日期")
     private String virtualOrderDate;
 
-    @ApiModelProperty("付款人")
-    private String payName;
-
-    @ApiModelProperty("预定数量")
-    private String carNumber;
-
     @ApiModelProperty("订金金额")
     private String deposit;
 
@@ -31,17 +28,17 @@ public class AppBusDepositBuscenterDetailVo implements Vo {
     private String payDate;
 
     @ApiModelProperty("付款方式")
-    private String payTypeValue;
+    private String payType;
 
     @ApiModelProperty("付款方式")
-    private String payType;
+    private String payTypeValue;
+
+    @ApiModelProperty("付款人")
+    private String payName;
 
     @ApiModelProperty("付款账号")
     private String payNumber;
 
-    @ApiModelProperty("创建日期")
-    private String createDate;
-
     @ApiModelProperty("收款银行")
     private String collectionBank;
 
@@ -54,19 +51,22 @@ public class AppBusDepositBuscenterDetailVo implements Vo {
     @ApiModelProperty("缴费凭证list")
     private List<String> payImages;
 
-    @ApiModelProperty("缴费凭证")
-    private String paymentProof;
-
     @ApiModelProperty("联系人电话")
     private String phone;
 
+    @ApiModelProperty("预定数量")
+    private String carNumber;
+
     @ApiModelProperty("销售专员")
     private String sellerName;
 
     @ApiModelProperty("部门名称")
     private String departmentName;
 
-    @ApiModelProperty("客户列表")
+    @ApiModelProperty("创建日期")
-    private List<AppBusDepositCustomerListVo> customerList;
+    private String createDate;
+
+    @ApiModelProperty("缴费凭证")
+    private String paymentProof;
 
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeposit/BusDepositMapper.xml

@@ -7,41 +7,44 @@
     <!--虚拟订单订金收取详情（不可修改）-->
     <select id="getDepositInfoDetails"
             resultType="com.yxt.anrui.buscenter.api.busdeposit.AppBusDepositBuscenterDetailVo">
-        SELECT billNo       AS virtualOrderId,
+        SELECT billNo          AS virtualOrderId,
-               createDate   AS virtualOrderDate,
+               createTime      AS virtualOrderDate,
-               draweeName   AS payName,
+               deposit,
-               draweeMobile AS phone,
+               paymentDate     AS payDate,
-               vehicleNum   AS carNumber,
+               payType         AS payTypeValue,
-               deposit      AS deposit,
+               payTypeKey      AS payType,
-               paymentDate  AS payDate,
+               draweeName      AS payName,
-               payType      AS payTypeValue,
+               payBankAcc      AS payNumber,
-               payTypeKey   AS payType,
+               proBankValue    AS collectionBank,
-               proBankAcc   AS collectionNumber,
+               proBankAccValue AS collectionNumber,
-               paymentProof,
-               createTime   AS createDate,
                remarks,
-               staffName    AS sellerName,
+               draweeMobile    AS phone,
-               orgName      AS departmentName
+               vehicleNum      AS carNumber,
+               staffName       AS sellerName,
+               orgName         AS departmentName
         FROM bus_deposit
         WHERE billSid = #{virtualOrderSid}
     </select>
 
     <select id="depositDetail" resultType="com.yxt.anrui.buscenter.api.busdeposit.AppBusDepositBusDetailsVo">
-        SELECT billSid      AS virtualOrderSid,
+        SELECT billNo          AS virtualOrderId,
-               createDate   AS virtualOrderDate,
+               createTime      AS virtualOrderDate,
-               draweeName   AS payName,
+               draweeName      AS payName,
-               draweeMobile AS mobile,
+               draweeMobile    AS mobile,
-               vehicleNum   AS carNumber,
+               vehicleNum      AS carNumber,
-               deposit      AS deposit,
+               deposit,
-               paymentDate  AS payDate,
+               paymentDate     AS payDate,
                payType,
                payTypeKey,
-               proBankAcc   AS collectionNumber,
+               proBankAccValue AS collectionNumber,
-               paymentProof,
+               collectionBankSid,
                remarks,
-               staffName    AS sellerName,
+               paymentProof,
-               orgName      AS departmentName,
+               billSid         AS virtualOrderSid,
-               collectionBankSid
+               payBankAcc      AS payNumber,
+               proBankValue    AS collectionBank,
+               proBankKey      AS collectionBankKey,
+               proBankAccKey   AS collectionNumberKey
         FROM bus_deposit
         WHERE billSid = #{virtualOrderSid}
           AND staffSid = #{staffSid}

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeposit/BusDepositService.java

@@ -131,7 +131,6 @@ public class BusDepositService extends MybatisBaseService<BusDepositMapper, BusD
             vo.setCustomerList(new ArrayList<>());
         }
         vo.setCustomerList(customerList);
-//        send(vo.getPayName());
         return vo;
     }
 

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

@@ -30,6 +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.busdeposit.AppBusDepositBusDetailsVo;
 import com.yxt.anrui.buscenter.api.busdepositcustomer.BusDepositCustomer;
 import com.yxt.anrui.buscenter.api.busdepositvehiclecustomer.BusDepositVehicleCustomer;
 import com.yxt.anrui.buscenter.api.busmaindeposit.*;
@@ -126,4 +127,6 @@ public interface BusMainDepositMapper extends BaseMapper<BusMainDeposit> {
     BusDepositCustomer selectDepositByBillSid(@Param("virtualOrderSid") String virtualOrderSid);
 
     int selByBillSidCount(@Param("virtualOrderSid") String virtualOrderSid);
+
+    AppBusDepositBusDetailsVo selDepositByBillsid(@Param("virtualOrderSid") String virtualOrderSid);
 }

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

@@ -212,4 +212,13 @@
         from bus_deposit_vehicle_customer bdvc
         where bdvc.billSid = #{virtualOrderSid}
     </select>
+    <select id="selDepositByBillsid"
+            resultType="com.yxt.anrui.buscenter.api.busdeposit.AppBusDepositBusDetailsVo">
+        select bd.draweeName   as payName,
+               bd.draweeMobile as mobile,
+               bd.vehicleNum   AS carNumber,
+               bd.deposit
+        from bus_deposit bd
+        where bd.billSid = #{virtualOrderSid}
+    </select>
 </mapper>

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

@@ -31,6 +31,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yxt.anrui.base.api.basevehicle.BaseVehicleFeign;
 import com.yxt.anrui.base.api.basevehmodelconfig.BaseVehmodelConfigFeign;
 import com.yxt.anrui.base.api.basevehmodelconfig.BaseVehmodelVo;
+import com.yxt.anrui.buscenter.api.busdeposit.AppBusDepositBusDetailsVo;
 import com.yxt.anrui.buscenter.api.busdeposit.BusDeposit;
 import com.yxt.anrui.buscenter.api.busdepositcustomer.AppBusDepositCustomerListDto;
 import com.yxt.anrui.buscenter.api.busdepositcustomer.BusDepositCustomer;
@@ -591,20 +592,17 @@ public class BusMainDepositService extends MybatisBaseService<BusMainDepositMapp
             int count = baseMapper.selByBillSidCount(virtualOrderSid);
             record.setCarNumber(String.valueOf(count));
             if (record.getVirtualOrderType().equals("01")) {
-                BusDepositCustomer busDepositCustomer = baseMapper.selectDepositByBillSid(virtualOrderSid);
+                AppBusDepositBusDetailsVo vo = baseMapper.selDepositByBillsid(virtualOrderSid);
-                record.setCustomerSid(busDepositCustomer.getCustomerSid());
+                record.setPayName(vo.getPayName());
-                record.setCustomerName(busDepositCustomer.getCustomerName());
+                record.setMobile(vo.getMobile());
-                record.setMobile(busDepositCustomer.getCustomerMobile());
+                record.setDescribe("订金: " + vo.getDeposit() + "元 已用: 0元");
-
+                record.setCarNumber(vo.getCarNumber());
             } else if (record.getVirtualOrderType().equals("02")) {
-
                 BusDepositVehicleCustomer busDepositVehicleCustomer = baseMapper.selectVehicleCustomerByBillSid(virtualOrderSid);
                 record.setCustomerSid(busDepositVehicleCustomer.getCustomerSid());
                 record.setCustomerName(busDepositVehicleCustomer.getCustomerName());
                 record.setMobile(busDepositVehicleCustomer.getCustomerMobile());
-
             }
-            record.setDescribe("订金: 50.000.00元 已用: 0元");
             ResultBean<SysFormStateVo> resultBean = sysFormLinkFeign.selectStateByBusinessSid(record.getVirtualOrderSid());
             record.setShowUpdateBtn(false);
             record.setShowDeleteBtn(false);
@@ -669,16 +667,19 @@ public class BusMainDepositService extends MybatisBaseService<BusMainDepositMapp
             busMainDeposit.setBillNo(map.get("billNo_Num"));
             busMainDeposit.setStaffSid(data.getStaffSid());
             busMainDeposit.setStaffName(data.getStaffName());
+            busMainDeposit.setOrgSid(data.getOrgSid());
+            busMainDeposit.setOrgName(data.getOrgName());
             busMainDeposit.setDepositBillType("订金收取");
             busMainDeposit.setDepositBillTypeKey("01");
             busMainDeposit.setCreateDate(dateFormat.format(date));
-/*            busMainDeposit.setProcDefId(dto.getTaskId());
-            busMainDeposit.setProcInstSid(dto.getProcInsId());*/
             baseMapper.insert(busMainDeposit);
             BusDeposit busDeposit = new BusDeposit();
             busDeposit.setBillNo(busMainDeposit.getBillNo());
             busDeposit.setBillSid(busMainDeposit.getSid());
             busDeposit.setStaffSid(busMainDeposit.getStaffSid());
+            busDeposit.setStaffName(data.getStaffName());
+            busDeposit.setOrgSid(data.getOrgSid());
+            busDeposit.setOrgName(data.getOrgName());
             busDeposit.setCreateDate(dateFormat.format(date));
             setBusDeposit(busDeposit, dto);
             //付款凭证
@@ -688,12 +689,25 @@ public class BusMainDepositService extends MybatisBaseService<BusMainDepositMapp
             appSetBusDepositCustomer(dto, busDeposit.getBillSid());
             return new ResultBean().success().setData(busMainDeposit.getSid()).setMsg("添加成功");
         } else { //修改
-            Integer flowState = sysFormLinkFeign.selectStateByBusinessSid(dto.getVirtualOrderSid()).getData().getFlowState();
+            BusMainDeposit busMainDeposit = baseMapper.selectBySid(dto.getVirtualOrderSid());
-            if (flowState == 0 || flowState == -1) { //判断订单状态是否是未提交和拨回到发起人状态
+            String nodeState = busMainDeposit.getNodeState();
+            if (StringUtils.isBlank(nodeState)) { //判断订单状态是否是未提交和拨回到发起人状态
+                BusDeposit busDeposit = busDepositService.selectByBillSid(dto.getVirtualOrderSid());
+                //付款凭证
+                busDeposit.setPaymentProof(parsePaymentProofList(dto.getPayImages()));
+                busDeposit.setCreateDate(dateFormat.format(date));
+                busDeposit.setCollectionBankSid(dto.getCollectionBankSid());
+                setBusDeposit(busDeposit, dto);
+                busDepositService.updateById(busDeposit);
+                busDepositCustomerService.delByBillSid(dto.getVirtualOrderSid());
+                appSetBusDepositCustomer(dto, busDeposit.getBillSid());
+                return new ResultBean().success().setMsg("修改成功");
+            } else if (nodeState.equals("未提交") && nodeState.equals("已驳回")) {
                 BusDeposit busDeposit = busDepositService.selectByBillSid(dto.getVirtualOrderSid());
                 //付款凭证
                 busDeposit.setPaymentProof(parsePaymentProofList(dto.getPayImages()));
                 busDeposit.setCreateDate(dateFormat.format(date));
+                busDeposit.setCollectionBankSid(dto.getCollectionBankSid());
                 setBusDeposit(busDeposit, dto);
                 busDepositService.updateById(busDeposit);
                 busDepositCustomerService.delByBillSid(dto.getVirtualOrderSid());
@@ -715,8 +729,15 @@ public class BusMainDepositService extends MybatisBaseService<BusMainDepositMapp
         busDeposit.setDraweeName(dto.getPayName());
         busDeposit.setProBankAccKey(dto.getCollectionNumberKey());
         busDeposit.setProBankAccValue(dto.getCollectionNumber());
+        busDeposit.setProBankValue(dto.getCollectionBank());
+        busDeposit.setProBankKey(dto.getCollectionBankKey());
         busDeposit.setPayTypeKey(dto.getPayTypeKey());
         busDeposit.setPayType(dto.getPayType());
+        if ("03".equals(dto.getPayTypeKey())) {
+            busDeposit.setPayBankAcc(dto.getPayNumber());
+        } else {
+            busDeposit.setPayBankAcc("");
+        }
         busDeposit.setPaymentDate(dto.getPayDate());
         busDeposit.setVehicleNum(dto.getCarNumber());
         busDeposit.setDraweeMobile(dto.getMobile());
@@ -1069,6 +1090,8 @@ public class BusMainDepositService extends MybatisBaseService<BusMainDepositMapp
             busMainDeposit.setBillNo(map.get("billNo_Num"));
             busMainDeposit.setStaffSid(data.getStaffSid());
             busMainDeposit.setStaffName(data.getStaffName());
+            busMainDeposit.setOrgSid(data.getOrgSid());
+            busMainDeposit.setOrgName(data.getOrgName());
             busMainDeposit.setDepositBillType("车辆预订");
             busMainDeposit.setDepositBillTypeKey("02");
             busMainDeposit.setCreateDate(dateFormat.format(date));