From cbb60d13bfc6aabd4cfd5fa9f4ce5c6855860149 Mon Sep 17 00:00:00 2001 From: dimengzhe <251008545@qq.com> Date: Wed, 25 May 2022 15:33:44 +0800 Subject: [PATCH] =?UTF-8?q?=E9=94=80=E5=94=AE=E8=AE=A2=E5=8D=95-=E7=A7=BB?= =?UTF-8?q?=E5=8A=A8=E7=AB=AF=E9=94=80=E5=94=AE=E8=AE=A2=E5=8D=95=E5=88=86?= =?UTF-8?q?=E9=A1=B5=E5=88=97=E8=A1=A8=E5=8F=8Apc=E7=AB=AF=E9=94=80?= =?UTF-8?q?=E5=94=AE=E8=AE=A2=E5=8D=95=E6=B5=81=E7=A8=8B=E7=9B=B8=E5=85=B3?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CommonContractBuscenterVo.java | 3 + .../api/bussalesorder/BusSalesOrderFeign.java | 8 +- ...{AppModelInfo.java => AppModelInfoVo.java} | 8 +- .../bussalesorder/BusSalesOrderMapper.java | 4 +- .../biz/bussalesorder/BusSalesOrderMapper.xml | 30 +++++--- .../bussalesorder/BusSalesOrderService.java | 77 ++++++++++++------- .../anrui/flowable/api/utils/ProcDefEnum.java | 2 +- 7 files changed, 79 insertions(+), 53 deletions(-) rename anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/{AppModelInfo.java => AppModelInfoVo.java} (74%) diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/CommonContractBuscenterVo.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/CommonContractBuscenterVo.java index e408533451..dbb7107f56 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/CommonContractBuscenterVo.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/CommonContractBuscenterVo.java @@ -30,6 +30,9 @@ import java.util.List; @Data public class CommonContractBuscenterVo implements Vo { + @ApiModelProperty(value = "状态") + private Integer state; + @ApiModelProperty("合同sid") private String sid; 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 3d78f3da72..1fe2ad25ba 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 @@ -87,22 +87,22 @@ public interface BusSalesOrderFeign { ResultBean submit(@RequestBody BusSalesOrderAllDto dto); @ApiOperation(value = "办理（同意）") - @PostMapping("/complete") + @PutMapping("/complete") @ResponseBody public ResultBean complete(@RequestBody BusSalesOrderFlowQuery busSalesOrderFlowQuery); @ApiOperation(value = "驳回任务") - @PostMapping("/reject") + @PutMapping("/reject") @ResponseBody ResultBean reject(@RequestBody BusSalesOrderFlowDto dto); @ApiOperation(value = "终止任务") - @PostMapping("/breakProcess") + @PutMapping("/breakProcess") @ResponseBody ResultBean breakProcess(@RequestBody BusSalesOrderFlowDto dto); @ApiOperation(value = "撤回任务") - @PostMapping("/revokeProcess") + @PutMapping("/revokeProcess") @ResponseBody ResultBean revokeProcess(@RequestBody BusSalesOrderFlowDto dto); diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/AppModelInfo.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/AppModelInfoVo.java similarity index 74% rename from anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/AppModelInfo.java rename to anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/AppModelInfoVo.java index 338c4eb327..c7aa3f0f6d 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/AppModelInfo.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/AppModelInfoVo.java @@ -1,23 +1,21 @@ package com.yxt.anrui.buscenter.api.bussalesorder.app; +import com.yxt.common.core.vo.Vo; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @Data -public class AppModelInfo { +public class AppModelInfoVo implements Vo { + private static final long serialVersionUID = 4061000162660564257L; @ApiModelProperty("车辆图片") private String carImage; - @ApiModelProperty("车型名称") private String model; - @ApiModelProperty("品牌") private String brand; - @ApiModelProperty("价格") private String price; - @ApiModelProperty("数量") private String number; diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.java index 99d45ad424..a8e9c4b702 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.java @@ -33,7 +33,7 @@ import com.baomidou.mybatisplus.core.toolkit.Constants; import com.yxt.anrui.buscenter.api.bussalesorder.*; import com.yxt.anrui.buscenter.api.bussalesorder.app.AppBusSalesOrderBillInfoVo; import com.yxt.anrui.buscenter.api.bussalesorder.app.AppBusSalesOrderVo; -import com.yxt.anrui.buscenter.api.bussalesorder.app.AppModelInfo; +import com.yxt.anrui.buscenter.api.bussalesorder.app.AppModelInfoVo; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Update; @@ -78,7 +78,7 @@ public interface BusSalesOrderMapper extends BaseMapper { * @param saleOrderSid * @return */ - AppModelInfo selectModelInfoByOrderSid(String saleOrderSid); + AppModelInfoVo selectModelInfoByOrderSid(String saleOrderSid); /** * App初始化销售订单单据信息 diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.xml b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.xml index f514b106df..7b921f341e 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.xml +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.xml @@ -37,21 +37,27 @@ - SELECT modelName AS model, brandName AS brand, guildPrice AS price @@ -92,7 +98,7 @@ SELECT count(*) FROM bus_sales_order WHERE createDate = #{date} - AND orgSid = #{orgSid} - AND billNo LIKE concat(#{billsType}, '%') + AND orgSid = #{orgSid} + AND billNo LIKE concat(#{billsType}, '%') \ No newline at end of file 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 4ea947031f..6b63c736b0 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 @@ -42,6 +42,8 @@ import com.yxt.anrui.base.api.basevehmodelconfig.BaseVehmodelConfigFeign; import com.yxt.anrui.base.api.busvehicleorder.AppOrderReadyCar; import com.yxt.anrui.base.api.busvehicleorder.BusVehicleOrderFeign; import com.yxt.anrui.base.api.busvehicleorder.BusVehicleOrderVo; +import com.yxt.anrui.base.api.commoncontract.CommonContractBuscenterVo; +import com.yxt.anrui.base.api.commoncontract.CommonContractFeign; import com.yxt.anrui.buscenter.api.busdepositfictitious.BusDepositFictitiousDetailsVo; import com.yxt.anrui.buscenter.api.busdepositfictitious.BusDepositFictitiousDto; import com.yxt.anrui.buscenter.api.bussalesorder.*; @@ -166,6 +168,8 @@ public class BusSalesOrderService extends MybatisBaseService> listResultBean = flowTaskFeign.getLatestTasks(dto.getInstanceId()); - if (listResultBean.getData().size() == 0) { - //更新销售订单的状态为不通过 - updateStateByBusinessSid(2, dto.getBusinessSid()); - } + //更新销售订单的状态为不通过 + updateStateByBusinessSid(3, dto.getBusinessSid()); ResultBean resultBean = flowTaskFeign.breakProcess(flowTaskVo); if (!resultBean.getSuccess()) { return resultBean; @@ -1079,33 +1079,52 @@ public class BusSalesOrderService extends MybatisBaseService page = PagerUtil.queryToPage(pq); IPage pagging = baseMapper.getSaleOrders(page, qw); for (AppBusSalesOrderVo record : pagging.getRecords()) { - String saleOrderState = record.getSaleOrderState(); - if (StringUtils.isNotBlank(saleOrderState)) { - record.setShowUpdateBtn(false); - record.setShowFinancialBtn(false); - record.setShowDeleteBtn(false); - } - if (saleOrderState.equals("审批完成")) { - record.setShowContractBtn(true); - } else { - record.setShowContractBtn(false); - } - int deposit = 0; - if (StringUtils.isNotBlank(record.getDeposit())) { - deposit = new Integer(record.getDeposit()); + //根据销售订单sid查询是否有合同，有合同的话，查询合同是否审核。且需补交订金是否为0 + String sid = record.getSid(); + ResultBean buscenterVoResultBean = commonContractFeign.selectByBusSid(sid); + //合同是否已审核通过 + boolean isTrue = false; + if (buscenterVoResultBean.getSuccess()) { + Integer state = buscenterVoResultBean.getData().getState(); + if (state == 2) { + isTrue = true; + } } - if (saleOrderState.equals("审批完成") || deposit <= 0) { - record.setShowApplyBtn(true); - } else { - record.setShowApplyBtn(false); + //已交定金 + String deposit = "-"; + BigDecimal depositBig = new BigDecimal("0"); + if (StringUtils.isNotBlank(record.getDepositAll())) { + //需补交订金 + if (StringUtils.isNotBlank(record.getMakeUpDeposit())) { + depositBig = new BigDecimal(record.getDepositAll()).subtract(new BigDecimal(record.getMakeUpDeposit())); + if ("0".equals(record.getMakeUpDeposit())) { + if (isTrue) { + record.setShowApplyBtn(true); + } else { + record.setShowApplyBtn(false); + } + } + } else { + depositBig = new BigDecimal(record.getDepositAll()); + if (isTrue) { + record.setShowApplyBtn(true); + } else { + record.setShowApplyBtn(false); + } + + } + //将已交订金转为string + deposit = depositBig.toString(); } - AppModelInfo appModelInfo = baseMapper.selectModelInfoByOrderSid(record.getSaleOrderSid()); + record.setDeposit(deposit); + //查询车型信息 + /* AppModelInfo appModelInfo = baseMapper.selectModelInfoByOrderSid(record.getSaleOrderSid()); if (appModelInfo == null) { AppModelInfo modelInfo = new AppModelInfo(); record.setModelInfo(modelInfo); } else { record.setModelInfo(appModelInfo); - } + }*/ } PagerVo p = PagerUtil.pageToVo(pagging, null); diff --git a/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java b/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java index 1e1ad8f9a6..69e8c2bb97 100644 --- a/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java +++ b/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java @@ -18,7 +18,7 @@ public enum ProcDefEnum { SCMVEHICLERETURN("采购退库", "process_md8aeoap:4:245028"), SEALAPPLY("盖章申请", "process_7h0z66tp:1:240064" ), BASEVEHICLEACTUALSALES("未售买断", ""),//ToDo - SALESORDER("销售订单审批流程", "process_p5ils2rn:1:242504"), + SALESORDER("销售订单审批流程", "process_p5ils2rn:2:245112"), BASEOUTSOURCINGAPPLICATION("外采申请", "process_5tqysnjc:1:232504"), ;