销售订单-虚拟订单分页列表添加返回单台指导价字段

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;
+
 
 }

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<BusMainDepositMapp
 
     @Autowired
     private SysFormLinkFeign sysFormLinkFeign;
+    @Autowired
+    private BaseVehmodelConfigFeign baseVehmodelConfigFeign;
 
 
     public PagerVo<BusMainDeposit> listPage(PagerQuery<BusMainDepositQuery> pq) {
@@ -1450,6 +1454,16 @@ public class BusMainDepositService extends MybatisBaseService<BusMainDepositMapp
         IPage<BusMainDeposit> page = PagerUtil.queryToPage(pagerQuery);
         IPage<PcBusMainDepositVo> pagging = baseMapper.orderPageList(page, qw);
         PagerVo<PcBusMainDepositVo> p = PagerUtil.pageToVo(pagging, null);
+        List<PcBusMainDepositVo> list = p.getRecords();
+        if (list.size() > 0) {
+            for (int i = 0; i < list.size(); i++) {
+                //根据车型sid及配置sid查询单台指导价
+                ResultBean<BaseVehmodelVo> voResultBean = baseVehmodelConfigFeign.selectOne(list.get(i).getModelSid(), list.get(i).getModelConfigSid());
+                if (voResultBean.getSuccess()) {
+                    list.get(i).setGuidedPrice(voResultBean.getData().getGuidedPrice());
+                }
+            }
+        }
         return p;
     }
 

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;
 }