From 8050aca0f46c9e573e0ad1fdd562a517f5789796 Mon Sep 17 00:00:00 2001 From: dimengzhe Date: Wed, 17 May 2023 16:43:37 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=AC=A0=E6=AC=BE=E6=8F=90?= =?UTF-8?q?=E8=BD=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/bussalesorder/SolutionsDetailsssVo.java | 7 +++++++ .../biz/bussalesorder/BusSalesOrderService.java | 8 ++++++++ .../BusSalesOrderVehicleService.java | 15 +++++++++++++++ .../FinUncollectedReceivablesDetailedFeign.java | 7 +++++++ ...collectedReceivablesDetailedFeignFallback.java | 10 ++++++++++ .../FinUncollectedReceivablesDetailedMapper.java | 4 ++++ .../FinUncollectedReceivablesDetailedMapper.xml | 10 ++++++++++ .../FinUncollectedReceivablesDetailedRest.java | 10 ++++++++++ .../FinUncollectedReceivablesDetailedService.java | 14 +++++++++++++- 9 files changed, 84 insertions(+), 1 deletion(-) diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/SolutionsDetailsssVo.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/SolutionsDetailsssVo.java index 6a671dc9a1..805fa62282 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/SolutionsDetailsssVo.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/SolutionsDetailsssVo.java @@ -151,4 +151,11 @@ public class SolutionsDetailsssVo { @ApiModelProperty("名义留购价") private String nominalPrice; + @ApiModelProperty("单台成交价") + private String finalPrice; + @ApiModelProperty("挂车价格") + private String gcPrice; + @ApiModelProperty("上装成交价") + private String szPrice; + } 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 b854904fca..76f922df04 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 @@ -306,6 +306,8 @@ public class BusSalesOrderService extends MybatisBaseService> listResultBean = finUncollectedReceivablesDetailedFeign.selectByCreateBySidOne(userSid); + if(!listResultBean.getData().isEmpty()){ + listResultBean.getData().removeAll(Collections.singleton(null)); + qw.notIn("bv.sid",listResultBean.getData()); + } List stringList = baseMapper.selectBusinessSid(userSid, useOrgSid, qw); stringList.removeAll(Collections.singleton(null)); return rb.success().setData(stringList); diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleService.java index 0d920814c0..1de2e7f802 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleService.java @@ -49,6 +49,7 @@ import com.yxt.anrui.buscenter.biz.bussalesorder.BusSalesOrderService; import com.yxt.anrui.fin.api.finbillvehicle.FinBillVehicleDetailsVo; import com.yxt.anrui.fin.api.finbillvehicle.FinBillVehicleFeign; import com.yxt.anrui.fin.api.finselectedreceivablesdetailed.FinSelectedReceivablesDetailedFeign; +import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.FinUncollectedReceivablesDetailedFeign; import com.yxt.common.base.service.MybatisBaseService; import com.yxt.common.base.utils.PagerUtil; import com.yxt.common.core.query.PagerQuery; @@ -93,6 +94,8 @@ public class BusSalesOrderVehicleService extends MybatisBaseService list, String sid) { if (list.size() > 0) { @@ -331,6 +334,12 @@ public class BusSalesOrderVehicleService extends MybatisBaseService> listResultBean = finUncollectedReceivablesDetailedFeign.selectByContractNoOne(query.getContractNo()); + if(!listResultBean.getData().isEmpty()){ + listResultBean.getData().removeAll(Collections.singleton(null)); + qw.notIn("bv.sid",listResultBean.getData()); + } List list = baseMapper.getCanUseCars(qw); list.removeAll(Collections.singleton(null)); if (!list.isEmpty()) { @@ -390,6 +399,12 @@ public class BusSalesOrderVehicleService extends MybatisBaseService> listResultBean = finUncollectedReceivablesDetailedFeign.selectByContractNoOne(params.getContractNo()); + if(!listResultBean.getData().isEmpty()){ + listResultBean.getData().removeAll(Collections.singleton(null)); + qw.notIn("bv.sid",listResultBean.getData()); + } IPage pagging = baseMapper.selectPageVo(page, qw); PagerVo p = PagerUtil.pageToVo(pagging, null); List list = pagging.getRecords(); diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedFeign.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedFeign.java index 809f56a9e4..a7e55d19ba 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedFeign.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedFeign.java @@ -108,4 +108,11 @@ public interface FinUncollectedReceivablesDetailedFeign { @GetMapping("/receivedSelect") ResultBean receivedSelect(@RequestParam("busVinSid") String busVinSid, @RequestParam("vinSid") String vinSid); + @ApiOperation("查询车辆的应收未收款项") + @GetMapping("/selectByContractNoOne") + ResultBean> selectByContractNoOne(@RequestParam("contractNo") String contractNo); + + @ApiOperation("查询车辆的应收未收款项") + @GetMapping("/selectByCreateBySidOne") + ResultBean> selectByCreateBySidOne(@RequestParam("userSid") String userSid); } \ No newline at end of file diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedFeignFallback.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedFeignFallback.java index 7b64b63449..2b1b65e2ee 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedFeignFallback.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedFeignFallback.java @@ -116,4 +116,14 @@ public class FinUncollectedReceivablesDetailedFeignFallback implements FinUncoll return null; } + @Override + public ResultBean> selectByContractNoOne(String contractNo) { + return null; + } + + @Override + public ResultBean> selectByCreateBySidOne(String userSid) { + return null; + } + } \ No newline at end of file diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedMapper.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedMapper.java index bccb894868..2b1c5f621e 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedMapper.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedMapper.java @@ -95,4 +95,8 @@ public interface FinUncollectedReceivablesDetailedMapper extends BaseMapper fetchYsSidByOrderVehSid(String sid); + + List selectByContractNoOne(String contractNo); + + List selectByCreateBySidOne(String userSid); } \ No newline at end of file diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedMapper.xml b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedMapper.xml index 722df241af..af838f15be 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedMapper.xml +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedMapper.xml @@ -148,4 +148,14 @@ WHERE furd.busVinSid = #{busVinSid} + + + + \ No newline at end of file diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedRest.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedRest.java index 546ea34428..c957941b69 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedRest.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedRest.java @@ -137,6 +137,16 @@ public class FinUncollectedReceivablesDetailedRest implements FinUncollectedRece return finUncollectedReceivablesDetailedService.receivedSelect(busVinSid, vinSid); } + @Override + public ResultBean> selectByContractNoOne(String contractNo) { + return finUncollectedReceivablesDetailedService.selectByContractNoOne(contractNo); + } + + @Override + public ResultBean> selectByCreateBySidOne(String userSid) { + return finUncollectedReceivablesDetailedService.selectByCreateBySidOne(userSid); + } + @Override public ResultBean> selectByContractNo(String contractNo) { diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedService.java index 91526b0cea..f9c5c04e55 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedService.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedService.java @@ -210,7 +210,7 @@ public class FinUncollectedReceivablesDetailedService extends MybatisBaseService } else { if ("2".equals(v.getPayTypeKey())) { v.setVIN(temporaryNo.substring(temporaryNo.length() - 2)); - }else{ + } else { v.setVIN(temporaryNo); } } @@ -779,4 +779,16 @@ public class FinUncollectedReceivablesDetailedService extends MybatisBaseService public List fetchYsSidByOrderVehSid(String sid) { return baseMapper.fetchYsSidByOrderVehSid(sid); } + + public ResultBean> selectByContractNoOne(String contractNo) { + ResultBean> rb = ResultBean.fireFail(); + List stringList = baseMapper.selectByContractNoOne(contractNo); + return rb.success().setData(stringList); + } + + public ResultBean> selectByCreateBySidOne(String userSid) { + ResultBean> rb = ResultBean.fireFail(); + List stringList = baseMapper.selectByCreateBySidOne(userSid); + return rb.success().setData(stringList); + } } \ No newline at end of file