From 301b6e216e2368ca4c33226976a3c69dc4e947ad Mon Sep 17 00:00:00 2001 From: dimengzhe <251008545@qq.com> Date: Thu, 5 May 2022 15:50:20 +0800 Subject: [PATCH] =?UTF-8?q?=E9=94=80=E5=94=AE=E8=AE=A2=E5=8D=95=E4=BF=9D?= =?UTF-8?q?=E5=AD=98=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BusDepositFictitiousDto.java | 6 +-- .../bussalesorder/BusSalesOrderAllDto.java | 43 ++++++++++++++++++- .../api/bussalesorder/BusSalesOrderDto.java | 42 +----------------- .../bussalesorder/BusSalesOrderService.java | 12 +++--- 4 files changed, 49 insertions(+), 54 deletions(-) diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdepositfictitious/BusDepositFictitiousDto.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdepositfictitious/BusDepositFictitiousDto.java index 0527a432be..8a1dd3a0e7 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdepositfictitious/BusDepositFictitiousDto.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdepositfictitious/BusDepositFictitiousDto.java @@ -31,8 +31,6 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.math.BigDecimal; - /** * Project: anrui-buscenter(业务管理)
* File: BusDepositFictitiousDto.java
@@ -56,9 +54,9 @@ public class BusDepositFictitiousDto implements Dto { @ApiModelProperty("订金信息sid") private String depositSid; @ApiModelProperty("订金剩余金额") - private BigDecimal depositPrice; + private String depositPrice; @ApiModelProperty("本次结转金额") - private BigDecimal price; + private String price; @ApiModelProperty("款项支付委托书") private String payPath; diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderAllDto.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderAllDto.java index 7ffd9bf00b..a75a549989 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderAllDto.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderAllDto.java @@ -1,5 +1,6 @@ package com.yxt.anrui.buscenter.api.bussalesorder; +import com.fasterxml.jackson.annotation.JsonFormat; import com.yxt.anrui.buscenter.api.busdepositfictitious.BusDepositFictitiousDto; import com.yxt.anrui.buscenter.api.bussalesorderdeposit.BusSalesOrderDepositDto; import com.yxt.anrui.buscenter.api.bussalesorderdiscount.BusSalesOrderDiscountDto; @@ -13,6 +14,7 @@ import com.yxt.common.core.dto.Dto; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.util.Date; import java.util.List; /** @@ -25,8 +27,45 @@ public class BusSalesOrderAllDto implements Dto { private static final long serialVersionUID = -734571880207951780L; private String sid; - @ApiModelProperty(value = "销售定单主表信息") - private BusSalesOrderDto busSalesOrder; + //===============================销售订单主表信息 + @ApiModelProperty("销售部门sid") + private String orgSid; + @ApiModelProperty("销售部门") + private String orgName; + @ApiModelProperty("客户名称") + private String customerName; + @ApiModelProperty("客户sid") + private String customerSid; + @ApiModelProperty("销售专员") + private String staffName; + @ApiModelProperty("销售专员sid") + private String staffSid; + @ApiModelProperty("客户联系电话") + private String mobile; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @ApiModelProperty("制单日期") + private Date createDate; + @ApiModelProperty("开票类型key") + private String billingTypeKey; + @ApiModelProperty("开票类型value") + private String billingType; + @ApiModelProperty("付款方式key") + private String payTypeKey; + @ApiModelProperty("付款方式value") + private String payType; + @ApiModelProperty("挂靠公司sid") + private String affiliatedCompanySid; + @ApiModelProperty("挂靠公司名称") + private String affiliatedCompany; + @ApiModelProperty("公司是否入保") + private String isInsurance; + @ApiModelProperty("补充说明") + private String notes; + @ApiModelProperty("是否包含上装") + private String isTop; + @ApiModelProperty("销售订单车辆类型：1现车、2订单、3排产") + private String type; + //============================== @ApiModelProperty(value = "主车车型信息") private BusSalesOrderModelDto busSalesOrderModel; @ApiModelProperty(value = "现车车辆信息") diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderDto.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderDto.java index ba1c22c551..c01cd5978f 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderDto.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderDto.java @@ -26,14 +26,10 @@ package com.yxt.anrui.buscenter.api.bussalesorder; -import com.fasterxml.jackson.annotation.JsonFormat; import com.yxt.common.core.dto.Dto; import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Date; - /** * Project: anrui-buscenter(业务管理)
* File: BusSalesOrderDto.java
@@ -53,43 +49,7 @@ public class BusSalesOrderDto implements Dto { private static final long serialVersionUID = 4012251859977808326L; - @ApiModelProperty("销售部门sid") - private String orgSid; - @ApiModelProperty("销售部门") - private String orgName; - @ApiModelProperty("客户名称") - private String customerName; - @ApiModelProperty("客户sid") - private String customerSid; - @ApiModelProperty("销售专员") - private String staffName; - @ApiModelProperty("销售专员sid") - private String staffSid; - @ApiModelProperty("客户联系电话") - private String mobile; - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") - @ApiModelProperty("制单日期") - private Date createDate; - @ApiModelProperty("开票类型key") - private String billingTypeKey; - @ApiModelProperty("开票类型value") - private String billingType; - @ApiModelProperty("付款方式key") - private String payTypeKey; - @ApiModelProperty("付款方式value") - private String payType; - @ApiModelProperty("挂靠公司sid") - private String affiliatedCompanySid; - @ApiModelProperty("挂靠公司名称") - private String affiliatedCompany; - @ApiModelProperty("公司是否入保") - private String isInsurance; - @ApiModelProperty("补充说明") - private String notes; - @ApiModelProperty("是否包含上装") - private String isTop; - @ApiModelProperty("销售订单车辆类型：1现车、2订单、3排产") - private String type; + 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 b4b9e83f06..a91a49d6d7 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 @@ -171,8 +171,6 @@ public class BusSalesOrderService extends MybatisBaseService busDepositFictitiousDtoList = dto.getBusDepositFictitiousList(); BusSalesOrder busSalesOrder = new BusSalesOrder(); - BeanUtil.copyProperties(busSalesOrderDto, busSalesOrder, "sid"); + BeanUtil.copyProperties(dto, busSalesOrder, "sid"); //主车车型信息保存 busSalesOrderModelService.saveModel(busSalesOrderModelDto, dto.getSid()); - if ("1".equals(busSalesOrderDto.getType())) { + if ("1".equals(dto.getType())) { //现车车辆信息 busSalesOrderVehicleService.saveVehicle(list, dto.getSid()); - } else if ("2".equals(busSalesOrderDto.getType())) { + } else if ("2".equals(dto.getType())) { //采购订单信息 busSalesVehicleOrderService.saveOrder(vehicleList, dto.getSid()); } //是否含有上装信息 - String isTop = busSalesOrderDto.getIsTop(); + String isTop = dto.getIsTop(); if ("1".equals(isTop)) { busSalesOrderMakeupService.saveMake(busSalesOrderMakeupDto, dto.getSid()); } @@ -212,7 +210,7 @@ public class BusSalesOrderService extends MybatisBaseService