diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busmaindeposit/pc/PcBusMainDepositFeign.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busmaindeposit/pc/PcBusMainDepositFeign.java new file mode 100644 index 0000000000..e15af9c18b --- /dev/null +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busmaindeposit/pc/PcBusMainDepositFeign.java @@ -0,0 +1,28 @@ +package com.yxt.anrui.buscenter.api.busmaindeposit.pc; + +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; +import io.swagger.annotations.ApiOperation; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.ResponseBody; + +/** + * @Author dimengzhe + * @Date 2022/4/28 14:07 + * @Description + */ +@FeignClient( + contextId = "anrui-buscenter-PcBusMainDeposit", + name = "anrui-buscenter", + path = "v1/pcbusmaindeposit", + fallback = PcBusMainDepositFeignFallback.class) +public interface PcBusMainDepositFeign { + + @ResponseBody + @PostMapping(value = "/pageList") + @ApiOperation(value = "销售订单-虚拟订单分页列表") + ResultBean> pageList(@RequestBody PagerQuery pagerQuery); +} diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busmaindeposit/pc/PcBusMainDepositFeignFallback.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busmaindeposit/pc/PcBusMainDepositFeignFallback.java new file mode 100644 index 0000000000..836fd20401 --- /dev/null +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busmaindeposit/pc/PcBusMainDepositFeignFallback.java @@ -0,0 +1,12 @@ +package com.yxt.anrui.buscenter.api.busmaindeposit.pc; + +import org.springframework.stereotype.Component; + +/** + * @Author dimengzhe + * @Date 2022/4/28 14:08 + * @Description + */ +@Component +public class PcBusMainDepositFeignFallback { +} diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busmaindeposit/pc/PcBusMainDepositQuery.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busmaindeposit/pc/PcBusMainDepositQuery.java new file mode 100644 index 0000000000..80ec60da36 --- /dev/null +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busmaindeposit/pc/PcBusMainDepositQuery.java @@ -0,0 +1,26 @@ +package com.yxt.anrui.buscenter.api.busmaindeposit.pc; + +import com.yxt.common.core.query.Query; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Author dimengzhe + * @Date 2022/4/28 14:10 + * @Description + */ +@Data +public class PcBusMainDepositQuery implements Query { + private static final long serialVersionUID = -257799062985555680L; + + @ApiModelProperty(value = "客户sid") + private String customerSid; + @ApiModelProperty(value = "业务员sid") + private String staffSid; + + @ApiModelProperty(value = "车型名称") + private String modelName; + @ApiModelProperty(value = "常用配置") + private String config; + +} 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 new file mode 100644 index 0000000000..e9b2c46c67 --- /dev/null +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busmaindeposit/pc/PcBusMainDepositVo.java @@ -0,0 +1,28 @@ +package com.yxt.anrui.buscenter.api.busmaindeposit.pc; + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Author dimengzhe + * @Date 2022/4/28 14:09 + * @Description + */ +@Data +public class PcBusMainDepositVo implements Vo { + private static final long serialVersionUID = 589097447359438621L; + + @ApiModelProperty(value = "品牌") + private String brandName; + @ApiModelProperty(value = "车型") + private String modelName; + @ApiModelProperty(value = "车型配置") + private String config; + @ApiModelProperty(value = "车型sid") + private String modelSid; + @ApiModelProperty(value = "车型配置sid") + private String modelConfigSid; + + +} diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordervehicle/BusSalesOrderVehicleFeign.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordervehicle/BusSalesOrderVehicleFeign.java index bf2f7933c6..209557e251 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordervehicle/BusSalesOrderVehicleFeign.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordervehicle/BusSalesOrderVehicleFeign.java @@ -25,16 +25,15 @@ *********************************************************/ package com.yxt.anrui.buscenter.api.bussalesordervehicle; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.cloud.openfeign.SpringQueryMap; import org.springframework.web.bind.annotation.*; -import java.util.List; - /** * Project: anrui-buscenter(业务管理)
* File: BusSalesOrderVehicleFeign.java
@@ -76,5 +75,8 @@ public interface BusSalesOrderVehicleFeign { @ResponseBody public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid); - ResultBean selectVo(); + @ApiOperation("获取现车列表及数量") + @GetMapping("/selectVo") + @ResponseBody + ResultBean selectVo(@SpringQueryMap BusSalesOrderVehicleQuery busSalesOrderVehicleQuery); } \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordervehicle/BusSalesOrderVehicleFeignFallback.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordervehicle/BusSalesOrderVehicleFeignFallback.java index 76d094c043..455c460c54 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordervehicle/BusSalesOrderVehicleFeignFallback.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordervehicle/BusSalesOrderVehicleFeignFallback.java @@ -46,30 +46,30 @@ import org.springframework.stereotype.Component; @Component public class BusSalesOrderVehicleFeignFallback implements BusSalesOrderVehicleFeign { - @Override - public ResultBean> listPage(PagerQuery pq){ - ResultBean rb = ResultBean.fireFail(); - return rb.setMsg("接口anrui-buscenter/bussalesordervehicle/listPage无法访问"); - } + @Override + public ResultBean> listPage(PagerQuery pq) { + ResultBean rb = ResultBean.fireFail(); + return rb.setMsg("接口anrui-buscenter/bussalesordervehicle/listPage无法访问"); + } - @Override - public ResultBean save(BusSalesOrderVehicleDto dto){ - return ResultBean.fireFail().setMsg("接口anrui-buscenter/bussalesordervehicle/save无法访问"); - } + @Override + public ResultBean save(BusSalesOrderVehicleDto dto) { + return ResultBean.fireFail().setMsg("接口anrui-buscenter/bussalesordervehicle/save无法访问"); + } - @Override - public ResultBean delBySids( String[] sids){ - return ResultBean.fireFail().setMsg("接口anrui-buscenter/bussalesordervehicle/delBySids无法访问"); - } + @Override + public ResultBean delBySids(String[] sids) { + return ResultBean.fireFail().setMsg("接口anrui-buscenter/bussalesordervehicle/delBySids无法访问"); + } - @Override - public ResultBean fetchDetailsBySid(String sid){ - ResultBean rb = ResultBean.fireFail(); - return rb.setMsg("接口anrui-buscenter/bussalesordervehicle/fetchDetailsBySid无法访问"); - } + @Override + public ResultBean fetchDetailsBySid(String sid) { + ResultBean rb = ResultBean.fireFail(); + return rb.setMsg("接口anrui-buscenter/bussalesordervehicle/fetchDetailsBySid无法访问"); + } - @Override - public ResultBean selectVo() { - return null; - } + @Override + public ResultBean selectVo(BusSalesOrderVehicleQuery busSalesOrderVehicleQuery) { + return null; + } } \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordervehicle/BusSalesOrderVehicleQuery.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordervehicle/BusSalesOrderVehicleQuery.java index 6011e541d1..ba180226e6 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordervehicle/BusSalesOrderVehicleQuery.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordervehicle/BusSalesOrderVehicleQuery.java @@ -50,8 +50,6 @@ import lombok.Data; public class BusSalesOrderVehicleQuery implements Query { private static final long serialVersionUID = 9092383680701191970L; - @ApiModelProperty("销售订单sid") - private String salesOrderSid; @ApiModelProperty(value = "车型sid") private String modelSid; @ApiModelProperty(value = "车型配置sid") @@ -60,4 +58,6 @@ public class BusSalesOrderVehicleQuery implements Query { private String staffSid; @ApiModelProperty(value = "客户sid") private String customerSid; + @ApiModelProperty(value = "类型：1意向车型选择、2虚拟订单选择、3车型选择") + private Integer type; } diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositMapper.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositMapper.java index 8b14b3c0ef..b0269292e5 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositMapper.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositMapper.java @@ -26,10 +26,12 @@ package com.yxt.anrui.buscenter.biz.busmaindeposit; import com.baomidou.mybatisplus.core.conditions.Wrapper; +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.busmaindeposit.*; +import com.yxt.anrui.buscenter.api.busmaindeposit.pc.PcBusMainDepositVo; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -93,4 +95,13 @@ public interface BusMainDepositMapper extends BaseMapper { BusMainDeposit selBusMainDepositBySid(@Param("virtualOrderSid") String virtualOrderSid); int updateFlowFiled(Map map); + + /** + * 销售订单-虚拟订单分页列表 + * + * @param page 分页 + * @param qw 查询条件 + * @return + */ + IPage orderPageList(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); } \ 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 d2cbf293e8..f8db80d79b 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 @@ -132,4 +132,17 @@ WHERE sid=#{sid} + + \ No newline at end of file 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 9a83c0e0c3..e72b15156b 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 @@ -40,7 +40,8 @@ import com.yxt.anrui.buscenter.api.busdepositvehicle.BusDepositVehicle; import com.yxt.anrui.buscenter.api.busdepositvehiclecustomer.BusDepositVehicleCustomer; import com.yxt.anrui.buscenter.api.busdepositvehiclecustomer.BusDepositVehicleCustomerVo; import com.yxt.anrui.buscenter.api.busmaindeposit.*; -import com.yxt.anrui.buscenter.api.flow.FlowTaskVo; +import com.yxt.anrui.buscenter.api.busmaindeposit.pc.PcBusMainDepositQuery; +import com.yxt.anrui.buscenter.api.busmaindeposit.pc.PcBusMainDepositVo; import com.yxt.anrui.buscenter.biz.busdeposit.BusDepositService; import com.yxt.anrui.buscenter.biz.busdepositcustomer.BusDepositCustomerService; import com.yxt.anrui.buscenter.biz.busdepositvehicle.BusDepositVehicleService; @@ -68,7 +69,6 @@ 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 io.swagger.annotations.ApiModelProperty; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -1437,5 +1437,35 @@ public class BusMainDepositService extends MybatisBaseService orderPageList(PagerQuery pagerQuery) { + PcBusMainDepositQuery query = pagerQuery.getParams(); + QueryWrapper qw = createOrderPageWrapper(query); + IPage page = PagerUtil.queryToPage(pagerQuery); + IPage pagging = baseMapper.orderPageList(page, qw); + PagerVo p = PagerUtil.pageToVo(pagging, null); + return p; + } + private QueryWrapper createOrderPageWrapper(PcBusMainDepositQuery query) { + QueryWrapper qw = new QueryWrapper<>(); + if (query != null) { + if (StringUtils.isNotBlank(query.getModelName())) { + qw.like("bv.modelName", query.getModelName()); + } + if (StringUtils.isNotBlank(query.getConfig())) { + qw.like("bv.config", query.getConfig()); + } + + } + qw.eq("bd.staffSid", query.getStaffSid()); + qw.eq("bc.customerSid", query.getCustomerSid()); + qw.groupBy("bv.modelSid","bv.modelConfigSid"); + return qw; + } } \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/pc/PcBusMainDepositRest.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/pc/PcBusMainDepositRest.java new file mode 100644 index 0000000000..7d5aced751 --- /dev/null +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/pc/PcBusMainDepositRest.java @@ -0,0 +1,34 @@ +package com.yxt.anrui.buscenter.biz.busmaindeposit.pc; + +import com.yxt.anrui.buscenter.api.busmaindeposit.pc.PcBusMainDepositFeign; +import com.yxt.anrui.buscenter.api.busmaindeposit.pc.PcBusMainDepositQuery; +import com.yxt.anrui.buscenter.api.busmaindeposit.pc.PcBusMainDepositVo; +import com.yxt.anrui.buscenter.biz.busmaindeposit.BusMainDepositService; +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; +import io.swagger.annotations.Api; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestMapping; + +/** + * @Author dimengzhe + * @Date 2022/4/28 14:21 + * @Description + */ +@Api(tags = "销售虚拟订单相关接口实现") +@RequestMapping("v1/pcbusmaindeposit") +@Controller +public class PcBusMainDepositRest implements PcBusMainDepositFeign { + + @Autowired + private BusMainDepositService busMainDepositService; + + @Override + public ResultBean> pageList(PagerQuery pagerQuery) { + ResultBean> rb = ResultBean.fireFail(); + PagerVo pv = busMainDepositService.orderPageList(pagerQuery); + return rb.success().setData(pv); + } +} diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleRest.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleRest.java index 0b4e033f18..119f49f7a9 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleRest.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleRest.java @@ -92,7 +92,7 @@ public class BusSalesOrderVehicleRest implements BusSalesOrderVehicleFeign { } @Override - public ResultBean selectVo() { - return null; + public ResultBean selectVo(BusSalesOrderVehicleQuery busSalesOrderVehicleQuery) { + return busSalesOrderVehicleService.selectVo(busSalesOrderVehicleQuery); } } diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleService.java index 21f449c619..f38042f930 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleService.java @@ -28,23 +28,14 @@ package com.yxt.anrui.buscenter.biz.bussalesordervehicle; import cn.hutool.core.bean.BeanUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; -import org.apache.commons.lang3.StringUtils; +import com.yxt.anrui.buscenter.api.bussalesordervehicle.*; import com.yxt.common.base.service.MybatisBaseService; 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.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicle; -import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicleQuery; -import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicleVo; -import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicleDetailsVo; -import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicleDto; -import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicleFeign; - import org.springframework.stereotype.Service; -import java.util.List; - /** * Project: anrui-buscenter(业务管理)
* File: BusSalesOrderVehicleService.java
@@ -88,4 +79,17 @@ public class BusSalesOrderVehicleService extends MybatisBaseService selectVo(BusSalesOrderVehicleQuery busSalesOrderVehicleQuery) { + //判断选择的是意向车型还是虚拟订单还是车型配置 + int type = busSalesOrderVehicleQuery.getType(); + if (type == 1 || type == 3) { + //查询该车型该配置下的所有现车的数量 + + + } else { + + } + return null; + } } \ No newline at end of file