From fa55cda60580a296512e6135af9dc9334bb7a482 Mon Sep 17 00:00:00 2001 From: dimengzhe <251008545@qq.com> Date: Mon, 19 Sep 2022 14:53:33 +0800 Subject: [PATCH] =?UTF-8?q?pc=E7=AB=AF=E6=9C=AA=E5=94=AE=E4=B9=B0=E6=96=AD?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../basemanufacturerbank/BaseManActualVo.java | 25 ++++++ .../BaseManufacturerBankFeign.java | 5 ++ .../BaseManufacturerBankFeignFallback.java | 7 ++ .../api/basevehicle/BaseVehicleActualVo.java | 8 ++ .../BaseVehicleActualDetails.java | 12 +++ .../BaseVehicleActualDetailsDto.java | 13 +++ .../BaseVehicleActualDetailsVo.java | 14 ++++ .../BaseVehicleActualPay.java | 35 ++++++++ .../BaseVehicleActualPayDto.java | 31 +++++++ .../BaseVehicleActualPayFeign.java | 17 ++++ .../BaseVehicleActualPayFeignFallback.java | 12 +++ .../BaseVehicleActualPayVo.java | 31 +++++++ .../BaseVehicleActualSales.java | 8 ++ .../BaseVehicleActualSalesDetailsVo.java | 10 +++ .../BaseVehicleActualSalesDto.java | 10 +++ .../base/common/enums/DictCommonEnum.java | 17 ++++ .../BaseManufacturerBankMapper.java | 3 + .../BaseManufacturerBankMapper.xml | 16 +++- .../BaseManufacturerBankRest.java | 13 ++- .../BaseManufacturerBankService.java | 5 ++ .../biz/basevehicle/BaseVehicleMapper.xml | 7 +- .../biz/basevehicle/BaseVehicleService.java | 1 + .../BaseVehicleActualDetailsMapper.xml | 3 +- .../BaseVehicleActualPayMapper.java | 24 ++++++ .../BaseVehicleActualPayMapper.xml | 34 ++++++++ .../BaseVehicleActualPayRest.java | 16 ++++ .../BaseVehicleActualPayService.java | 56 +++++++++++++ .../BaseVehicleActualSalesMapper.xml | 5 +- .../BaseVehicleActualSalesService.java | 81 +++++++++++++------ doc/databases/base_tables.sql | 31 ++++++- 30 files changed, 516 insertions(+), 34 deletions(-) create mode 100644 anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturerbank/BaseManActualVo.java create mode 100644 anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleactualpay/BaseVehicleActualPay.java create mode 100644 anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleactualpay/BaseVehicleActualPayDto.java create mode 100644 anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleactualpay/BaseVehicleActualPayFeign.java create mode 100644 anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleactualpay/BaseVehicleActualPayFeignFallback.java create mode 100644 anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleactualpay/BaseVehicleActualPayVo.java create mode 100644 anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleactualpay/BaseVehicleActualPayMapper.java create mode 100644 anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleactualpay/BaseVehicleActualPayMapper.xml create mode 100644 anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleactualpay/BaseVehicleActualPayRest.java create mode 100644 anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleactualpay/BaseVehicleActualPayService.java diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturerbank/BaseManActualVo.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturerbank/BaseManActualVo.java new file mode 100644 index 0000000000..f0afcfc6d9 --- /dev/null +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturerbank/BaseManActualVo.java @@ -0,0 +1,25 @@ +package com.yxt.anrui.base.api.basemanufacturerbank; + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Author dimengzhe + * @Date 2022/9/19 14:07 + * @Description + */ +@Data +public class BaseManActualVo implements Vo { + private static final long serialVersionUID = -8356553970394175402L; + @ApiModelProperty("厂家销售通路") + private String accountName; + + @ApiModelProperty("开户行") + private String depositBank; + + @ApiModelProperty("收款银行账号") + private String bankAccount; + + +} diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturerbank/BaseManufacturerBankFeign.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturerbank/BaseManufacturerBankFeign.java index 0796dabaae..9a4d143791 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturerbank/BaseManufacturerBankFeign.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturerbank/BaseManufacturerBankFeign.java @@ -10,6 +10,7 @@ import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import javax.validation.Valid; +import java.util.List; /** * Project: anrui-base(安瑞基础信息模块)
@@ -46,4 +47,8 @@ public interface BaseManufacturerBankFeign { @ApiOperation("查看及修改回显（已测试）") @GetMapping("/selectDetails/{sid}") public ResultBean selectDetails(@PathVariable("sid") String sid); + + @ApiOperation("未售买断获取厂家销售通路") + @GetMapping("/actualList/{useOrgSid}") + ResultBean> actualList(@PathVariable("useOrgSid") String useOrgSid); } \ No newline at end of file diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturerbank/BaseManufacturerBankFeignFallback.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturerbank/BaseManufacturerBankFeignFallback.java index 5be9cdeee9..977f815ad6 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturerbank/BaseManufacturerBankFeignFallback.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturerbank/BaseManufacturerBankFeignFallback.java @@ -3,6 +3,8 @@ package com.yxt.anrui.base.api.basemanufacturerbank; import com.yxt.common.core.result.ResultBean; import org.springframework.stereotype.Component; +import java.util.List; + /** * Project: anrui-base(安瑞基础信息模块)
* File: BaseManufacturerBankFeignFallback.java
@@ -28,4 +30,9 @@ public class BaseManufacturerBankFeignFallback implements BaseManufacturerBankFe public ResultBean selectDetails(String sid) { return null; } + + @Override + public ResultBean> actualList(String useOrgSid) { + return null; + } } \ No newline at end of file diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleActualVo.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleActualVo.java index 562bbb9fd3..4e30285a37 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleActualVo.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleActualVo.java @@ -51,4 +51,12 @@ public class BaseVehicleActualVo implements Vo { private String insideCode; @ApiModelProperty("库龄") private int dayNum; + @ApiModelProperty("版本") + private String vehicleVersionValue; + @ApiModelProperty("燃料") + private String fuelTypeValue; + @ApiModelProperty("变速箱") + private String gearboxTypeValue; + @ApiModelProperty("排放标准") + private String emissionStandardValue; } diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleactualdetails/BaseVehicleActualDetails.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleactualdetails/BaseVehicleActualDetails.java index fd4392a95f..175e1289d9 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleactualdetails/BaseVehicleActualDetails.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleactualdetails/BaseVehicleActualDetails.java @@ -4,6 +4,7 @@ import com.yxt.common.core.domain.BaseEntity; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.math.BigDecimal; import java.util.Date; /** @@ -31,4 +32,15 @@ public class BaseVehicleActualDetails extends BaseEntity { private int dayNum; @ApiModelProperty("车辆数量") private int vehicleNum; + + @ApiModelProperty("版本") + private String vehicleVersionValue; + @ApiModelProperty("燃料") + private String fuelTypeValue; + @ApiModelProperty("变速箱") + private String gearboxTypeValue; + @ApiModelProperty("排放标准") + private String emissionStandardValue; + @ApiModelProperty("买断金额") + private BigDecimal actualMoney; } diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleactualdetails/BaseVehicleActualDetailsDto.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleactualdetails/BaseVehicleActualDetailsDto.java index 61c124aa44..4ccf56aa45 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleactualdetails/BaseVehicleActualDetailsDto.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleactualdetails/BaseVehicleActualDetailsDto.java @@ -4,6 +4,7 @@ import com.yxt.common.core.dto.Dto; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.math.BigDecimal; import java.util.Date; /** @@ -31,4 +32,16 @@ public class BaseVehicleActualDetailsDto implements Dto { @ApiModelProperty("车辆数量") private int vehicleNum; + @ApiModelProperty("版本") + private String vehicleVersionValue; + @ApiModelProperty("燃料") + private String fuelTypeValue; + @ApiModelProperty("变速箱") + private String gearboxTypeValue; + @ApiModelProperty("排放标准") + private String emissionStandardValue; + + @ApiModelProperty("买断金额") + private String actualMoney; + } diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleactualdetails/BaseVehicleActualDetailsVo.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleactualdetails/BaseVehicleActualDetailsVo.java index 6a10beee80..f9153bb7b6 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleactualdetails/BaseVehicleActualDetailsVo.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleactualdetails/BaseVehicleActualDetailsVo.java @@ -4,6 +4,8 @@ import com.yxt.common.core.vo.Vo; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.math.BigDecimal; + /** * @Author dimengzhe * @Date 2022/4/9 11:35 @@ -29,4 +31,16 @@ public class BaseVehicleActualDetailsVo implements Vo { private int dayNum; @ApiModelProperty("车辆数量") private int vehicleNum; + + @ApiModelProperty("版本") + private String vehicleVersionValue; + @ApiModelProperty("燃料") + private String fuelTypeValue; + @ApiModelProperty("变速箱") + private String gearboxTypeValue; + @ApiModelProperty("排放标准") + private String emissionStandardValue; + + @ApiModelProperty("买断金额") + private String actualMoney; } diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleactualpay/BaseVehicleActualPay.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleactualpay/BaseVehicleActualPay.java new file mode 100644 index 0000000000..1e266f3bb4 --- /dev/null +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleactualpay/BaseVehicleActualPay.java @@ -0,0 +1,35 @@ +package com.yxt.anrui.base.api.basevehicleactualpay; + +import com.yxt.common.core.domain.BaseEntity; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.math.BigDecimal; + +/** + * @Author dimengzhe + * @Date 2022/9/19 11:49 + * @Description + */ +@Data +public class BaseVehicleActualPay extends BaseEntity { + private static final long serialVersionUID = -3051690321206077883L; + + @ApiModelProperty(value = "车辆未售买断申请sid") + private String vehicleActualSid; + @ApiModelProperty(value = "付款方式") + private String paymentType; + @ApiModelProperty(value = "付款方式key") + private String paymentTypeKey; + @ApiModelProperty(value = "厂家销售通路") + private String actualPay; + @ApiModelProperty(value = "开户行") + private String bank; + + @ApiModelProperty("收款银行账号") + private String receivingAccount; + @ApiModelProperty("付款金额") + private BigDecimal payAccount; + @ApiModelProperty("付款备注") + private String payRemark; +} diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleactualpay/BaseVehicleActualPayDto.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleactualpay/BaseVehicleActualPayDto.java new file mode 100644 index 0000000000..6cc5670385 --- /dev/null +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleactualpay/BaseVehicleActualPayDto.java @@ -0,0 +1,31 @@ +package com.yxt.anrui.base.api.basevehicleactualpay; + +import com.yxt.common.core.dto.Dto; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Author dimengzhe + * @Date 2022/9/19 11:52 + * @Description + */ +@Data +public class BaseVehicleActualPayDto implements Dto { + private static final long serialVersionUID = -7136887711471736748L; + + @ApiModelProperty(value = "付款方式") + private String paymentType; + @ApiModelProperty(value = "付款方式key") + private String paymentTypeKey; + @ApiModelProperty(value = "厂家销售通路") + private String actualPay; + @ApiModelProperty(value = "开户行") + private String bank; + + @ApiModelProperty("收款银行账号") + private String receivingAccount; + @ApiModelProperty("付款金额") + private String payAccount; + @ApiModelProperty("付款备注") + private String payRemark; +} diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleactualpay/BaseVehicleActualPayFeign.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleactualpay/BaseVehicleActualPayFeign.java new file mode 100644 index 0000000000..c3c9b8e93f --- /dev/null +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleactualpay/BaseVehicleActualPayFeign.java @@ -0,0 +1,17 @@ +package com.yxt.anrui.base.api.basevehicleactualpay; + +import com.yxt.anrui.base.api.basevehicleactualdetails.BaseVehicleActualDetailsFeignFallback; +import org.springframework.cloud.openfeign.FeignClient; + +/** + * @Author dimengzhe + * @Date 2022/9/19 11:57 + * @Description + */ +@FeignClient( + contextId = "anrui-base-BaseVehicleActualPay", + name = "anrui-base", + path = "v1/basevehicleactualpay", + fallback = BaseVehicleActualPayFeignFallback.class) +public interface BaseVehicleActualPayFeign { +} diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleactualpay/BaseVehicleActualPayFeignFallback.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleactualpay/BaseVehicleActualPayFeignFallback.java new file mode 100644 index 0000000000..ff27270af5 --- /dev/null +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleactualpay/BaseVehicleActualPayFeignFallback.java @@ -0,0 +1,12 @@ +package com.yxt.anrui.base.api.basevehicleactualpay; + +import org.springframework.stereotype.Component; + +/** + * @Author dimengzhe + * @Date 2022/9/19 11:58 + * @Description + */ +@Component +public class BaseVehicleActualPayFeignFallback { +} diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleactualpay/BaseVehicleActualPayVo.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleactualpay/BaseVehicleActualPayVo.java new file mode 100644 index 0000000000..cf09719da1 --- /dev/null +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleactualpay/BaseVehicleActualPayVo.java @@ -0,0 +1,31 @@ +package com.yxt.anrui.base.api.basevehicleactualpay; + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Author dimengzhe + * @Date 2022/9/19 13:36 + * @Description + */ +@Data +public class BaseVehicleActualPayVo implements Vo { + private static final long serialVersionUID = 7103772117018168626L; + + @ApiModelProperty(value = "付款方式") + private String paymentType; + @ApiModelProperty(value = "付款方式key") + private String paymentTypeKey; + @ApiModelProperty(value = "厂家销售通路") + private String actualPay; + @ApiModelProperty(value = "开户行") + private String bank; + + @ApiModelProperty("收款银行账号") + private String receivingAccount; + @ApiModelProperty("付款金额") + private String payAccount; + @ApiModelProperty("付款备注") + private String payRemark; +} diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleactualsales/BaseVehicleActualSales.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleactualsales/BaseVehicleActualSales.java index d049588d47..e599055168 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleactualsales/BaseVehicleActualSales.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleactualsales/BaseVehicleActualSales.java @@ -29,5 +29,13 @@ public class BaseVehicleActualSales extends BaseEntity { @ApiModelProperty("未售买断费用") private String money; + @ApiModelProperty("是否需要付款：1是，0否") + private String isPay; + + @ApiModelProperty("分公司名称") + private String useOrgName; + @ApiModelProperty("分公司sid") + private String useOrgSid; + } diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleactualsales/BaseVehicleActualSalesDetailsVo.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleactualsales/BaseVehicleActualSalesDetailsVo.java index 550557e5ed..5f35931cfe 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleactualsales/BaseVehicleActualSalesDetailsVo.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleactualsales/BaseVehicleActualSalesDetailsVo.java @@ -1,6 +1,7 @@ package com.yxt.anrui.base.api.basevehicleactualsales; import com.yxt.anrui.base.api.basevehicleactualdetails.BaseVehicleActualDetailsVo; +import com.yxt.anrui.base.api.basevehicleactualpay.BaseVehicleActualPayVo; import com.yxt.common.core.vo.Vo; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -26,6 +27,7 @@ public class BaseVehicleActualSalesDetailsVo implements Vo { private String reason; @ApiModelProperty(value = "车辆列表") private List detailsList = new ArrayList<>(); + private List detailsPayList = new ArrayList<>(); @ApiModelProperty(value = "创建人sid") private String userSid; @ApiModelProperty(value = "任务id") @@ -35,4 +37,12 @@ public class BaseVehicleActualSalesDetailsVo implements Vo { @ApiModelProperty("未售买断费用") private String money; + + @ApiModelProperty("是否需要付款：1是，0否") + private String isPay; + + @ApiModelProperty("分公司名称") + private String useOrgName; + @ApiModelProperty("分公司sid") + private String useOrgSid; } diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleactualsales/BaseVehicleActualSalesDto.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleactualsales/BaseVehicleActualSalesDto.java index 281975bc0c..2ee7f2bdbc 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleactualsales/BaseVehicleActualSalesDto.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleactualsales/BaseVehicleActualSalesDto.java @@ -2,6 +2,7 @@ package com.yxt.anrui.base.api.basevehicleactualsales; import com.fasterxml.jackson.annotation.JsonFormat; import com.yxt.anrui.base.api.basevehicleactualdetails.BaseVehicleActualDetailsDto; +import com.yxt.anrui.base.api.basevehicleactualpay.BaseVehicleActualPayDto; import com.yxt.common.core.dto.Dto; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -33,9 +34,18 @@ public class BaseVehicleActualSalesDto implements Dto { private String reason; @ApiModelProperty(value = "车辆列表") private List detailsList; + private List detailsPayList; @ApiModelProperty("未售买断费用") private String money; + @ApiModelProperty("付款金额总计") + private String payAccountAll; + @ApiModelProperty("是否需要付款：1是，0否") + private String isPay; + @ApiModelProperty("分公司名称") + private String useOrgName; + @ApiModelProperty("分公司sid") + private String useOrgSid; } diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/common/enums/DictCommonEnum.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/common/enums/DictCommonEnum.java index f367ab618d..f1e82e836d 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/common/enums/DictCommonEnum.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/common/enums/DictCommonEnum.java @@ -43,4 +43,21 @@ public class DictCommonEnum { this.remarks = remarks; } } + + @Getter + public static enum dueBank { + HK_TYPE("1", "回款账户"), + DJ_TYPE("2", "订金账户"), + XL_TYPE("3", "销量保证金"), + QY_TYPE("4", "牵引车回款账户"), + ; + private final String code; + private final String remarks; + + dueBank(String code, String remarks) { + this.code = code; + this.remarks = remarks; + } + } + } diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturerbank/BaseManufacturerBankMapper.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturerbank/BaseManufacturerBankMapper.java index 20cebf2d07..b24e63ebb0 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturerbank/BaseManufacturerBankMapper.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturerbank/BaseManufacturerBankMapper.java @@ -1,6 +1,7 @@ package com.yxt.anrui.base.biz.basemanufacturerbank; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.yxt.anrui.base.api.basemanufacturerbank.BaseManActualVo; import com.yxt.anrui.base.api.basemanufacturerbank.BaseManufacturerBank; import com.yxt.anrui.base.api.basemanufacturerbank.BaseManufacturerBankVo; import com.yxt.anrui.base.api.busvehicleapply.BusApplyVo; @@ -59,4 +60,6 @@ public interface BaseManufacturerBankMapper extends BaseMapper selectByApplySid(String modelSid); + + List actualList(@Param("useOrgSid") String useOrgSid, @Param("code") String code); } \ No newline at end of file diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturerbank/BaseManufacturerBankMapper.xml b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturerbank/BaseManufacturerBankMapper.xml index 33195f7af3..700ce73d42 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturerbank/BaseManufacturerBankMapper.xml +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturerbank/BaseManufacturerBankMapper.xml @@ -55,7 +55,7 @@ bmb.remarks FROM base_manufacturer_bank bmb WHERE bmb.manufacturerSid = #{sid} - AND bmb.isDelete = 0 + AND bmb.isDelete = 0 + + \ No newline at end of file diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturerbank/BaseManufacturerBankRest.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturerbank/BaseManufacturerBankRest.java index 55122bcf66..fe55f0bd9f 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturerbank/BaseManufacturerBankRest.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturerbank/BaseManufacturerBankRest.java @@ -1,11 +1,9 @@ package com.yxt.anrui.base.biz.basemanufacturerbank; import com.yxt.anrui.base.api.basemanufacturer.BaseManufacturer; -import com.yxt.anrui.base.api.basemanufacturerbank.BaseManufacturerBank; -import com.yxt.anrui.base.api.basemanufacturerbank.BaseManufacturerBankDto; -import com.yxt.anrui.base.api.basemanufacturerbank.BaseManufacturerBankFeign; -import com.yxt.anrui.base.api.basemanufacturerbank.BaseManufacturerBankVo; +import com.yxt.anrui.base.api.basemanufacturerbank.*; import com.yxt.anrui.base.biz.basemanufacturer.BaseManufacturerService; +import com.yxt.anrui.base.common.enums.DictCommonEnum; import com.yxt.common.core.result.ResultBean; import io.swagger.annotations.Api; import org.springframework.beans.factory.annotation.Autowired; @@ -78,5 +76,12 @@ public class BaseManufacturerBankRest implements BaseManufacturerBankFeign { return rb.success().setData(vo); } + @Override + public ResultBean> actualList(String useOrgSid) { + ResultBean> rb = ResultBean.fireFail(); + List voList = baseManufacturerBankService.actualList(useOrgSid, DictCommonEnum.dueBank.HK_TYPE.getCode()); + return rb.success().setData(voList); + } + } diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturerbank/BaseManufacturerBankService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturerbank/BaseManufacturerBankService.java index 52335425ee..8392392bc5 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturerbank/BaseManufacturerBankService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturerbank/BaseManufacturerBankService.java @@ -1,5 +1,6 @@ package com.yxt.anrui.base.biz.basemanufacturerbank; +import com.yxt.anrui.base.api.basemanufacturerbank.BaseManActualVo; import com.yxt.anrui.base.api.basemanufacturerbank.BaseManufacturerBank; import com.yxt.anrui.base.api.basemanufacturerbank.BaseManufacturerBankVo; import com.yxt.anrui.base.api.busvehicleapply.BusApplyVo; @@ -68,4 +69,8 @@ public class BaseManufacturerBankService extends MybatisBaseService selectByApplySid(String modelSid) { return baseMapper.selectByApplySid(modelSid); } + + public List actualList(String useOrgSid, String code) { + return baseMapper.actualList(useOrgSid,code); + } } \ No newline at end of file diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.xml b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.xml index de6051977c..7ad2a2d763 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.xml +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.xml @@ -793,8 +793,11 @@ bv.insideCode, (select count(*) from base_vehicle bvv where bvv.insideCode = bv.insideCode and (bvv.vehicleStateValue = '库存' or bvv.vehicleStateValue = '调入')) as vehicleNum, - (select datediff(now(),DATE_FORMAT(bv.priceDate,'%Y-%m-%d'))) as dayNum - + (select datediff(now(),DATE_FORMAT(bv.priceDate,'%Y-%m-%d'))) as dayNum, + bvm.vehicleVersionValue, + bvm.fuelTypeValue, + bvm.gearboxTypeValue, + bvm.emissionStandardValue FROM base_vehicle bv LEFT JOIN base_vehicle_model bvm ON bv.`modelSid` = bvm.`sid` LEFT JOIN base_model_config bmc ON bv.modelConfigSid = bmc.`sid` diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java index 4dbe367693..996dd73c4d 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java @@ -1434,6 +1434,7 @@ public class BaseVehicleService extends MybatisBaseService diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleactualpay/BaseVehicleActualPayMapper.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleactualpay/BaseVehicleActualPayMapper.java new file mode 100644 index 0000000000..79caa13203 --- /dev/null +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleactualpay/BaseVehicleActualPayMapper.java @@ -0,0 +1,24 @@ +package com.yxt.anrui.base.biz.basevehicleactualpay; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.yxt.anrui.base.api.basevehicleactualpay.BaseVehicleActualPay; +import com.yxt.anrui.base.api.basevehicleactualpay.BaseVehicleActualPayVo; +import org.apache.ibatis.annotations.Mapper; + +import java.util.List; + +/** + * @Author dimengzhe + * @Date 2022/9/19 11:55 + * @Description + */ +@Mapper +public interface BaseVehicleActualPayMapper extends BaseMapper { + List selectBySaleSid(String sid); + + int deleteBySaleSid(String sid); + + List detailsList(String sid); + + int deleteByActualSid(String s); +} diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleactualpay/BaseVehicleActualPayMapper.xml b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleactualpay/BaseVehicleActualPayMapper.xml new file mode 100644 index 0000000000..0f03fa4ba1 --- /dev/null +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleactualpay/BaseVehicleActualPayMapper.xml @@ -0,0 +1,34 @@ + + + + + + + delete + from base_vehicle_actual_pay + where vehicleActualSid = #{sid} + + + + + + delete + from base_vehicle_actual_pay + where vehicleActualSid = #{s} + + \ No newline at end of file diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleactualpay/BaseVehicleActualPayRest.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleactualpay/BaseVehicleActualPayRest.java new file mode 100644 index 0000000000..1a5f82af3d --- /dev/null +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleactualpay/BaseVehicleActualPayRest.java @@ -0,0 +1,16 @@ +package com.yxt.anrui.base.biz.basevehicleactualpay; + +import io.swagger.annotations.Api; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestMapping; + +/** + * @Author dimengzhe + * @Date 2022/9/19 11:54 + * @Description + */ +@Api(tags = "车辆未售买断管理") +@RequestMapping("v1/basevehicleactualsales") +@Controller +public class BaseVehicleActualPayRest { +} diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleactualpay/BaseVehicleActualPayService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleactualpay/BaseVehicleActualPayService.java new file mode 100644 index 0000000000..be7be0098d --- /dev/null +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleactualpay/BaseVehicleActualPayService.java @@ -0,0 +1,56 @@ +package com.yxt.anrui.base.biz.basevehicleactualpay; + +import com.yxt.anrui.base.api.basevehicleactualpay.BaseVehicleActualPay; +import com.yxt.anrui.base.api.basevehicleactualpay.BaseVehicleActualPayDto; +import com.yxt.anrui.base.api.basevehicleactualpay.BaseVehicleActualPayVo; +import com.yxt.common.base.service.MybatisBaseService; +import org.springframework.beans.BeanUtils; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.Arrays; +import java.util.List; + +/** + * @Author dimengzhe + * @Date 2022/9/19 11:55 + * @Description + */ +@Service +public class BaseVehicleActualPayService extends MybatisBaseService { + + @Transactional(rollbackFor = Exception.class) + public void saveDetails(List detailsPayList, String sid) { + BaseVehicleActualPay BaseVehicleActualPay = null; + for (BaseVehicleActualPayDto dto : detailsPayList) { + BaseVehicleActualPay = new BaseVehicleActualPay(); + BeanUtils.copyProperties(dto, BaseVehicleActualPay, "sid"); + BaseVehicleActualPay.setVehicleActualSid(sid); + save(BaseVehicleActualPay); + } + } + + public List selectBySaleSid(String sid) { + return baseMapper.selectBySaleSid(sid); + } + + public void deleteBySaleSid(String sid) { + baseMapper.deleteBySaleSid(sid); + } + + @Transactional(rollbackFor = Exception.class) + public void updateListByReturnSid(String sid, List detailsPayList) { + saveDetails(detailsPayList, sid); + } + + public List detailsList(String sid) { + return baseMapper.detailsList(sid); + } + + public void deleteByActualSid(String[] sidsList) { + List stringList = Arrays.asList(sidsList); + for (int i = 0; i < stringList.size(); i++) { + baseMapper.deleteByActualSid(stringList.get(i)); + } + } +} diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleactualsales/BaseVehicleActualSalesMapper.xml b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleactualsales/BaseVehicleActualSalesMapper.xml index 1d78417cc8..59170df266 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleactualsales/BaseVehicleActualSalesMapper.xml +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleactualsales/BaseVehicleActualSalesMapper.xml @@ -23,7 +23,10 @@ taskId, procInstId, createBySid userSid, - money + money, + isPay, + useOrgSid, + useOrgName from base_vehicle_actual_sales where sid = #{sid} diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleactualsales/BaseVehicleActualSalesService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleactualsales/BaseVehicleActualSalesService.java index 0794b26ebd..841a1b1991 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleactualsales/BaseVehicleActualSalesService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleactualsales/BaseVehicleActualSalesService.java @@ -11,6 +11,8 @@ import com.yxt.anrui.base.api.basevehicleactualdetails.AppBaseVehicleActualDetai import com.yxt.anrui.base.api.basevehicleactualdetails.BaseVehicleActualDetails; import com.yxt.anrui.base.api.basevehicleactualdetails.BaseVehicleActualDetailsDto; import com.yxt.anrui.base.api.basevehicleactualdetails.BaseVehicleActualDetailsVo; +import com.yxt.anrui.base.api.basevehicleactualpay.BaseVehicleActualPay; +import com.yxt.anrui.base.api.basevehicleactualpay.BaseVehicleActualPayVo; import com.yxt.anrui.base.api.basevehicleactualsales.*; import com.yxt.anrui.base.api.basevehicleactualsales.flow.ActualGetNodeQuery; import com.yxt.anrui.base.api.basevehicleactualsales.flow.ActualGetNodeVo; @@ -18,6 +20,7 @@ import com.yxt.anrui.base.api.basevehicleactualsales.flow.BaseActualSalesTaskQue import com.yxt.anrui.base.api.basevehicleactualsales.flow.SubmitActualSalesDto; import com.yxt.anrui.base.biz.basevehicle.BaseVehicleService; import com.yxt.anrui.base.biz.basevehicleactualdetails.BaseVehicleActualDetailsService; +import com.yxt.anrui.base.biz.basevehicleactualpay.BaseVehicleActualPayService; import com.yxt.anrui.base.common.enums.VehicleState; import com.yxt.anrui.flowable.api.flow.FlowableFeign; import com.yxt.anrui.flowable.api.flow.UpdateFlowFieldVo; @@ -47,6 +50,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import java.math.BigDecimal; import java.util.*; import java.util.stream.Collectors; @@ -60,6 +64,8 @@ public class BaseVehicleActualSalesService extends MybatisBaseService 0) { baseVehicleActualDetailsService.saveDetails(scmVehicleActualSalesDto.getDetailsList(), baseVehicleActualSales.getSid()); } + if ("1".equals(scmVehicleActualSalesDto.getIsPay())) { + if (scmVehicleActualSalesDto.getDetailsPayList().size() > 0) { + baseVehicleActualPayService.saveDetails(scmVehicleActualSalesDto.getDetailsPayList(), sid); + + } + } + } } else { //编辑 @@ -165,6 +178,18 @@ public class BaseVehicleActualSalesService extends MybatisBaseService 0) { baseVehicleActualDetailsService.updateListByReturnSid(sid, scmVehicleActualSalesDto.getDetailsList()); } + + //查询pay中是否有关于sales的该条sid数据 + List scmVehicleActualPayList = baseVehicleActualPayService.selectBySaleSid(sid); + if (scmVehicleActualPayList.size() > 0) { + baseVehicleActualPayService.deleteBySaleSid(sid); + } + if ("1".equals(scmVehicleActualSalesDto.getIsPay())) { + if (scmVehicleActualSalesDto.getDetailsPayList().size() > 0) { + baseVehicleActualPayService.updateListByReturnSid(sid, scmVehicleActualSalesDto.getDetailsPayList()); + } + } + } return rb.success().setData(sid); } @@ -200,7 +225,9 @@ public class BaseVehicleActualSalesService extends MybatisBaseService voList = baseVehicleActualDetailsService.detailsList(sid); + List voPayList = baseVehicleActualPayService.detailsList(sid); vo.setDetailsList(voList); + vo.setDetailsPayList(voPayList); return rb.success().setData(vo); } @@ -245,12 +272,13 @@ public class BaseVehicleActualSalesService extends MybatisBaseService 0) { return rb.setMsg("删除的数据中包含已经提交审批的数据，删除失败"); } + baseVehicleActualDetailsService.deleteByActualSid(sidsList); + baseVehicleActualPayService.deleteByActualSid(sidsList); delBySids(sidsList); return rb.success().setMsg("删除成功"); } @@ -285,6 +313,11 @@ public class BaseVehicleActualSalesService extends MybatisBaseService resultBean = saveOrUpdateVehicleSales(dto); if (!resultBean.getSuccess()) { @@ -318,7 +351,7 @@ public class BaseVehicleActualSalesService extends MybatisBaseService detailsList = dto.getDetailsList(); for (BaseVehicleActualDetailsDto f : detailsList) { - BaseVehicle baseVehicle = baseVehicleService.selectByVinNoAndOrgSid(f.getVinNo(),useOrgSid); + BaseVehicle baseVehicle = baseVehicleService.selectByVinNoAndOrgSid(f.getVinNo(), useOrgSid); baseVehicle.setVinNo(f.getVinNo()); baseVehicle.setSettlementStatus(VehicleState.BuyoutEnum.PRE_BUYOUT.getCode()); baseVehicle.setSettlementStatusValue(VehicleState.BuyoutEnum.PRE_BUYOUT.getRemarks()); @@ -328,12 +361,12 @@ public class BaseVehicleActualSalesService extends MybatisBaseService stringResultBean = messageFeign.pushMessage(messageFlowableQuery); return voResultBean; @@ -388,10 +421,10 @@ public class BaseVehicleActualSalesService extends MybatisBaseService variables = new HashMap<>(); - Map appMap = new HashMap<>(); - appMap.put("sid",bv.getBusinessSid()); - variables.put("app",appMap); + Map variables = new HashMap<>(); + Map appMap = new HashMap<>(); + appMap.put("sid", bv.getBusinessSid()); + variables.put("app", appMap); bv.setFormVariables(variables); ResultBean resultBean = flowableFeign.handleProsess(bv); if (!resultBean.getSuccess()) { @@ -399,19 +432,19 @@ public class BaseVehicleActualSalesService extends MybatisBaseService stringResultBean = messageFeign.pushMessage(messageFlowableQuery); } @@ -491,10 +524,10 @@ public class BaseVehicleActualSalesService extends MybatisBaseService variables = new HashMap<>(); - Map appMap = new HashMap<>(); - appMap.put("sid",query.getBusinessSid()); - variables.put("app",appMap); + Map variables = new HashMap<>(); + Map appMap = new HashMap<>(); + appMap.put("sid", query.getBusinessSid()); + variables.put("app", appMap); flowTaskVo.setValues(variables); ResultBean resultBean = flowableFeign.taskReject(flowTaskVo); if (!resultBean.getSuccess()) { @@ -508,7 +541,7 @@ public class BaseVehicleActualSalesService extends MybatisBaseService> listResultBean = flowTaskFeign.getLatestTasks(procId); + ResultBean> listResultBean = flowTaskFeign.getLatestTasks(procId); String nextNodeUserSids = listResultBean.getData().get(0).getASSIGNEE_(); List receiveSidList = Arrays.asList(nextNodeUserSids.split(",")); - if(receiveSidList.size() == 1 && receiveSidList.get(0).equals(baseVehicleActualSales.getCreateBySid())){ - messageFlowableQuery.setMsgContent("您提交的"+messageFlowableQuery.getModuleName()+"已被驳回,请重新提交"); - }else{ - messageFlowableQuery.setMsgContent(baseVehicleActualSales.getApplicationName()+"提交的"+messageFlowableQuery.getModuleName()+",请审批"); + if (receiveSidList.size() == 1 && receiveSidList.get(0).equals(baseVehicleActualSales.getCreateBySid())) { + messageFlowableQuery.setMsgContent("您提交的" + messageFlowableQuery.getModuleName() + "已被驳回,请重新提交"); + } else { + messageFlowableQuery.setMsgContent(baseVehicleActualSales.getApplicationName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批"); } messageFlowableQuery.setMsgTitle("供应链"); @@ -557,7 +590,7 @@ public class BaseVehicleActualSalesService extends MybatisBaseService