diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.xml b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.xml index faa16d3bf7..89a01aa02d 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.xml +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.xml @@ -885,7 +885,7 @@ select bv.vinNo vin, bv.locationName address, bv.sid carSid, - if(bv.lockedState = 1, 1, 0) + if(bv.lockedState = '01', 1, 0) as isFictitious from base_vehicle bv where bv.modelSid = #{modelSid} diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busmaindeposit/AppBusMainDepositVo.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busmaindeposit/AppBusMainDepositVo.java index 0ab2d32a4c..b46cd06b21 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busmaindeposit/AppBusMainDepositVo.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busmaindeposit/AppBusMainDepositVo.java @@ -115,4 +115,6 @@ public class AppBusMainDepositVo implements Vo { @ApiModelProperty("订车特殊:审批成功后不再显示流程状态显示为 : 有效期:3天/2天/1天;失效") private String virtualOrderState2; + private String usedDeposit; + } diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeposit/BusDepositMapper.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeposit/BusDepositMapper.java index 8a0e33a2cb..1db99be7fe 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeposit/BusDepositMapper.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeposit/BusDepositMapper.java @@ -63,4 +63,6 @@ public interface BusDepositMapper extends BaseMapper { * @return */ int updateFlowFiled(Map map); + + int updateDeposit(@Param("depositAll") String depositAll, @Param("depositBillNo") String depositBillNo); } \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeposit/BusDepositMapper.xml b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeposit/BusDepositMapper.xml index 58d04e3d25..afcb4809c3 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeposit/BusDepositMapper.xml +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeposit/BusDepositMapper.xml @@ -67,4 +67,7 @@ WHERE sid = #{sid} + + update bus_deposit set usedDeposit = #{depositAll} where billNo = #{depositBillNo} + \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeposit/BusDepositService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeposit/BusDepositService.java index 0f49d2ac66..af59fc327d 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeposit/BusDepositService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeposit/BusDepositService.java @@ -202,4 +202,8 @@ public class BusDepositService extends MybatisBaseService getList(String sid); + + String selectDeposit(String depositBillNo); } \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdepositfictitious/BusDepositFictitiousMapper.xml b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdepositfictitious/BusDepositFictitiousMapper.xml index 74911bdef5..eefb64066a 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdepositfictitious/BusDepositFictitiousMapper.xml +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdepositfictitious/BusDepositFictitiousMapper.xml @@ -48,4 +48,10 @@ left join bus_deposit bd2 on bf.depositBillSid = bd2.billSid where bf.depositSid = #{sid} + + \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdepositfictitious/BusDepositFictitiousService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdepositfictitious/BusDepositFictitiousService.java index 88138745a9..06fecc0b3c 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdepositfictitious/BusDepositFictitiousService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdepositfictitious/BusDepositFictitiousService.java @@ -99,4 +99,8 @@ public class BusDepositFictitiousService extends MybatisBaseService getList(String sid) { return baseMapper.getList(sid); } + + public String selectDeposit(String depositBillNo) { + return baseMapper.selectDeposit(depositBillNo); + } } \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositMapper.xml b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositMapper.xml index b4faf1f731..9ffd2a8f52 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositMapper.xml +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositMapper.xml @@ -45,7 +45,8 @@ bmd.staffName AS sellerName, bmd.orgName, if(length(bmd.nodeState) > 0, nodeState, '待提交') AS virtualOrderState, - bmd.remarks + bmd.remarks, + bd.usedDeposit FROM bus_main_deposit bmd LEFT JOIN bus_deposit_vehicle_customer bdvc ON bmd.sid = bdvc.billSid LEFT JOIN bus_deposit bd ON bmd.sid = bd.billSid @@ -67,7 +68,8 @@ bmd.staffName AS sellerName, bmd.orgName, if(length(bmd.nodeState) > 0, nodeState, '待提交') AS virtualOrderState, - bmd.remarks + bmd.remarks, + bd.usedDeposit FROM bus_main_deposit bmd LEFT JOIN bus_deposit_vehicle_customer bdvc ON bmd.sid = bdvc.billSid LEFT JOIN bus_deposit bd ON bmd.sid = bd.billSid @@ -88,7 +90,8 @@ bmd.staffName AS sellerName, bmd.orgName, if(length(bmd.nodeState) > 0, nodeState, '待提交') AS virtualOrderState, - bmd.remarks + bmd.remarks, + bd.usedDeposit FROM bus_main_deposit bmd LEFT JOIN bus_deposit_vehicle_customer bdvc ON bmd.sid = bdvc.billSid LEFT JOIN bus_deposit bd ON bmd.sid = bd.billSid diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositService.java index 511de27783..3ac4fb10a7 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositService.java @@ -71,7 +71,6 @@ import com.yxt.anrui.flowable.api.sysformlink.SysFormLinkFeign; import com.yxt.anrui.flowable.api.sysformlink.SysFormLinkTypeEnum; import com.yxt.anrui.flowable.api.sysformlink.SysFormStateVo; import com.yxt.anrui.flowable.api.sysprourl.SysProUrlFeign; -import com.yxt.anrui.flowable.api.sysprourl.SysProUrlVo; import com.yxt.anrui.flowable.api.utils.ProcDefEnum; import com.yxt.anrui.flowable.api.utils.ProcessStateEnum; import com.yxt.anrui.flowable.sqloperationsymbol.BusinessVariables; @@ -94,7 +93,9 @@ import com.yxt.common.base.utils.PagerUtil; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; -import com.yxt.messagecenter.api.message.*; +import com.yxt.messagecenter.api.message.MessageFeign; +import com.yxt.messagecenter.api.message.MessageFlowVo; +import com.yxt.messagecenter.api.message.MessageFlowableQuery; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -643,7 +644,12 @@ public class BusMainDepositService extends MybatisBaseService depositRecords = busDepositFictitiousService.getDepositRecords(record.getVirtualOrderId()); + if(StringUtils.isNotBlank(record.getUsedDeposit())){ + record.setDescribe("订金: " + vo.getDeposit() + "元 已用:" + record.getUsedDeposit() + "元"); + }else{ + record.setDescribe("订金: " + vo.getDeposit() + "元 已用:" + "0" + "元"); + } + /*List depositRecords = busDepositFictitiousService.getDepositRecords(record.getVirtualOrderId()); if (depositRecords.size() > 0) { for (BusDepositRecordsVo depositRecord : depositRecords) { String usePrice = depositRecord.getUsePrice(); @@ -655,7 +661,7 @@ public class BusMainDepositService extends MybatisBaseService AppCreatePagePcWrapper(AppCrmOrderVehicleDemandQuery query) { QueryWrapper qw = new QueryWrapper<>(); if (query != null) { - qw.eq("cv.customerSid", query.getCustomerSid()); + if(StringUtils.isNotBlank(query.getCustomerSid())){ + qw.eq("cv.customerSid", query.getCustomerSid()); + } + if(StringUtils.isNotBlank(query.getNames())){ + qw.like("cv.modelName",query.getNames()); + } + } //是否意向:0非意向,1意向 qw.eq("states", 1); diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/model/CrmOrderVehicleDemandQuery.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/model/CrmOrderVehicleDemandQuery.java index f8336cb958..6b780b4257 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/model/CrmOrderVehicleDemandQuery.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/model/CrmOrderVehicleDemandQuery.java @@ -15,4 +15,6 @@ public class CrmOrderVehicleDemandQuery implements Query { @ApiModelProperty("客户sid") private String customerSid; + + private String names; }