From 81a10e2c8c72fc1d259bfa4b7b80f6000332adfa Mon Sep 17 00:00:00 2001 From: hanlinghao <2969694837@qq.com> Date: Thu, 14 Apr 2022 17:30:10 +0800 Subject: [PATCH] =?UTF-8?q?=E6=AC=BE=E9=A1=B9=E7=A1=AE=E8=AE=A4app?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AppBusCollectionConfirmationDto.java | 68 +++++ .../AppBusCollectionConfirmationInitVo.java | 69 +++++ .../AppBusCollectionConfirmationPageVo.java | 2 + ...electedReceivablesPaymentDetailsQuery.java | 21 ++ ...usSelectedReceivablesPaymentDetailsVo.java | 37 +++ .../BusCollectionConfirmationFeign.java | 22 +- ...usCollectionConfirmationFeignFallback.java | 25 ++ .../AppBusSelectedReceivablesDetailedDto.java | 69 +++++ .../BusCollectionConfirmationMapper.java | 22 +- .../BusCollectionConfirmationMapper.xml | 56 ++++- .../BusCollectionConfirmationRest.java | 74 +++++- .../BusCollectionConfirmationService.java | 146 ++++++++++- .../BusSelectedReceivablesDetailedMapper.java | 37 ++- .../BusSelectedReceivablesDetailedMapper.xml | 28 ++- ...BusSelectedReceivablesDetailedService.java | 236 ++++++++++-------- 15 files changed, 750 insertions(+), 162 deletions(-) create mode 100644 anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/buscollectionconfirmation/AppBusCollectionConfirmationDto.java create mode 100644 anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/buscollectionconfirmation/AppBusCollectionConfirmationInitVo.java create mode 100644 anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/buscollectionconfirmation/AppBusSelectedReceivablesPaymentDetailsQuery.java create mode 100644 anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/buscollectionconfirmation/AppBusSelectedReceivablesPaymentDetailsVo.java create mode 100644 anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busselectedreceivablesdetailed/AppBusSelectedReceivablesDetailedDto.java diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/buscollectionconfirmation/AppBusCollectionConfirmationDto.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/buscollectionconfirmation/AppBusCollectionConfirmationDto.java new file mode 100644 index 0000000000..8cdab0deee --- /dev/null +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/buscollectionconfirmation/AppBusCollectionConfirmationDto.java @@ -0,0 +1,68 @@ +package com.yxt.anrui.buscenter.api.buscollectionconfirmation; + +import com.yxt.anrui.buscenter.api.busselectedreceivablesdetailed.AppBusSelectedReceivablesDetailedDto; +import com.yxt.common.core.dto.Dto; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.math.BigDecimal; +import java.util.List; + +@Data +public class AppBusCollectionConfirmationDto implements Dto { + + @ApiModelProperty("款项确认sid") + private String sid; + + @ApiModelProperty("收款银行") + private String collectionBank; + + @ApiModelProperty("收款银行key") + private String collectionBankKey; + + @ApiModelProperty("汇款确认") + private List payConfirmFiles; + + @ApiModelProperty("付款金额") + private BigDecimal paymentMoney; + + @ApiModelProperty("收款日期") + private String collectionDate; + + @ApiModelProperty("付款方名称") + private String paymentName; + + @ApiModelProperty("收款账号") + private String collectionNum; + + @ApiModelProperty("收款账号key") + private String collectionNumKey; + + @ApiModelProperty("收款记录sid") + private String collectionBillSid; + + @ApiModelProperty("下载模板") + private String downLoadUrl; + + @ApiModelProperty("备注") + private String remarks; + + @ApiModelProperty("收款方式") + private String collectionType; + + @ApiModelProperty("收款方式key") + private String collectionTypeKey; + + @ApiModelProperty("打款凭证") + private List payFiles; + + @ApiModelProperty("款项明细") + private List paymentDetail; + + @ApiModelProperty("余额") + private String balance; + + @ApiModelProperty("用户sid") + private String userSid; + +} diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/buscollectionconfirmation/AppBusCollectionConfirmationInitVo.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/buscollectionconfirmation/AppBusCollectionConfirmationInitVo.java new file mode 100644 index 0000000000..479ae45fbe --- /dev/null +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/buscollectionconfirmation/AppBusCollectionConfirmationInitVo.java @@ -0,0 +1,69 @@ +package com.yxt.anrui.buscenter.api.buscollectionconfirmation; + +import com.yxt.anrui.buscenter.api.busselectedreceivablesdetailed.AppBusSelectedReceivablesDetailedDto; +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +@Data +public class AppBusCollectionConfirmationInitVo implements Vo { + + @ApiModelProperty("款项确认sid") + private String sid; + + @ApiModelProperty("收款银行") + private String collectionBank; + + @ApiModelProperty("收款银行key") + private String collectionBankKey; + + @ApiModelProperty("汇款确认") + private List payConfirmFiles; + + @ApiModelProperty("付款金额") + private String paymentMoney; + + @ApiModelProperty("收款日期") + private String collectionDate; + + @ApiModelProperty("付款方名称") + private String paymentName; + + @ApiModelProperty("收款账号") + private String collectionNum; + + @ApiModelProperty("收款账号key") + private String collectionNumKey; + + @ApiModelProperty("收款记录sid") + private String collectionBillSid; + + @ApiModelProperty("下载模板") + private String downLoadUrl; + + @ApiModelProperty("备注") + private String remarks; + + @ApiModelProperty("收款方式") + private String collectionType; + + @ApiModelProperty("收款方式key") + private String collectionTypeKey; + + @ApiModelProperty("打款凭证") + private List payFiles; + + @ApiModelProperty("款项明细") + private List paymentDetail; + + @ApiModelProperty("余额") + private String balance; + + @ApiModelProperty("用户sid") + private String userSid; + + + +} diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/buscollectionconfirmation/AppBusCollectionConfirmationPageVo.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/buscollectionconfirmation/AppBusCollectionConfirmationPageVo.java index 8f4671f246..5b6a2ad690 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/buscollectionconfirmation/AppBusCollectionConfirmationPageVo.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/buscollectionconfirmation/AppBusCollectionConfirmationPageVo.java @@ -25,6 +25,8 @@ public class AppBusCollectionConfirmationPageVo implements Vo { private String collectionMoney; @ApiModelProperty("备注") private String remarks; + @ApiModelProperty("余额") + private Integer balance; @ApiModelProperty("是否显示办理") private boolean showHandle; @ApiModelProperty("是否显示下载") diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/buscollectionconfirmation/AppBusSelectedReceivablesPaymentDetailsQuery.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/buscollectionconfirmation/AppBusSelectedReceivablesPaymentDetailsQuery.java new file mode 100644 index 0000000000..5acb706bc2 --- /dev/null +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/buscollectionconfirmation/AppBusSelectedReceivablesPaymentDetailsQuery.java @@ -0,0 +1,21 @@ +package com.yxt.anrui.buscenter.api.buscollectionconfirmation; + +import com.yxt.common.core.query.Query; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +@Data +public class AppBusSelectedReceivablesPaymentDetailsQuery implements Query { + + @ApiModelProperty("用户sid") + private String userSid; + + @ApiModelProperty("客户名称") + private String name; + + @ApiModelProperty("明细sid") + private List sidList; + +} diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/buscollectionconfirmation/AppBusSelectedReceivablesPaymentDetailsVo.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/buscollectionconfirmation/AppBusSelectedReceivablesPaymentDetailsVo.java new file mode 100644 index 0000000000..205c372bd6 --- /dev/null +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/buscollectionconfirmation/AppBusSelectedReceivablesPaymentDetailsVo.java @@ -0,0 +1,37 @@ +package com.yxt.anrui.buscenter.api.buscollectionconfirmation; + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +public class AppBusSelectedReceivablesPaymentDetailsVo implements Vo { + + @ApiModelProperty("合同编号") + private String contractId; + + @ApiModelProperty("项目名称") + private String projectName; + + @ApiModelProperty("联系电话") + private String mobile; + + @ApiModelProperty("客户名称") + private String name; + + @ApiModelProperty("应收金额") + private String receivable; + + @ApiModelProperty("合同sid") + private String contractSid; + + @ApiModelProperty("付款金额") + private String confirmMoney; + + @ApiModelProperty("车架号") + private String vin; + + @ApiModelProperty("认款时间") + private String confirmDate; + +} diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/buscollectionconfirmation/BusCollectionConfirmationFeign.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/buscollectionconfirmation/BusCollectionConfirmationFeign.java index ca93366807..04864cdca5 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/buscollectionconfirmation/BusCollectionConfirmationFeign.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/buscollectionconfirmation/BusCollectionConfirmationFeign.java @@ -63,7 +63,7 @@ public interface BusCollectionConfirmationFeign { @ApiOperation("新增或修改保存") @PostMapping("/saveOrUpdate") public ResultBean saveOrUpdate(@RequestBody BusCollectionConfirmationDto dto); - + @ApiOperation("根据sid批量删除") @PostMapping("/delBySids") public ResultBean delBySids(@RequestBody String[] sids); @@ -77,4 +77,24 @@ public interface BusCollectionConfirmationFeign { @ApiOperation("手机端—获取款项确认列表") @PostMapping("/getCollectionConfirmList") public ResultBean> getCollectionConfirmList(@RequestBody PagerQuery pagerQuery); + + @ApiOperation("手机端—新增款项确认申请单") + @PostMapping("/addCollectionConfirm") + public ResultBean addCollectionConfirm(@RequestBody AppBusCollectionConfirmationDto dto); + + @ApiOperation("手机端—初始化收款确认申请") + @GetMapping("/initCollectionConfirm/{collectionBillSid}/{userSid}") + public ResultBean initCollectionConfirm(@PathVariable("collectionBillSid") String collectionBillSid, @PathVariable("userSid") String userSid); + + @ApiOperation("手机端—提交款项确认申请") + @PostMapping("/submitCollectionConfirm") + public ResultBean submitCollectionConfirm(@RequestBody AppBusCollectionConfirmationDto dto); + + @ApiOperation("手机端—删除收款确认单") + @DeleteMapping("/deleteCollectionConfirm/{collectionBillSid}") + public ResultBean deleteCollectionConfirm(@PathVariable("collectionBillSid") String collectionBillSid); + + @ApiOperation("手机端—查询可使用款项明细列表") + @PostMapping("/getPaymentDetailsList") + public ResultBean> getPaymentDetailsList(@RequestBody PagerQuery pagerQuery); } \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/buscollectionconfirmation/BusCollectionConfirmationFeignFallback.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/buscollectionconfirmation/BusCollectionConfirmationFeignFallback.java index 565c8ebb45..f3b3ee81f7 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/buscollectionconfirmation/BusCollectionConfirmationFeignFallback.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/buscollectionconfirmation/BusCollectionConfirmationFeignFallback.java @@ -74,4 +74,29 @@ public class BusCollectionConfirmationFeignFallback implements BusCollectionConf public ResultBean> getCollectionConfirmList(PagerQuery pagerQuery) { return null; } + + @Override + public ResultBean addCollectionConfirm(AppBusCollectionConfirmationDto dto) { + return null; + } + + @Override + public ResultBean initCollectionConfirm(String collectionBillSid, String userSid) { + return null; + } + + @Override + public ResultBean submitCollectionConfirm(AppBusCollectionConfirmationDto dto) { + return null; + } + + @Override + public ResultBean deleteCollectionConfirm(String collectionBillSid) { + return null; + } + + @Override + public ResultBean> getPaymentDetailsList(PagerQuery pagerQuery) { + return null; + } } \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busselectedreceivablesdetailed/AppBusSelectedReceivablesDetailedDto.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busselectedreceivablesdetailed/AppBusSelectedReceivablesDetailedDto.java new file mode 100644 index 0000000000..72ac03d40e --- /dev/null +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busselectedreceivablesdetailed/AppBusSelectedReceivablesDetailedDto.java @@ -0,0 +1,69 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.buscenter.api.busselectedreceivablesdetailed; + + +import com.yxt.common.core.dto.Dto; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * Project: anrui-buscenter(销售相关)
+ * File: BusCustomerBillDetailedDto.java
+ * Class: com.yxt.anrui.buscenter.api.buscustomerbilldetailed.BusCustomerBillDetailedDto
+ * Description: 客户账单明细表 数据传输对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-04-12 17:57:01
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@ApiModel(value = "客户账单明细表 数据传输对象", description = "客户账单明细表 数据传输对象") +@Data +public class AppBusSelectedReceivablesDetailedDto implements Dto { + + @ApiModelProperty("应收金额") + private String receivable; + @ApiModelProperty("车架号") + private String vin; + @ApiModelProperty("认款金额") + private String confirmMoney; + @ApiModelProperty("合同号") + private String contractId; + @ApiModelProperty("应收项目") + private String projectName; + @ApiModelProperty("合同sid") + private String contractSid; + @ApiModelProperty("客户名") + private String name; + @ApiModelProperty("联系电话") + private String mobile; + @ApiModelProperty("认款日期") + private String confirmDate; +} \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/buscollectionconfirmation/BusCollectionConfirmationMapper.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/buscollectionconfirmation/BusCollectionConfirmationMapper.java index 36d5ef937f..7f0137bafc 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/buscollectionconfirmation/BusCollectionConfirmationMapper.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/buscollectionconfirmation/BusCollectionConfirmationMapper.java @@ -30,13 +30,11 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.toolkit.Constants; -import com.yxt.anrui.buscenter.api.buscollectionconfirmation.AppBusCollectionConfirmationPageVo; -import com.yxt.anrui.buscenter.api.buscollectionconfirmation.AppBusCollectionConfirmationQuery; +import com.yxt.anrui.buscenter.api.buscollectionconfirmation.*; +import com.yxt.common.core.result.ResultBean; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; -import com.yxt.anrui.buscenter.api.buscollectionconfirmation.BusCollectionConfirmation; -import com.yxt.anrui.buscenter.api.buscollectionconfirmation.BusCollectionConfirmationVo; import java.util.List; @@ -66,5 +64,21 @@ public interface BusCollectionConfirmationMapper extends BaseMapper selectListVo(); + /** + * 手机端—获取款项确认列表 + * + * @param page + * @param qw + * @return + */ IPage getCollectionConfirmList(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); + + /** + * 手机端—初始化收款确认申请 + * + * @param collectionBillSid + * @param useOrgSid + * @return + */ + AppBusCollectionConfirmationInitVo initCollectionConfirm(@Param("collectionBillSid") String collectionBillSid, @Param("useOrgSid") String useOrgSid); } \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/buscollectionconfirmation/BusCollectionConfirmationMapper.xml b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/buscollectionconfirmation/BusCollectionConfirmationMapper.xml index 234282309a..065e84f11a 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/buscollectionconfirmation/BusCollectionConfirmationMapper.xml +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/buscollectionconfirmation/BusCollectionConfirmationMapper.xml @@ -1,18 +1,52 @@ - - - - - + + + + + + + select sid AS collectionBillSid, + collectionBankNum AS collectionNum, + subscriptionState AS collectionBillState, + collectionBank, + collectionTypeValue AS collectionType, + collectionDate, + payerName AS paymentName, + collectionMoney, + remarks, + balance + from bus_collection_confirmation + + ${ew.sqlSegment} + + + \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/buscollectionconfirmation/BusCollectionConfirmationRest.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/buscollectionconfirmation/BusCollectionConfirmationRest.java index d7d206b068..aa95acb0c7 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/buscollectionconfirmation/BusCollectionConfirmationRest.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/buscollectionconfirmation/BusCollectionConfirmationRest.java @@ -26,8 +26,10 @@ package com.yxt.anrui.buscenter.biz.buscollectionconfirmation; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.yxt.anrui.base.api.basevehicle.AppCurrentCarModelByPageListVo; import com.yxt.anrui.base.api.basevehicle.BaseVehicleVo; import com.yxt.anrui.buscenter.api.buscollectionconfirmation.*; +import com.yxt.common.base.utils.PagerUtil; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; @@ -78,9 +80,9 @@ public class BusCollectionConfirmationRest implements BusCollectionConfirmationF @Override @ApiOperation("根据sid批量删除") @PostMapping("/delBySids") - public ResultBean delBySids(@RequestBody String[] sids){ - return busCollectionConfirmationService.delAllBySids(sids); - } + public ResultBean delBySids(@RequestBody String[] sids) { + return busCollectionConfirmationService.delAllBySids(sids); + } @Override @ApiOperation("根据SID获取一条记录") @@ -97,8 +99,68 @@ public class BusCollectionConfirmationRest implements BusCollectionConfirmationF */ @Override public ResultBean> getCollectionConfirmList(PagerQuery pagerQuery) { - ResultBean> rb = ResultBean.fireFail(); - IPage page = busCollectionConfirmationService.getCollectionConfirmList(pagerQuery); - return null; + PagerVo page = new PagerVo<>(); + IPage iPage = busCollectionConfirmationService.getCollectionConfirmList(pagerQuery); + PagerVo pagerVo = PagerUtil.pageToVo(iPage, page); + return new ResultBean>().success().setData(pagerVo); + } + + /** + * 手机端—新增款项确认申请单 + * + * @param dto + * @return + */ + @Override + public ResultBean addCollectionConfirm(AppBusCollectionConfirmationDto dto) { + return busCollectionConfirmationService.addCollectionConfirm(dto); + } + + /** + * 手机端—初始化收款确认申请 + * + * @param collectionBillSid + * @param userSid + * @return + */ + @Override + public ResultBean initCollectionConfirm(String collectionBillSid, String userSid) { + return busCollectionConfirmationService.initCollectionConfirm(collectionBillSid, userSid); + } + + /** + * 手机端—提交款项确认申请 + * + * @param dto + * @return + */ + @Override + public ResultBean submitCollectionConfirm(AppBusCollectionConfirmationDto dto) { + return busCollectionConfirmationService.submitCollectionConfirm(dto); + } + + /** + * 手机端—删除收款确认单 + * + * @param collectionBillSid + * @return + */ + @Override + public ResultBean deleteCollectionConfirm(String collectionBillSid) { + return busCollectionConfirmationService.deleteCollectionConfirm(collectionBillSid); + } + + /** + * 手机端—查询可使用款项明细列表 + * + * @param pagerQuery + * @return + */ + @Override + public ResultBean> getPaymentDetailsList(PagerQuery pagerQuery) { + PagerVo page = new PagerVo<>(); + IPage iPage = busCollectionConfirmationService.getPaymentDetailsList(pagerQuery); + PagerVo pagerVo = PagerUtil.pageToVo(iPage, page); + return new ResultBean>().success().setData(pagerVo); } } diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/buscollectionconfirmation/BusCollectionConfirmationService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/buscollectionconfirmation/BusCollectionConfirmationService.java index dea6cff2dc..b4a1e443d0 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/buscollectionconfirmation/BusCollectionConfirmationService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/buscollectionconfirmation/BusCollectionConfirmationService.java @@ -26,6 +26,7 @@ package com.yxt.anrui.buscenter.biz.buscollectionconfirmation; import cn.hutool.core.bean.BeanUtil; +import com.alibaba.nacos.api.config.filter.IFilterConfig; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.yxt.anrui.base.api.basevehicle.BaseVehicleQuery; @@ -39,6 +40,8 @@ import com.yxt.anrui.buscenter.api.busselectedreceivablesdetailed.BusSelectedRec import com.yxt.anrui.buscenter.api.busselectedreceivablesdetailed.BusSelectedReceivablesDetailedDto; import com.yxt.anrui.buscenter.api.busselectedreceivablesdetailed.BusSelectedReceivablesDetailedVo; import com.yxt.anrui.buscenter.biz.busselectedreceivablesdetailed.BusSelectedReceivablesDetailedService; +import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign; +import com.yxt.anrui.portal.api.sysuser.SysUserFeign; import com.yxt.common.base.config.component.FileUploadComponent; import org.apache.commons.lang3.StringUtils; import com.yxt.common.base.service.MybatisBaseService; @@ -49,6 +52,7 @@ import com.yxt.common.core.vo.PagerVo; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import java.util.List; @@ -74,6 +78,10 @@ public class BusCollectionConfirmationService extends MybatisBaseService createQueryWrapper(BusCollectionConfirmationQuery query) { // todo: 这里根据具体业务调整查询条件 @@ -189,12 +197,25 @@ public class BusCollectionConfirmationService extends MybatisBaseService getCollectionConfirmList(PagerQuery pagerQuery) { IPage page = PagerUtil.queryToPage(pagerQuery); QueryWrapper qw = appBuildQueryWrapper(pagerQuery.getParams()); - return baseMapper.getCollectionConfirmList(page,qw); + IPage collectionConfirmList = baseMapper.getCollectionConfirmList(page, qw); + for (AppBusCollectionConfirmationPageVo record : collectionConfirmList.getRecords()) { + Integer balance = record.getBalance(); + String collectionBillState = record.getCollectionBillState(); + if (balance <= 0 || collectionBillState.equals("1") || collectionBillState.equals("3")) { + record.setShowHandle(false); + } + record.setShowDownload(false); + List busSelectedReceivablesDetailedVos = busSelectedReceivablesDetailedService.fetchByCillSid(record.getCollectionBillSid()); + if (busSelectedReceivablesDetailedVos.size() > 0 || collectionBillState != "1") { + record.setShowDelete(false); + } + } + return collectionConfirmList; } /** @@ -204,12 +225,119 @@ public class BusCollectionConfirmationService extends MybatisBaseService appBuildQueryWrapper(AppBusCollectionConfirmationQuery pagerQuery) { - QueryWrapper qw = new QueryWrapper<>(); - if (pagerQuery != null) { - if (com.yxt.common.base.utils.StringUtils.isNotBlank(pagerQuery.getName())) {//车架号 - qw.like("bv.vinNo", pagerQuery.getName()); - } - } - return qw; + QueryWrapper qw = new QueryWrapper<>(); + if (pagerQuery != null) { + if (com.yxt.common.base.utils.StringUtils.isNotBlank(pagerQuery.getName())) {//车架号 + qw.like("bv.vinNo", pagerQuery.getName()); + } + } + return qw; + } + + /** + * 手机端—新增款项确认申请单 + * + * @param dto + * @return + */ + @Transactional(rollbackFor = Exception.class) + public ResultBean addCollectionConfirm(AppBusCollectionConfirmationDto dto) { + ResultBean rb = ResultBean.fireFail(); + String staffSid = sysUserFeign.getUserOrgInfoByUserSid(dto.getUserSid()).getData().getStaffSid(); + BusCollectionConfirmation busCollectionConfirmation = new BusCollectionConfirmation(); + CommonAppendixDto commonAppendixDto = new CommonAppendixDto(); + String sid = busCollectionConfirmation.getSid(); + busCollectionConfirmation.setSid(sid); + busCollectionConfirmation.setCollectionDate(dto.getCollectionDate()); + busCollectionConfirmation.setCollectionBank(dto.getCollectionBank()); + busCollectionConfirmation.setCollectionBankNum(dto.getCollectionNum()); + busCollectionConfirmation.setCollectionMoney(dto.getPaymentMoney()); + busCollectionConfirmation.setCollectionTypeKey(dto.getCollectionTypeKey()); + busCollectionConfirmation.setCollectionTypeValue(dto.getCollectionType()); + busCollectionConfirmation.setPayerName(dto.getPaymentName()); + busCollectionConfirmation.setCollectionMoney(dto.getPaymentMoney()); + busCollectionConfirmation.setRemarks(dto.getRemarks()); + insert(busCollectionConfirmation); + List payFiles = dto.getPayFiles(); + for (String payFile : payFiles) { + String payFilePath = payFile.replace(fileUploadComponent.getUrlPrefix(), ""); + commonAppendixDto.setLinkSid(sid); + commonAppendixDto.setFilePath(payFilePath); + commonAppendixDto.setCreateBySid(staffSid); + commonAppendixDto.setAttachType(CommonAttachTypeEnum.PAYMENT_VOUCHER.getAttachType()); + commonAppendixFeign.save(commonAppendixDto); + } + return rb.success(); + } + + /** + * 手机端—初始化收款确认申请 + * + * @param collectionBillSid + * @param userSid + * @return + */ + public ResultBean initCollectionConfirm(String collectionBillSid, String userSid) { + ResultBean rb = ResultBean.fireFail(); + if (StringUtils.isNotBlank(userSid)) { + return rb.fail().setMsg("用户sid不能为空"); + } + String useOrgSid = sysOrganizationFeign.getUseOrgByUserSid(userSid).getData().getSid(); + AppBusCollectionConfirmationInitVo vo = baseMapper.initCollectionConfirm(collectionBillSid, useOrgSid); + return rb.success().setData(vo); + } + + /** + * 手机端—提交款项确认申请 + * + * @param dto + * @return + */ + public ResultBean submitCollectionConfirm(AppBusCollectionConfirmationDto dto) { + return null; + } + + /** + * 手机端—删除收款确认单 + * + * @param collectionBillSid + * @return + */ + @Transactional(rollbackFor = Exception.class) + public ResultBean deleteCollectionConfirm(String collectionBillSid) { + ResultBean rb = ResultBean.fireFail(); + deleteBySid(collectionBillSid); + busSelectedReceivablesDetailedService.deleteByCollSid(collectionBillSid); + return rb.success().setMsg("删除成功"); + } + + + /** + * 手机端—查询可使用款项明细列表 + * + * @param pagerQuery + * @return + */ + public IPage getPaymentDetailsList(PagerQuery pagerQuery) { + IPage page = PagerUtil.queryToPage(pagerQuery); + QueryWrapper qw = appPaymentDetailsBuildQueryWrapper(pagerQuery.getParams()); + IPage collectionConfirmList = busSelectedReceivablesDetailedService.getPaymentDetailsList(page, qw); + return collectionConfirmList; + } + + /** + * 构造条件 + * + * @param pagerQuery 查询条件 + * @return + */ + private QueryWrapper appPaymentDetailsBuildQueryWrapper(AppBusSelectedReceivablesPaymentDetailsQuery pagerQuery) { + QueryWrapper qw = new QueryWrapper<>(); + if (pagerQuery != null) { + if (com.yxt.common.base.utils.StringUtils.isNotBlank(pagerQuery.getName())) {//车架号 + qw.like("bv.vinNo", pagerQuery.getName()); + } + } + return qw; } } \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busselectedreceivablesdetailed/BusSelectedReceivablesDetailedMapper.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busselectedreceivablesdetailed/BusSelectedReceivablesDetailedMapper.java index fe7174f927..b11c0ebb4f 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busselectedreceivablesdetailed/BusSelectedReceivablesDetailedMapper.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busselectedreceivablesdetailed/BusSelectedReceivablesDetailedMapper.java @@ -26,9 +26,12 @@ package com.yxt.anrui.buscenter.biz.busselectedreceivablesdetailed; import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.toolkit.Constants; +import com.yxt.anrui.buscenter.api.buscollectionconfirmation.AppBusSelectedReceivablesPaymentDetailsQuery; +import com.yxt.anrui.buscenter.api.buscollectionconfirmation.AppBusSelectedReceivablesPaymentDetailsVo; import org.apache.ibatis.annotations.Delete; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -54,19 +57,29 @@ import java.util.List; @Mapper public interface BusSelectedReceivablesDetailedMapper extends BaseMapper { - //@Update("update bus_selected_receivables_detailed set name=#{msg} where id=#{id}") - //IPage voPage(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); - - IPage selectPageVo(IPage page, @Param(Constants.WRAPPER) Wrapper qw); - - List selectListAllVo(@Param(Constants.WRAPPER) Wrapper qw); - - @Select("select * from bus_selected_receivables_detailed") - List selectListVo(); + //@Update("update bus_selected_receivables_detailed set name=#{msg} where id=#{id}") + //IPage voPage(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); - @Delete("delete from bus_selected_receivables_detailed where collSid = #{sid}") + IPage selectPageVo(IPage page, @Param(Constants.WRAPPER) Wrapper qw); + + List selectListAllVo(@Param(Constants.WRAPPER) Wrapper qw); + + @Select("select * from bus_selected_receivables_detailed") + List selectListVo(); + + @Delete("delete from bus_selected_receivables_detailed where collSid = #{sid}") void deleteByCollSid(String sid); - @Select("select * from bus_selected_receivables_detailed where collSid = #{sid}") - List fetchByCillSid(String sid); + @Select("select * from bus_selected_receivables_detailed where collSid = #{sid}") + List fetchByCillSid(String sid); + + + /** + * 手机端—查询可使用款项明细列表 + * + * @param page + * @param qw + * @return + */ + IPage getPaymentDetailsList(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); } \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busselectedreceivablesdetailed/BusSelectedReceivablesDetailedMapper.xml b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busselectedreceivablesdetailed/BusSelectedReceivablesDetailedMapper.xml index ea583bec99..39928dc880 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busselectedreceivablesdetailed/BusSelectedReceivablesDetailedMapper.xml +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busselectedreceivablesdetailed/BusSelectedReceivablesDetailedMapper.xml @@ -1,13 +1,23 @@ - - - - - + + + + + + + + \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busselectedreceivablesdetailed/BusSelectedReceivablesDetailedService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busselectedreceivablesdetailed/BusSelectedReceivablesDetailedService.java index 1c2125fd61..a0793c4cce 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busselectedreceivablesdetailed/BusSelectedReceivablesDetailedService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busselectedreceivablesdetailed/BusSelectedReceivablesDetailedService.java @@ -28,6 +28,9 @@ package com.yxt.anrui.buscenter.biz.busselectedreceivablesdetailed; import cn.hutool.core.bean.BeanUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.yxt.anrui.buscenter.api.buscollectionconfirmation.AppBusSelectedReceivablesPaymentDetailsQuery; +import com.yxt.anrui.buscenter.api.buscollectionconfirmation.AppBusSelectedReceivablesPaymentDetailsVo; +import io.swagger.annotations.ApiModelProperty; import org.apache.commons.lang3.StringUtils; import com.yxt.common.base.service.MybatisBaseService; import com.yxt.common.base.utils.PagerUtil; @@ -59,114 +62,127 @@ import java.util.List; */ @Service public class BusSelectedReceivablesDetailedService extends MybatisBaseService { - public PagerVo listPage(PagerQuery pq) { - BusSelectedReceivablesDetailedQuery query = pq.getParams(); - QueryWrapper qw = createQueryWrapper(query); - IPage page = PagerUtil.queryToPage(pq); - IPage pagging = baseMapper.selectPage(page, qw); - PagerVo p = PagerUtil.pageToVo(pagging, null); - return p; - } - public List listAll(BusSelectedReceivablesDetailedQuery query) { - QueryWrapper qw = createQueryWrapper(query); - return baseMapper.selectList(qw); - } - private QueryWrapper createQueryWrapper(BusSelectedReceivablesDetailedQuery query) { - // todo: 这里根据具体业务调整查询条件 - // 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName())); - QueryWrapper qw = new QueryWrapper<>(); - - - if (StringUtils.isNotBlank(query.getCreateByName())) { - qw.eq("createByName", query.getCreateByName()); - } - - if (StringUtils.isNotBlank(query.getContractSid())) { - qw.eq("contractSid", query.getContractSid()); - } - - if (StringUtils.isNotBlank(query.getContractNo())) { - qw.eq("contractNo", query.getContractNo()); - } - - if (StringUtils.isNotBlank(query.getCustomerSid())) { - qw.eq("customerSid", query.getCustomerSid()); - } - - if (StringUtils.isNotBlank(query.getCustomerName())) { - qw.eq("customerName", query.getCustomerName()); - } - - if (StringUtils.isNotBlank(query.getVIN())) { - qw.eq("VIN", query.getVIN()); - } - - if (StringUtils.isNotBlank(query.getUseOrgSid())) { - qw.eq("useOrgSid", query.getUseOrgSid()); - } - - if (StringUtils.isNotBlank(query.getCustomerPhone())) { - qw.eq("customerPhone", query.getCustomerPhone()); - } - - if (StringUtils.isNotBlank(query.getReceivablesName())) { - qw.eq("receivablesName", query.getReceivablesName()); - } - - if (query.getCurrentReceivableMoney() != null) { - qw.eq("currentReceivableMoney", query.getCurrentReceivableMoney()); - } - - if (query.getSubscriptionMoney() != null) { - qw.eq("subscriptionMoney", query.getSubscriptionMoney()); - } - - if (StringUtils.isNotBlank(query.getSubscriptionDate())) { - qw.eq("subscriptionDate", query.getSubscriptionDate()); - } - - if (StringUtils.isNotBlank(query.getCollSid())) { - qw.eq("collSid", query.getCollSid()); - } - return qw; - } - - public PagerVo listPageVo(PagerQuery pq) { - BusSelectedReceivablesDetailedQuery query = pq.getParams(); - QueryWrapper qw = createQueryWrapper(query); - IPage page = PagerUtil.queryToPage(pq); - IPage pagging = baseMapper.selectPageVo(page, qw); - PagerVo p = PagerUtil.pageToVo(pagging, null); - return p; - } - - public List listAllVo(BusSelectedReceivablesDetailedQuery query) { - QueryWrapper qw = createQueryWrapper(query); - return baseMapper.selectListAllVo(qw); - } - - public List listVo() { - return baseMapper.selectListVo(); - } - - public void saveOrUpdateDto(BusSelectedReceivablesDetailedDto dto){ - BusSelectedReceivablesDetailed entity = new BusSelectedReceivablesDetailed(); - dto.fillEntity(entity); - this.saveOrUpdate(entity); - } - - public BusSelectedReceivablesDetailedVo fetchByIdVo(String id){ - BusSelectedReceivablesDetailed entity = this.fetchById(id); - BusSelectedReceivablesDetailedVo vo = new BusSelectedReceivablesDetailedVo(); - BeanUtil.copyProperties(entity, vo); - return vo; - } - - public void deleteByCollSid(String sid) { - baseMapper.deleteByCollSid(sid); - } - - public List fetchByCillSid(String sid) { - return baseMapper.fetchByCillSid(sid); - } + public PagerVo listPage(PagerQuery pq) { + BusSelectedReceivablesDetailedQuery query = pq.getParams(); + QueryWrapper qw = createQueryWrapper(query); + IPage page = PagerUtil.queryToPage(pq); + IPage pagging = baseMapper.selectPage(page, qw); + PagerVo p = PagerUtil.pageToVo(pagging, null); + return p; + } + + public List listAll(BusSelectedReceivablesDetailedQuery query) { + QueryWrapper qw = createQueryWrapper(query); + return baseMapper.selectList(qw); + } + + private QueryWrapper createQueryWrapper(BusSelectedReceivablesDetailedQuery query) { + // todo: 这里根据具体业务调整查询条件 + // 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName())); + QueryWrapper qw = new QueryWrapper<>(); + + + if (StringUtils.isNotBlank(query.getCreateByName())) { + qw.eq("createByName", query.getCreateByName()); + } + + if (StringUtils.isNotBlank(query.getContractSid())) { + qw.eq("contractSid", query.getContractSid()); + } + + if (StringUtils.isNotBlank(query.getContractNo())) { + qw.eq("contractNo", query.getContractNo()); + } + + if (StringUtils.isNotBlank(query.getCustomerSid())) { + qw.eq("customerSid", query.getCustomerSid()); + } + + if (StringUtils.isNotBlank(query.getCustomerName())) { + qw.eq("customerName", query.getCustomerName()); + } + + if (StringUtils.isNotBlank(query.getVIN())) { + qw.eq("VIN", query.getVIN()); + } + + if (StringUtils.isNotBlank(query.getUseOrgSid())) { + qw.eq("useOrgSid", query.getUseOrgSid()); + } + + if (StringUtils.isNotBlank(query.getCustomerPhone())) { + qw.eq("customerPhone", query.getCustomerPhone()); + } + + if (StringUtils.isNotBlank(query.getReceivablesName())) { + qw.eq("receivablesName", query.getReceivablesName()); + } + + if (query.getCurrentReceivableMoney() != null) { + qw.eq("currentReceivableMoney", query.getCurrentReceivableMoney()); + } + + if (query.getSubscriptionMoney() != null) { + qw.eq("subscriptionMoney", query.getSubscriptionMoney()); + } + + if (StringUtils.isNotBlank(query.getSubscriptionDate())) { + qw.eq("subscriptionDate", query.getSubscriptionDate()); + } + + if (StringUtils.isNotBlank(query.getCollSid())) { + qw.eq("collSid", query.getCollSid()); + } + return qw; + } + + public PagerVo listPageVo(PagerQuery pq) { + BusSelectedReceivablesDetailedQuery query = pq.getParams(); + QueryWrapper qw = createQueryWrapper(query); + IPage page = PagerUtil.queryToPage(pq); + IPage pagging = baseMapper.selectPageVo(page, qw); + PagerVo p = PagerUtil.pageToVo(pagging, null); + return p; + } + + public List listAllVo(BusSelectedReceivablesDetailedQuery query) { + QueryWrapper qw = createQueryWrapper(query); + return baseMapper.selectListAllVo(qw); + } + + public List listVo() { + return baseMapper.selectListVo(); + } + + public void saveOrUpdateDto(BusSelectedReceivablesDetailedDto dto) { + BusSelectedReceivablesDetailed entity = new BusSelectedReceivablesDetailed(); + dto.fillEntity(entity); + this.saveOrUpdate(entity); + } + + public BusSelectedReceivablesDetailedVo fetchByIdVo(String id) { + BusSelectedReceivablesDetailed entity = this.fetchById(id); + BusSelectedReceivablesDetailedVo vo = new BusSelectedReceivablesDetailedVo(); + BeanUtil.copyProperties(entity, vo); + return vo; + } + + public void deleteByCollSid(String sid) { + baseMapper.deleteByCollSid(sid); + } + + public List fetchByCillSid(String sid) { + return baseMapper.fetchByCillSid(sid); + } + + /** + * 手机端—查询可使用款项明细列表 + * + * @param page + * @param qw + * @return + */ + public IPage getPaymentDetailsList(IPage page, QueryWrapper qw) { + return baseMapper.getPaymentDetailsList(page, qw); + } } \ No newline at end of file