From 63d1e1150d33d0fce8125049e0d0907d65287c2c Mon Sep 17 00:00:00 2001 From: God <10745413@qq.com> Date: Sat, 7 May 2022 14:46:20 +0800 Subject: [PATCH] =?UTF-8?q?=E9=94=80=E5=94=AE=E8=AE=A2=E5=8D=95=E5=BC=80?= =?UTF-8?q?=E7=A5=A8=E9=87=91=E9=A2=9D=E7=A7=BB=E5=8A=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bussalesorder/BusSalesOrderDetailsVo.java | 6 ++- .../BusSalesOrderModelFeign.java | 1 - .../BusSalesOrderPriceFeign.java | 4 ++ .../BusSalesOrderPriceFeignFallback.java | 5 +++ .../bussalesorder/BusSalesOrderMapper.java | 2 +- .../BusSalesOrderPriceMapper.java | 3 ++ .../BusSalesOrderPriceRest.java | 7 ++++ .../BusSalesOrderPriceService.java | 4 ++ .../FinBillApplicationService.java | 41 +++++++++++-------- .../biz/finbillfile/FinBillFileService.java | 2 +- 10 files changed, 54 insertions(+), 21 deletions(-) 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 0418a9e816..e385fef4ac 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 @@ -40,6 +40,8 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.math.BigDecimal; +import java.util.Date; import java.util.List; /** @@ -96,7 +98,7 @@ public class BusSalesOrderDetailsVo implements Vo { private String isTop; @ApiModelProperty("销售订单车辆类型：1现车、2订单、3排产") private String type; - + @ApiModelProperty(value = "主车车型信息") private BusSalesOrderModelVo busSalesOrderModel; @ApiModelProperty(value = "现车车辆信息") @@ -116,4 +118,6 @@ public class BusSalesOrderDetailsVo implements Vo { @ApiModelProperty(value = "虚拟订单和订金关联信息") private List busDepositFictitiousList; + @ApiModelProperty("单台开票金额") + private String oneBillMoney; // 单台开票金额 } \ 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 ec76cb7a41..32f57adb9c 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 @@ -74,5 +74,4 @@ public interface BusSalesOrderModelFeign { @ResponseBody public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid); -// ResultBean<> } \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderprice/BusSalesOrderPriceFeign.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderprice/BusSalesOrderPriceFeign.java index c188ccbc88..b5d03fa413 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderprice/BusSalesOrderPriceFeign.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderprice/BusSalesOrderPriceFeign.java @@ -75,4 +75,8 @@ public interface BusSalesOrderPriceFeign { @GetMapping("/fetchDetailsBySid/{sid}") @ResponseBody public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid); + + @ApiOperation("根据订单sid查询单台成交价") + @GetMapping("/getPriceByOrderSid") + ResultBean getPriceByOrderSid(@RequestParam(value = "busSid") String busSid); } \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderprice/BusSalesOrderPriceFeignFallback.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderprice/BusSalesOrderPriceFeignFallback.java index 497f3b9bd8..6a175a86be 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderprice/BusSalesOrderPriceFeignFallback.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderprice/BusSalesOrderPriceFeignFallback.java @@ -69,4 +69,9 @@ public class BusSalesOrderPriceFeignFallback implements BusSalesOrderPriceFeign ResultBean rb = ResultBean.fireFail(); return rb.setMsg("接口anrui-buscenter/bussalesorderprice/fetchDetailsBySid无法访问"); } + + @Override + public ResultBean getPriceByOrderSid(String busSid) { + return null; + } } \ No newline at end of file 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 842e7921da..3f64e9ccd1 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 @@ -56,6 +56,6 @@ public interface BusSalesOrderMapper extends BaseMapper { @Param("procInstSid") String procInstSid, @Param("nodeSid") String nodeSid); - @Update("update bus_order set oneBillMoney = #{oneBillMoney} where sid = #{orderSid}") + @Update("update bus_sales_order set oneBillMoney = #{oneBillMoney} where sid = #{orderSid}") int updateOneBillMoneyByOrderSid(@Param("orderSid") String orderSid,@Param("oneBillMoney") String oneBillMoney); } \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderprice/BusSalesOrderPriceMapper.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderprice/BusSalesOrderPriceMapper.java index fcfaf56970..cab4aca72f 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderprice/BusSalesOrderPriceMapper.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderprice/BusSalesOrderPriceMapper.java @@ -64,4 +64,7 @@ public interface BusSalesOrderPriceMapper extends BaseMapper List selectListVo(); BusSalesOrderPrice selectBySalesOrderSid(String sid); + + @Select("select singleFinalPrice from bus_sales_order_price where salesOrderSid = #{busSid}") + String getPriceByOrderSid(String busSid); } \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderprice/BusSalesOrderPriceRest.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderprice/BusSalesOrderPriceRest.java index cbc810a89c..c8a7b9ceae 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderprice/BusSalesOrderPriceRest.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderprice/BusSalesOrderPriceRest.java @@ -90,4 +90,11 @@ public class BusSalesOrderPriceRest implements BusSalesOrderPriceFeign { BusSalesOrderPriceDetailsVo vo = busSalesOrderPriceService.fetchDetailsVoBySid(sid); return rb.success().setData(vo); } + + @Override + public ResultBean getPriceByOrderSid(String busSid) { + ResultBean rb = ResultBean.fireFail(); + String price = busSalesOrderPriceService.getPriceByOrderSid(busSid); + return rb.success().setData(price); + } } 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 8f3c3e7784..4d615dc537 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 @@ -96,4 +96,8 @@ public class BusSalesOrderPriceService extends MybatisBaseService createQueryWrapper(FinBillApplicationQuery query) { // todo: 这里根据具体业务调整查询条件 @@ -131,10 +131,10 @@ public class FinBillApplicationService extends MybatisBaseService commonAppendixVoResultBean = commonAppendixFeign.fetchByFilePath(filePath); CommonAppendixVo data = commonAppendixVoResultBean.getData(); + if (data == null){ + return rb.setMsg("请上传相关附件"); + } String sid1 = data.getSid(); finBillFile.setFileSid(sid1); finBillFileService.save(finBillFile); @@ -324,6 +327,9 @@ public class FinBillApplicationService extends MybatisBaseService commonAppendixVoResultBean = commonAppendixFeign.fetchByFilePath(filePath); CommonAppendixVo data = commonAppendixVoResultBean.getData(); + if (data == null){ + return rb.setMsg("请上传相关附件"); + } String sid1 = data.getSid(); finBillFile.setFileSid(sid1); finBillFileService.save(finBillFile); @@ -346,6 +352,9 @@ public class FinBillApplicationService extends MybatisBaseService commonAppendixVoResultBean = commonAppendixFeign.fetchByFilePath(filePath); CommonAppendixVo data = commonAppendixVoResultBean.getData(); + if (data == null){ + return rb.setMsg("请上传相关附件"); + } String sid1 = data.getSid(); finBillFile.setFileSid(sid1); finBillFileService.save(finBillFile); @@ -359,10 +368,7 @@ public class FinBillApplicationService extends MybatisBaseService commonContractVoResultBean = commonContractFeign.fetchBySid(sid1); CommonContractVo data = commonContractVoResultBean.getData(); - String busSid = data.getBusSid(); - ResultBean busOrderVoResultBean = busOrderFeign.fetchSid(busSid); - BusOrderVo data1 = busOrderVoResultBean.getData(); - String orderSid = data1.getOrderSid(); + String orderSid = data.getBusSid(); if (StringUtils.isNotBlank(oneBillMoney)){ busSalesOrderFeign.updateOneBillMoneyByOrderSid(orderSid,oneBillMoney); } @@ -404,8 +410,8 @@ public class FinBillApplicationService extends MybatisBaseService commonContractVoResultBean = commonContractFeign.fetchBySid(sid1); CommonContractVo data = commonContractVoResultBean.getData(); String busSid = data.getBusSid(); - ResultBean busOrderVoResultBean = busOrderFeign.fetchSid(busSid); - BusOrderVo data1 = busOrderVoResultBean.getData(); + ResultBean busSalesOrderDetailsVoResultBean = busSalesOrderFeign.fetchDetailsBySid(busSid); + BusSalesOrderDetailsVo data1 = busSalesOrderDetailsVoResultBean.getData(); String oneBillMoney = data1.getOneBillMoney(); if (StringUtils.isBlank(oneBillMoney)){ vo.setOneBillState("0"); @@ -452,7 +458,8 @@ public class FinBillApplicationService extends MybatisBaseService commonContractVoResultBean = commonContractFeign.fetchBySid(contractSid); CommonContractVo data1 = commonContractVoResultBean.getData(); String busSid = data1.getBusSid(); - String price = busOrderModelFeign.getPriceByOrderSid(busSid); + ResultBean priceByOrderSid = busSalesOrderPriceFeign.getPriceByOrderSid(busSid); + String price = priceByOrderSid.getData(); if (price.equals(oneBillMoney)) { variables.put("isHighAndLowOpen",false); } else { diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillfile/FinBillFileService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillfile/FinBillFileService.java index 3969cec46b..40fa175b1d 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillfile/FinBillFileService.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillfile/FinBillFileService.java @@ -123,11 +123,11 @@ public class FinBillFileService extends MybatisBaseService fetchFileBySid(String billAppSid, String fileType) { - FinBillFileAppendxVo finBillFileAppendxVo = new FinBillFileAppendxVo(); ArrayList finBillFileAppendxVos = new ArrayList<>(); List finBillFileDetailsVos = baseMapper.fetchFileBySid(billAppSid, fileType); String path = ""; for (FinBillFileDetailsVo finBillFileDetailsVo : finBillFileDetailsVos) { + FinBillFileAppendxVo finBillFileAppendxVo = new FinBillFileAppendxVo(); String fileUrl = finBillFileDetailsVo.getFileUrl(); String urlPrefix = fileUploadComponent.getUrlPrefix(); path = urlPrefix + fileUrl;