From dc146307dc2c79f23e0e6928459605edc566d488 Mon Sep 17 00:00:00 2001 From: dimengzhe <251008545@qq.com> Date: Sat, 7 Jan 2023 14:55:22 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../anrui/base/common/enums/BillTypeEnum.java | 1 + .../busvehicleorder/BusVehicleOrderMapper.xml | 2 +- .../BusDeliveredApplyFeign.java | 4 +- .../api/bussalesorder/BusSalesOrder.java | 3 + .../api/bussalesorder/BusSalesOrderFeign.java | 7 +- .../BusSalesOrderFeignFallback.java | 5 ++ .../app/model/AppNowCarListVo.java | 5 ++ .../bussalesorder/app/model/AppNowCarVo.java | 5 ++ .../app/model/AppReadyCarListVo.java | 5 ++ .../app/model/AppReadyCarVo.java | 5 ++ .../app/order/AppOrderRemarkDto.java | 5 ++ .../app/order/OrderRemarksVo.java | 28 ++++++ .../bussalesorder/BusSalesOrderMapper.java | 2 + .../biz/bussalesorder/BusSalesOrderMapper.xml | 4 + .../biz/bussalesorder/BusSalesOrderRest.java | 5 ++ .../bussalesorder/BusSalesOrderService.java | 86 ++++++++++++++++++- .../BusSalesOrderVehicleService.java | 17 +++- .../BusSalesVehicleOrderService.java | 20 ++++- ...ppFinCollectionConfirmationDetailedVo.java | 6 ++ .../AppFinCollectionConfirmationInitVo.java | 3 + .../AppFinCollectionConfirmationPageVo.java | 2 + .../FinCollectionConfirmation.java | 2 + .../FinCollectionConfirmationDetailsVo.java | 3 + .../FinCollectionConfirmationVo.java | 3 + .../FinPaymentrecordUpdateDto.java | 2 +- .../finpaymentrecord/FinPaymentrecordVo.java | 4 + .../FinCollectionConfirmationMapper.java | 2 + .../FinCollectionConfirmationMapper.xml | 17 +++- .../FinCollectionConfirmationService.java | 27 ++++++ .../FinPaymentrecordService.java | 21 +++++ .../saleOrders/AppBusSalesOrderFeign.java | 5 ++ .../AppBusSalesOrderFeignFallback.java | 5 ++ .../saleOrders/model/NowCarVo.java | 7 ++ .../saleOrders/model/ReadyCarVo.java | 7 ++ .../saleOrders/order/OrderRemarksDto.java | 5 ++ .../saleOrders/order/RemarksVo.java | 25 ++++++ .../ConfirmationDetailedVo.java | 5 ++ .../collectionConfirm/ConfirmationInitVo.java | 5 ++ .../collectionConfirm/ConfirmationPageVo.java | 4 + .../saleOrders/AppBusSalesOrderRest.java | 5 ++ .../saleOrders/AppBusSalesOrderService.java | 5 ++ 41 files changed, 368 insertions(+), 11 deletions(-) create mode 100644 anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/OrderRemarksVo.java create mode 100644 anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/order/RemarksVo.java diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/common/enums/BillTypeEnum.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/common/enums/BillTypeEnum.java index ec3f38812d..229ce320fa 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/common/enums/BillTypeEnum.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/common/enums/BillTypeEnum.java @@ -21,6 +21,7 @@ public enum BillTypeEnum { JYDDCLYD("JYDDCLYD","简易订单车辆预定"), XSDDHT("XSDDHT","销售订单合同"), XSDD("XSDD","销售订单"), + SKD("SKD","款项确认"), ; private String billType; diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleorder/BusVehicleOrderMapper.xml b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleorder/BusVehicleOrderMapper.xml index da742623fd..f7af46556a 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleorder/BusVehicleOrderMapper.xml +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleorder/BusVehicleOrderMapper.xml @@ -217,7 +217,7 @@ @@ -117,4 +120,12 @@ + + \ No newline at end of file diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java index cf9109388c..f7ba3d4cf2 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java @@ -38,7 +38,10 @@ import com.yxt.anrui.base.api.basevehicletempstate.BaseVehicleTempstateVo; import com.yxt.anrui.base.api.commonappendix.*; import com.yxt.anrui.base.api.commoncontract.CommonContract; import com.yxt.anrui.base.api.commoncontract.CommonContractFeign; +import com.yxt.anrui.base.common.enums.BillTypeEnum; import com.yxt.anrui.base.common.enums.VehicleStateTempOrLast; +import com.yxt.anrui.base.common.utils.Rule; +import com.yxt.anrui.base.common.utils.domain.BillNo; import com.yxt.anrui.buscenter.api.busdelivered.BusDeliveredDto; import com.yxt.anrui.buscenter.api.busdelivered.BusDeliveredFeign; import com.yxt.anrui.buscenter.api.busdeposit.AppBusDepositBuscenterDetailVo; @@ -250,6 +253,23 @@ public class FinCollectionConfirmationService extends MybatisBaseService resultBean1 = sysOrganizationFeign.fetchBySid(useOrgSid); + String orgCode = resultBean1.getData().getOrgCode(); + BillNo b = new BillNo(); + b.setOrgCode(orgCode); + b.setBillType(BillTypeEnum.SKD.getBillType()); + String bill = Rule.getBill(b); + String i = baseMapper.selectNum(bill); + String billNo = ""; + if (StringUtils.isNotBlank(i)) { + billNo = Rule.getBillNo(bill, Integer.valueOf(i).intValue()); + } else { + billNo = Rule.getBillNo(bill, 0); + } + return billNo; + } + public ResultBean saveAllDto(FinCollectionConfirmationDto dto) { ResultBean rb = ResultBean.fireFail(); String sid = dto.getSid(); @@ -363,6 +383,10 @@ public class FinCollectionConfirmationService extends MybatisBaseService payFiles = dto.getPayFiles(); if (payFiles.size() > 0) { diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordService.java index 34ad162bb9..c85a8e86b4 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordService.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordService.java @@ -150,6 +150,22 @@ public class FinPaymentrecordService extends MybatisBaseService page = PagerUtil.queryToPage(pq); IPage pagging = baseMapper.selectPageVo(page, qw); + List list = pagging.getRecords(); + list.removeAll(Collections.singleton(null)); + if(!list.isEmpty()){ + for (FinPaymentrecordVo vv : list){ + String payFile = vv.getPayFile(); + if(StringUtils.isNotBlank(payFile)){ + List strings = Arrays.asList(payFile.split(",")); + for (int i =0;i p = PagerUtil.pageToVo(pagging, null); return p; } @@ -187,6 +203,11 @@ public class FinPaymentrecordService extends MybatisBaseService payFiles = dto.getPayFiles(); + if(payFiles.size()>0){ + String payFile = payFiles.stream().map(v -> v.replace(fileUploadComponent.getUrlPrefix(), "")).collect(Collectors.joining(",")); + finPaymentrecord.setPayFile(payFile); + } baseMapper.updateById(finPaymentrecord); //更新付款申请中的状态 FinPaymentapply finPaymentapply = finPaymentapplyService.fetchBySid(finPaymentrecord.getApplySid()); diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/AppBusSalesOrderFeign.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/AppBusSalesOrderFeign.java index 50001595ce..91f5be43ba 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/AppBusSalesOrderFeign.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/AppBusSalesOrderFeign.java @@ -219,6 +219,11 @@ public interface AppBusSalesOrderFeign { @ResponseBody ResultBean updateNodesBySid(@RequestBody OrderRemarksDto dto); + @ApiOperation("初始化销售订单补充说明") + @GetMapping("/getOrderRemarksInfo") + @ResponseBody + ResultBean getOrderRemarksInfo(@RequestParam("saleOrderSid")String saleOrderSid); + /*-----------------------------------------提交------------------------------------------*/ @ApiOperation("判断销售订单是否可提交") diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/AppBusSalesOrderFeignFallback.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/AppBusSalesOrderFeignFallback.java index ee8d266586..0dd53288cb 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/AppBusSalesOrderFeignFallback.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/AppBusSalesOrderFeignFallback.java @@ -192,6 +192,11 @@ public class AppBusSalesOrderFeignFallback implements AppBusSalesOrderFeign { return null; } + @Override + public ResultBean getOrderRemarksInfo(String saleOrderSid) { + return null; + } + @Override public ResultBean isSubmit(String sid) { return null; diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/model/NowCarVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/model/NowCarVo.java index 746edebcf5..a716a7b90c 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/model/NowCarVo.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/model/NowCarVo.java @@ -1,5 +1,6 @@ package com.yxt.anrui.terminal.api.autoservice.saleOrders.model; +import com.fasterxml.jackson.annotation.JsonProperty; import com.yxt.common.core.vo.Vo; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -29,4 +30,10 @@ public class NowCarVo implements Vo { private String virtual; @ApiModelProperty("上装配置sid") private String topSid; + + @ApiModelProperty("采购系统sid") + private String purchaseSystemSid; + @ApiModelProperty("采购系统名称") + @JsonProperty("paySystem") + private String purchaseSystemName; } diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/model/ReadyCarVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/model/ReadyCarVo.java index c85ecc6658..5522482d30 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/model/ReadyCarVo.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/model/ReadyCarVo.java @@ -1,5 +1,6 @@ package com.yxt.anrui.terminal.api.autoservice.saleOrders.model; +import com.fasterxml.jackson.annotation.JsonProperty; import com.yxt.common.core.vo.Vo; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -35,4 +36,10 @@ public class ReadyCarVo implements Vo { private String msg; @ApiModelProperty("上装配置sid") private String topSid; + + @ApiModelProperty("采购系统sid") + private String purchaseSystemSid; + @ApiModelProperty("采购系统名称") + @JsonProperty("paySystem") + private String purchaseSystemName; } diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/order/OrderRemarksDto.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/order/OrderRemarksDto.java index d97d8ead7a..5104316924 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/order/OrderRemarksDto.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/order/OrderRemarksDto.java @@ -4,6 +4,8 @@ import com.yxt.common.core.dto.Dto; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.util.List; + /** * @Author dimengzhe * @Date 2022/6/8 9:49 @@ -18,4 +20,7 @@ public class OrderRemarksDto implements Dto { @ApiModelProperty(value = "补充说明") private String remarks; + + @ApiModelProperty("补充说明附件") + private List images; } diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/order/RemarksVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/order/RemarksVo.java new file mode 100644 index 0000000000..a651dcdd93 --- /dev/null +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/order/RemarksVo.java @@ -0,0 +1,25 @@ +package com.yxt.anrui.terminal.api.autoservice.saleOrders.order; + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.ArrayList; +import java.util.List; + +/** + * @Author dimengzhe + * @Date 2023/1/7 14:22 + * @Description + */ +@Data +public class RemarksVo implements Vo { + private static final long serialVersionUID = 3777312179499130622L; + + @ApiModelProperty("补充说明") + private String remarks; + @ApiModelProperty("销售订单sid") + private String saleOrderSid; + @ApiModelProperty("补充说明附件") + private List images = new ArrayList<>(); +} diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/collectionConfirm/ConfirmationDetailedVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/collectionConfirm/ConfirmationDetailedVo.java index fb79ba36b8..2cba02e16d 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/collectionConfirm/ConfirmationDetailedVo.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/collectionConfirm/ConfirmationDetailedVo.java @@ -1,5 +1,6 @@ package com.yxt.anrui.terminal.api.finance.collectionConfirm; +import com.fasterxml.jackson.annotation.JsonProperty; import com.yxt.common.core.vo.Vo; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -48,5 +49,9 @@ public class ConfirmationDetailedVo implements Vo { private String receivingName; @ApiModelProperty("付款账号后4位") private String payAccount; + + @ApiModelProperty("单据编号") + @JsonProperty("collectionBillId") + private String billNo; } diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/collectionConfirm/ConfirmationInitVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/collectionConfirm/ConfirmationInitVo.java index c83a85cab2..cee71b72b4 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/collectionConfirm/ConfirmationInitVo.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/collectionConfirm/ConfirmationInitVo.java @@ -1,5 +1,6 @@ package com.yxt.anrui.terminal.api.finance.collectionConfirm; +import com.fasterxml.jackson.annotation.JsonProperty; import com.yxt.common.core.vo.Vo; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -79,4 +80,8 @@ public class ConfirmationInitVo implements Vo { private String accountSid; @ApiModelProperty("申请人名称") private String createByName; + + @ApiModelProperty("单据编号") + @JsonProperty("collectionBillId") + private String billNo; } diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/collectionConfirm/ConfirmationPageVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/collectionConfirm/ConfirmationPageVo.java index 162fab0228..a3aa201eca 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/collectionConfirm/ConfirmationPageVo.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/collectionConfirm/ConfirmationPageVo.java @@ -50,4 +50,8 @@ public class ConfirmationPageVo implements Vo { @ApiModelProperty("付款账号后4位") private String payAccount; + @ApiModelProperty("单据编号") + @JsonProperty("collectionBillId") + private String billNo; + } diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/saleOrders/AppBusSalesOrderRest.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/saleOrders/AppBusSalesOrderRest.java index f59913bb81..184c47ae8e 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/saleOrders/AppBusSalesOrderRest.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/saleOrders/AppBusSalesOrderRest.java @@ -279,6 +279,11 @@ public class AppBusSalesOrderRest implements AppBusSalesOrderFeign { return appBusSalesOrderService.updateNodesBySid(dto); } + @Override + public ResultBean getOrderRemarksInfo(String saleOrderSid) { + return appBusSalesOrderService.getOrderRemarksInfo(saleOrderSid); + } + @Override public ResultBean isSubmit(String sid) { return appBusSalesOrderService.isSubmit(sid); diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/saleOrders/AppBusSalesOrderService.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/saleOrders/AppBusSalesOrderService.java index a472ea1ac4..03e17dfdee 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/saleOrders/AppBusSalesOrderService.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/saleOrders/AppBusSalesOrderService.java @@ -607,4 +607,9 @@ public class AppBusSalesOrderService { } return rb.success(); } + + public ResultBean getOrderRemarksInfo(String saleOrderSid) { + ResultBean rb = ResultBean.fireFail(); + return null; + } } \ No newline at end of file