From 148a899291bb2a34852ae7d167e559b4d686f5de Mon Sep 17 00:00:00 2001 From: dimengzhe <251008545@qq.com> Date: Fri, 29 Apr 2022 11:19:29 +0800 Subject: [PATCH] =?UTF-8?q?=E9=94=80=E5=94=AE=E8=AE=A2=E5=8D=95-=E8=99=9A?= =?UTF-8?q?=E6=8B=9F=E8=AE=A2=E5=8D=95=E5=88=86=E9=A1=B5=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=BF=94=E5=9B=9E=E5=8D=95=E5=8F=B0=E6=8C=87?= =?UTF-8?q?=E5=AF=BC=E4=BB=B7=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/busmaindeposit/pc/PcBusMainDepositVo.java | 5 +++++ .../biz/busmaindeposit/BusMainDepositService.java | 14 ++++++++++++++ .../crmvehicledemand/pc/PcCrmVehicleDemandVo.java | 1 - 3 files changed, 19 insertions(+), 1 deletion(-) diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busmaindeposit/pc/PcBusMainDepositVo.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busmaindeposit/pc/PcBusMainDepositVo.java index e9b2c46c67..d957b66fe6 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busmaindeposit/pc/PcBusMainDepositVo.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busmaindeposit/pc/PcBusMainDepositVo.java @@ -1,5 +1,7 @@ package com.yxt.anrui.buscenter.api.busmaindeposit.pc; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import com.yxt.common.core.vo.Vo; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -24,5 +26,8 @@ public class PcBusMainDepositVo implements Vo { @ApiModelProperty(value = "车型配置sid") private String modelConfigSid; + @ApiModelProperty(value = "单台指导价") + private String guidedPrice; + } 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 57203d227a..475b8cc277 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 @@ -29,6 +29,8 @@ import cn.hutool.core.bean.BeanUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; 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.BusDeposit; import com.yxt.anrui.buscenter.api.busdepositcustomer.AppBusDepositCustomerListDto; import com.yxt.anrui.buscenter.api.busdepositcustomer.BusDepositCustomer; @@ -130,6 +132,8 @@ public class BusMainDepositService extends MybatisBaseService listPage(PagerQuery pq) { @@ -1450,6 +1454,16 @@ public class BusMainDepositService extends MybatisBaseService page = PagerUtil.queryToPage(pagerQuery); IPage pagging = baseMapper.orderPageList(page, qw); PagerVo p = PagerUtil.pageToVo(pagging, null); + List list = p.getRecords(); + if (list.size() > 0) { + for (int i = 0; i < list.size(); i++) { + //根据车型sid及配置sid查询单台指导价 + ResultBean voResultBean = baseVehmodelConfigFeign.selectOne(list.get(i).getModelSid(), list.get(i).getModelConfigSid()); + if (voResultBean.getSuccess()) { + list.get(i).setGuidedPrice(voResultBean.getData().getGuidedPrice()); + } + } + } return p; } diff --git a/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmvehicledemand/pc/PcCrmVehicleDemandVo.java b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmvehicledemand/pc/PcCrmVehicleDemandVo.java index 5bbf033765..5af5986647 100644 --- a/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmvehicledemand/pc/PcCrmVehicleDemandVo.java +++ b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmvehicledemand/pc/PcCrmVehicleDemandVo.java @@ -27,6 +27,5 @@ public class PcCrmVehicleDemandVo implements Vo { @ApiModelProperty(value = "常用配置") private String config; @ApiModelProperty(value = "单台指导价") - @JsonSerialize(using = ToStringSerializer.class) private String guidedPrice; }