From 3269f87ed6fdc81f6aa8370879854dfa2bc153b0 Mon Sep 17 00:00:00 2001 From: dimengzhe <251008545@qq.com> Date: Mon, 9 May 2022 13:37:08 +0800 Subject: [PATCH] =?UTF-8?q?=E9=94=80=E5=94=AE=E8=AE=A2=E5=8D=95=E7=BC=96?= =?UTF-8?q?=E8=BE=91=E5=88=9D=E5=A7=8B=E5=8C=96=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BusDepositFictitiousDetailsVo.java | 13 ++- .../bussalesorder/BusSalesOrderDetailsVo.java | 39 +++++---- .../api/bussalesorder/BusSalesOrderFeign.java | 5 +- .../BusSalesOrderDepositDetailsVo.java | 17 ++-- .../BusSalesOrderDiscountDetailsVo.java | 5 +- .../BusSalesOrderInsuranceDetailsVo.java | 11 +-- .../BusSalesOrderMakeupDetailsVo.java | 11 +-- .../BusSalesOrderModelDetailsVo.java | 14 ++-- .../BusSalesOrderModelFeign.java | 8 +- .../BusSalesOrderModelFeignFallback.java | 8 -- .../BusSalesOrderPriceDetailsVo.java | 22 +++--- .../BusSalesOrderVehicleDetailsVo.java | 4 - .../BusSalesVehicleOrderDetailsVo.java | 17 ++-- .../BusDepositFictitiousMapper.java | 27 ++++--- .../BusDepositFictitiousMapper.xml | 10 +++ .../BusDepositFictitiousService.java | 9 +++ .../biz/bussalesorder/BusSalesOrderRest.java | 17 ++-- .../bussalesorder/BusSalesOrderService.java | 79 ++++++++++++++++++- .../BusSalesOrderDepositMapper.java | 27 ++++--- .../BusSalesOrderDepositMapper.xml | 11 +++ .../BusSalesOrderDepositService.java | 10 +++ .../BusSalesOrderDiscountMapper.java | 27 ++++--- .../BusSalesOrderDiscountMapper.xml | 12 +++ .../BusSalesOrderDiscountService.java | 10 +++ .../BusSalesOrderInsuranceMapper.java | 9 +++ .../BusSalesOrderInsuranceMapper.xml | 9 +++ .../BusSalesOrderInsuranceService.java | 10 +++ .../BusSalesOrderMakeupMapper.java | 27 ++++--- .../BusSalesOrderMakeupMapper.xml | 7 ++ .../BusSalesOrderMakeupService.java | 4 + .../BusSalesOrderModelMapper.java | 33 +++++--- .../BusSalesOrderModelMapper.xml | 14 ++++ .../BusSalesOrderModelRest.java | 9 --- .../BusSalesOrderModelService.java | 10 +++ .../BusSalesOrderPriceMapper.java | 9 +++ .../BusSalesOrderPriceMapper.xml | 11 +++ .../BusSalesOrderPriceService.java | 12 ++- .../BusSalesOrderVehicleMapper.java | 35 +++++--- .../BusSalesOrderVehicleMapper.xml | 9 +++ .../BusSalesOrderVehicleService.java | 12 ++- .../BusSalesVehicleOrderMapper.java | 23 ++++-- .../BusSalesVehicleOrderMapper.xml | 9 +++ .../BusSalesVehicleOrderService.java | 18 ++++- 43 files changed, 483 insertions(+), 200 deletions(-) diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdepositfictitious/BusDepositFictitiousDetailsVo.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdepositfictitious/BusDepositFictitiousDetailsVo.java index 74a8010eee..e7a2ef374f 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdepositfictitious/BusDepositFictitiousDetailsVo.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdepositfictitious/BusDepositFictitiousDetailsVo.java @@ -26,13 +26,13 @@ package com.yxt.anrui.buscenter.api.busdepositfictitious; +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.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.math.BigDecimal; - /** * Project: anrui-buscenter(业务管理)
* File: BusDepositFictitiousVo.java
@@ -51,16 +51,15 @@ import java.math.BigDecimal; public class BusDepositFictitiousDetailsVo implements Vo { private static final long serialVersionUID = -972207402015740843L; - private String sid; @ApiModelProperty("虚拟订单编号") private String depositBillNo; - @ApiModelProperty("订金信息sid") - private String depositSid; @ApiModelProperty("订金剩余金额") - private BigDecimal depositPrice; + @JsonSerialize(using = ToStringSerializer.class) + private String depositPrice; @ApiModelProperty("本次结转金额") - private BigDecimal price; + @JsonSerialize(using = ToStringSerializer.class) + private String price; @ApiModelProperty("款项支付委托书") private String payPath; diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderDetailsVo.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderDetailsVo.java index e385fef4ac..763ba63901 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderDetailsVo.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderDetailsVo.java @@ -26,22 +26,21 @@ package com.yxt.anrui.buscenter.api.bussalesorder; -import com.yxt.anrui.buscenter.api.busdepositfictitious.BusDepositFictitiousVo; -import com.yxt.anrui.buscenter.api.bussalesorderdeposit.BusSalesOrderDepositVo; -import com.yxt.anrui.buscenter.api.bussalesorderdiscount.BusSalesOrderDiscountVo; -import com.yxt.anrui.buscenter.api.bussalesorderinsurance.BusSalesOrderInsuranceVo; -import com.yxt.anrui.buscenter.api.bussalesordermakeup.BusSalesOrderMakeupVo; -import com.yxt.anrui.buscenter.api.bussalesordermodel.BusSalesOrderModelVo; -import com.yxt.anrui.buscenter.api.bussalesorderprice.BusSalesOrderPriceVo; -import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicleListVo; -import com.yxt.anrui.buscenter.api.bussalesvehicleorder.BusSalesVehicleOrderVo; +import com.yxt.anrui.buscenter.api.busdepositfictitious.BusDepositFictitiousDetailsVo; +import com.yxt.anrui.buscenter.api.bussalesorderdeposit.BusSalesOrderDepositDetailsVo; +import com.yxt.anrui.buscenter.api.bussalesorderdiscount.BusSalesOrderDiscountDetailsVo; +import com.yxt.anrui.buscenter.api.bussalesorderinsurance.BusSalesOrderInsuranceDetailsVo; +import com.yxt.anrui.buscenter.api.bussalesordermakeup.BusSalesOrderMakeupDetailsVo; +import com.yxt.anrui.buscenter.api.bussalesordermodel.BusSalesOrderModelDetailsVo; +import com.yxt.anrui.buscenter.api.bussalesorderprice.BusSalesOrderPriceDetailsVo; +import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicleDetailsVo; +import com.yxt.anrui.buscenter.api.bussalesvehicleorder.BusSalesVehicleOrderDetailsVo; import com.yxt.common.core.vo.Vo; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.math.BigDecimal; -import java.util.Date; +import java.util.ArrayList; import java.util.List; /** @@ -100,23 +99,23 @@ public class BusSalesOrderDetailsVo implements Vo { private String type; @ApiModelProperty(value = "主车车型信息") - private BusSalesOrderModelVo busSalesOrderModel; + private BusSalesOrderModelDetailsVo busSalesOrderModel; @ApiModelProperty(value = "现车车辆信息") - private List busSalesOrderVehicleList; + private List busSalesOrderVehicleList = new ArrayList<>(); @ApiModelProperty(value = "采购订单信息") - private List busSalesVehicleOrderList; + private List busSalesVehicleOrderList = new ArrayList<>(); @ApiModelProperty(value = "上装配置信息") - private BusSalesOrderMakeupVo busSalesOrderMakeup; + private BusSalesOrderMakeupDetailsVo busSalesOrderMakeup; @ApiModelProperty(value = "价格信息") - private BusSalesOrderPriceVo busSalesOrderPrice; + private BusSalesOrderPriceDetailsVo busSalesOrderPrice; @ApiModelProperty(value = "主车优惠明细") - private List busSalesOrderDiscountList; + private List busSalesOrderDiscountList = new ArrayList<>(); @ApiModelProperty(value = "保险说明") - private BusSalesOrderInsuranceVo busSalesOrderInsurance; + private BusSalesOrderInsuranceDetailsVo busSalesOrderInsurance; @ApiModelProperty(value = "订金信息") - private BusSalesOrderDepositVo busSalesOrderDeposit; + private BusSalesOrderDepositDetailsVo busSalesOrderDeposit; @ApiModelProperty(value = "虚拟订单和订金关联信息") - private List busDepositFictitiousList; + private List busDepositFictitiousList = new ArrayList<>(); @ApiModelProperty("单台开票金额") private String oneBillMoney; // 单台开票金额 diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderFeign.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderFeign.java index 8286764848..b3db7483d5 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderFeign.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderFeign.java @@ -69,13 +69,14 @@ public interface BusSalesOrderFeign { @ResponseBody public ResultBean delBySids(@RequestBody String[] sids); - @ApiOperation("根据SID获取一条记录") + @ApiOperation("编辑初始化") @GetMapping("/fetchDetailsBySid/{sid}") @ResponseBody public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid); + @ResponseBody @PostMapping("/updateOneBillMoneyByOrderSid") - ResultBean updateOneBillMoneyByOrderSid(@RequestParam("orderSid") String orderSid,@RequestParam("oneBillMoney") String oneBillMoney); + ResultBean updateOneBillMoneyByOrderSid(@RequestParam("orderSid") String orderSid, @RequestParam("oneBillMoney") String oneBillMoney); @ApiOperation("提交") @PostMapping("/submit") diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderdeposit/BusSalesOrderDepositDetailsVo.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderdeposit/BusSalesOrderDepositDetailsVo.java index af7f4a47c1..51e1cd5fd4 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderdeposit/BusSalesOrderDepositDetailsVo.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderdeposit/BusSalesOrderDepositDetailsVo.java @@ -26,13 +26,13 @@ package com.yxt.anrui.buscenter.api.bussalesorderdeposit; +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.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.math.BigDecimal; - /** * Project: anrui-buscenter(业务管理)
* File: BusSalesOrderDepositVo.java
@@ -51,19 +51,20 @@ import java.math.BigDecimal; public class BusSalesOrderDepositDetailsVo implements Vo { private static final long serialVersionUID = -2982858398780933605L; + @ApiModelProperty(value = "sid") private String sid; - - @ApiModelProperty("销售订单sid") - private String salesOrderSid; @ApiModelProperty("单台订金") - private BigDecimal deposit; + @JsonSerialize(using = ToStringSerializer.class) + private String deposit; @ApiModelProperty("订金合计") - private BigDecimal depositAll; + @JsonSerialize(using = ToStringSerializer.class) + private String depositAll; @ApiModelProperty("订金交纳方式") private String depositType; @ApiModelProperty("订金交纳方式key") private String depositTypeKey; @ApiModelProperty("需补交订金") - private BigDecimal makeUpDeposit; + @JsonSerialize(using = ToStringSerializer.class) + private String makeUpDeposit; } \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderdiscount/BusSalesOrderDiscountDetailsVo.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderdiscount/BusSalesOrderDiscountDetailsVo.java index 88a0e95323..fe5aee22e6 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderdiscount/BusSalesOrderDiscountDetailsVo.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderdiscount/BusSalesOrderDiscountDetailsVo.java @@ -49,10 +49,7 @@ import lombok.Data; @ApiModel(value = "销售订单-主车优惠明细 视图数据详情", description = "销售订单-主车优惠明细 视图数据详情") public class BusSalesOrderDiscountDetailsVo implements Vo { - private String sid; - - @ApiModelProperty("销售订单sid") - private String salesOrderSid; + private static final long serialVersionUID = 3473959286223813480L; @ApiModelProperty("销售政策sid") private String salesPolicySid; @ApiModelProperty("优惠名称") diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderinsurance/BusSalesOrderInsuranceDetailsVo.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderinsurance/BusSalesOrderInsuranceDetailsVo.java index e82d666eeb..22e2926cf0 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderinsurance/BusSalesOrderInsuranceDetailsVo.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderinsurance/BusSalesOrderInsuranceDetailsVo.java @@ -26,13 +26,13 @@ package com.yxt.anrui.buscenter.api.bussalesorderinsurance; +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.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.math.BigDecimal; - /** * Project: anrui-buscenter(业务管理)
* File: BusSalesOrderInsuranceVo.java
@@ -51,14 +51,11 @@ import java.math.BigDecimal; public class BusSalesOrderInsuranceDetailsVo implements Vo { private static final long serialVersionUID = -6347871635639885185L; - private String sid; - - @ApiModelProperty("销售订单sid") - private String salesOrderSid; @ApiModelProperty("保险公司名称") private String insuranceName; @ApiModelProperty("单台车保费预估金额") - private BigDecimal insuranceCarMoney; + @JsonSerialize(using = ToStringSerializer.class) + private String insuranceCarMoney; @ApiModelProperty("公司入保期数") private Integer insuranceNum; diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordermakeup/BusSalesOrderMakeupDetailsVo.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordermakeup/BusSalesOrderMakeupDetailsVo.java index 14989fdcaf..8b9571c113 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordermakeup/BusSalesOrderMakeupDetailsVo.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordermakeup/BusSalesOrderMakeupDetailsVo.java @@ -26,13 +26,13 @@ package com.yxt.anrui.buscenter.api.bussalesordermakeup; +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.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.math.BigDecimal; - /** * Project: anrui-buscenter(业务管理)
* File: BusSalesOrderMakeupVo.java
@@ -51,10 +51,6 @@ import java.math.BigDecimal; public class BusSalesOrderMakeupDetailsVo implements Vo { private static final long serialVersionUID = 6043993539109459479L; - private String sid; - - @ApiModelProperty("销售订单sid") - private String salesOrderSid; @ApiModelProperty("上装名称") private String topName; @ApiModelProperty("委改方式") @@ -70,7 +66,8 @@ public class BusSalesOrderMakeupDetailsVo implements Vo { @ApiModelProperty("公告型号") private String announcementModel; @ApiModelProperty("上装价格") - private BigDecimal topPrice; + @JsonSerialize(using = ToStringSerializer.class) + private String topPrice; @ApiModelProperty("更多配置") private String moreConfig; @ApiModelProperty("合同上传") diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordermodel/BusSalesOrderModelDetailsVo.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordermodel/BusSalesOrderModelDetailsVo.java index f68b7c1bff..510eb2a158 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordermodel/BusSalesOrderModelDetailsVo.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordermodel/BusSalesOrderModelDetailsVo.java @@ -26,13 +26,13 @@ package com.yxt.anrui.buscenter.api.bussalesordermodel; +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.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.math.BigDecimal; - /** * Project: anrui-buscenter(业务管理)
* File: BusSalesOrderModelVo.java
@@ -50,10 +50,6 @@ import java.math.BigDecimal; @ApiModel(value = "销售订单-主车车型 视图数据详情", description = "销售订单-主车车型 视图数据详情") public class BusSalesOrderModelDetailsVo implements Vo { - private String sid; - - @ApiModelProperty("销售订单sid") - private String salesOrderSid; @ApiModelProperty("车型sid") private String modelSid; @ApiModelProperty("配置sid") @@ -69,8 +65,10 @@ public class BusSalesOrderModelDetailsVo implements Vo { @ApiModelProperty("特殊配置说明") private String specialConfig; @ApiModelProperty("单台指导价") - private BigDecimal guildPrice; + @JsonSerialize(using = ToStringSerializer.class) + private String guildPrice; @ApiModelProperty("单台成交价") - private BigDecimal finalPrice; + @JsonSerialize(using = ToStringSerializer.class) + private String finalPrice; } \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordermodel/BusSalesOrderModelFeign.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordermodel/BusSalesOrderModelFeign.java index 32f57adb9c..e966d646ee 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordermodel/BusSalesOrderModelFeign.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordermodel/BusSalesOrderModelFeign.java @@ -63,15 +63,9 @@ public interface BusSalesOrderModelFeign { @PostMapping("/save") @ResponseBody public ResultBean save(@RequestBody BusSalesOrderModelDto dto); - + @ApiOperation("根据sid删除记录") @DeleteMapping("/delBySids") @ResponseBody public ResultBean delBySids(@RequestBody String[] sids); - - @ApiOperation("根据SID获取一条记录") - @GetMapping("/fetchDetailsBySid/{sid}") - @ResponseBody - public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid); - } \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordermodel/BusSalesOrderModelFeignFallback.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordermodel/BusSalesOrderModelFeignFallback.java index 1398e0bef3..b0ae13c188 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordermodel/BusSalesOrderModelFeignFallback.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordermodel/BusSalesOrderModelFeignFallback.java @@ -30,8 +30,6 @@ import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; import org.springframework.stereotype.Component; -import java.util.List; - /** * Project: anrui-buscenter(业务管理)
* File: BusSalesOrderModelFeignFallback.java
@@ -63,10 +61,4 @@ public class BusSalesOrderModelFeignFallback implements BusSalesOrderModelFeign public ResultBean delBySids( String[] sids){ return ResultBean.fireFail().setMsg("接口anrui-buscenter/bussalesordermodel/delBySids无法访问"); } - - @Override - public ResultBean fetchDetailsBySid(String sid){ - ResultBean rb = ResultBean.fireFail(); - return rb.setMsg("接口anrui-buscenter/bussalesordermodel/fetchDetailsBySid无法访问"); - } } \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderprice/BusSalesOrderPriceDetailsVo.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderprice/BusSalesOrderPriceDetailsVo.java index 0b686f0f30..7e29606387 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderprice/BusSalesOrderPriceDetailsVo.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderprice/BusSalesOrderPriceDetailsVo.java @@ -26,15 +26,13 @@ package com.yxt.anrui.buscenter.api.bussalesorderprice; -import com.fasterxml.jackson.annotation.JsonFormat; +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.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.math.BigDecimal; -import java.util.Date; - /** * Project: anrui-buscenter(业务管理)
* File: BusSalesOrderPriceVo.java
@@ -53,22 +51,20 @@ import java.util.Date; public class BusSalesOrderPriceDetailsVo implements Vo { private static final long serialVersionUID = 5499940712460451699L; - private String sid; - - @ApiModelProperty("销售订单sid") - private String salesOrderSid; @ApiModelProperty("单台指导价（主车加上装）") - private BigDecimal singleGuildPrice; + @JsonSerialize(using = ToStringSerializer.class) + private String singleGuildPrice; @ApiModelProperty("单台成交价（主车加上装）") - private BigDecimal singleFinalPrice; + @JsonSerialize(using = ToStringSerializer.class) + private String singleFinalPrice; @ApiModelProperty("台数") private Integer quantity; @ApiModelProperty("车价合计") - private BigDecimal priceSum; + @JsonSerialize(using = ToStringSerializer.class) + private String priceSum; @ApiModelProperty("计划提车地点") private String plannedPickUpLocation; - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") @ApiModelProperty("计划提车日期") - private Date plannedPickUpDateStart; + private String plannedPickUpDate; } \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordervehicle/BusSalesOrderVehicleDetailsVo.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordervehicle/BusSalesOrderVehicleDetailsVo.java index 872d31dc21..68f414c0c0 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordervehicle/BusSalesOrderVehicleDetailsVo.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordervehicle/BusSalesOrderVehicleDetailsVo.java @@ -50,10 +50,6 @@ import lombok.Data; public class BusSalesOrderVehicleDetailsVo implements Vo { private static final long serialVersionUID = 7843658414945191854L; - private String sid; - - @ApiModelProperty("销售订单sid") - private String salesOrderSid; @ApiModelProperty("车架号") private String linkNo; @ApiModelProperty("车辆存放地点") diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesvehicleorder/BusSalesVehicleOrderDetailsVo.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesvehicleorder/BusSalesVehicleOrderDetailsVo.java index 3d962e8d00..27fea964d6 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesvehicleorder/BusSalesVehicleOrderDetailsVo.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesvehicleorder/BusSalesVehicleOrderDetailsVo.java @@ -49,15 +49,12 @@ import lombok.Data; @ApiModel(value = "销售订单-采购订单信息 视图数据详情", description = "销售订单-采购订单信息 视图数据详情") public class BusSalesVehicleOrderDetailsVo implements Vo { - private String sid; // sid - - @ApiModelProperty("销售订单sid") - private String salesOrderSid; // 销售订单sid - @ApiModelProperty("采购订单sid") - private String linkSid; // 采购订单sid - @ApiModelProperty("采购订单编号") - private String linkNo; // 采购订单编号 - @ApiModelProperty("采购订单日期") - private String linkText; // 采购订单日期 + private static final long serialVersionUID = -1876792209833287984L; + @ApiModelProperty("采购订单sid") + private String linkSid; + @ApiModelProperty("采购订单编号") + private String linkNo; + @ApiModelProperty("采购订单日期") + private String linkText; } \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdepositfictitious/BusDepositFictitiousMapper.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdepositfictitious/BusDepositFictitiousMapper.java index ed2c710bcd..4bebceb723 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdepositfictitious/BusDepositFictitiousMapper.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdepositfictitious/BusDepositFictitiousMapper.java @@ -29,6 +29,7 @@ import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.toolkit.Constants; +import com.yxt.anrui.buscenter.api.busdepositfictitious.BusDepositFictitiousDetailsVo; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; @@ -53,15 +54,23 @@ import java.util.List; @Mapper public interface BusDepositFictitiousMapper extends BaseMapper { - //@Update("update bus_deposit_fictitious set name=#{msg} where id=#{id}") - //IPage voPage(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); - - IPage selectPageVo(IPage page, @Param(Constants.WRAPPER) Wrapper qw); - - List selectListAllVo(@Param(Constants.WRAPPER) Wrapper qw); - - @Select("select * from bus_deposit_fictitious") - List selectListVo(); + //@Update("update bus_deposit_fictitious set name=#{msg} where id=#{id}") + //IPage voPage(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); + + IPage selectPageVo(IPage page, @Param(Constants.WRAPPER) Wrapper qw); + + List selectListAllVo(@Param(Constants.WRAPPER) Wrapper qw); + + @Select("select * from bus_deposit_fictitious") + List selectListVo(); int deleteByOrderSid(String sid); + + /** + * 根据订金sid查询虚拟订单和订金的信息 + * + * @param sid 订金sid + * @return + */ + List detailsList(String sid); } \ 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 d5b16f0284..26d060b08f 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 @@ -24,4 +24,14 @@ from bus_deposit_fictitious where 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 0a40a36f16..91c2cae04a 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,13 @@ public class BusDepositFictitiousService extends MybatisBaseService detailsList(String sid) { + return baseMapper.detailsList(sid); + } } \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderRest.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderRest.java index 0e96b26199..deeb70f63e 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderRest.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderRest.java @@ -32,6 +32,7 @@ import com.yxt.common.core.vo.PagerVo; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.*; /** @@ -48,7 +49,7 @@ import org.springframework.web.bind.annotation.*; * @since 1.0 */ @Api(tags = "销售订单主表") -@RestController("com.yxt.anrui.buscenter.biz.bussalesorder.BusSalesOrderRest") +@Controller @RequestMapping("v1/bussalesorder") public class BusSalesOrderRest implements BusSalesOrderFeign { @@ -84,17 +85,21 @@ public class BusSalesOrderRest implements BusSalesOrderFeign { return rb.success(); } + /** + * 销售订单初始化 + * + * @param sid 销售订单sid + * @return + */ @Override - @ApiOperation("根据SID获取一条记录") + @ApiOperation("编辑初始化") @GetMapping("/fetchDetailsBySid/{sid}") public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid) { - ResultBean rb = ResultBean.fireFail(); - BusSalesOrderDetailsVo vo = busSalesOrderService.fetchDetailsVoBySid(sid); - return rb.success().setData(vo); + return busSalesOrderService.fetchDetailsVoBySid(sid); } @Override - public ResultBean updateOneBillMoneyByOrderSid(String orderSid,String oneBillMoney) { + public ResultBean updateOneBillMoneyByOrderSid(String orderSid, String oneBillMoney) { ResultBean rb = ResultBean.fireFail(); int i = busSalesOrderService.updateOneBillMoneyByOrderSid(orderSid, oneBillMoney); return rb.success().setMsg("操作成功"); diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java index a2c3e71cbe..a4963f876e 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java @@ -29,15 +29,24 @@ import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.convert.Convert; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.yxt.anrui.buscenter.api.busdepositfictitious.BusDepositFictitiousDetailsVo; import com.yxt.anrui.buscenter.api.busdepositfictitious.BusDepositFictitiousDto; import com.yxt.anrui.buscenter.api.bussalesorder.*; +import com.yxt.anrui.buscenter.api.bussalesorderdeposit.BusSalesOrderDepositDetailsVo; import com.yxt.anrui.buscenter.api.bussalesorderdeposit.BusSalesOrderDepositDto; +import com.yxt.anrui.buscenter.api.bussalesorderdiscount.BusSalesOrderDiscountDetailsVo; import com.yxt.anrui.buscenter.api.bussalesorderdiscount.BusSalesOrderDiscountDto; +import com.yxt.anrui.buscenter.api.bussalesorderinsurance.BusSalesOrderInsuranceDetailsVo; import com.yxt.anrui.buscenter.api.bussalesorderinsurance.BusSalesOrderInsuranceDto; +import com.yxt.anrui.buscenter.api.bussalesordermakeup.BusSalesOrderMakeupDetailsVo; import com.yxt.anrui.buscenter.api.bussalesordermakeup.BusSalesOrderMakeupDto; +import com.yxt.anrui.buscenter.api.bussalesordermodel.BusSalesOrderModelDetailsVo; import com.yxt.anrui.buscenter.api.bussalesordermodel.BusSalesOrderModelDto; +import com.yxt.anrui.buscenter.api.bussalesorderprice.BusSalesOrderPriceDetailsVo; import com.yxt.anrui.buscenter.api.bussalesorderprice.BusSalesOrderPriceDto; +import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicleDetailsVo; import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicleDto; +import com.yxt.anrui.buscenter.api.bussalesvehicleorder.BusSalesVehicleOrderDetailsVo; import com.yxt.anrui.buscenter.api.bussalesvehicleorder.BusSalesVehicleOrderDto; import com.yxt.anrui.buscenter.biz.busdepositfictitious.BusDepositFictitiousService; import com.yxt.anrui.buscenter.biz.bussalesorderdeposit.BusSalesOrderDepositService; @@ -164,11 +173,75 @@ public class BusSalesOrderService extends MybatisBaseService fetchDetailsVoBySid(String sid) { + ResultBean rb = ResultBean.fireFail(); BusSalesOrder entity = fetchBySid(sid); + if (entity == null) { + return rb.setMsg("该销售订单不存在"); + } BusSalesOrderDetailsVo vo = new BusSalesOrderDetailsVo(); BeanUtil.copyProperties(entity, vo); - return vo; + //查询主车车型信息 + BusSalesOrderModelDetailsVo busSalesOrderModelDetailsVo = busSalesOrderModelService.details(entity.getSid()); + if (busSalesOrderModelDetailsVo != null) { + vo.setBusSalesOrderModel(busSalesOrderModelDetailsVo); + } + //查询现车车辆 + if ("1".equals(entity.getType())) { + List busSalesOrderVehicleListVoList = busSalesOrderVehicleService.detailsList(entity.getSid()); + if (busSalesOrderVehicleListVoList.size() != 0) { + vo.setBusSalesOrderVehicleList(busSalesOrderVehicleListVoList); + } + } else if ("2".equals(entity.getType())) { + //查询采购订单 + List busSalesVehicleOrderDetailsVoList = busSalesVehicleOrderService.detailsList(entity.getSid()); + if (busSalesVehicleOrderDetailsVoList.size() != 0) { + vo.setBusSalesVehicleOrderList(busSalesVehicleOrderDetailsVoList); + } + } + //查询上装配置 + if ("1".equals(entity.getIsTop())) { + BusSalesOrderMakeupDetailsVo busSalesOrderMakeupDetailsVo = busSalesOrderMakeupService.details(entity.getSid()); + if (busSalesOrderMakeupDetailsVo != null) { + vo.setBusSalesOrderMakeup(busSalesOrderMakeupDetailsVo); + } + } + //查询价格信息 + BusSalesOrderPriceDetailsVo busSalesOrderPriceDetailsVo = busSalesOrderPriceService.details(entity.getSid()); + if (busSalesOrderPriceDetailsVo != null) { + vo.setBusSalesOrderPrice(busSalesOrderPriceDetailsVo); + } + //查询主车优惠明细 + List busSalesOrderDiscountDetailsVoList = busSalesOrderDiscountService.detailsList(entity.getSid()); + if (busSalesOrderDiscountDetailsVoList.size() != 0) { + vo.setBusSalesOrderDiscountList(busSalesOrderDiscountDetailsVoList); + } + //查询保险说明 + if ("1".equals(entity.getIsInsurance())) { + BusSalesOrderInsuranceDetailsVo busSalesOrderInsuranceDetailsVo = busSalesOrderInsuranceService.details(entity.getSid()); + if (busSalesOrderInsuranceDetailsVo != null) { + vo.setBusSalesOrderInsurance(busSalesOrderInsuranceDetailsVo); + } + } + //查询订金信息 + BusSalesOrderDepositDetailsVo busSalesOrderDepositDetailsVo = busSalesOrderDepositService.details(entity.getSid()); + if (busSalesOrderDepositDetailsVo != null) { + vo.setBusSalesOrderDeposit(busSalesOrderDepositDetailsVo); + if ("02".equals(busSalesOrderDepositDetailsVo.getDepositTypeKey())) { + //查询虚拟订单和订金关联信息 + List busDepositFictitiousDetailsVoList = busDepositFictitiousService.detailsList(busSalesOrderDepositDetailsVo.getSid()); + if (busDepositFictitiousDetailsVoList.size() != 0) { + vo.setBusDepositFictitiousList(busDepositFictitiousDetailsVoList); + } + } + } + return rb.success().setData(vo); } /** @@ -466,7 +539,7 @@ public class BusSalesOrderService extends MybatisBaseService { - //@Update("update bus_sales_order_deposit set name=#{msg} where id=#{id}") - //IPage voPage(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); - - IPage selectPageVo(IPage page, @Param(Constants.WRAPPER) Wrapper qw); - - List selectListAllVo(@Param(Constants.WRAPPER) Wrapper qw); - - @Select("select * from bus_sales_order_deposit") - List selectListVo(); + //@Update("update bus_sales_order_deposit set name=#{msg} where id=#{id}") + //IPage voPage(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); + + IPage selectPageVo(IPage page, @Param(Constants.WRAPPER) Wrapper qw); + + List selectListAllVo(@Param(Constants.WRAPPER) Wrapper qw); + + @Select("select * from bus_sales_order_deposit") + List selectListVo(); BusSalesOrderDeposit selectByOrderSid(String sid); + + /** + * 根据销售订单sid查询订金信息 + * + * @param sid 销售订单sid + * @return + */ + BusSalesOrderDepositDetailsVo details(String sid); } \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderdeposit/BusSalesOrderDepositMapper.xml b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderdeposit/BusSalesOrderDepositMapper.xml index e859cc6509..3467ae3343 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderdeposit/BusSalesOrderDepositMapper.xml +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderdeposit/BusSalesOrderDepositMapper.xml @@ -24,4 +24,15 @@ from bus_sales_order_discount where salesOrderSid = #{sid} + + \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderdeposit/BusSalesOrderDepositService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderdeposit/BusSalesOrderDepositService.java index 2f38f77372..caec61a587 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderdeposit/BusSalesOrderDepositService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderdeposit/BusSalesOrderDepositService.java @@ -94,4 +94,14 @@ public class BusSalesOrderDepositService extends MybatisBaseService { - //@Update("update bus_sales_order_discount set name=#{msg} where id=#{id}") - //IPage voPage(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); - - IPage selectPageVo(IPage page, @Param(Constants.WRAPPER) Wrapper qw); - - List selectListAllVo(@Param(Constants.WRAPPER) Wrapper qw); - - @Select("select * from bus_sales_order_discount") - List selectListVo(); + //@Update("update bus_sales_order_discount set name=#{msg} where id=#{id}") + //IPage voPage(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); + + IPage selectPageVo(IPage page, @Param(Constants.WRAPPER) Wrapper qw); + + List selectListAllVo(@Param(Constants.WRAPPER) Wrapper qw); + + @Select("select * from bus_sales_order_discount") + List selectListVo(); int deleteList(String sid); + + /** + * 根据销售订单sid查询主车优惠明细 + * + * @param sid 销售订单sid + * @return + */ + List detailsList(String sid); } \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderdiscount/BusSalesOrderDiscountMapper.xml b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderdiscount/BusSalesOrderDiscountMapper.xml index 71e83bd273..a42ef59d32 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderdiscount/BusSalesOrderDiscountMapper.xml +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderdiscount/BusSalesOrderDiscountMapper.xml @@ -24,4 +24,16 @@ from bus_sales_order_discount where salesOrderSid = #{sid} + + \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderdiscount/BusSalesOrderDiscountService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderdiscount/BusSalesOrderDiscountService.java index 3778f0e509..f8cb0eb1a7 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderdiscount/BusSalesOrderDiscountService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderdiscount/BusSalesOrderDiscountService.java @@ -90,4 +90,14 @@ public class BusSalesOrderDiscountService extends MybatisBaseService detailsList(String sid) { + return baseMapper.detailsList(sid); + } } \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderinsurance/BusSalesOrderInsuranceMapper.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderinsurance/BusSalesOrderInsuranceMapper.java index 0afa464d46..67c0a8f7ba 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderinsurance/BusSalesOrderInsuranceMapper.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderinsurance/BusSalesOrderInsuranceMapper.java @@ -29,6 +29,7 @@ import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.toolkit.Constants; +import com.yxt.anrui.buscenter.api.bussalesorderinsurance.BusSalesOrderInsuranceDetailsVo; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; @@ -64,4 +65,12 @@ public interface BusSalesOrderInsuranceMapper extends BaseMapper selectListVo(); int deleteByOrderSid(String sid); + + /** + * 根据销售订单sid查询保险信息 + * + * @param sid 销售订单sid + * @return + */ + BusSalesOrderInsuranceDetailsVo details(String sid); } \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderinsurance/BusSalesOrderInsuranceMapper.xml b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderinsurance/BusSalesOrderInsuranceMapper.xml index a2b54ed16c..422f743036 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderinsurance/BusSalesOrderInsuranceMapper.xml +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderinsurance/BusSalesOrderInsuranceMapper.xml @@ -25,4 +25,13 @@ from bus_sales_order_insurance where salesOrderSid = #{sid} + + \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderinsurance/BusSalesOrderInsuranceService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderinsurance/BusSalesOrderInsuranceService.java index 72eebc2c5c..f6e2282012 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderinsurance/BusSalesOrderInsuranceService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderinsurance/BusSalesOrderInsuranceService.java @@ -82,4 +82,14 @@ public class BusSalesOrderInsuranceService extends MybatisBaseService { - //@Update("update bus_sales_order_makeup set name=#{msg} where id=#{id}") - //IPage voPage(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); - - IPage selectPageVo(IPage page, @Param(Constants.WRAPPER) Wrapper qw); - - List selectListAllVo(@Param(Constants.WRAPPER) Wrapper qw); - - @Select("select * from bus_sales_order_makeup") - List selectListVo(); + //@Update("update bus_sales_order_makeup set name=#{msg} where id=#{id}") + //IPage voPage(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); + + IPage selectPageVo(IPage page, @Param(Constants.WRAPPER) Wrapper qw); + + List selectListAllVo(@Param(Constants.WRAPPER) Wrapper qw); + + @Select("select * from bus_sales_order_makeup") + List selectListVo(); int deleteBySalesOrderSid(String sid); + + /** + * 根据销售订单sid查询销售订单的上装配置 + * + * @param sid 销售订单sid + * @return + */ + BusSalesOrderMakeupDetailsVo details(String sid); } \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordermakeup/BusSalesOrderMakeupMapper.xml b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordermakeup/BusSalesOrderMakeupMapper.xml index b36ff863f7..b808ab3c82 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordermakeup/BusSalesOrderMakeupMapper.xml +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordermakeup/BusSalesOrderMakeupMapper.xml @@ -24,4 +24,11 @@ from bus_sales_order_makeup where salesOrderSid = #{sid} + + \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordermakeup/BusSalesOrderMakeupService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordermakeup/BusSalesOrderMakeupService.java index 4d9eaf18c4..309d56336f 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordermakeup/BusSalesOrderMakeupService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordermakeup/BusSalesOrderMakeupService.java @@ -88,4 +88,8 @@ public class BusSalesOrderMakeupService extends MybatisBaseService { - //@Update("update bus_sales_order_model set name=#{msg} where id=#{id}") - //IPage voPage(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); - - IPage selectPageVo(IPage page, @Param(Constants.WRAPPER) Wrapper qw); - - List selectListAllVo(@Param(Constants.WRAPPER) Wrapper qw); - - @Select("select * from bus_sales_order_model") - List selectListVo(); + //@Update("update bus_sales_order_model set name=#{msg} where id=#{id}") + //IPage voPage(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); + + IPage selectPageVo(IPage page, @Param(Constants.WRAPPER) Wrapper qw); + + List selectListAllVo(@Param(Constants.WRAPPER) Wrapper qw); + + @Select("select * from bus_sales_order_model") + List selectListVo(); BusSalesOrderModel selectBySalesSid(String sid); + + /** + * 根据销售订单sid查询销售订单主车车型信息 + * + * @param sid 销售订单sid + * @return + */ + BusSalesOrderModelDetailsVo details(String sid); } \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordermodel/BusSalesOrderModelMapper.xml b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordermodel/BusSalesOrderModelMapper.xml index 0b1bb316e7..febebbcd3a 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordermodel/BusSalesOrderModelMapper.xml +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordermodel/BusSalesOrderModelMapper.xml @@ -24,4 +24,18 @@ from bus_sales_order_model where salesOrderSid = #{sid} + + \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordermodel/BusSalesOrderModelRest.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordermodel/BusSalesOrderModelRest.java index 7e3ef16cb4..5be25de5f6 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordermodel/BusSalesOrderModelRest.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordermodel/BusSalesOrderModelRest.java @@ -81,13 +81,4 @@ public class BusSalesOrderModelRest implements BusSalesOrderModelFeign { busSalesOrderModelService.delBySids(sids); return rb.success(); } - - @Override - @ApiOperation("根据SID获取一条记录") - @GetMapping("/fetchDetailsBySid/{sid}") - public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid){ - ResultBean rb = ResultBean.fireFail(); - BusSalesOrderModelDetailsVo vo = busSalesOrderModelService.fetchDetailsVoBySid(sid); - return rb.success().setData(vo); - } } diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordermodel/BusSalesOrderModelService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordermodel/BusSalesOrderModelService.java index 17977c72f5..0a0b8d501f 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordermodel/BusSalesOrderModelService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordermodel/BusSalesOrderModelService.java @@ -94,4 +94,14 @@ public class BusSalesOrderModelService extends MybatisBaseService @Select("select singleFinalPrice from bus_sales_order_price where salesOrderSid = #{busSid}") String getPriceByOrderSid(String busSid); + + /** + * 根据销售订单sid查询价格信息 + * + * @param sid 销售订单sid + * @return + */ + BusSalesOrderPriceDetailsVo details(String sid); } \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderprice/BusSalesOrderPriceMapper.xml b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderprice/BusSalesOrderPriceMapper.xml index 9c34aa08a7..34b1f17a39 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderprice/BusSalesOrderPriceMapper.xml +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderprice/BusSalesOrderPriceMapper.xml @@ -24,4 +24,15 @@ from bus_sales_order_price where salesOrderSid = #{sid} + + \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderprice/BusSalesOrderPriceService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderprice/BusSalesOrderPriceService.java index 4d615dc537..097ed8ee21 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderprice/BusSalesOrderPriceService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderprice/BusSalesOrderPriceService.java @@ -88,7 +88,7 @@ public class BusSalesOrderPriceService extends MybatisBaseService { - //@Update("update bus_sales_order_vehicle set name=#{msg} where id=#{id}") - //IPage voPage(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); - - IPage selectPageVo(IPage page, @Param(Constants.WRAPPER) Wrapper qw); - - List selectListAllVo(@Param(Constants.WRAPPER) Wrapper qw); - - @Select("select * from bus_sales_order_vehicle") - List selectListVo(); + //@Update("update bus_sales_order_vehicle set name=#{msg} where id=#{id}") + //IPage voPage(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); + + IPage selectPageVo(IPage page, @Param(Constants.WRAPPER) Wrapper qw); + + List selectListAllVo(@Param(Constants.WRAPPER) Wrapper qw); + + @Select("select * from bus_sales_order_vehicle") + List selectListVo(); List selectVehicleList(String sid); - int deleteBySalesOrderSid(String sid); + int deleteBySalesOrderSid(String sid); + + /** + * 根据销售订单sid查询现车车辆 + * + * @param sid 销售订单sid + * @return + */ + List detailsList(String sid); } \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleMapper.xml b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleMapper.xml index 69d451a786..19b696b541 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleMapper.xml +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleMapper.xml @@ -30,4 +30,13 @@ from bus_sales_order_vehicle where salesOrderSid = #{sid} + + \ No newline at end of file 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 7b0f862ab4..19ac1e85df 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 @@ -82,16 +82,20 @@ public class BusSalesOrderVehicleService extends MybatisBaseService list, String sid) { - List stringList = baseMapper.selectVehicleList(sid) ; - if (stringList.size()>0){ + List stringList = baseMapper.selectVehicleList(sid); + if (stringList.size() > 0) { //删除 baseMapper.deleteBySalesOrderSid(sid); - for (int i = 0; i detailsList(String sid) { + return baseMapper.detailsList(sid); + } } \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesvehicleorder/BusSalesVehicleOrderMapper.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesvehicleorder/BusSalesVehicleOrderMapper.java index 9df644034f..80240512d8 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesvehicleorder/BusSalesVehicleOrderMapper.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesvehicleorder/BusSalesVehicleOrderMapper.java @@ -29,6 +29,7 @@ import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.toolkit.Constants; +import com.yxt.anrui.buscenter.api.bussalesvehicleorder.BusSalesVehicleOrderDetailsVo; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; @@ -53,17 +54,25 @@ import java.util.List; @Mapper public interface BusSalesVehicleOrderMapper extends BaseMapper { - //@Update("update bus_sales_vehicle_order set name=#{msg} where id=#{id}") - //IPage voPage(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); + //@Update("update bus_sales_vehicle_order set name=#{msg} where id=#{id}") + //IPage voPage(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); - IPage selectPageVo(IPage page, @Param(Constants.WRAPPER) Wrapper qw); + IPage selectPageVo(IPage page, @Param(Constants.WRAPPER) Wrapper qw); - List selectListAllVo(@Param(Constants.WRAPPER) Wrapper qw); + List selectListAllVo(@Param(Constants.WRAPPER) Wrapper qw); - @Select("select * from bus_sales_vehicle_order") - List selectListVo(); + @Select("select * from bus_sales_vehicle_order") + List selectListVo(); List selectVehicleList(String sid); - int deleteBySalesOrderSid(@Param("sid") String sid); + int deleteBySalesOrderSid(@Param("sid") String sid); + + /** + * 根据销售订单sid查询采购订单 + * + * @param sid 销售订单sid + * @return + */ + List detailsList(String sid); } \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesvehicleorder/BusSalesVehicleOrderMapper.xml b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesvehicleorder/BusSalesVehicleOrderMapper.xml index 73b3aa69d1..3e15d19bec 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesvehicleorder/BusSalesVehicleOrderMapper.xml +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesvehicleorder/BusSalesVehicleOrderMapper.xml @@ -30,4 +30,13 @@ from bus_sales_vehicle_order where salesOrderSid = #{sid} + + \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesvehicleorder/BusSalesVehicleOrderService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesvehicleorder/BusSalesVehicleOrderService.java index 2ff39e7449..dd5ca4f7ee 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesvehicleorder/BusSalesVehicleOrderService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesvehicleorder/BusSalesVehicleOrderService.java @@ -82,16 +82,26 @@ public class BusSalesVehicleOrderService extends MybatisBaseService vehicleList, String sid) { - List stringList = baseMapper.selectVehicleList(sid) ; - if (stringList.size()>0){ + List stringList = baseMapper.selectVehicleList(sid); + if (stringList.size() > 0) { //删除 baseMapper.deleteBySalesOrderSid(sid); - for (int i = 0; i detailsList(String sid) { + return baseMapper.detailsList(sid); + } } \ No newline at end of file