From ee99264e5fc21611108269530946e6a2ab03da25 Mon Sep 17 00:00:00 2001 From: dimengzhe <251008545@qq.com> Date: Thu, 29 Sep 2022 17:16:25 +0800 Subject: [PATCH] =?UTF-8?q?=E8=BD=A6=E8=BE=86=E5=87=BA=E5=BA=93=E8=AF=A6?= =?UTF-8?q?=E6=83=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/basemiddleman/BaseMiddlemanFeign.java | 2 +- .../BaseVehicleOutDetailsVo.java | 61 +++++++++++++++++++ .../basevehicleout/BaseVehicleOutFeign.java | 11 +++- .../api/basevehicleout/BaseVehicleOutVo.java | 3 + .../BusVehicleApplyDetail.java | 3 + .../BusVehicleApplyDetailDto.java | 2 + .../BusVehicleApplyDetailVo.java | 2 + .../basevehicleout/BaseVehicleOutMapper.java | 3 + .../basevehicleout/BaseVehicleOutMapper.xml | 32 +++++++++- .../basevehicleout/BaseVehicleOutRest.java | 10 +-- .../basevehicleout/BaseVehicleOutService.java | 11 ++-- 11 files changed, 127 insertions(+), 13 deletions(-) create mode 100644 anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleout/BaseVehicleOutDetailsVo.java diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemiddleman/BaseMiddlemanFeign.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemiddleman/BaseMiddlemanFeign.java index f0fdc138f8..e891e03891 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemiddleman/BaseMiddlemanFeign.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemiddleman/BaseMiddlemanFeign.java @@ -89,7 +89,7 @@ public interface BaseMiddlemanFeign { ResultBean> getMiddleList(@Valid @RequestBody PagerQuery query); @ApiOperation("车辆出库中介人员") - @PostMapping("/selectMiddleList") + @GetMapping("/selectMiddleList") @ResponseBody ResultBean> selectMiddleList(@SpringQueryMap BaseMiddleListQuery query); } \ No newline at end of file diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleout/BaseVehicleOutDetailsVo.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleout/BaseVehicleOutDetailsVo.java new file mode 100644 index 0000000000..f68c39411b --- /dev/null +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleout/BaseVehicleOutDetailsVo.java @@ -0,0 +1,61 @@ +package com.yxt.anrui.base.api.basevehicleout; + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Author dimengzhe + * @Date 2022/9/29 16:45 + * @Description + */ +@Data +public class BaseVehicleOutDetailsVo implements Vo { + private static final long serialVersionUID = -7699189616162991308L; + + private String vinSid; + private String vinNo; + @ApiModelProperty("出库类型") + private String type; + private String typeKey; + @ApiModelProperty("销售部门sid") + private String orgSid; + @ApiModelProperty("销售部门名称") + private String orgName; + @ApiModelProperty("销售专员sid") + private String staffSid; + @ApiModelProperty("销售专员") + private String staffName; + @ApiModelProperty("合同编号") + private String concatNo; + @ApiModelProperty("成交价") + private String price; + @ApiModelProperty("是否为终端客户:1是0不是") + private String isTerminal; + @ApiModelProperty("客户名称") + private String customerName; + @ApiModelProperty("客户sid") + private String customerSid; + @ApiModelProperty("手机号") + private String mobile; + @ApiModelProperty("赠品说明") + private String giftsDescription; + + @ApiModelProperty("销售折让") + private String salesAllowance; + @ApiModelProperty("中介人1") + private String middleOne; + @ApiModelProperty("中介人1sid") + private String middleOneSid; + @ApiModelProperty("返利金额1") + private String rebateMoneyOne; + @ApiModelProperty("中介人2") + private String middleTwo; + @ApiModelProperty("中介人2sid") + private String middleTwoSid; + @ApiModelProperty("返利金额2") + private String rebateMoneyTwo; + @ApiModelProperty("备注") + private String remarks; + private String saleDate; +} diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleout/BaseVehicleOutFeign.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleout/BaseVehicleOutFeign.java index e1aff860e3..2198a2266a 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleout/BaseVehicleOutFeign.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleout/BaseVehicleOutFeign.java @@ -5,9 +5,7 @@ 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; +import org.springframework.web.bind.annotation.*; /** * @Author dimengzhe @@ -30,6 +28,13 @@ public interface BaseVehicleOutFeign { @PostMapping("/pagerList") @ResponseBody ResultBean> pagerList(@RequestBody PagerQuery query); + + @ApiOperation("出库详情") + @GetMapping("/details/{sid}") + @ResponseBody + ResultBean details(@PathVariable("sid") String sid); + + } diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleout/BaseVehicleOutVo.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleout/BaseVehicleOutVo.java index 588f946f93..4f1253e432 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleout/BaseVehicleOutVo.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleout/BaseVehicleOutVo.java @@ -13,6 +13,9 @@ import lombok.Data; public class BaseVehicleOutVo implements Vo { private static final long serialVersionUID = -1711615769602118459L; + @ApiModelProperty("sid") + private String sid; + @ApiModelProperty("车架号") private String vinSid; diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapplydetail/BusVehicleApplyDetail.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapplydetail/BusVehicleApplyDetail.java index 28977d56bc..c9f880a127 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapplydetail/BusVehicleApplyDetail.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapplydetail/BusVehicleApplyDetail.java @@ -47,4 +47,7 @@ public class BusVehicleApplyDetail extends BaseEntity { private String insideCode; @ApiModelProperty(value = "厂家合同价") private Integer contractPrice; + + @ApiModelProperty("厂家销售通路") + private String actualPay; } diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapplydetail/BusVehicleApplyDetailDto.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapplydetail/BusVehicleApplyDetailDto.java index eda3859918..49506a1092 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapplydetail/BusVehicleApplyDetailDto.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapplydetail/BusVehicleApplyDetailDto.java @@ -52,4 +52,6 @@ public class BusVehicleApplyDetailDto implements Dto { private String contractPrice; private BusVehicleApplySzDto busVehicleApplySz; + @ApiModelProperty("厂家销售通路") + private String actualPay; } \ No newline at end of file diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapplydetail/BusVehicleApplyDetailVo.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapplydetail/BusVehicleApplyDetailVo.java index 3815496a7e..67f83d51f5 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapplydetail/BusVehicleApplyDetailVo.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapplydetail/BusVehicleApplyDetailVo.java @@ -55,4 +55,6 @@ public class BusVehicleApplyDetailVo implements Vo { @ApiModelProperty(value = "上装指导价") private Integer guidePrice; + @ApiModelProperty("厂家销售通路") + private String actualPay; } diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutMapper.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutMapper.java index 382fe7ad9a..7ac5ab7c4d 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutMapper.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutMapper.java @@ -5,6 +5,7 @@ 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.base.api.basevehicleout.BaseVehicleOut; +import com.yxt.anrui.base.api.basevehicleout.BaseVehicleOutDetailsVo; import com.yxt.anrui.base.api.basevehicleout.BaseVehicleOutVo; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -25,4 +26,6 @@ public interface BaseVehicleOutMapper extends BaseMapper { IPage selectPageVo(IPage page, @Param(Constants.WRAPPER)QueryWrapper qw); + + BaseVehicleOutDetailsVo details(String sid); } diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutMapper.xml b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutMapper.xml index 57636e87d2..642e706a88 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutMapper.xml +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutMapper.xml @@ -42,10 +42,40 @@ bvo.middleOne, bvo.middleTwo, bvo.rebateMoneyOne, - bvo.rebateMoneyTwo + bvo.rebateMoneyTwo, + bv.configName as modelConfig, + bvo.sid from base_vehicle_out bvo + left join base_vehicle bv on bv.sid = bvo.vinSid ${ew.sqlSegment} + + \ No newline at end of file diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutRest.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutRest.java index 157475632e..8afc9e4c9c 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutRest.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutRest.java @@ -1,9 +1,6 @@ package com.yxt.anrui.base.biz.basevehicleout; -import com.yxt.anrui.base.api.basevehicleout.BaseVehicleOutDto; -import com.yxt.anrui.base.api.basevehicleout.BaseVehicleOutFeign; -import com.yxt.anrui.base.api.basevehicleout.BaseVehicleOutQuery; -import com.yxt.anrui.base.api.basevehicleout.BaseVehicleOutVo; +import com.yxt.anrui.base.api.basevehicleout.*; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; @@ -36,4 +33,9 @@ public class BaseVehicleOutRest implements BaseVehicleOutFeign { PagerVo pv = baseVehicleOutService.pagerList(query); return rb.success().setData(pv); } + + @Override + public ResultBean details(String sid) { + return baseVehicleOutService.details(sid); + } } diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutService.java index 6ee0246721..80334eb196 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutService.java @@ -4,10 +4,7 @@ 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.BaseVehicle; -import com.yxt.anrui.base.api.basevehicleout.BaseVehicleOut; -import com.yxt.anrui.base.api.basevehicleout.BaseVehicleOutDto; -import com.yxt.anrui.base.api.basevehicleout.BaseVehicleOutQuery; -import com.yxt.anrui.base.api.basevehicleout.BaseVehicleOutVo; +import com.yxt.anrui.base.api.basevehicleout.*; import com.yxt.anrui.base.biz.basevehicle.BaseVehicleService; import com.yxt.anrui.base.common.enums.VehicleState; import com.yxt.common.base.service.MybatisBaseService; @@ -99,4 +96,10 @@ public class BaseVehicleOutService extends MybatisBaseService p = PagerUtil.pageToVo(pagging, null); return p; } + + public ResultBean details(String sid) { + ResultBean rb = ResultBean.fireFail(); + BaseVehicleOutDetailsVo baseVehicleOutDetailsVo = baseMapper.details(sid); + return rb.success().setData(baseVehicleOutDetailsVo); + } }