From c22db651938097ef293efa3a425122171d6220c5 Mon Sep 17 00:00:00 2001 From: God <10745413@qq.com> Date: Mon, 18 Apr 2022 11:07:36 +0800 Subject: [PATCH 1/8] =?UTF-8?q?=E6=AC=BE=E9=A1=B9=E7=A1=AE=E8=AE=A4?= =?UTF-8?q?=E4=BB=8Ebuscenter=E7=A7=BB=E5=8A=A8=E5=88=B0fin?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../basevehicle/BaseVehicleFeignFallback.java | 5 - .../BusUncollectedReceivablesDetailed.java | 85 ------- ...usUncollectedReceivablesDetailedMapper.xml | 23 -- .../AppFinCollectionConfirmationDto.java | 8 +- .../AppFinCollectionConfirmationInitVo.java | 8 +- .../AppFinCollectionConfirmationPageVo.java | 4 +- .../AppFinCollectionConfirmationQuery.java | 4 +- ...electedReceivablesPaymentDetailsQuery.java | 4 +- ...inSelectedReceivablesPaymentDetailsVo.java | 4 +- .../FinCollectionConfirmation.java | 12 +- .../FinCollectionConfirmationAppendixDto.java | 4 +- .../FinCollectionConfirmationDetailsVo.java | 15 +- .../FinCollectionConfirmationDto.java | 20 +- .../FinCollectionConfirmationFeign.java | 40 ++-- ...inCollectionConfirmationFeignFallback.java | 36 ++- .../FinCollectionConfirmationQuery.java | 11 +- .../FinCollectionConfirmationVo.java | 11 +- .../AppFinSelectedReceivablesDetailedDto.java | 10 +- .../FinSelectedReceivablesDetailed.java | 12 +- .../FinSelectedReceivablesDetailedDto.java | 11 +- .../FinSelectedReceivablesDetailedFeign.java | 32 ++- ...ectedReceivablesDetailedFeignFallback.java | 22 +- .../FinSelectedReceivablesDetailedQuery.java | 11 +- .../FinSelectedReceivablesDetailedVo.java | 11 +- .../FinUncollectedReceivablesDetailedDto.java | 11 +- ...inUncollectedReceivablesDetailedFeign.java | 33 +-- ...ectedReceivablesDetailedFeignFallback.java | 24 +- ...inUncollectedReceivablesDetailedQuery.java | 11 +- .../FinUncollectedReceivablesDetailedVo.java | 11 +- .../FinCollectionConfirmationMapper.java | 30 ++- .../FinCollectionConfirmationMapper.xml | 18 +- .../FinCollectionConfirmationRest.java | 70 +++--- .../FinCollectionConfirmationService.java | 218 +++++++++--------- .../FinSelectedReceivablesDetailedMapper.java | 44 ++-- .../FinSelectedReceivablesDetailedMapper.xml | 14 +- .../FinSelectedReceivablesDetailedRest.java | 35 ++- ...FinSelectedReceivablesDetailedService.java | 82 ++++--- ...nUncollectedReceivablesDetailedMapper.java | 30 +-- ...inUncollectedReceivablesDetailedMapper.xml | 23 ++ ...FinUncollectedReceivablesDetailedRest.java | 41 ++-- ...UncollectedReceivablesDetailedService.java | 41 ++-- anrui-terminal/anrui-terminal-api/pom.xml | 6 + ...=> AppFinCollectionConfirmationFeign.java} | 26 +-- ...nCollectionConfirmationFeignFallback.java} | 20 +- ... => AppFinCollectionConfirmationRest.java} | 40 ++-- ... AppFinCollectionConfirmationService.java} | 34 +-- 46 files changed, 563 insertions(+), 702 deletions(-) delete mode 100644 anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busuncollectedreceivablesdetailed/BusUncollectedReceivablesDetailed.java delete mode 100644 anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busuncollectedreceivablesdetailed/BusUncollectedReceivablesDetailedMapper.xml rename anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/buscollectionconfirmation/AppBusCollectionConfirmationDto.java => anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/AppFinCollectionConfirmationDto.java (83%) rename anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/buscollectionconfirmation/AppBusCollectionConfirmationInitVo.java => anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/AppFinCollectionConfirmationInitVo.java (82%) rename anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/buscollectionconfirmation/AppBusCollectionConfirmationPageVo.java => anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/AppFinCollectionConfirmationPageVo.java (89%) rename anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/buscollectionconfirmation/AppBusCollectionConfirmationQuery.java => anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/AppFinCollectionConfirmationQuery.java (66%) rename anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/buscollectionconfirmation/AppBusSelectedReceivablesPaymentDetailsQuery.java => anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/AppFinSelectedReceivablesPaymentDetailsQuery.java (73%) rename anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/buscollectionconfirmation/AppBusSelectedReceivablesPaymentDetailsVo.java => anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/AppFinSelectedReceivablesPaymentDetailsVo.java (86%) rename anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/buscollectionconfirmation/BusCollectionConfirmation.java => anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmation.java (90%) rename anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/buscollectionconfirmation/BusCollectionConfirmationAppendixDto.java => anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmationAppendixDto.java (90%) rename anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/buscollectionconfirmation/BusCollectionConfirmationDetailsVo.java => anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmationDetailsVo.java (84%) rename anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/buscollectionconfirmation/BusCollectionConfirmationDto.java => anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmationDto.java (83%) rename anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/buscollectionconfirmation/BusCollectionConfirmationFeign.java => anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmationFeign.java (74%) rename anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/buscollectionconfirmation/BusCollectionConfirmationFeignFallback.java => anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmationFeignFallback.java (63%) rename anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/buscollectionconfirmation/BusCollectionConfirmationQuery.java => anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmationQuery.java (88%) rename anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/buscollectionconfirmation/BusCollectionConfirmationVo.java => anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmationVo.java (90%) rename anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busselectedreceivablesdetailed/AppBusSelectedReceivablesDetailedDto.java => anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finselectedreceivablesdetailed/AppFinSelectedReceivablesDetailedDto.java (88%) rename anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busselectedreceivablesdetailed/BusSelectedReceivablesDetailed.java => anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finselectedreceivablesdetailed/FinSelectedReceivablesDetailed.java (89%) rename anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busselectedreceivablesdetailed/BusSelectedReceivablesDetailedDto.java => anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedDto.java (90%) rename anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busselectedreceivablesdetailed/BusSelectedReceivablesDetailedFeign.java => anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedFeign.java (72%) rename anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busselectedreceivablesdetailed/BusSelectedReceivablesDetailedFeignFallback.java => anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedFeignFallback.java (68%) rename anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busselectedreceivablesdetailed/BusSelectedReceivablesDetailedQuery.java => anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedQuery.java (90%) rename anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busselectedreceivablesdetailed/BusSelectedReceivablesDetailedVo.java => anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedVo.java (90%) rename anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busuncollectedreceivablesdetailed/BusUncollectedReceivablesDetailedDto.java => anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedDto.java (89%) rename anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busuncollectedreceivablesdetailed/BusUncollectedReceivablesDetailedFeign.java => anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedFeign.java (69%) rename anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busuncollectedreceivablesdetailed/BusUncollectedReceivablesDetailedFeignFallback.java => anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedFeignFallback.java (65%) rename anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busuncollectedreceivablesdetailed/BusUncollectedReceivablesDetailedQuery.java => anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedQuery.java (87%) rename anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busuncollectedreceivablesdetailed/BusUncollectedReceivablesDetailedVo.java => anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedVo.java (88%) rename anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/buscollectionconfirmation/BusCollectionConfirmationMapper.java => anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationMapper.java (65%) rename anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/buscollectionconfirmation/BusCollectionConfirmationMapper.xml => anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationMapper.xml (66%) rename anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/buscollectionconfirmation/BusCollectionConfirmationRest.java => anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationRest.java (62%) rename anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/buscollectionconfirmation/BusCollectionConfirmationService.java => anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java (59%) rename anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busselectedreceivablesdetailed/BusSelectedReceivablesDetailedMapper.java => anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedMapper.java (58%) rename anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busselectedreceivablesdetailed/BusSelectedReceivablesDetailedMapper.xml => anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedMapper.xml (65%) rename anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busselectedreceivablesdetailed/BusSelectedReceivablesDetailedRest.java => anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedRest.java (62%) rename anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busselectedreceivablesdetailed/BusSelectedReceivablesDetailedService.java => anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedService.java (62%) rename anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busuncollectedreceivablesdetailed/BusUncollectedReceivablesDetailedMapper.java => anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedMapper.java (63%) create mode 100644 anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedMapper.xml rename anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busuncollectedreceivablesdetailed/BusUncollectedReceivablesDetailedRest.java => anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedRest.java (59%) rename anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busuncollectedreceivablesdetailed/BusUncollectedReceivablesDetailedService.java => anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedService.java (66%) rename anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/{AppBusCollectionConfirmationFeign.java => AppFinCollectionConfirmationFeign.java} (76%) rename anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/{AppBusCollectionConfirmationFeignFallback.java => AppFinCollectionConfirmationFeignFallback.java} (73%) rename anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/finance/{AppBusCollectionConfirmationRest.java => AppFinCollectionConfirmationRest.java} (69%) rename anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/finance/{AppBusCollectionConfirmationService.java => AppFinCollectionConfirmationService.java} (71%) diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeignFallback.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeignFallback.java index 254e2b538c..2c78d4bd68 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeignFallback.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeignFallback.java @@ -109,11 +109,6 @@ public class BaseVehicleFeignFallback implements BaseVehicleFeign { return null; } - @Override - public ResultBean updateByVinNo(BaseVehicleUpdateQuery baseVehicleUpdateQuery) { - return null; - } - @Override public ResultBean selectStateByVinNo(List vinNoList) { return null; diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busuncollectedreceivablesdetailed/BusUncollectedReceivablesDetailed.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busuncollectedreceivablesdetailed/BusUncollectedReceivablesDetailed.java deleted file mode 100644 index 2b14261775..0000000000 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busuncollectedreceivablesdetailed/BusUncollectedReceivablesDetailed.java +++ /dev/null @@ -1,85 +0,0 @@ -/********************************************************* - ********************************************************* - ******************** ******************* - ************* ************ - ******* _oo0oo_ ******* - *** o8888888o *** - * 88" . "88 * - * (| -_- |) * - * 0\ = /0 * - * ___/`---'\___ * - * .' \\| |// '. * - * / \\||| : |||// \ * - * / _||||| -:- |||||- \ * - * | | \\\ - /// | | * - * | \_| ''\---/'' |_/ | * - * \ .-\__ '-' ___/-. / * - * ___'. .' /--.--\ `. .'___ * - * ."" '< `.___\_<|>_/___.' >' "". * - * | | : `- \`.;`\ _ /`;.`/ - ` : | | * - * \ \ `_. \_ __\ /__ _/ .-` / / * - * =====`-.____`.___ \_____/___.-`___.-'===== * - * `=---=' * - * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * - *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* - *********************************************************/ -package com.yxt.anrui.buscenter.api.busuncollectedreceivablesdetailed; - -import com.baomidou.mybatisplus.annotation.TableName; -import com.yxt.common.core.domain.BaseEntity; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.math.BigDecimal; - -/** - * Project: anrui-buscenter(销售相关)
- * File: BusUncollectedReceivablesDetailed.java
- * Class: com.yxt.anrui.buscenter.api.busuncollectedreceivablesdetailed.BusUncollectedReceivablesDetailed
- * 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 -@TableName("bus_uncollected_receivables_detailed") -public class BusUncollectedReceivablesDetailed extends BaseEntity { - private static final long serialVersionUID = 1L; - - - @ApiModelProperty("创建人接口") - private String createByName; // 创建人接口 - - @ApiModelProperty("合同sid") - private String contractSid; // 合同sid - - @ApiModelProperty("合同编号") - private String contractNo; // 合同编号 - - @ApiModelProperty("客户sid") - private String customerSid; // 客户sid - - @ApiModelProperty("客户名称") - private String customerName; // 客户名称 - - @ApiModelProperty("车架号") - private String VIN; // 车架号 - - @ApiModelProperty("分公司sid") - private String useOrgSid; // 分公司sid - - @ApiModelProperty("联系电话") - private String customerPhone; // 联系电话 - - @ApiModelProperty("应收项目名称") - private String receivablesName; // 应收项目名称 - - @ApiModelProperty("当前应收金额") - private BigDecimal currentReceivableMoney; // 当前应收金额 -} diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busuncollectedreceivablesdetailed/BusUncollectedReceivablesDetailedMapper.xml b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busuncollectedreceivablesdetailed/BusUncollectedReceivablesDetailedMapper.xml deleted file mode 100644 index 65fabeba9d..0000000000 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busuncollectedreceivablesdetailed/BusUncollectedReceivablesDetailedMapper.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/buscollectionconfirmation/AppBusCollectionConfirmationDto.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/AppFinCollectionConfirmationDto.java similarity index 83% rename from anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/buscollectionconfirmation/AppBusCollectionConfirmationDto.java rename to anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/AppFinCollectionConfirmationDto.java index 8cdab0deee..c2208a7a54 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/buscollectionconfirmation/AppBusCollectionConfirmationDto.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/AppFinCollectionConfirmationDto.java @@ -1,6 +1,6 @@ -package com.yxt.anrui.buscenter.api.buscollectionconfirmation; +package com.yxt.anrui.fin.api.fincollectionconfirmation; -import com.yxt.anrui.buscenter.api.busselectedreceivablesdetailed.AppBusSelectedReceivablesDetailedDto; +import com.yxt.anrui.fin.api.finselectedreceivablesdetailed.AppFinSelectedReceivablesDetailedDto; import com.yxt.common.core.dto.Dto; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -9,7 +9,7 @@ import java.math.BigDecimal; import java.util.List; @Data -public class AppBusCollectionConfirmationDto implements Dto { +public class AppFinCollectionConfirmationDto implements Dto { @ApiModelProperty("款项确认sid") private String sid; @@ -57,7 +57,7 @@ public class AppBusCollectionConfirmationDto implements Dto { private List payFiles; @ApiModelProperty("款项明细") - private List paymentDetail; + private List paymentDetail; @ApiModelProperty("余额") private String balance; diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/buscollectionconfirmation/AppBusCollectionConfirmationInitVo.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/AppFinCollectionConfirmationInitVo.java similarity index 82% rename from anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/buscollectionconfirmation/AppBusCollectionConfirmationInitVo.java rename to anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/AppFinCollectionConfirmationInitVo.java index 479ae45fbe..9df01da6bc 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/buscollectionconfirmation/AppBusCollectionConfirmationInitVo.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/AppFinCollectionConfirmationInitVo.java @@ -1,6 +1,6 @@ -package com.yxt.anrui.buscenter.api.buscollectionconfirmation; +package com.yxt.anrui.fin.api.fincollectionconfirmation; -import com.yxt.anrui.buscenter.api.busselectedreceivablesdetailed.AppBusSelectedReceivablesDetailedDto; +import com.yxt.anrui.fin.api.finselectedreceivablesdetailed.AppFinSelectedReceivablesDetailedDto; import com.yxt.common.core.vo.Vo; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -8,7 +8,7 @@ import lombok.Data; import java.util.List; @Data -public class AppBusCollectionConfirmationInitVo implements Vo { +public class AppFinCollectionConfirmationInitVo implements Vo { @ApiModelProperty("款项确认sid") private String sid; @@ -56,7 +56,7 @@ public class AppBusCollectionConfirmationInitVo implements Vo { private List payFiles; @ApiModelProperty("款项明细") - private List paymentDetail; + private List paymentDetail; @ApiModelProperty("余额") private String balance; diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/buscollectionconfirmation/AppBusCollectionConfirmationPageVo.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/AppFinCollectionConfirmationPageVo.java similarity index 89% rename from anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/buscollectionconfirmation/AppBusCollectionConfirmationPageVo.java rename to anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/AppFinCollectionConfirmationPageVo.java index b36871bf1d..1d3ac0afc4 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/buscollectionconfirmation/AppBusCollectionConfirmationPageVo.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/AppFinCollectionConfirmationPageVo.java @@ -1,11 +1,11 @@ -package com.yxt.anrui.buscenter.api.buscollectionconfirmation; +package com.yxt.anrui.fin.api.fincollectionconfirmation; import com.yxt.common.core.vo.Vo; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @Data -public class AppBusCollectionConfirmationPageVo implements Vo { +public class AppFinCollectionConfirmationPageVo implements Vo { @ApiModelProperty("确认单sid") private String collectionBillSid; diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/buscollectionconfirmation/AppBusCollectionConfirmationQuery.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/AppFinCollectionConfirmationQuery.java similarity index 66% rename from anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/buscollectionconfirmation/AppBusCollectionConfirmationQuery.java rename to anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/AppFinCollectionConfirmationQuery.java index e95dc71c0f..8a3982bf12 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/buscollectionconfirmation/AppBusCollectionConfirmationQuery.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/AppFinCollectionConfirmationQuery.java @@ -1,11 +1,11 @@ -package com.yxt.anrui.buscenter.api.buscollectionconfirmation; +package com.yxt.anrui.fin.api.fincollectionconfirmation; import com.yxt.common.core.query.Query; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @Data -public class AppBusCollectionConfirmationQuery implements Query { +public class AppFinCollectionConfirmationQuery implements Query { @ApiModelProperty("用户sid") private String userSid; diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/buscollectionconfirmation/AppBusSelectedReceivablesPaymentDetailsQuery.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/AppFinSelectedReceivablesPaymentDetailsQuery.java similarity index 73% rename from anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/buscollectionconfirmation/AppBusSelectedReceivablesPaymentDetailsQuery.java rename to anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/AppFinSelectedReceivablesPaymentDetailsQuery.java index 5acb706bc2..b08573f718 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/buscollectionconfirmation/AppBusSelectedReceivablesPaymentDetailsQuery.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/AppFinSelectedReceivablesPaymentDetailsQuery.java @@ -1,4 +1,4 @@ -package com.yxt.anrui.buscenter.api.buscollectionconfirmation; +package com.yxt.anrui.fin.api.fincollectionconfirmation; import com.yxt.common.core.query.Query; import io.swagger.annotations.ApiModelProperty; @@ -7,7 +7,7 @@ import lombok.Data; import java.util.List; @Data -public class AppBusSelectedReceivablesPaymentDetailsQuery implements Query { +public class AppFinSelectedReceivablesPaymentDetailsQuery implements Query { @ApiModelProperty("用户sid") private String userSid; diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/buscollectionconfirmation/AppBusSelectedReceivablesPaymentDetailsVo.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/AppFinSelectedReceivablesPaymentDetailsVo.java similarity index 86% rename from anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/buscollectionconfirmation/AppBusSelectedReceivablesPaymentDetailsVo.java rename to anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/AppFinSelectedReceivablesPaymentDetailsVo.java index 7362dcb42a..21d75ae14c 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/buscollectionconfirmation/AppBusSelectedReceivablesPaymentDetailsVo.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/AppFinSelectedReceivablesPaymentDetailsVo.java @@ -1,11 +1,11 @@ -package com.yxt.anrui.buscenter.api.buscollectionconfirmation; +package com.yxt.anrui.fin.api.fincollectionconfirmation; import com.yxt.common.core.vo.Vo; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @Data -public class AppBusSelectedReceivablesPaymentDetailsVo implements Vo { +public class AppFinSelectedReceivablesPaymentDetailsVo implements Vo { @ApiModelProperty("合同编号") private String contractId; diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/buscollectionconfirmation/BusCollectionConfirmation.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmation.java similarity index 90% rename from anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/buscollectionconfirmation/BusCollectionConfirmation.java rename to anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmation.java index 1bf1ebf290..52c6c76ab5 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/buscollectionconfirmation/BusCollectionConfirmation.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmation.java @@ -23,7 +23,7 @@ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* *********************************************************/ -package com.yxt.anrui.buscenter.api.buscollectionconfirmation; +package com.yxt.anrui.fin.api.fincollectionconfirmation; import com.baomidou.mybatisplus.annotation.TableName; import com.yxt.common.core.domain.BaseEntity; @@ -34,9 +34,9 @@ import lombok.Data; import java.math.BigDecimal; /** - * Project: anrui-buscenter(销售相关)
- * File: BusCollectionConfirmation.java
- * Class: com.yxt.anrui.buscenter.api.buscollectionconfirmation.BusCollectionConfirmation
+ * Project: anrui-fin(销售相关)
+ * File: FinCollectionConfirmation.java
+ * Class: com.yxt.anrui.fin.api.fincollectionconfirmation.FinCollectionConfirmation
* Description: 收款确认表.
* Copyright: Copyright (c) 2011
* Company: https://gitee.com/liuzp315
@@ -48,8 +48,8 @@ import java.math.BigDecimal; */ @ApiModel(value = "收款确认表", description = "收款确认表") @Data -@TableName("bus_collection_confirmation") -public class BusCollectionConfirmation extends BaseEntity { +@TableName("fin_collection_confirmation") +public class FinCollectionConfirmation extends BaseEntity { private static final long serialVersionUID = 1L; @ApiModelProperty("创建人接口") diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/buscollectionconfirmation/BusCollectionConfirmationAppendixDto.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmationAppendixDto.java similarity index 90% rename from anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/buscollectionconfirmation/BusCollectionConfirmationAppendixDto.java rename to anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmationAppendixDto.java index e28da55338..f4cbbefbbd 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/buscollectionconfirmation/BusCollectionConfirmationAppendixDto.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmationAppendixDto.java @@ -1,4 +1,4 @@ -package com.yxt.anrui.buscenter.api.buscollectionconfirmation; +package com.yxt.anrui.fin.api.fincollectionconfirmation; import com.yxt.common.core.dto.Dto; @@ -21,7 +21,7 @@ import lombok.Data; */ @ApiModel(value = "公共附件表 数据传输对象", description = "公共附件表 数据传输对象") @Data -public class BusCollectionConfirmationAppendixDto implements Dto { +public class FinCollectionConfirmationAppendixDto implements Dto { @ApiModelProperty("上传人sid") private String createBySid; diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/buscollectionconfirmation/BusCollectionConfirmationDetailsVo.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmationDetailsVo.java similarity index 84% rename from anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/buscollectionconfirmation/BusCollectionConfirmationDetailsVo.java rename to anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmationDetailsVo.java index e4386a5d11..c3607f21e2 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/buscollectionconfirmation/BusCollectionConfirmationDetailsVo.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmationDetailsVo.java @@ -23,11 +23,10 @@ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* *********************************************************/ -package com.yxt.anrui.buscenter.api.buscollectionconfirmation; +package com.yxt.anrui.fin.api.fincollectionconfirmation; -import com.yxt.anrui.buscenter.api.busselectedreceivablesdetailed.BusSelectedReceivablesDetailedDto; -import com.yxt.anrui.buscenter.api.busselectedreceivablesdetailed.BusSelectedReceivablesDetailedVo; +import com.yxt.anrui.fin.api.finselectedreceivablesdetailed.FinSelectedReceivablesDetailedVo; import com.yxt.common.core.vo.Vo; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -36,9 +35,9 @@ import lombok.Data; import java.util.List; /** - * Project: anrui-buscenter(销售相关)
- * File: BusCollectionConfirmationVo.java
- * Class: com.yxt.anrui.buscenter.api.buscollectionconfirmation.BusCollectionConfirmationVo
+ * Project: anrui-fin(销售相关)
+ * File: FinCollectionConfirmationVo.java
+ * Class: com.yxt.anrui.fin.api.fincollectionconfirmation.FinCollectionConfirmationVo
* Description: 收款确认表 视图数据对象.
* Copyright: Copyright (c) 2011
* Company: https://gitee.com/liuzp315
@@ -50,7 +49,7 @@ import java.util.List; */ @ApiModel(value = "收款确认表 视图数据对象", description = "收款确认表 视图数据对象") @Data -public class BusCollectionConfirmationDetailsVo implements Vo { +public class FinCollectionConfirmationDetailsVo implements Vo { @ApiModelProperty("创建人接口") @@ -78,5 +77,5 @@ public class BusCollectionConfirmationDetailsVo implements Vo { @ApiModelProperty("分公司sid") private String useOrgSid; // 分公司sid @ApiModelProperty("已选应收款项明细") - private List busSelectedReceivablesDetailedVos; // 已选应收款项明细 + private List finSelectedReceivablesDetailedVos; // 已选应收款项明细 } diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/buscollectionconfirmation/BusCollectionConfirmationDto.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmationDto.java similarity index 83% rename from anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/buscollectionconfirmation/BusCollectionConfirmationDto.java rename to anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmationDto.java index 6f8c3aa680..0394aff622 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/buscollectionconfirmation/BusCollectionConfirmationDto.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmationDto.java @@ -23,12 +23,12 @@ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* *********************************************************/ -package com.yxt.anrui.buscenter.api.buscollectionconfirmation; +package com.yxt.anrui.fin.api.fincollectionconfirmation; -import com.yxt.anrui.buscenter.api.busselectedreceivablesdetailed.BusSelectedReceivablesDetailedDto; +import com.yxt.anrui.fin.api.finselectedreceivablesdetailed.FinSelectedReceivablesDetailedDto; +import com.yxt.anrui.fin.api.finselectedreceivablesdetailed.FinSelectedReceivablesDetailedDto; import com.yxt.common.core.dto.Dto; - import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -36,9 +36,9 @@ import lombok.Data; import java.util.List; /** - * Project: anrui-buscenter(销售相关)
- * File: BusCollectionConfirmationDto.java
- * Class: com.yxt.anrui.buscenter.api.buscollectionconfirmation.BusCollectionConfirmationDto
+ * Project: anrui-fin(销售相关)
+ * File: FinCollectionConfirmationDto.java
+ * Class: com.yxt.anrui.fin.api.fincollectionconfirmation.FinCollectionConfirmationDto
* Description: 收款确认表 数据传输对象.
* Copyright: Copyright (c) 2011
* Company: https://gitee.com/liuzp315
@@ -50,7 +50,7 @@ import java.util.List; */ @ApiModel(value = "收款确认表 数据传输对象", description = "收款确认表 数据传输对象") @Data -public class BusCollectionConfirmationDto implements Dto { +public class FinCollectionConfirmationDto implements Dto { @ApiModelProperty("收款确认单sid") private String sid; // 收款确认单sid @@ -81,9 +81,9 @@ public class BusCollectionConfirmationDto implements Dto { @ApiModelProperty("分公司sid") private String useOrgSid; // 分公司sid @ApiModelProperty("已选应收款项明细") - private List busSelectedReceivablesDetailedDtos; // 已选应收款项明细 + private List finSelectedReceivablesDetailedDtos; // 已选应收款项明细 @ApiModelProperty("打款凭证附件") - private List paymentVoucherAppendixs; // 打款凭证附件 + private List paymentVoucherAppendixs; // 打款凭证附件 @ApiModelProperty("汇款确认书附件") - private List remittanceConfirmationAppendixs; // 汇款确认书附件 + private List remittanceConfirmationAppendixs; // 汇款确认书附件 } \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/buscollectionconfirmation/BusCollectionConfirmationFeign.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmationFeign.java similarity index 74% rename from anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/buscollectionconfirmation/BusCollectionConfirmationFeign.java rename to anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmationFeign.java index dcfd9806cc..b2c10fc025 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/buscollectionconfirmation/BusCollectionConfirmationFeign.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmationFeign.java @@ -23,22 +23,20 @@ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* *********************************************************/ -package com.yxt.anrui.buscenter.api.buscollectionconfirmation; +package com.yxt.anrui.fin.api.fincollectionconfirmation; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.*; -import java.util.List; - /** - * Project: anrui-buscenter(销售相关)
- * File: BusCollectionConfirmationFeign.java
- * Class: com.yxt.anrui.buscenter.api.buscollectionconfirmation.BusCollectionConfirmationFeign
+ * Project: anrui-fin(销售相关)
+ * File: FinCollectionConfirmationFeign.java
+ * Class: com.yxt.anrui.fin.api.fincollectionconfirmation.finCollectionConfirmationFeign
* Description: 收款确认表.
* Copyright: Copyright (c) 2011
* Company: https://gitee.com/liuzp315
@@ -50,19 +48,19 @@ import java.util.List; */ @Api(tags = "收款确认表") @FeignClient( - contextId = "anrui-buscenter-BusCollectionConfirmation", - name = "anrui-buscenter", - path = "buscollectionconfirmation", - fallback = BusCollectionConfirmationFeignFallback.class) -public interface BusCollectionConfirmationFeign { + contextId = "anrui-fin-FinCollectionConfirmation", + name = "anrui-fin", + path = "fincollectionconfirmation", + fallback = FinCollectionConfirmationFeignFallback.class) +public interface FinCollectionConfirmationFeign { @ApiOperation("根据条件分页查询数据的列表") @PostMapping("/listPage") - public ResultBean> listPage(@RequestBody PagerQuery pq); + public ResultBean> listPage(@RequestBody PagerQuery pq); @ApiOperation("提交新增保存") @PostMapping("/save") - public ResultBean save(@RequestBody BusCollectionConfirmationDto dto); + public ResultBean save(@RequestBody FinCollectionConfirmationDto dto); @ApiOperation("根据sid批量删除") @PostMapping("/delBySids") @@ -70,7 +68,7 @@ public interface BusCollectionConfirmationFeign { @ApiOperation("编辑回显或详情") @GetMapping("/fetchBySid/{sid}") - public ResultBean fetchBySid(@PathVariable("sid") String sid); + public ResultBean fetchBySid(@PathVariable("sid") String sid); @ApiOperation("出纳确认") @PostMapping("/cashierConfirm") @@ -80,19 +78,19 @@ public interface BusCollectionConfirmationFeign { @ApiOperation("手机端—获取款项确认列表") @PostMapping("/getCollectionConfirmList") - public ResultBean> getCollectionConfirmList(@RequestBody PagerQuery pagerQuery); + public ResultBean> getCollectionConfirmList(@RequestBody PagerQuery pagerQuery); @ApiOperation("手机端—新增款项确认申请单") @PostMapping("/addCollectionConfirm") - public ResultBean addCollectionConfirm(@RequestBody AppBusCollectionConfirmationDto dto); + public ResultBean addCollectionConfirm(@RequestBody AppFinCollectionConfirmationDto dto); @ApiOperation("手机端—初始化收款确认申请") @GetMapping("/initCollectionConfirm/{collectionBillSid}/{userSid}") - public ResultBean initCollectionConfirm(@PathVariable("collectionBillSid") String collectionBillSid, @PathVariable("userSid") String userSid); + public ResultBean initCollectionConfirm(@PathVariable("collectionBillSid") String collectionBillSid, @PathVariable("userSid") String userSid); @ApiOperation("手机端—提交款项确认申请") @PostMapping("/submitCollectionConfirm") - public ResultBean submitCollectionConfirm(@RequestBody AppBusCollectionConfirmationDto dto); + public ResultBean submitCollectionConfirm(@RequestBody AppFinCollectionConfirmationDto dto); @ApiOperation("手机端—删除收款确认单") @DeleteMapping("/deleteCollectionConfirm/{collectionBillSid}") @@ -100,5 +98,5 @@ public interface BusCollectionConfirmationFeign { @ApiOperation("手机端—查询可使用款项明细列表") @PostMapping("/getPaymentDetailsList") - public ResultBean> getPaymentDetailsList(@RequestBody PagerQuery pagerQuery); + 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-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmationFeignFallback.java similarity index 63% rename from anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/buscollectionconfirmation/BusCollectionConfirmationFeignFallback.java rename to anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmationFeignFallback.java index e930d2d417..680218db38 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/buscollectionconfirmation/BusCollectionConfirmationFeignFallback.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmationFeignFallback.java @@ -23,19 +23,17 @@ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* *********************************************************/ -package com.yxt.anrui.buscenter.api.buscollectionconfirmation; +package com.yxt.anrui.fin.api.fincollectionconfirmation; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; import org.springframework.stereotype.Component; -import java.util.List; - /** - * Project: anrui-buscenter(销售相关)
- * File: BusCollectionConfirmationFeignFallback.java
- * Class: com.yxt.anrui.buscenter.api.buscollectionconfirmation.BusCollectionConfirmationFeignFallback
+ * Project: anrui-fin(销售相关)
+ * File: FinCollectionConfirmationFeignFallback.java
+ * Class: com.yxt.anrui.fin.api.fincollectionconfirmation.FinCollectionConfirmationFeignFallback
* Description: 收款确认表.
* Copyright: Copyright (c) 2011
* Company: https://gitee.com/liuzp315
@@ -46,28 +44,28 @@ import java.util.List; * @since 1.0 */ @Component -public class BusCollectionConfirmationFeignFallback implements BusCollectionConfirmationFeign { +public class FinCollectionConfirmationFeignFallback implements FinCollectionConfirmationFeign { @Override - public ResultBean> listPage(PagerQuery pq){ + public ResultBean> listPage(PagerQuery pq){ ResultBean rb = ResultBean.fireFail(); - return rb.setMsg("接口anrui-buscenter/buscollectionconfirmation/listPage无法访问"); + return rb.setMsg("接口anrui-fin/fincollectionconfirmation/listPage无法访问"); } @Override - public ResultBean save(BusCollectionConfirmationDto dto){ - return ResultBean.fireFail().setMsg("接口anrui-buscenter/buscollectionconfirmation/save无法访问"); + public ResultBean save(FinCollectionConfirmationDto dto){ + return ResultBean.fireFail().setMsg("接口anrui-fin/fincollectionconfirmation/save无法访问"); } @Override public ResultBean delBySids( String[] sids){ - return ResultBean.fireFail().setMsg("接口anrui-buscenter/buscollectionconfirmation/delBySids无法访问"); + return ResultBean.fireFail().setMsg("接口anrui-fin/fincollectionconfirmation/delBySids无法访问"); } @Override - public ResultBean fetchBySid(String sid){ + public ResultBean fetchBySid(String sid){ ResultBean rb = ResultBean.fireFail(); - return rb.setMsg("接口anrui-buscenter/buscollectionconfirmation/fetchBySid无法访问"); + return rb.setMsg("接口anrui-fin/fincollectionconfirmation/fetchBySid无法访问"); } @Override @@ -76,22 +74,22 @@ public class BusCollectionConfirmationFeignFallback implements BusCollectionConf } @Override - public ResultBean> getCollectionConfirmList(PagerQuery pagerQuery) { + public ResultBean> getCollectionConfirmList(PagerQuery pagerQuery) { return null; } @Override - public ResultBean addCollectionConfirm(AppBusCollectionConfirmationDto dto) { + public ResultBean addCollectionConfirm(AppFinCollectionConfirmationDto dto) { return null; } @Override - public ResultBean initCollectionConfirm(String collectionBillSid, String userSid) { + public ResultBean initCollectionConfirm(String collectionBillSid, String userSid) { return null; } @Override - public ResultBean submitCollectionConfirm(AppBusCollectionConfirmationDto dto) { + public ResultBean submitCollectionConfirm(AppFinCollectionConfirmationDto dto) { return null; } @@ -101,7 +99,7 @@ public class BusCollectionConfirmationFeignFallback implements BusCollectionConf } @Override - public ResultBean> getPaymentDetailsList(PagerQuery pagerQuery) { + 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/buscollectionconfirmation/BusCollectionConfirmationQuery.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmationQuery.java similarity index 88% rename from anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/buscollectionconfirmation/BusCollectionConfirmationQuery.java rename to anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmationQuery.java index 2a63a24744..64f4f3adc2 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/buscollectionconfirmation/BusCollectionConfirmationQuery.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmationQuery.java @@ -23,19 +23,18 @@ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* *********************************************************/ -package com.yxt.anrui.buscenter.api.buscollectionconfirmation; +package com.yxt.anrui.fin.api.fincollectionconfirmation; import com.yxt.common.core.query.Query; - import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; /** - * Project: anrui-buscenter(销售相关)
- * File: BusCollectionConfirmationQuery.java
- * Class: com.yxt.anrui.buscenter.api.buscollectionconfirmation.BusCollectionConfirmationQuery
+ * Project: anrui-fincenter(销售相关)
+ * File: FinCollectionConfirmationQuery.java
+ * Class: com.yxt.anrui.fincenter.api.fincollectionconfirmation.FinCollectionConfirmationQuery
* Description: 收款确认表 查询条件.
* Copyright: Copyright (c) 2011
* Company: https://gitee.com/liuzp315
@@ -47,7 +46,7 @@ import lombok.Data; */ @ApiModel(value = "收款确认表 查询条件", description = "收款确认表 查询条件") @Data -public class BusCollectionConfirmationQuery implements Query { +public class FinCollectionConfirmationQuery implements Query { @ApiModelProperty("收款日期") private String collectionDate; // 收款日期 diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/buscollectionconfirmation/BusCollectionConfirmationVo.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmationVo.java similarity index 90% rename from anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/buscollectionconfirmation/BusCollectionConfirmationVo.java rename to anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmationVo.java index 2fecfbac2e..571178878c 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/buscollectionconfirmation/BusCollectionConfirmationVo.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmationVo.java @@ -23,19 +23,18 @@ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* *********************************************************/ -package com.yxt.anrui.buscenter.api.buscollectionconfirmation; +package com.yxt.anrui.fin.api.fincollectionconfirmation; import com.yxt.common.core.vo.Vo; - import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; /** - * Project: anrui-buscenter(销售相关)
- * File: BusCollectionConfirmationVo.java
- * Class: com.yxt.anrui.buscenter.api.buscollectionconfirmation.BusCollectionConfirmationVo
+ * Project: anrui-fin(销售相关)
+ * File: FinCollectionConfirmationVo.java
+ * Class: com.yxt.anrui.fin.api.fincollectionconfirmation.FinCollectionConfirmationVo
* Description: 收款确认表 视图数据对象.
* Copyright: Copyright (c) 2011
* Company: https://gitee.com/liuzp315
@@ -47,7 +46,7 @@ import lombok.Data; */ @ApiModel(value = "收款确认表 视图数据对象", description = "收款确认表 视图数据对象") @Data -public class BusCollectionConfirmationVo implements Vo { +public class FinCollectionConfirmationVo implements Vo { @ApiModelProperty("收款确认单sid") private String sid; // 收款确认单sid diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busselectedreceivablesdetailed/AppBusSelectedReceivablesDetailedDto.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finselectedreceivablesdetailed/AppFinSelectedReceivablesDetailedDto.java similarity index 88% rename from anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busselectedreceivablesdetailed/AppBusSelectedReceivablesDetailedDto.java rename to anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finselectedreceivablesdetailed/AppFinSelectedReceivablesDetailedDto.java index 72ac03d40e..0d60ec68c7 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busselectedreceivablesdetailed/AppBusSelectedReceivablesDetailedDto.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finselectedreceivablesdetailed/AppFinSelectedReceivablesDetailedDto.java @@ -23,7 +23,7 @@ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* *********************************************************/ -package com.yxt.anrui.buscenter.api.busselectedreceivablesdetailed; +package com.yxt.anrui.fin.api.finselectedreceivablesdetailed; import com.yxt.common.core.dto.Dto; @@ -32,9 +32,9 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; /** - * Project: anrui-buscenter(销售相关)
- * File: BusCustomerBillDetailedDto.java
- * Class: com.yxt.anrui.buscenter.api.buscustomerbilldetailed.BusCustomerBillDetailedDto
+ * Project: anrui-fin(销售相关)
+ * File: FinCustomerBillDetailedDto.java
+ * Class: com.yxt.anrui.fin.api.fincustomerbilldetailed.FinCustomerBillDetailedDto
* Description: 客户账单明细表 数据传输对象.
* Copyright: Copyright (c) 2011
* Company: https://gitee.com/liuzp315
@@ -46,7 +46,7 @@ import lombok.Data; */ @ApiModel(value = "客户账单明细表 数据传输对象", description = "客户账单明细表 数据传输对象") @Data -public class AppBusSelectedReceivablesDetailedDto implements Dto { +public class AppFinSelectedReceivablesDetailedDto implements Dto { @ApiModelProperty("应收金额") private String receivable; diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busselectedreceivablesdetailed/BusSelectedReceivablesDetailed.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finselectedreceivablesdetailed/FinSelectedReceivablesDetailed.java similarity index 89% rename from anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busselectedreceivablesdetailed/BusSelectedReceivablesDetailed.java rename to anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finselectedreceivablesdetailed/FinSelectedReceivablesDetailed.java index a81bf69307..1525e28bdc 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busselectedreceivablesdetailed/BusSelectedReceivablesDetailed.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finselectedreceivablesdetailed/FinSelectedReceivablesDetailed.java @@ -23,7 +23,7 @@ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* *********************************************************/ -package com.yxt.anrui.buscenter.api.busselectedreceivablesdetailed; +package com.yxt.anrui.fin.api.finselectedreceivablesdetailed; import com.baomidou.mybatisplus.annotation.TableName; import com.yxt.common.core.domain.BaseEntity; @@ -34,9 +34,9 @@ import lombok.Data; import java.math.BigDecimal; /** - * Project: anrui-buscenter(销售相关)
- * File: BusSelectedReceivablesDetailed.java
- * Class: com.yxt.anrui.buscenter.api.busselectedreceivablesdetailed.BusSelectedReceivablesDetailed
+ * Project: anrui-fin(销售相关)
+ * File: FinSelectedReceivablesDetailed.java
+ * Class: com.yxt.anrui.fin.api.finselectedreceivablesdetailed.FinSelectedReceivablesDetailed
* Description: 已选应收款项明细表.
* Copyright: Copyright (c) 2011
* Company: https://gitee.com/liuzp315
@@ -48,8 +48,8 @@ import java.math.BigDecimal; */ @ApiModel(value = "已选应收款项明细表", description = "已选应收款项明细表") @Data -@TableName("bus_selected_receivables_detailed") -public class BusSelectedReceivablesDetailed extends BaseEntity { +@TableName("fin_selected_receivables_detailed") +public class FinSelectedReceivablesDetailed extends BaseEntity { private static final long serialVersionUID = 1L; @ApiModelProperty("创建人接口") diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busselectedreceivablesdetailed/BusSelectedReceivablesDetailedDto.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedDto.java similarity index 90% rename from anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busselectedreceivablesdetailed/BusSelectedReceivablesDetailedDto.java rename to anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedDto.java index bba256a2df..b6175538ad 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busselectedreceivablesdetailed/BusSelectedReceivablesDetailedDto.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedDto.java @@ -23,19 +23,18 @@ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* *********************************************************/ -package com.yxt.anrui.buscenter.api.busselectedreceivablesdetailed; +package com.yxt.anrui.fin.api.finselectedreceivablesdetailed; import com.yxt.common.core.dto.Dto; - import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; /** - * Project: anrui-buscenter(销售相关)
- * File: BusSelectedReceivablesDetailedDto.java
- * Class: com.yxt.anrui.buscenter.api.busselectedreceivablesdetailed.BusSelectedReceivablesDetailedDto
+ * Project: anrui-fin(销售相关)
+ * File: FinSelectedReceivablesDetailedDto.java
+ * Class: com.yxt.anrui.fin.api.finselectedreceivablesdetailed.FinSelectedReceivablesDetailedDto
* Description: 已选应收款项明细表 数据传输对象.
* Copyright: Copyright (c) 2011
* Company: https://gitee.com/liuzp315
@@ -47,7 +46,7 @@ import lombok.Data; */ @ApiModel(value = "已选应收款项明细表 数据传输对象", description = "已选应收款项明细表 数据传输对象") @Data -public class BusSelectedReceivablesDetailedDto implements Dto { +public class FinSelectedReceivablesDetailedDto implements Dto { @ApiModelProperty("创建人接口") private String createByName; // 创建人接口 diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busselectedreceivablesdetailed/BusSelectedReceivablesDetailedFeign.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedFeign.java similarity index 72% rename from anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busselectedreceivablesdetailed/BusSelectedReceivablesDetailedFeign.java rename to anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedFeign.java index d4558f71c4..51addcf3b5 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busselectedreceivablesdetailed/BusSelectedReceivablesDetailedFeign.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedFeign.java @@ -23,22 +23,20 @@ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* *********************************************************/ -package com.yxt.anrui.buscenter.api.busselectedreceivablesdetailed; +package com.yxt.anrui.fin.api.finselectedreceivablesdetailed; +import com.yxt.common.core.result.ResultBean; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; -import com.yxt.common.core.query.PagerQuery; -import com.yxt.common.core.result.ResultBean; -import com.yxt.common.core.vo.PagerVo; import org.springframework.cloud.openfeign.FeignClient; -import org.springframework.web.bind.annotation.*; - -import java.util.List; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; /** - * Project: anrui-buscenter(销售相关)
- * File: BusSelectedReceivablesDetailedFeign.java
- * Class: com.yxt.anrui.buscenter.api.busselectedreceivablesdetailed.BusSelectedReceivablesDetailedFeign
+ * Project: anrui-fin(销售相关)
+ * File: FinSelectedReceivablesDetailedFeign.java
+ * Class: com.yxt.anrui.fin.api.finselectedreceivablesdetailed.FinSelectedReceivablesDetailedFeign
* Description: 已选应收款项明细表.
* Copyright: Copyright (c) 2011
* Company: https://gitee.com/liuzp315
@@ -50,17 +48,17 @@ import java.util.List; */ @Api(tags = "已选应收款项明细表") @FeignClient( - contextId = "anrui-buscenter-BusSelectedReceivablesDetailed", - name = "anrui-buscenter", - path = "busselectedreceivablesdetailed", - fallback = BusSelectedReceivablesDetailedFeignFallback.class) -public interface BusSelectedReceivablesDetailedFeign { + contextId = "anrui-fin-FinSelectedReceivablesDetailed", + name = "anrui-fin", + path = "finselectedreceivablesdetailed", + fallback = FinSelectedReceivablesDetailedFeignFallback.class) +public interface FinSelectedReceivablesDetailedFeign { @ApiOperation("新增保存") @PostMapping("/save") - public ResultBean save(@RequestBody BusSelectedReceivablesDetailedDto dto); + public ResultBean save(@RequestBody FinSelectedReceivablesDetailedDto dto); @ApiOperation("修改保存") @PostMapping("/update/{sid}") - public ResultBean update(@RequestBody BusSelectedReceivablesDetailedDto dto, @PathVariable("sid") String sid); + public ResultBean update(@RequestBody FinSelectedReceivablesDetailedDto dto, @PathVariable("sid") String sid); } \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busselectedreceivablesdetailed/BusSelectedReceivablesDetailedFeignFallback.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedFeignFallback.java similarity index 68% rename from anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busselectedreceivablesdetailed/BusSelectedReceivablesDetailedFeignFallback.java rename to anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedFeignFallback.java index 05132b0071..eef9bfe025 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busselectedreceivablesdetailed/BusSelectedReceivablesDetailedFeignFallback.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedFeignFallback.java @@ -23,19 +23,15 @@ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* *********************************************************/ -package com.yxt.anrui.buscenter.api.busselectedreceivablesdetailed; +package com.yxt.anrui.fin.api.finselectedreceivablesdetailed; -import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; -import com.yxt.common.core.vo.PagerVo; import org.springframework.stereotype.Component; -import java.util.List; - /** - * Project: anrui-buscenter(销售相关)
- * File: BusSelectedReceivablesDetailedFeignFallback.java
- * Class: com.yxt.anrui.buscenter.api.busselectedreceivablesdetailed.BusSelectedReceivablesDetailedFeignFallback
+ * Project: anrui-fin(销售相关)
+ * File: FinSelectedReceivablesDetailedFeignFallback.java
+ * Class: com.yxt.anrui.fin.api.finselectedreceivablesdetailed.FinSelectedReceivablesDetailedFeignFallback
* Description: 已选应收款项明细表.
* Copyright: Copyright (c) 2011
* Company: https://gitee.com/liuzp315
@@ -46,16 +42,16 @@ import java.util.List; * @since 1.0 */ @Component -public class BusSelectedReceivablesDetailedFeignFallback implements BusSelectedReceivablesDetailedFeign { +public class FinSelectedReceivablesDetailedFeignFallback implements FinSelectedReceivablesDetailedFeign { @Override - public ResultBean save(BusSelectedReceivablesDetailedDto dto){ - return ResultBean.fireFail().setMsg("接口anrui-buscenter/busselectedreceivablesdetailed/save无法访问"); + public ResultBean save(FinSelectedReceivablesDetailedDto dto){ + return ResultBean.fireFail().setMsg("接口anrui-fin/finselectedreceivablesdetailed/save无法访问"); } @Override - public ResultBean update(BusSelectedReceivablesDetailedDto dto, String sid){ - return ResultBean.fireFail().setMsg("接口anrui-buscenter/busselectedreceivablesdetailed/update无法访问"); + public ResultBean update(FinSelectedReceivablesDetailedDto dto, String sid){ + return ResultBean.fireFail().setMsg("接口anrui-fin/finselectedreceivablesdetailed/update无法访问"); } } \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busselectedreceivablesdetailed/BusSelectedReceivablesDetailedQuery.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedQuery.java similarity index 90% rename from anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busselectedreceivablesdetailed/BusSelectedReceivablesDetailedQuery.java rename to anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedQuery.java index 9c92d78170..9e34c1238a 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busselectedreceivablesdetailed/BusSelectedReceivablesDetailedQuery.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedQuery.java @@ -23,19 +23,18 @@ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* *********************************************************/ -package com.yxt.anrui.buscenter.api.busselectedreceivablesdetailed; +package com.yxt.anrui.fin.api.finselectedreceivablesdetailed; import com.yxt.common.core.query.Query; - import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; /** - * Project: anrui-buscenter(销售相关)
- * File: BusSelectedReceivablesDetailedQuery.java
- * Class: com.yxt.anrui.buscenter.api.busselectedreceivablesdetailed.BusSelectedReceivablesDetailedQuery
+ * Project: anrui-fin(销售相关)
+ * File: FinSelectedReceivablesDetailedQuery.java
+ * Class: com.yxt.anrui.fin.api.finselectedreceivablesdetailed.FinSelectedReceivablesDetailedQuery
* Description: 已选应收款项明细表 查询条件.
* Copyright: Copyright (c) 2011
* Company: https://gitee.com/liuzp315
@@ -47,7 +46,7 @@ import lombok.Data; */ @ApiModel(value = "已选应收款项明细表 查询条件", description = "已选应收款项明细表 查询条件") @Data -public class BusSelectedReceivablesDetailedQuery implements Query { +public class FinSelectedReceivablesDetailedQuery implements Query { @ApiModelProperty("创建人接口") diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busselectedreceivablesdetailed/BusSelectedReceivablesDetailedVo.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedVo.java similarity index 90% rename from anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busselectedreceivablesdetailed/BusSelectedReceivablesDetailedVo.java rename to anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedVo.java index 9ebfea312e..66bd9fb16a 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busselectedreceivablesdetailed/BusSelectedReceivablesDetailedVo.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedVo.java @@ -23,19 +23,18 @@ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* *********************************************************/ -package com.yxt.anrui.buscenter.api.busselectedreceivablesdetailed; +package com.yxt.anrui.fin.api.finselectedreceivablesdetailed; import com.yxt.common.core.vo.Vo; - import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; /** - * Project: anrui-buscenter(销售相关)
- * File: BusSelectedReceivablesDetailedVo.java
- * Class: com.yxt.anrui.buscenter.api.busselectedreceivablesdetailed.BusSelectedReceivablesDetailedVo
+ * Project: anrui-fin(销售相关)
+ * File: FinSelectedReceivablesDetailedVo.java
+ * Class: com.yxt.anrui.fin.api.finselectedreceivablesdetailed.FinSelectedReceivablesDetailedVo
* Description: 已选应收款项明细表 视图数据对象.
* Copyright: Copyright (c) 2011
* Company: https://gitee.com/liuzp315
@@ -47,7 +46,7 @@ import lombok.Data; */ @ApiModel(value = "已选应收款项明细表 视图数据对象", description = "已选应收款项明细表 视图数据对象") @Data -public class BusSelectedReceivablesDetailedVo implements Vo { +public class FinSelectedReceivablesDetailedVo implements Vo { @ApiModelProperty("创建人接口") diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busuncollectedreceivablesdetailed/BusUncollectedReceivablesDetailedDto.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedDto.java similarity index 89% rename from anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busuncollectedreceivablesdetailed/BusUncollectedReceivablesDetailedDto.java rename to anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedDto.java index 28d0ae6466..61fe6c7e3f 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busuncollectedreceivablesdetailed/BusUncollectedReceivablesDetailedDto.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedDto.java @@ -23,19 +23,18 @@ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* *********************************************************/ -package com.yxt.anrui.buscenter.api.busuncollectedreceivablesdetailed; +package com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed; import com.yxt.common.core.dto.Dto; - import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; /** - * Project: anrui-buscenter(销售相关)
- * File: BusUncollectedReceivablesDetailedDto.java
- * Class: com.yxt.anrui.buscenter.api.busuncollectedreceivablesdetailed.BusUncollectedReceivablesDetailedDto
+ * Project: anrui-fin(销售相关)
+ * File: FinUncollectedReceivablesDetailedDto.java
+ * Class: com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.FinUncollectedReceivablesDetailedDto
* Description: 应收未收款项明细表 数据传输对象.
* Copyright: Copyright (c) 2011
* Company: https://gitee.com/liuzp315
@@ -47,7 +46,7 @@ import lombok.Data; */ @ApiModel(value = "应收未收款项明细表 数据传输对象", description = "应收未收款项明细表 数据传输对象") @Data -public class BusUncollectedReceivablesDetailedDto implements Dto { +public class FinUncollectedReceivablesDetailedDto implements Dto { @ApiModelProperty("应收未收款项sid") private String sid; // 应收未收款项sid diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busuncollectedreceivablesdetailed/BusUncollectedReceivablesDetailedFeign.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedFeign.java similarity index 69% rename from anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busuncollectedreceivablesdetailed/BusUncollectedReceivablesDetailedFeign.java rename to anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedFeign.java index 33b3282f14..a70b69908a 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busuncollectedreceivablesdetailed/BusUncollectedReceivablesDetailedFeign.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedFeign.java @@ -23,22 +23,23 @@ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* *********************************************************/ -package com.yxt.anrui.buscenter.api.busuncollectedreceivablesdetailed; +package com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed; +import com.yxt.common.core.result.ResultBean; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; -import com.yxt.common.core.query.PagerQuery; -import com.yxt.common.core.result.ResultBean; -import com.yxt.common.core.vo.PagerVo; import org.springframework.cloud.openfeign.FeignClient; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; import java.util.List; /** - * Project: anrui-buscenter(销售相关)
- * File: BusUncollectedReceivablesDetailedFeign.java
- * Class: com.yxt.anrui.buscenter.api.busuncollectedreceivablesdetailed.BusUncollectedReceivablesDetailedFeign
+ * Project: anrui-fin(销售相关)
+ * File: FinUncollectedReceivablesDetailedFeign.java
+ * Class: com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.FinUncollectedReceivablesDetailedFeign
* Description: 应收未收款项明细表.
* Copyright: Copyright (c) 2011
* Company: https://gitee.com/liuzp315
@@ -50,22 +51,22 @@ import java.util.List; */ @Api(tags = "应收未收款项明细表") @FeignClient( - contextId = "anrui-buscenter-BusUncollectedReceivablesDetailed", - name = "anrui-buscenter", + contextId = "anrui-fin-FinUncollectedReceivablesDetailed", + name = "anrui-fin", - path = "busuncollectedreceivablesdetailed", - fallback = BusUncollectedReceivablesDetailedFeignFallback.class) -public interface BusUncollectedReceivablesDetailedFeign { + path = "finuncollectedreceivablesdetailed", + fallback = FinUncollectedReceivablesDetailedFeignFallback.class) +public interface FinUncollectedReceivablesDetailedFeign { @ApiOperation("根据条件查询所有数据列表") @PostMapping("/listAll") - public ResultBean> listAll(@RequestBody BusUncollectedReceivablesDetailedQuery query); + public ResultBean> listAll(@RequestBody FinUncollectedReceivablesDetailedQuery query); @ApiOperation("新增或修改保存") @PostMapping("/saveOrUpdate") - public ResultBean saveOrUpdate(@RequestBody BusUncollectedReceivablesDetailedDto dto); + public ResultBean saveOrUpdate(@RequestBody FinUncollectedReceivablesDetailedDto dto); @ApiOperation("根据SID获取一条记录") @GetMapping("/fetchBySid/{sid}") - public ResultBean fetchBySid(@PathVariable("sid") String sid); + public ResultBean fetchBySid(@PathVariable("sid") String sid); } \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busuncollectedreceivablesdetailed/BusUncollectedReceivablesDetailedFeignFallback.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedFeignFallback.java similarity index 65% rename from anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busuncollectedreceivablesdetailed/BusUncollectedReceivablesDetailedFeignFallback.java rename to anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedFeignFallback.java index 37f04abd86..1e48f628a3 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busuncollectedreceivablesdetailed/BusUncollectedReceivablesDetailedFeignFallback.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedFeignFallback.java @@ -23,19 +23,17 @@ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* *********************************************************/ -package com.yxt.anrui.buscenter.api.busuncollectedreceivablesdetailed; +package com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed; -import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; -import com.yxt.common.core.vo.PagerVo; import org.springframework.stereotype.Component; import java.util.List; /** - * Project: anrui-buscenter(销售相关)
- * File: BusUncollectedReceivablesDetailedFeignFallback.java
- * Class: com.yxt.anrui.buscenter.api.busuncollectedreceivablesdetailed.BusUncollectedReceivablesDetailedFeignFallback
+ * Project: anrui-fin(销售相关)
+ * File: FinUncollectedReceivablesDetailedFeignFallback.java
+ * Class: com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.FinUncollectedReceivablesDetailedFeignFallback
* Description: 应收未收款项明细表.
* Copyright: Copyright (c) 2011
* Company: https://gitee.com/liuzp315
@@ -46,22 +44,22 @@ import java.util.List; * @since 1.0 */ @Component -public class BusUncollectedReceivablesDetailedFeignFallback implements BusUncollectedReceivablesDetailedFeign { +public class FinUncollectedReceivablesDetailedFeignFallback implements FinUncollectedReceivablesDetailedFeign { @Override - public ResultBean> listAll(BusUncollectedReceivablesDetailedQuery query){ + public ResultBean> listAll(FinUncollectedReceivablesDetailedQuery query){ ResultBean rb = ResultBean.fireFail(); - return rb.setMsg("接口anrui-buscenter/busuncollectedreceivablesdetailed/listAll无法访问"); + return rb.setMsg("接口anrui-fin/finuncollectedreceivablesdetailed/listAll无法访问"); } @Override - public ResultBean saveOrUpdate(BusUncollectedReceivablesDetailedDto dto){ - return ResultBean.fireFail().setMsg("接口anrui-buscenter/busuncollectedreceivablesdetailed/saveOrUpdate无法访问"); + public ResultBean saveOrUpdate(FinUncollectedReceivablesDetailedDto dto){ + return ResultBean.fireFail().setMsg("接口anrui-fin/finuncollectedreceivablesdetailed/saveOrUpdate无法访问"); } @Override - public ResultBean fetchBySid(String sid){ + public ResultBean fetchBySid(String sid){ ResultBean rb = ResultBean.fireFail(); - return rb.setMsg("接口anrui-buscenter/busuncollectedreceivablesdetailed/fetchBySid无法访问"); + return rb.setMsg("接口anrui-fin/finuncollectedreceivablesdetailed/fetchBySid无法访问"); } } \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busuncollectedreceivablesdetailed/BusUncollectedReceivablesDetailedQuery.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedQuery.java similarity index 87% rename from anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busuncollectedreceivablesdetailed/BusUncollectedReceivablesDetailedQuery.java rename to anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedQuery.java index dffae77a61..8c4bcc7696 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busuncollectedreceivablesdetailed/BusUncollectedReceivablesDetailedQuery.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedQuery.java @@ -23,19 +23,18 @@ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* *********************************************************/ -package com.yxt.anrui.buscenter.api.busuncollectedreceivablesdetailed; +package com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed; import com.yxt.common.core.query.Query; - import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; /** - * Project: anrui-buscenter(销售相关)
- * File: BusUncollectedReceivablesDetailedQuery.java
- * Class: com.yxt.anrui.buscenter.api.busuncollectedreceivablesdetailed.BusUncollectedReceivablesDetailedQuery
+ * Project: anrui-fin(销售相关)
+ * File: FinUncollectedReceivablesDetailedQuery.java
+ * Class: com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.FinUncollectedReceivablesDetailedQuery
* Description: 应收未收款项明细表 查询条件.
* Copyright: Copyright (c) 2011
* Company: https://gitee.com/liuzp315
@@ -47,7 +46,7 @@ import lombok.Data; */ @ApiModel(value = "应收未收款项明细表 查询条件", description = "应收未收款项明细表 查询条件") @Data -public class BusUncollectedReceivablesDetailedQuery implements Query { +public class FinUncollectedReceivablesDetailedQuery implements Query { @ApiModelProperty("合同编号") private String contractNo; // 合同编号 diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busuncollectedreceivablesdetailed/BusUncollectedReceivablesDetailedVo.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedVo.java similarity index 88% rename from anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busuncollectedreceivablesdetailed/BusUncollectedReceivablesDetailedVo.java rename to anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedVo.java index bb4e8c565f..20922b9064 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busuncollectedreceivablesdetailed/BusUncollectedReceivablesDetailedVo.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedVo.java @@ -23,19 +23,18 @@ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* *********************************************************/ -package com.yxt.anrui.buscenter.api.busuncollectedreceivablesdetailed; +package com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed; import com.yxt.common.core.vo.Vo; - import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; /** - * Project: anrui-buscenter(销售相关)
- * File: BusUncollectedReceivablesDetailedVo.java
- * Class: com.yxt.anrui.buscenter.api.busuncollectedreceivablesdetailed.BusUncollectedReceivablesDetailedVo
+ * Project: anrui-fin(销售相关)
+ * File: FinUncollectedReceivablesDetailedVo.java
+ * Class: com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.FinUncollectedReceivablesDetailedVo
* Description: 应收未收款项明细表 视图数据对象.
* Copyright: Copyright (c) 2011
* Company: https://gitee.com/liuzp315
@@ -47,7 +46,7 @@ import lombok.Data; */ @ApiModel(value = "应收未收款项明细表 视图数据对象", description = "应收未收款项明细表 视图数据对象") @Data -public class BusUncollectedReceivablesDetailedVo implements Vo { +public class FinUncollectedReceivablesDetailedVo implements Vo { @ApiModelProperty("应收未收款项sid") private String sid; // 应收未收款项sid diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/buscollectionconfirmation/BusCollectionConfirmationMapper.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationMapper.java similarity index 65% rename from anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/buscollectionconfirmation/BusCollectionConfirmationMapper.java rename to anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationMapper.java index 7f0137bafc..3c8604ddee 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/buscollectionconfirmation/BusCollectionConfirmationMapper.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationMapper.java @@ -23,15 +23,14 @@ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* *********************************************************/ -package com.yxt.anrui.buscenter.biz.buscollectionconfirmation; +package com.yxt.anrui.fin.biz.fincollectionconfirmation; 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.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Constants; -import com.yxt.anrui.buscenter.api.buscollectionconfirmation.*; -import com.yxt.common.core.result.ResultBean; +import com.yxt.anrui.fin.api.fincollectionconfirmation.*; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; @@ -39,9 +38,9 @@ import org.apache.ibatis.annotations.Select; import java.util.List; /** - * Project: anrui-buscenter(销售相关)
- * File: BusCollectionConfirmationMapper.java
- * Class: com.yxt.anrui.buscenter.biz.buscollectionconfirmation.BusCollectionConfirmationMapper
+ * Project: anrui-fin(销售相关)
+ * File: FinCollectionConfirmationMapper.java
+ * Class: com.yxt.anrui.fin.biz.fincollectionconfirmation.FinCollectionConfirmationMapper
* Description: 收款确认表.
* Copyright: Copyright (c) 2011
* Company: https://gitee.com/liuzp315
@@ -52,17 +51,14 @@ import java.util.List; * @since 1.0 */ @Mapper -public interface BusCollectionConfirmationMapper extends BaseMapper { - - //@Update("update bus_collection_confirmation set name=#{msg} where id=#{id}") - //IPage voPage(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); +public interface FinCollectionConfirmationMapper extends BaseMapper { - IPage selectPageVo(IPage page, @Param(Constants.WRAPPER) Wrapper qw); + IPage selectPageVo(IPage page, @Param(Constants.WRAPPER) Wrapper qw); - List selectListAllVo(@Param(Constants.WRAPPER) Wrapper qw); + List selectListAllVo(@Param(Constants.WRAPPER) Wrapper qw); - @Select("select * from bus_collection_confirmation") - List selectListVo(); + @Select("select * from fin_collection_confirmation") + List selectListVo(); /** * 手机端—获取款项确认列表 @@ -71,7 +67,7 @@ public interface BusCollectionConfirmationMapper extends BaseMapper getCollectionConfirmList(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); + IPage getCollectionConfirmList(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); /** * 手机端—初始化收款确认申请 @@ -80,5 +76,5 @@ public interface BusCollectionConfirmationMapper extends BaseMapper - + diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/buscollectionconfirmation/BusCollectionConfirmationRest.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationRest.java similarity index 62% rename from anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/buscollectionconfirmation/BusCollectionConfirmationRest.java rename to anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationRest.java index 13bebe4446..c533ff0546 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/buscollectionconfirmation/BusCollectionConfirmationRest.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationRest.java @@ -23,12 +23,10 @@ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* *********************************************************/ -package com.yxt.anrui.buscenter.biz.buscollectionconfirmation; +package com.yxt.anrui.fin.biz.fincollectionconfirmation; 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.anrui.fin.api.fincollectionconfirmation.*; import com.yxt.common.base.utils.PagerUtil; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; @@ -38,12 +36,10 @@ import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; -import java.util.List; - /** - * Project: anrui-buscenter(销售相关)
- * File: BusCollectionConfirmationFeignFallback.java
- * Class: com.yxt.anrui.buscenter.biz.buscollectionconfirmation.BusCollectionConfirmationRest
+ * Project: anrui-fin(销售相关)
+ * File: FinCollectionConfirmationFeignFallback.java
+ * Class: com.yxt.anrui.fin.biz.fincollectionconfirmation.FinCollectionConfirmationRest
* Description: 收款确认表.
* Copyright: Copyright (c) 2011
* Company: https://gitee.com/liuzp315
@@ -54,41 +50,41 @@ import java.util.List; * @since 1.0 */ @Api(tags = "收款确认表") -@RestController("com.yxt.anrui.buscenter.biz.buscollectionconfirmation.BusCollectionConfirmationRest") -@RequestMapping("/buscollectionconfirmation") -public class BusCollectionConfirmationRest implements BusCollectionConfirmationFeign { +@RestController("com.yxt.anrui.fin.biz.fincollectionconfirmation.FinCollectionConfirmationRest") +@RequestMapping("/fincollectionconfirmation") +public class FinCollectionConfirmationRest implements FinCollectionConfirmationFeign { @Autowired - private BusCollectionConfirmationService busCollectionConfirmationService; + private FinCollectionConfirmationService finCollectionConfirmationService; @Override @ApiOperation("根据条件分页查询数据的列表") @PostMapping("/listPage") - public ResultBean> listPage(@RequestBody PagerQuery pq) { + public ResultBean> listPage(@RequestBody PagerQuery pq) { ResultBean rb = ResultBean.fireFail(); - PagerVo pv = busCollectionConfirmationService.listPageVo(pq); + PagerVo pv = finCollectionConfirmationService.listPageVo(pq); return rb.success().setData(pv); } @Override @ApiOperation("提交新增保存") @PostMapping("/save") - public ResultBean save(@RequestBody BusCollectionConfirmationDto dto) { - return busCollectionConfirmationService.saveAllDto(dto); + public ResultBean save(@RequestBody FinCollectionConfirmationDto dto) { + return finCollectionConfirmationService.saveAllDto(dto); } @Override @ApiOperation("根据sid批量删除") @PostMapping("/delBySids") public ResultBean delBySids(@RequestBody String[] sids) { - return busCollectionConfirmationService.delAllBySids(sids); + return finCollectionConfirmationService.delAllBySids(sids); } @Override @ApiOperation("根据SID获取一条记录") @GetMapping("/fetchBySid/{sid}") - public ResultBean fetchBySid(@PathVariable("sid") String sid) { - return busCollectionConfirmationService.fetchByAllSid(sid); + public ResultBean fetchBySid(@PathVariable("sid") String sid) { + return finCollectionConfirmationService.fetchByAllSid(sid); } @Override @@ -103,11 +99,11 @@ public class BusCollectionConfirmationRest implements BusCollectionConfirmationF * @return */ @Override - public ResultBean> getCollectionConfirmList(PagerQuery pagerQuery) { - PagerVo page = new PagerVo<>(); - IPage iPage = busCollectionConfirmationService.getCollectionConfirmList(pagerQuery); - PagerVo pagerVo = PagerUtil.pageToVo(iPage, page); - return new ResultBean>().success().setData(pagerVo); + public ResultBean> getCollectionConfirmList(PagerQuery pagerQuery) { + PagerVo page = new PagerVo<>(); + IPage iPage = finCollectionConfirmationService.getCollectionConfirmList(pagerQuery); + PagerVo pagerVo = PagerUtil.pageToVo(iPage, page); + return new ResultBean>().success().setData(pagerVo); } /** @@ -117,8 +113,8 @@ public class BusCollectionConfirmationRest implements BusCollectionConfirmationF * @return */ @Override - public ResultBean addCollectionConfirm(AppBusCollectionConfirmationDto dto) { - return busCollectionConfirmationService.addCollectionConfirm(dto); + public ResultBean addCollectionConfirm(AppFinCollectionConfirmationDto dto) { + return finCollectionConfirmationService.addCollectionConfirm(dto); } /** @@ -129,8 +125,8 @@ public class BusCollectionConfirmationRest implements BusCollectionConfirmationF * @return */ @Override - public ResultBean initCollectionConfirm(String collectionBillSid, String userSid) { - return busCollectionConfirmationService.initCollectionConfirm(collectionBillSid, userSid); + public ResultBean initCollectionConfirm(String collectionBillSid, String userSid) { + return finCollectionConfirmationService.initCollectionConfirm(collectionBillSid, userSid); } /** @@ -140,8 +136,8 @@ public class BusCollectionConfirmationRest implements BusCollectionConfirmationF * @return */ @Override - public ResultBean submitCollectionConfirm(AppBusCollectionConfirmationDto dto) { - return busCollectionConfirmationService.submitCollectionConfirm(dto); + public ResultBean submitCollectionConfirm(AppFinCollectionConfirmationDto dto) { + return finCollectionConfirmationService.submitCollectionConfirm(dto); } /** @@ -152,7 +148,7 @@ public class BusCollectionConfirmationRest implements BusCollectionConfirmationF */ @Override public ResultBean deleteCollectionConfirm(String collectionBillSid) { - return busCollectionConfirmationService.deleteCollectionConfirm(collectionBillSid); + return finCollectionConfirmationService.deleteCollectionConfirm(collectionBillSid); } /** @@ -162,10 +158,10 @@ public class BusCollectionConfirmationRest implements BusCollectionConfirmationF * @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); + public ResultBean> getPaymentDetailsList(PagerQuery pagerQuery) { + PagerVo page = new PagerVo<>(); + IPage iPage = finCollectionConfirmationService.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-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java similarity index 59% rename from anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/buscollectionconfirmation/BusCollectionConfirmationService.java rename to anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java index fd2f2960c2..b0c712142f 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/buscollectionconfirmation/BusCollectionConfirmationService.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java @@ -23,35 +23,31 @@ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* *********************************************************/ -package com.yxt.anrui.buscenter.biz.buscollectionconfirmation; +package com.yxt.anrui.fin.biz.fincollectionconfirmation; 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.base.api.basevehicle.BaseVehicleQuery; -import com.yxt.anrui.base.api.basevehicle.BaseVehicleVo; -import com.yxt.anrui.base.api.commonappendix.CommonAppendix; import com.yxt.anrui.base.api.commonappendix.CommonAppendixDto; import com.yxt.anrui.base.api.commonappendix.CommonAppendixFeign; import com.yxt.anrui.base.api.commonappendix.CommonAttachTypeEnum; -import com.yxt.anrui.buscenter.api.buscollectionconfirmation.*; -import com.yxt.anrui.buscenter.api.busselectedreceivablesdetailed.BusSelectedReceivablesDetailed; -import com.yxt.anrui.buscenter.api.busselectedreceivablesdetailed.BusSelectedReceivablesDetailedDto; -import com.yxt.anrui.buscenter.api.busselectedreceivablesdetailed.BusSelectedReceivablesDetailedVo; -import com.yxt.anrui.buscenter.api.busuncollectedreceivablesdetailed.BusUncollectedReceivablesDetailedDto; -import com.yxt.anrui.buscenter.api.busuncollectedreceivablesdetailed.BusUncollectedReceivablesDetailedVo; -import com.yxt.anrui.buscenter.biz.busselectedreceivablesdetailed.BusSelectedReceivablesDetailedService; -import com.yxt.anrui.buscenter.biz.busuncollectedreceivablesdetailed.BusUncollectedReceivablesDetailedService; +import com.yxt.anrui.fin.api.fincollectionconfirmation.*; +import com.yxt.anrui.fin.api.finselectedreceivablesdetailed.FinSelectedReceivablesDetailed; +import com.yxt.anrui.fin.api.finselectedreceivablesdetailed.FinSelectedReceivablesDetailedDto; +import com.yxt.anrui.fin.api.finselectedreceivablesdetailed.FinSelectedReceivablesDetailedVo; +import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.FinUncollectedReceivablesDetailedDto; +import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.FinUncollectedReceivablesDetailedVo; +import com.yxt.anrui.fin.biz.finselectedreceivablesdetailed.FinSelectedReceivablesDetailedService; +import com.yxt.anrui.fin.biz.finuncollectedreceivablesdetailed.FinUncollectedReceivablesDetailedService; 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; 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; - +import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -60,9 +56,9 @@ import java.math.BigDecimal; import java.util.List; /** - * Project: anrui-buscenter(销售相关)
- * File: BusCollectionConfirmationService.java
- * Class: com.yxt.anrui.buscenter.biz.buscollectionconfirmation.BusCollectionConfirmationService
+ * Project: anrui-fin(销售相关)
+ * File: FinCollectionConfirmationService.java
+ * Class: com.yxt.anrui.fin.biz.fincollectionconfirmation.FinCollectionConfirmationService
* Description: 收款确认表 业务逻辑.
* Copyright: Copyright (c) 2011
* Company: https://gitee.com/liuzp315
@@ -73,12 +69,12 @@ import java.util.List; * @since 1.0 */ @Service -public class BusCollectionConfirmationService extends MybatisBaseService { +public class FinCollectionConfirmationService extends MybatisBaseService { @Autowired - private BusSelectedReceivablesDetailedService busSelectedReceivablesDetailedService; + private FinSelectedReceivablesDetailedService finSelectedReceivablesDetailedService; @Autowired - private BusUncollectedReceivablesDetailedService busUncollectedReceivablesDetailedService; + private FinUncollectedReceivablesDetailedService finUncollectedReceivablesDetailedService; @Autowired private CommonAppendixFeign commonAppendixFeign; @Autowired @@ -88,10 +84,10 @@ public class BusCollectionConfirmationService extends MybatisBaseService createQueryWrapper(BusCollectionConfirmationQuery query) { + private QueryWrapper createQueryWrapper(FinCollectionConfirmationQuery query) { // todo: 这里根据具体业务调整查询条件 // 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName())); - QueryWrapper qw = new QueryWrapper<>(); + QueryWrapper qw = new QueryWrapper<>(); qw.eq("useOrgSid", query.getUseOrgSid()); if (StringUtils.isNotBlank(query.getCreateBySid())) { qw.eq("createBySid", query.getCreateBySid()); @@ -111,27 +107,27 @@ public class BusCollectionConfirmationService extends MybatisBaseService listPageVo(PagerQuery pq) { - BusCollectionConfirmationQuery query = pq.getParams(); - QueryWrapper qw = createQueryWrapper(query); - IPage page = PagerUtil.queryToPage(pq); - IPage pagging = baseMapper.selectPageVo(page, qw); - List records = pagging.getRecords(); - for (BusCollectionConfirmationVo record : records) { + public PagerVo listPageVo(PagerQuery pq) { + FinCollectionConfirmationQuery query = pq.getParams(); + QueryWrapper qw = createQueryWrapper(query); + IPage page = PagerUtil.queryToPage(pq); + IPage pagging = baseMapper.selectPageVo(page, qw); + List records = pagging.getRecords(); + for (FinCollectionConfirmationVo record : records) { String s = ""; BigDecimal subscriptionMoney = null; String sid = record.getSid(); - List busSelectedReceivablesDetailedVos = busSelectedReceivablesDetailedService.fetchByCillSid(sid); - for (BusSelectedReceivablesDetailedVo busSelectedReceivablesDetailedVo : busSelectedReceivablesDetailedVos) { - Integer auditState = busSelectedReceivablesDetailedVo.getAuditState(); + List finSelectedReceivablesDetailedVos = finSelectedReceivablesDetailedService.fetchByCillSid(sid); + for (FinSelectedReceivablesDetailedVo finSelectedReceivablesDetailedVo : finSelectedReceivablesDetailedVos) { + Integer auditState = finSelectedReceivablesDetailedVo.getAuditState(); s += auditState + ","; } if (!s.contains("3")) { record.setSubscriptionState(1); } else if (s.contains("3")) { - List busSelectedReceivablesDetailedVos1 = busSelectedReceivablesDetailedService.fetchByAuditState(); - for (BusSelectedReceivablesDetailedVo busSelectedReceivablesDetailedVo : busSelectedReceivablesDetailedVos1) { - BigDecimal subscriptionMoney1 = new BigDecimal(busSelectedReceivablesDetailedVo.getSubscriptionMoney()); + List finSelectedReceivablesDetailedVos1 = finSelectedReceivablesDetailedService.fetchByAuditState(); + for (FinSelectedReceivablesDetailedVo finSelectedReceivablesDetailedVo : finSelectedReceivablesDetailedVos1) { + BigDecimal subscriptionMoney1 = new BigDecimal(finSelectedReceivablesDetailedVo.getSubscriptionMoney()); subscriptionMoney = subscriptionMoney.add(subscriptionMoney1); } BigDecimal collectionMoney = new BigDecimal(record.getCollectionMoney()); @@ -142,23 +138,23 @@ public class BusCollectionConfirmationService extends MybatisBaseService p = PagerUtil.pageToVo(pagging, null); + PagerVo p = PagerUtil.pageToVo(pagging, null); return p; } - public ResultBean saveAllDto(BusCollectionConfirmationDto dto) { + public ResultBean saveAllDto(FinCollectionConfirmationDto dto) { ResultBean rb = ResultBean.fireFail(); - BusCollectionConfirmation busCollectionConfirmation = new BusCollectionConfirmation(); - List busSelectedReceivablesDetailedDtos = dto.getBusSelectedReceivablesDetailedDtos(); + FinCollectionConfirmation finCollectionConfirmation = new FinCollectionConfirmation(); + List finSelectedReceivablesDetailedDtos = dto.getFinSelectedReceivablesDetailedDtos(); CommonAppendixDto commonAppendixDto = new CommonAppendixDto(); - List paymentVoucherAppendixs = dto.getPaymentVoucherAppendixs(); - List remittanceConfirmationAppendixs = dto.getRemittanceConfirmationAppendixs(); - String sid1 = busCollectionConfirmation.getSid(); - BeanUtil.copyProperties(dto, busCollectionConfirmation); - busCollectionConfirmation.setSid(sid1); + List paymentVoucherAppendixs = dto.getPaymentVoucherAppendixs(); + List remittanceConfirmationAppendixs = dto.getRemittanceConfirmationAppendixs(); + String sid1 = finCollectionConfirmation.getSid(); + BeanUtil.copyProperties(dto, finCollectionConfirmation); + finCollectionConfirmation.setSid(sid1); String payFilePath = ""; String remFilePath = ""; - for (BusCollectionConfirmationAppendixDto paymentVoucherAppendix : paymentVoucherAppendixs) { + for (FinCollectionConfirmationAppendixDto paymentVoucherAppendix : paymentVoucherAppendixs) { BeanUtil.copyProperties(paymentVoucherAppendix, commonAppendixDto); payFilePath = commonAppendixDto.getFilePath(); if (payFilePath.indexOf(fileUploadComponent.getUrlPrefix()) > -1) { @@ -171,8 +167,8 @@ public class BusCollectionConfirmationService extends MybatisBaseService -1) { @@ -185,62 +181,62 @@ public class BusCollectionConfirmationService extends MybatisBaseService busSelectedReceivablesDetailedVos = busSelectedReceivablesDetailedService.fetchByCillSid(sid1); + List finSelectedReceivablesDetailedVos = finSelectedReceivablesDetailedService.fetchByCillSid(sid1); BigDecimal totalSubscriptionMone = null; - for (BusSelectedReceivablesDetailedVo busSelectedReceivablesDetailedVo : busSelectedReceivablesDetailedVos) { - BigDecimal subscriptionMoney = new BigDecimal(busSelectedReceivablesDetailedVo.getSubscriptionMoney()); + for (FinSelectedReceivablesDetailedVo finSelectedReceivablesDetailedVo : finSelectedReceivablesDetailedVos) { + BigDecimal subscriptionMoney = new BigDecimal(finSelectedReceivablesDetailedVo.getSubscriptionMoney()); totalSubscriptionMone = totalSubscriptionMone.add(subscriptionMoney); } - BigDecimal collectionMoney = busCollectionConfirmation.getCollectionMoney(); + BigDecimal collectionMoney = finCollectionConfirmation.getCollectionMoney(); BigDecimal subtract = collectionMoney.subtract(totalSubscriptionMone); if (subtract.compareTo(BigDecimal.ZERO) < 0) { return rb.setMsg("已选应收款项金额已超出该确认单应收金额总额，请重新核对"); } - busCollectionConfirmation.setBalance(totalSubscriptionMone); - busCollectionConfirmation.setAuditState(1); - save(busCollectionConfirmation); + finCollectionConfirmation.setBalance(totalSubscriptionMone); + finCollectionConfirmation.setAuditState(1); + save(finCollectionConfirmation); return rb.success().setMsg("添加成功"); } - public ResultBean fetchByAllSid(String sid) { + public ResultBean fetchByAllSid(String sid) { ResultBean rb = ResultBean.fireFail(); - BusCollectionConfirmationDetailsVo busCollectionConfirmationDetailsVo = new BusCollectionConfirmationDetailsVo(); - BusCollectionConfirmation busCollectionConfirmation = fetchBySid(sid); - BeanUtil.copyProperties(busCollectionConfirmation, busCollectionConfirmationDetailsVo); - List busSelectedReceivablesDetailedVos = busSelectedReceivablesDetailedService.fetchByCillSid(sid); - busCollectionConfirmationDetailsVo.setBusSelectedReceivablesDetailedVos(busSelectedReceivablesDetailedVos); - return rb.success().setData(busCollectionConfirmationDetailsVo); + FinCollectionConfirmationDetailsVo finCollectionConfirmationDetailsVo = new FinCollectionConfirmationDetailsVo(); + FinCollectionConfirmation finCollectionConfirmation = fetchBySid(sid); + BeanUtil.copyProperties(finCollectionConfirmation, finCollectionConfirmationDetailsVo); + List finSelectedReceivablesDetailedVos = finSelectedReceivablesDetailedService.fetchByCillSid(sid); + finCollectionConfirmationDetailsVo.setFinSelectedReceivablesDetailedVos(finSelectedReceivablesDetailedVos); + return rb.success().setData(finCollectionConfirmationDetailsVo); } public ResultBean delAllBySids(String[] sids) { ResultBean rb = ResultBean.fireFail(); delBySids(sids); for (String sid : sids) { - busSelectedReceivablesDetailedService.deleteByCollSid(sid); + finSelectedReceivablesDetailedService.deleteByCollSid(sid); } return rb.success().setMsg("删除成功"); } @@ -251,19 +247,19 @@ public class BusCollectionConfirmationService extends MybatisBaseService getCollectionConfirmList(PagerQuery pagerQuery) { - IPage page = PagerUtil.queryToPage(pagerQuery); - QueryWrapper qw = appBuildQueryWrapper(pagerQuery.getParams()); - IPage collectionConfirmList = baseMapper.getCollectionConfirmList(page, qw); - for (AppBusCollectionConfirmationPageVo record : collectionConfirmList.getRecords()) { + public IPage getCollectionConfirmList(PagerQuery pagerQuery) { + IPage page = PagerUtil.queryToPage(pagerQuery); + QueryWrapper qw = appBuildQueryWrapper(pagerQuery.getParams()); + IPage collectionConfirmList = baseMapper.getCollectionConfirmList(page, qw); + for (AppFinCollectionConfirmationPageVo 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") { + List finSelectedReceivablesDetailedVos = finSelectedReceivablesDetailedService.fetchByCillSid(record.getCollectionBillSid()); + if (finSelectedReceivablesDetailedVos.size() > 0 || collectionBillState != "1") { record.setShowDelete(false); } } @@ -276,8 +272,8 @@ public class BusCollectionConfirmationService extends MybatisBaseService appBuildQueryWrapper(AppBusCollectionConfirmationQuery pagerQuery) { - QueryWrapper qw = new QueryWrapper<>(); + private QueryWrapper appBuildQueryWrapper(AppFinCollectionConfirmationQuery pagerQuery) { + QueryWrapper qw = new QueryWrapper<>(); if (pagerQuery != null) { if (com.yxt.common.base.utils.StringUtils.isNotBlank(pagerQuery.getName())) {//车架号 qw.like("bv.vinNo", pagerQuery.getName()); @@ -293,23 +289,23 @@ public class BusCollectionConfirmationService extends MybatisBaseService payFiles = dto.getPayFiles(); for (String payFile : payFiles) { String payFilePath = payFile.replace(fileUploadComponent.getUrlPrefix(), ""); @@ -329,13 +325,13 @@ public class BusCollectionConfirmationService extends MybatisBaseService initCollectionConfirm(String collectionBillSid, String userSid) { - ResultBean rb = ResultBean.fireFail(); + 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); + AppFinCollectionConfirmationInitVo vo = baseMapper.initCollectionConfirm(collectionBillSid, useOrgSid); return rb.success().setData(vo); } @@ -345,7 +341,7 @@ public class BusCollectionConfirmationService extends MybatisBaseService getPaymentDetailsList(PagerQuery pagerQuery) { - IPage page = PagerUtil.queryToPage(pagerQuery); - QueryWrapper qw = appPaymentDetailsBuildQueryWrapper(pagerQuery.getParams()); + public IPage getPaymentDetailsList(PagerQuery pagerQuery) { + IPage page = PagerUtil.queryToPage(pagerQuery); + QueryWrapper qw = appPaymentDetailsBuildQueryWrapper(pagerQuery.getParams()); List sidList = pagerQuery.getParams().getSidList(); - IPage collectionConfirmList = busSelectedReceivablesDetailedService.getPaymentDetailsList(sidList, page, qw); + IPage collectionConfirmList = finSelectedReceivablesDetailedService.getPaymentDetailsList(sidList, page, qw); return collectionConfirmList; } @@ -384,8 +380,8 @@ public class BusCollectionConfirmationService extends MybatisBaseService appPaymentDetailsBuildQueryWrapper(AppBusSelectedReceivablesPaymentDetailsQuery pagerQuery) { - QueryWrapper qw = new QueryWrapper<>(); + private QueryWrapper appPaymentDetailsBuildQueryWrapper(AppFinSelectedReceivablesPaymentDetailsQuery pagerQuery) { + QueryWrapper qw = new QueryWrapper<>(); if (pagerQuery != null) { if (com.yxt.common.base.utils.StringUtils.isNotBlank(pagerQuery.getName())) {//车架号 qw.like("bv.vinNo", pagerQuery.getName()); diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busselectedreceivablesdetailed/BusSelectedReceivablesDetailedMapper.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedMapper.java similarity index 58% rename from anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busselectedreceivablesdetailed/BusSelectedReceivablesDetailedMapper.java rename to anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedMapper.java index 10d66b6483..fc0535ca08 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busselectedreceivablesdetailed/BusSelectedReceivablesDetailedMapper.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedMapper.java @@ -23,28 +23,28 @@ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* *********************************************************/ -package com.yxt.anrui.buscenter.biz.busselectedreceivablesdetailed; +package com.yxt.anrui.fin.biz.finselectedreceivablesdetailed; 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.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Constants; -import com.yxt.anrui.buscenter.api.buscollectionconfirmation.AppBusSelectedReceivablesPaymentDetailsQuery; -import com.yxt.anrui.buscenter.api.buscollectionconfirmation.AppBusSelectedReceivablesPaymentDetailsVo; +import com.yxt.anrui.fin.api.fincollectionconfirmation.AppFinSelectedReceivablesPaymentDetailsQuery; +import com.yxt.anrui.fin.api.fincollectionconfirmation.AppFinSelectedReceivablesPaymentDetailsVo; +import com.yxt.anrui.fin.api.finselectedreceivablesdetailed.FinSelectedReceivablesDetailed; +import com.yxt.anrui.fin.api.finselectedreceivablesdetailed.FinSelectedReceivablesDetailedVo; import org.apache.ibatis.annotations.Delete; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; -import com.yxt.anrui.buscenter.api.busselectedreceivablesdetailed.BusSelectedReceivablesDetailed; -import com.yxt.anrui.buscenter.api.busselectedreceivablesdetailed.BusSelectedReceivablesDetailedVo; import java.util.List; /** - * Project: anrui-buscenter(销售相关)
- * File: BusSelectedReceivablesDetailedMapper.java
- * Class: com.yxt.anrui.buscenter.biz.busselectedreceivablesdetailed.BusSelectedReceivablesDetailedMapper
+ * Project: anrui-fin(销售相关)
+ * File: FinSelectedReceivablesDetailedMapper.java
+ * Class: com.yxt.anrui.fin.biz.finselectedreceivablesdetailed.FinSelectedReceivablesDetailedMapper
* Description: 已选应收款项明细表.
* Copyright: Copyright (c) 2011
* Company: https://gitee.com/liuzp315
@@ -55,23 +55,23 @@ import java.util.List; * @since 1.0 */ @Mapper -public interface BusSelectedReceivablesDetailedMapper extends BaseMapper { +public interface FinSelectedReceivablesDetailedMapper extends BaseMapper { - //@Update("update bus_selected_receivables_detailed set name=#{msg} where id=#{id}") - //IPage voPage(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); + //@Update("update fin_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); + IPage selectPageVo(IPage page, @Param(Constants.WRAPPER) Wrapper qw); - List selectListAllVo(@Param(Constants.WRAPPER) Wrapper qw); + List selectListAllVo(@Param(Constants.WRAPPER) Wrapper qw); - @Select("select * from bus_selected_receivables_detailed") - List selectListVo(); + @Select("select * from fin_selected_receivables_detailed") + List selectListVo(); - @Delete("delete from bus_selected_receivables_detailed where collSid = #{sid}") + @Delete("delete from fin_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 fin_selected_receivables_detailed where collSid = #{sid}") + List fetchByCillSid(String sid); /** @@ -81,9 +81,9 @@ public interface BusSelectedReceivablesDetailedMapper extends BaseMapper getPaymentDetailsList(@Param("sidList") List sidList, IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); + IPage getPaymentDetailsList(@Param("sidList") List sidList, IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); - @Select("select * from bus_selected_receivables_detailed where auditState = #{auditState}") - List fetchByAuditState(int auditState); + @Select("select * from fin_selected_receivables_detailed where auditState = #{auditState}") + List fetchByAuditState(int auditState); } \ 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-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedMapper.xml similarity index 65% rename from anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busselectedreceivablesdetailed/BusSelectedReceivablesDetailedMapper.xml rename to anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedMapper.xml index c33e315189..7310fcbd88 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busselectedreceivablesdetailed/BusSelectedReceivablesDetailedMapper.xml +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedMapper.xml @@ -1,19 +1,19 @@ - + + resultType="com.yxt.anrui.fin.api.fincollectionconfirmation.AppFinSelectedReceivablesPaymentDetailsVo"> SELECT -- AS contractId, @@ -43,7 +43,7 @@ -- subscriptionDate AS confirmDate, -- AS `state` - FROM bus_selected_receivables_detailed bsrd WHERE bsrd.sid NOT IN + FROM fin_selected_receivables_detailed bsrd WHERE bsrd.sid NOT IN #{sids} diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busselectedreceivablesdetailed/BusSelectedReceivablesDetailedRest.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedRest.java similarity index 62% rename from anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busselectedreceivablesdetailed/BusSelectedReceivablesDetailedRest.java rename to anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedRest.java index fd941a5b0f..cc2b5266f5 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busselectedreceivablesdetailed/BusSelectedReceivablesDetailedRest.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedRest.java @@ -23,27 +23,20 @@ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* *********************************************************/ -package com.yxt.anrui.buscenter.biz.busselectedreceivablesdetailed; +package com.yxt.anrui.fin.biz.finselectedreceivablesdetailed; -import com.yxt.common.core.query.PagerQuery; +import com.yxt.anrui.fin.api.finselectedreceivablesdetailed.FinSelectedReceivablesDetailedDto; +import com.yxt.anrui.fin.api.finselectedreceivablesdetailed.FinSelectedReceivablesDetailedFeign; import com.yxt.common.core.result.ResultBean; -import com.yxt.common.core.vo.PagerVo; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; -import java.util.List; -import com.yxt.anrui.buscenter.api.busselectedreceivablesdetailed.BusSelectedReceivablesDetailed; -import com.yxt.anrui.buscenter.api.busselectedreceivablesdetailed.BusSelectedReceivablesDetailedQuery; -import com.yxt.anrui.buscenter.api.busselectedreceivablesdetailed.BusSelectedReceivablesDetailedVo; -import com.yxt.anrui.buscenter.api.busselectedreceivablesdetailed.BusSelectedReceivablesDetailedDto; -import com.yxt.anrui.buscenter.api.busselectedreceivablesdetailed.BusSelectedReceivablesDetailedFeign; - /** - * Project: anrui-buscenter(销售相关)
- * File: BusSelectedReceivablesDetailedFeignFallback.java
- * Class: com.yxt.anrui.buscenter.biz.busselectedreceivablesdetailed.BusSelectedReceivablesDetailedRest
+ * Project: anrui-fin(销售相关)
+ * File: FinSelectedReceivablesDetailedFeignFallback.java
+ * Class: com.yxt.anrui.fin.biz.finselectedreceivablesdetailed.FinSelectedReceivablesDetailedRest
* Description: 已选应收款项明细表.
* Copyright: Copyright (c) 2011
* Company: https://gitee.com/liuzp315
@@ -54,28 +47,28 @@ import com.yxt.anrui.buscenter.api.busselectedreceivablesdetailed.BusSelectedRec * @since 1.0 */ @Api(tags = "已选应收款项明细表") -@RestController("com.yxt.anrui.buscenter.biz.busselectedreceivablesdetailed.BusSelectedReceivablesDetailedRest") -@RequestMapping("/busselectedreceivablesdetailed") -public class BusSelectedReceivablesDetailedRest implements BusSelectedReceivablesDetailedFeign { +@RestController("com.yxt.anrui.fin.biz.finselectedreceivablesdetailed.FinSelectedReceivablesDetailedRest") +@RequestMapping("/finselectedreceivablesdetailed") +public class FinSelectedReceivablesDetailedRest implements FinSelectedReceivablesDetailedFeign { @Autowired - private BusSelectedReceivablesDetailedService busSelectedReceivablesDetailedService; + private FinSelectedReceivablesDetailedService finSelectedReceivablesDetailedService; @Override @ApiOperation("新增保存") @PostMapping("/save") - public ResultBean save(@RequestBody BusSelectedReceivablesDetailedDto dto){ + public ResultBean save(@RequestBody FinSelectedReceivablesDetailedDto dto){ ResultBean rb = ResultBean.fireFail(); - busSelectedReceivablesDetailedService.saveOrUpdateDto(dto); + finSelectedReceivablesDetailedService.saveOrUpdateDto(dto); return rb.success(); } @Override @ApiOperation("修改保存") @PostMapping("/update/{sid}") - public ResultBean update(@RequestBody BusSelectedReceivablesDetailedDto dto, @PathVariable("sid") String sid){ + public ResultBean update(@RequestBody FinSelectedReceivablesDetailedDto dto, @PathVariable("sid") String sid){ ResultBean rb = ResultBean.fireFail(); - busSelectedReceivablesDetailedService.updateBySid(dto.toMap(),sid); + finSelectedReceivablesDetailedService.updateBySid(dto.toMap(),sid); return rb.success(); } } diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busselectedreceivablesdetailed/BusSelectedReceivablesDetailedService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedService.java similarity index 62% rename from anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busselectedreceivablesdetailed/BusSelectedReceivablesDetailedService.java rename to anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedService.java index 95670e493e..abc9067042 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busselectedreceivablesdetailed/BusSelectedReceivablesDetailedService.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedService.java @@ -23,34 +23,30 @@ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* *********************************************************/ -package com.yxt.anrui.buscenter.biz.busselectedreceivablesdetailed; +package com.yxt.anrui.fin.biz.finselectedreceivablesdetailed; 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 org.apache.commons.lang3.StringUtils; +import com.yxt.anrui.fin.api.fincollectionconfirmation.AppFinSelectedReceivablesPaymentDetailsQuery; +import com.yxt.anrui.fin.api.fincollectionconfirmation.AppFinSelectedReceivablesPaymentDetailsVo; +import com.yxt.anrui.fin.api.finselectedreceivablesdetailed.FinSelectedReceivablesDetailed; +import com.yxt.anrui.fin.api.finselectedreceivablesdetailed.FinSelectedReceivablesDetailedDto; +import com.yxt.anrui.fin.api.finselectedreceivablesdetailed.FinSelectedReceivablesDetailedQuery; +import com.yxt.anrui.fin.api.finselectedreceivablesdetailed.FinSelectedReceivablesDetailedVo; import com.yxt.common.base.service.MybatisBaseService; 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; -import com.yxt.anrui.buscenter.api.busselectedreceivablesdetailed.BusSelectedReceivablesDetailed; -import com.yxt.anrui.buscenter.api.busselectedreceivablesdetailed.BusSelectedReceivablesDetailedQuery; -import com.yxt.anrui.buscenter.api.busselectedreceivablesdetailed.BusSelectedReceivablesDetailedVo; -import com.yxt.anrui.buscenter.api.busselectedreceivablesdetailed.BusSelectedReceivablesDetailedDto; -import com.yxt.anrui.buscenter.api.busselectedreceivablesdetailed.BusSelectedReceivablesDetailedFeign; - -import org.apache.ibatis.annotations.Param; +import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; import java.util.List; /** - * Project: anrui-buscenter(销售相关)
- * File: BusSelectedReceivablesDetailedService.java
- * Class: com.yxt.anrui.buscenter.biz.busselectedreceivablesdetailed.BusSelectedReceivablesDetailedService
+ * Project: anrui-fin(销售相关)
+ * File: FinSelectedReceivablesDetailedService.java
+ * Class: com.yxt.anrui.fin.biz.finselectedreceivablesdetailed.FinSelectedReceivablesDetailedService
* Description: 已选应收款项明细表 业务逻辑.
* Copyright: Copyright (c) 2011
* Company: https://gitee.com/liuzp315
@@ -61,25 +57,25 @@ import java.util.List; * @since 1.0 */ @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); +public class FinSelectedReceivablesDetailedService extends MybatisBaseService { + public PagerVo listPage(PagerQuery pq) { + FinSelectedReceivablesDetailedQuery 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); + public List listAll(FinSelectedReceivablesDetailedQuery query) { + QueryWrapper qw = createQueryWrapper(query); return baseMapper.selectList(qw); } - private QueryWrapper createQueryWrapper(BusSelectedReceivablesDetailedQuery query) { + private QueryWrapper createQueryWrapper(FinSelectedReceivablesDetailedQuery query) { // todo: 这里根据具体业务调整查询条件 // 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName())); - QueryWrapper qw = new QueryWrapper<>(); + QueryWrapper qw = new QueryWrapper<>(); if (StringUtils.isNotBlank(query.getCreateByName())) { @@ -136,33 +132,33 @@ public class BusSelectedReceivablesDetailedService extends MybatisBaseService 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); + public PagerVo listPageVo(PagerQuery pq) { + FinSelectedReceivablesDetailedQuery 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); + public List listAllVo(FinSelectedReceivablesDetailedQuery query) { + QueryWrapper qw = createQueryWrapper(query); return baseMapper.selectListAllVo(qw); } - public List listVo() { + public List listVo() { return baseMapper.selectListVo(); } - public void saveOrUpdateDto(BusSelectedReceivablesDetailedDto dto) { - BusSelectedReceivablesDetailed entity = new BusSelectedReceivablesDetailed(); + public void saveOrUpdateDto(FinSelectedReceivablesDetailedDto dto) { + FinSelectedReceivablesDetailed entity = new FinSelectedReceivablesDetailed(); dto.fillEntity(entity); this.saveOrUpdate(entity); } - public BusSelectedReceivablesDetailedVo fetchByIdVo(String id) { - BusSelectedReceivablesDetailed entity = this.fetchById(id); - BusSelectedReceivablesDetailedVo vo = new BusSelectedReceivablesDetailedVo(); + public FinSelectedReceivablesDetailedVo fetchByIdVo(String id) { + FinSelectedReceivablesDetailed entity = this.fetchById(id); + FinSelectedReceivablesDetailedVo vo = new FinSelectedReceivablesDetailedVo(); BeanUtil.copyProperties(entity, vo); return vo; } @@ -171,7 +167,7 @@ public class BusSelectedReceivablesDetailedService extends MybatisBaseService fetchByCillSid(String sid) { + public List fetchByCillSid(String sid) { return baseMapper.fetchByCillSid(sid); } @@ -182,11 +178,11 @@ public class BusSelectedReceivablesDetailedService extends MybatisBaseService getPaymentDetailsList(List sidList, IPage page, QueryWrapper qw) { + public IPage getPaymentDetailsList(List sidList, IPage page, QueryWrapper qw) { return baseMapper.getPaymentDetailsList(sidList, page, qw); } - public List fetchByAuditState() { + public List fetchByAuditState() { int auditState = 3; return baseMapper.fetchByAuditState(auditState); } diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busuncollectedreceivablesdetailed/BusUncollectedReceivablesDetailedMapper.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedMapper.java similarity index 63% rename from anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busuncollectedreceivablesdetailed/BusUncollectedReceivablesDetailedMapper.java rename to anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedMapper.java index 05678f54a7..0f96557347 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busuncollectedreceivablesdetailed/BusUncollectedReceivablesDetailedMapper.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedMapper.java @@ -23,24 +23,24 @@ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* *********************************************************/ -package com.yxt.anrui.buscenter.biz.busuncollectedreceivablesdetailed; +package com.yxt.anrui.fin.biz.finuncollectedreceivablesdetailed; import com.baomidou.mybatisplus.core.conditions.Wrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Constants; +import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.FinUncollectedReceivablesDetailed; +import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.FinUncollectedReceivablesDetailedVo; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; -import com.yxt.anrui.buscenter.api.busuncollectedreceivablesdetailed.BusUncollectedReceivablesDetailed; -import com.yxt.anrui.buscenter.api.busuncollectedreceivablesdetailed.BusUncollectedReceivablesDetailedVo; import java.util.List; /** - * Project: anrui-buscenter(销售相关)
- * File: BusUncollectedReceivablesDetailedMapper.java
- * Class: com.yxt.anrui.buscenter.biz.busuncollectedreceivablesdetailed.BusUncollectedReceivablesDetailedMapper
+ * Project: anrui-fin(销售相关)
+ * File: FinUncollectedReceivablesDetailedMapper.java
+ * Class: com.yxt.anrui.fin.biz.finuncollectedreceivablesdetailed.FinUncollectedReceivablesDetailedMapper
* Description: 应收未收款项明细表.
* Copyright: Copyright (c) 2011
* Company: https://gitee.com/liuzp315
@@ -51,17 +51,17 @@ import java.util.List; * @since 1.0 */ @Mapper -public interface BusUncollectedReceivablesDetailedMapper extends BaseMapper { +public interface FinUncollectedReceivablesDetailedMapper extends BaseMapper { - //@Update("update bus_uncollected_receivables_detailed set name=#{msg} where id=#{id}") - //IPage voPage(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); + //@Update("update fin_uncollected_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); + IPage selectPageVo(IPage page, @Param(Constants.WRAPPER) Wrapper qw); - List selectListAllVo(@Param(Constants.WRAPPER) Wrapper qw); + List selectListAllVo(@Param(Constants.WRAPPER) Wrapper qw); - @Select("select * from bus_uncollected_receivables_detailed") - List selectListVo(); + @Select("select * from fin_uncollected_receivables_detailed") + List selectListVo(); - BusUncollectedReceivablesDetailedVo fetchByVinAndRecName(@Param("vin") String vin, @Param("receivablesName") String receivablesName); + FinUncollectedReceivablesDetailedVo fetchByVinAndRecName(@Param("vin") String vin, @Param("receivablesName") String receivablesName); } \ 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 new file mode 100644 index 0000000000..1dcbd9ece0 --- /dev/null +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedMapper.xml @@ -0,0 +1,23 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busuncollectedreceivablesdetailed/BusUncollectedReceivablesDetailedRest.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedRest.java similarity index 59% rename from anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busuncollectedreceivablesdetailed/BusUncollectedReceivablesDetailedRest.java rename to anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedRest.java index 5782f169c3..56fab59148 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busuncollectedreceivablesdetailed/BusUncollectedReceivablesDetailedRest.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedRest.java @@ -23,29 +23,24 @@ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* *********************************************************/ -package com.yxt.anrui.buscenter.biz.busuncollectedreceivablesdetailed; +package com.yxt.anrui.fin.biz.finuncollectedreceivablesdetailed; -import com.yxt.common.base.utils.StringUtils; -import com.yxt.common.core.query.PagerQuery; +import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.FinUncollectedReceivablesDetailedDto; +import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.FinUncollectedReceivablesDetailedFeign; +import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.FinUncollectedReceivablesDetailedQuery; +import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.FinUncollectedReceivablesDetailedVo; import com.yxt.common.core.result.ResultBean; -import com.yxt.common.core.vo.PagerVo; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; -import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import java.util.List; -import com.yxt.anrui.buscenter.api.busuncollectedreceivablesdetailed.BusUncollectedReceivablesDetailed; -import com.yxt.anrui.buscenter.api.busuncollectedreceivablesdetailed.BusUncollectedReceivablesDetailedQuery; -import com.yxt.anrui.buscenter.api.busuncollectedreceivablesdetailed.BusUncollectedReceivablesDetailedVo; -import com.yxt.anrui.buscenter.api.busuncollectedreceivablesdetailed.BusUncollectedReceivablesDetailedDto; -import com.yxt.anrui.buscenter.api.busuncollectedreceivablesdetailed.BusUncollectedReceivablesDetailedFeign; /** - * Project: anrui-buscenter(销售相关)
- * File: BusUncollectedReceivablesDetailedFeignFallback.java
- * Class: com.yxt.anrui.buscenter.biz.busuncollectedreceivablesdetailed.BusUncollectedReceivablesDetailedRest
+ * Project: anrui-fin(销售相关)
+ * File: FinUncollectedReceivablesDetailedFeignFallback.java
+ * Class: com.yxt.anrui.fin.biz.finuncollectedreceivablesdetailed.FinUncollectedReceivablesDetailedRest
* Description: 应收未收款项明细表.
* Copyright: Copyright (c) 2011
* Company: https://gitee.com/liuzp315
@@ -56,35 +51,35 @@ import com.yxt.anrui.buscenter.api.busuncollectedreceivablesdetailed.BusUncollec * @since 1.0 */ @Api(tags = "应收未收款项明细表") -@RestController("com.yxt.anrui.buscenter.biz.busuncollectedreceivablesdetailed.BusUncollectedReceivablesDetailedRest") -@RequestMapping("/busuncollectedreceivablesdetailed") -public class BusUncollectedReceivablesDetailedRest implements BusUncollectedReceivablesDetailedFeign { +@RestController("com.yxt.anrui.fin.biz.finuncollectedreceivablesdetailed.FinUncollectedReceivablesDetailedRest") +@RequestMapping("/finuncollectedreceivablesdetailed") +public class FinUncollectedReceivablesDetailedRest implements FinUncollectedReceivablesDetailedFeign { @Autowired - private BusUncollectedReceivablesDetailedService busUncollectedReceivablesDetailedService; + private FinUncollectedReceivablesDetailedService finUncollectedReceivablesDetailedService; @Override @ApiOperation("根据条件查询所有数据列表") @PostMapping("/listAll") - public ResultBean> listAll(@RequestBody BusUncollectedReceivablesDetailedQuery query){ + public ResultBean> listAll(@RequestBody FinUncollectedReceivablesDetailedQuery query){ ResultBean rb = ResultBean.fireFail(); - List list = busUncollectedReceivablesDetailedService.listAllVo(query); + List list = finUncollectedReceivablesDetailedService.listAllVo(query); return rb.success().setData(list); } @Override @ApiOperation("新增或修改保存") @PostMapping("/saveOrUpdate") - public ResultBean saveOrUpdate(@RequestBody BusUncollectedReceivablesDetailedDto dto){ - return busUncollectedReceivablesDetailedService.saveOrUpdateDto(dto); + public ResultBean saveOrUpdate(@RequestBody FinUncollectedReceivablesDetailedDto dto){ + return finUncollectedReceivablesDetailedService.saveOrUpdateDto(dto); } @Override @ApiOperation("根据SID获取一条记录") @GetMapping("/fetchBySid/{sid}") - public ResultBean fetchBySid(@PathVariable("sid") String sid){ + public ResultBean fetchBySid(@PathVariable("sid") String sid){ ResultBean rb = ResultBean.fireFail(); - BusUncollectedReceivablesDetailedVo vo = new BusUncollectedReceivablesDetailedVo(); + FinUncollectedReceivablesDetailedVo vo = new FinUncollectedReceivablesDetailedVo(); return rb.success().setData(vo); } } diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busuncollectedreceivablesdetailed/BusUncollectedReceivablesDetailedService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedService.java similarity index 66% rename from anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busuncollectedreceivablesdetailed/BusUncollectedReceivablesDetailedService.java rename to anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedService.java index 88e430d598..b47fdcaab7 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busuncollectedreceivablesdetailed/BusUncollectedReceivablesDetailedService.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedService.java @@ -23,32 +23,25 @@ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* *********************************************************/ -package com.yxt.anrui.buscenter.biz.busuncollectedreceivablesdetailed; +package com.yxt.anrui.fin.biz.finuncollectedreceivablesdetailed; -import cn.hutool.core.bean.BeanUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import org.apache.commons.lang3.StringUtils; +import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.FinUncollectedReceivablesDetailed; +import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.FinUncollectedReceivablesDetailedDto; +import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.FinUncollectedReceivablesDetailedQuery; +import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.FinUncollectedReceivablesDetailedVo; import com.yxt.common.base.service.MybatisBaseService; -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; -import com.yxt.anrui.buscenter.api.busuncollectedreceivablesdetailed.BusUncollectedReceivablesDetailed; -import com.yxt.anrui.buscenter.api.busuncollectedreceivablesdetailed.BusUncollectedReceivablesDetailedQuery; -import com.yxt.anrui.buscenter.api.busuncollectedreceivablesdetailed.BusUncollectedReceivablesDetailedVo; -import com.yxt.anrui.buscenter.api.busuncollectedreceivablesdetailed.BusUncollectedReceivablesDetailedDto; -import com.yxt.anrui.buscenter.api.busuncollectedreceivablesdetailed.BusUncollectedReceivablesDetailedFeign; - +import org.apache.commons.lang3.StringUtils; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; import java.util.List; /** - * Project: anrui-buscenter(销售相关)
- * File: BusUncollectedReceivablesDetailedService.java
- * Class: com.yxt.anrui.buscenter.biz.busuncollectedreceivablesdetailed.BusUncollectedReceivablesDetailedService
+ * Project: anrui-fin(销售相关)
+ * File: FinUncollectedReceivablesDetailedService.java
+ * Class: com.yxt.anrui.fin.biz.finuncollectedreceivablesdetailed.FinUncollectedReceivablesDetailedService
* Description: 应收未收款项明细表 业务逻辑.
* Copyright: Copyright (c) 2011
* Company: https://gitee.com/liuzp315
@@ -59,11 +52,11 @@ import java.util.List; * @since 1.0 */ @Service -public class BusUncollectedReceivablesDetailedService extends MybatisBaseService { - private QueryWrapper createQueryWrapper(BusUncollectedReceivablesDetailedQuery query) { +public class FinUncollectedReceivablesDetailedService extends MybatisBaseService { + private QueryWrapper createQueryWrapper(FinUncollectedReceivablesDetailedQuery query) { // todo: 这里根据具体业务调整查询条件 // 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName())); - QueryWrapper qw = new QueryWrapper<>(); + QueryWrapper qw = new QueryWrapper<>(); qw.ne("currentReceivableMoney",0); qw.eq("useOrgSid", query.getUseOrgSid()); qw.eq("createBySid",query.getCreateBySid()); @@ -79,15 +72,15 @@ public class BusUncollectedReceivablesDetailedService extends MybatisBaseService return qw; } - public List listAllVo(BusUncollectedReceivablesDetailedQuery query) { - QueryWrapper qw = createQueryWrapper(query); + public List listAllVo(FinUncollectedReceivablesDetailedQuery query) { + QueryWrapper qw = createQueryWrapper(query); return baseMapper.selectListAllVo(qw); } - public ResultBean saveOrUpdateDto(BusUncollectedReceivablesDetailedDto dto){ + public ResultBean saveOrUpdateDto(FinUncollectedReceivablesDetailedDto dto){ ResultBean rb = ResultBean.fireFail(); String sid = dto.getSid(); - BusUncollectedReceivablesDetailed entity = new BusUncollectedReceivablesDetailed(); + FinUncollectedReceivablesDetailed entity = new FinUncollectedReceivablesDetailed(); if (StringUtils.isBlank(sid)){//新增 BeanUtils.copyProperties(dto,entity); save(entity); @@ -97,7 +90,7 @@ public class BusUncollectedReceivablesDetailedService extends MybatisBaseService return rb.success().setMsg("修改成功"); } - public BusUncollectedReceivablesDetailedVo fetchByVinAndRecName(String vin, String receivablesName) { + public FinUncollectedReceivablesDetailedVo fetchByVinAndRecName(String vin, String receivablesName) { return baseMapper.fetchByVinAndRecName(vin,receivablesName); } } \ No newline at end of file diff --git a/anrui-terminal/anrui-terminal-api/pom.xml b/anrui-terminal/anrui-terminal-api/pom.xml index dc5824619a..c752cd71cb 100644 --- a/anrui-terminal/anrui-terminal-api/pom.xml +++ b/anrui-terminal/anrui-terminal-api/pom.xml @@ -41,6 +41,12 @@ 0.0.1 compile + + com.yxt.anrui.fin + anrui-fin-api + 0.0.1 + compile + diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/AppBusCollectionConfirmationFeign.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/AppFinCollectionConfirmationFeign.java similarity index 76% rename from anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/AppBusCollectionConfirmationFeign.java rename to anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/AppFinCollectionConfirmationFeign.java index 473b2e9847..c2904f68bd 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/AppBusCollectionConfirmationFeign.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/AppFinCollectionConfirmationFeign.java @@ -25,7 +25,7 @@ *********************************************************/ package com.yxt.anrui.terminal.api.finance; -import com.yxt.anrui.buscenter.api.buscollectionconfirmation.*; +import com.yxt.anrui.fin.api.fincollectionconfirmation.*; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; @@ -35,9 +35,9 @@ import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.*; /** - * Project: anrui-buscenter(销售相关)
- * File: BusCollectionConfirmationFeign.java
- * Class: com.yxt.anrui.buscenter.api.buscollectionconfirmation.BusCollectionConfirmationFeign
+ * Project: anrui-fin(销售相关)
+ * File: FinCollectionConfirmationFeign.java
+ * Class: com.yxt.anrui.fin.api.fincollectionconfirmation.FinCollectionConfirmationFeign
* Description: 收款确认表.
* Copyright: Copyright (c) 2011
* Company: https://gitee.com/liuzp315
@@ -49,27 +49,27 @@ import org.springframework.web.bind.annotation.*; */ @Api(tags = "收款确认表") @FeignClient( - contextId = "anrui-buscenter-BusCollectionConfirmation", - name = "anrui-buscenter", + contextId = "anrui-fin-FinCollectionConfirmation", + name = "anrui-fin", path = "v1/collectionConfirm", - fallback = AppBusCollectionConfirmationFeignFallback.class) -public interface AppBusCollectionConfirmationFeign { + fallback = AppFinCollectionConfirmationFeignFallback.class) +public interface AppFinCollectionConfirmationFeign { @ApiOperation("手机端—获取款项确认列表") @PostMapping("/getCollectionConfirmList") - public ResultBean> getCollectionConfirmList(@RequestBody PagerQuery pagerQuery); + public ResultBean> getCollectionConfirmList(@RequestBody PagerQuery pagerQuery); @ApiOperation("手机端—新增款项确认申请单") @PostMapping("/addCollectionConfirm") - public ResultBean addCollectionConfirm(@RequestBody AppBusCollectionConfirmationDto dto); + public ResultBean addCollectionConfirm(@RequestBody AppFinCollectionConfirmationDto dto); @ApiOperation("手机端—初始化收款确认申请") @GetMapping("/initCollectionConfirm/{collectionBillSid}/{userSid}") - public ResultBean initCollectionConfirm(@PathVariable("collectionBillSid") String collectionBillSid, @PathVariable("userSid") String userSid); + public ResultBean initCollectionConfirm(@PathVariable("collectionBillSid") String collectionBillSid, @PathVariable("userSid") String userSid); @ApiOperation("手机端—提交款项确认申请") @PostMapping("/submitCollectionConfirm") - public ResultBean submitCollectionConfirm(@RequestBody AppBusCollectionConfirmationDto dto); + public ResultBean submitCollectionConfirm(@RequestBody AppFinCollectionConfirmationDto dto); @ApiOperation("手机端—删除收款确认单") @DeleteMapping("/deleteCollectionConfirm/{collectionBillSid}") @@ -77,5 +77,5 @@ public interface AppBusCollectionConfirmationFeign { @ApiOperation("手机端—查询可使用款项明细列表") @PostMapping("/getPaymentDetailsList") - public ResultBean> getPaymentDetailsList(@RequestBody PagerQuery pagerQuery); + public ResultBean> getPaymentDetailsList(@RequestBody PagerQuery pagerQuery); } \ No newline at end of file diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/AppBusCollectionConfirmationFeignFallback.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/AppFinCollectionConfirmationFeignFallback.java similarity index 73% rename from anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/AppBusCollectionConfirmationFeignFallback.java rename to anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/AppFinCollectionConfirmationFeignFallback.java index 3ffd51cbe7..f0a207dd46 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/AppBusCollectionConfirmationFeignFallback.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/AppFinCollectionConfirmationFeignFallback.java @@ -25,16 +25,16 @@ *********************************************************/ package com.yxt.anrui.terminal.api.finance; -import com.yxt.anrui.buscenter.api.buscollectionconfirmation.*; +import com.yxt.anrui.fin.api.fincollectionconfirmation.*; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; import org.springframework.stereotype.Component; /** - * Project: anrui-buscenter(销售相关)
- * File: BusCollectionConfirmationFeignFallback.java
- * Class: com.yxt.anrui.buscenter.api.buscollectionconfirmation.BusCollectionConfirmationFeignFallback
+ * Project: anrui-fin(销售相关)
+ * File: FinCollectionConfirmationFeignFallback.java
+ * Class: com.yxt.anrui.fin.api.fincollectionconfirmation.FinCollectionConfirmationFeignFallback
* Description: 收款确认表.
* Copyright: Copyright (c) 2011
* Company: https://gitee.com/liuzp315
@@ -45,26 +45,26 @@ import org.springframework.stereotype.Component; * @since 1.0 */ @Component -public class AppBusCollectionConfirmationFeignFallback implements AppBusCollectionConfirmationFeign { +public class AppFinCollectionConfirmationFeignFallback implements AppFinCollectionConfirmationFeign { @Override - public ResultBean> getCollectionConfirmList(PagerQuery pagerQuery) { + public ResultBean> getCollectionConfirmList(PagerQuery pagerQuery) { return null; } @Override - public ResultBean addCollectionConfirm(AppBusCollectionConfirmationDto dto) { + public ResultBean addCollectionConfirm(AppFinCollectionConfirmationDto dto) { return null; } @Override - public ResultBean initCollectionConfirm(String collectionBillSid, String userSid) { + public ResultBean initCollectionConfirm(String collectionBillSid, String userSid) { return null; } @Override - public ResultBean submitCollectionConfirm(AppBusCollectionConfirmationDto dto) { + public ResultBean submitCollectionConfirm(AppFinCollectionConfirmationDto dto) { return null; } @@ -74,7 +74,7 @@ public class AppBusCollectionConfirmationFeignFallback implements AppBusCollecti } @Override - public ResultBean> getPaymentDetailsList(PagerQuery pagerQuery) { + public ResultBean> getPaymentDetailsList(PagerQuery pagerQuery) { return null; } } \ No newline at end of file diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/finance/AppBusCollectionConfirmationRest.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/finance/AppFinCollectionConfirmationRest.java similarity index 69% rename from anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/finance/AppBusCollectionConfirmationRest.java rename to anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/finance/AppFinCollectionConfirmationRest.java index 1423dae0d7..5fe6bbed82 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/finance/AppBusCollectionConfirmationRest.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/finance/AppFinCollectionConfirmationRest.java @@ -25,8 +25,8 @@ *********************************************************/ package com.yxt.anrui.terminal.biz.finance; -import com.yxt.anrui.buscenter.api.buscollectionconfirmation.*; -import com.yxt.anrui.terminal.api.finance.AppBusCollectionConfirmationFeign; +import com.yxt.anrui.fin.api.fincollectionconfirmation.*; +import com.yxt.anrui.terminal.api.finance.AppFinCollectionConfirmationFeign; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; @@ -35,9 +35,9 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; /** - * Project: anrui-buscenter(销售相关)
- * File: BusCollectionConfirmationFeignFallback.java
- * Class: com.yxt.anrui.buscenter.biz.buscollectionconfirmation.BusCollectionConfirmationRest
+ * Project: anrui-fin(销售相关)
+ * File: FinCollectionConfirmationFeignFallback.java
+ * Class: com.yxt.anrui.fin.biz.fincollectionconfirmation.FinCollectionConfirmationRest
* Description: 收款确认表.
* Copyright: Copyright (c) 2011
* Company: https://gitee.com/liuzp315
@@ -48,12 +48,12 @@ import org.springframework.web.bind.annotation.*; * @since 1.0 */ @Api(tags = "收款确认表") -@RestController("com.yxt.anrui.buscenter.biz.buscollectionconfirmation.BusCollectionConfirmationRest") -@RequestMapping("/buscollectionconfirmation") -public class AppBusCollectionConfirmationRest implements AppBusCollectionConfirmationFeign { +@RestController("com.yxt.anrui.fin.biz.fincollectionconfirmation.FinCollectionConfirmationRest") +@RequestMapping("/fincollectionconfirmation") +public class AppFinCollectionConfirmationRest implements AppFinCollectionConfirmationFeign { @Autowired - private AppBusCollectionConfirmationService appbusCollectionConfirmationService; + private AppFinCollectionConfirmationService appfinCollectionConfirmationService; /** @@ -63,8 +63,8 @@ public class AppBusCollectionConfirmationRest implements AppBusCollectionConfirm * @return */ @Override - public ResultBean> getCollectionConfirmList(PagerQuery pagerQuery) { - return appbusCollectionConfirmationService.getCollectionConfirmList(pagerQuery); + public ResultBean> getCollectionConfirmList(PagerQuery pagerQuery) { + return appfinCollectionConfirmationService.getCollectionConfirmList(pagerQuery); } /** @@ -74,8 +74,8 @@ public class AppBusCollectionConfirmationRest implements AppBusCollectionConfirm * @return */ @Override - public ResultBean addCollectionConfirm(AppBusCollectionConfirmationDto dto) { - return appbusCollectionConfirmationService.addCollectionConfirm(dto); + public ResultBean addCollectionConfirm(AppFinCollectionConfirmationDto dto) { + return appfinCollectionConfirmationService.addCollectionConfirm(dto); } /** @@ -86,8 +86,8 @@ public class AppBusCollectionConfirmationRest implements AppBusCollectionConfirm * @return */ @Override - public ResultBean initCollectionConfirm(String collectionBillSid, String userSid) { - return appbusCollectionConfirmationService.initCollectionConfirm(collectionBillSid,userSid); + public ResultBean initCollectionConfirm(String collectionBillSid, String userSid) { + return appfinCollectionConfirmationService.initCollectionConfirm(collectionBillSid,userSid); } /** @@ -97,8 +97,8 @@ public class AppBusCollectionConfirmationRest implements AppBusCollectionConfirm * @return */ @Override - public ResultBean submitCollectionConfirm(AppBusCollectionConfirmationDto dto) { - return appbusCollectionConfirmationService.submitCollectionConfirm(dto); + public ResultBean submitCollectionConfirm(AppFinCollectionConfirmationDto dto) { + return appfinCollectionConfirmationService.submitCollectionConfirm(dto); } /** @@ -109,7 +109,7 @@ public class AppBusCollectionConfirmationRest implements AppBusCollectionConfirm */ @Override public ResultBean deleteCollectionConfirm(String collectionBillSid) { - return appbusCollectionConfirmationService.deleteCollectionConfirm(collectionBillSid); + return appfinCollectionConfirmationService.deleteCollectionConfirm(collectionBillSid); } /** @@ -119,7 +119,7 @@ public class AppBusCollectionConfirmationRest implements AppBusCollectionConfirm * @return */ @Override - public ResultBean> getPaymentDetailsList(PagerQuery pagerQuery) { - return appbusCollectionConfirmationService.getPaymentDetailsList(pagerQuery); + public ResultBean> getPaymentDetailsList(PagerQuery pagerQuery) { + return appfinCollectionConfirmationService.getPaymentDetailsList(pagerQuery); } } diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/finance/AppBusCollectionConfirmationService.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/finance/AppFinCollectionConfirmationService.java similarity index 71% rename from anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/finance/AppBusCollectionConfirmationService.java rename to anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/finance/AppFinCollectionConfirmationService.java index 1fc0aa16d5..cefba38f80 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/finance/AppBusCollectionConfirmationService.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/finance/AppFinCollectionConfirmationService.java @@ -26,7 +26,7 @@ package com.yxt.anrui.terminal.biz.finance; -import com.yxt.anrui.buscenter.api.buscollectionconfirmation.*; +import com.yxt.anrui.fin.api.fincollectionconfirmation.*; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; @@ -35,9 +35,9 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; /** - * Project: anrui-buscenter(销售相关)
- * File: BusCollectionConfirmationService.java
- * Class: com.yxt.anrui.buscenter.biz.buscollectionconfirmation.BusCollectionConfirmationService
+ * Project: anrui-fin(销售相关)
+ * File: FinCollectionConfirmationService.java
+ * Class: com.yxt.anrui.fin.biz.fincollectionconfirmation.FinCollectionConfirmationService
* Description: 收款确认表 业务逻辑.
* Copyright: Copyright (c) 2011
* Company: https://gitee.com/liuzp315
@@ -48,9 +48,9 @@ import org.springframework.stereotype.Service; * @since 1.0 */ @Service -public class AppBusCollectionConfirmationService { +public class AppFinCollectionConfirmationService { @Autowired - BusCollectionConfirmationFeign busCollectionConfirmationFeign; + FinCollectionConfirmationFeign finCollectionConfirmationFeign; /** @@ -59,8 +59,8 @@ public class AppBusCollectionConfirmationService { * @param pagerQuery * @return */ - public ResultBean> getCollectionConfirmList(PagerQuery pagerQuery) { - return busCollectionConfirmationFeign.getCollectionConfirmList(pagerQuery); + public ResultBean> getCollectionConfirmList(PagerQuery pagerQuery) { + return finCollectionConfirmationFeign.getCollectionConfirmList(pagerQuery); } /** @@ -69,8 +69,8 @@ public class AppBusCollectionConfirmationService { * @param dto * @return */ - public ResultBean addCollectionConfirm(AppBusCollectionConfirmationDto dto) { - return busCollectionConfirmationFeign.addCollectionConfirm(dto); + public ResultBean addCollectionConfirm(AppFinCollectionConfirmationDto dto) { + return finCollectionConfirmationFeign.addCollectionConfirm(dto); } /** @@ -80,8 +80,8 @@ public class AppBusCollectionConfirmationService { * @param userSid * @return */ - public ResultBean initCollectionConfirm(String collectionBillSid, String userSid) { - return busCollectionConfirmationFeign.initCollectionConfirm(collectionBillSid, userSid); + public ResultBean initCollectionConfirm(String collectionBillSid, String userSid) { + return finCollectionConfirmationFeign.initCollectionConfirm(collectionBillSid, userSid); } /** @@ -90,8 +90,8 @@ public class AppBusCollectionConfirmationService { * @param dto * @return */ - public ResultBean submitCollectionConfirm(AppBusCollectionConfirmationDto dto) { - return busCollectionConfirmationFeign.submitCollectionConfirm(dto); + public ResultBean submitCollectionConfirm(AppFinCollectionConfirmationDto dto) { + return finCollectionConfirmationFeign.submitCollectionConfirm(dto); } /** @@ -102,7 +102,7 @@ public class AppBusCollectionConfirmationService { * @return */ public ResultBean deleteCollectionConfirm(String collectionBillSid) { - return busCollectionConfirmationFeign.deleteCollectionConfirm(collectionBillSid); + return finCollectionConfirmationFeign.deleteCollectionConfirm(collectionBillSid); } /** @@ -111,7 +111,7 @@ public class AppBusCollectionConfirmationService { * @param pagerQuery * @return */ - public ResultBean> getPaymentDetailsList(PagerQuery pagerQuery) { - return busCollectionConfirmationFeign.getPaymentDetailsList(pagerQuery); + public ResultBean> getPaymentDetailsList(PagerQuery pagerQuery) { + return finCollectionConfirmationFeign.getPaymentDetailsList(pagerQuery); } } \ No newline at end of file From 292bf6ec72e67f8d2a0a56ad28f71dd858a95def Mon Sep 17 00:00:00 2001 From: God <10745413@qq.com> Date: Mon, 18 Apr 2022 14:10:36 +0800 Subject: [PATCH 2/8] =?UTF-8?q?=E6=AC=BE=E9=A1=B9=E7=A1=AE=E8=AE=A4?= =?UTF-8?q?=E5=87=BA=E7=BA=B3=E9=A9=B3=E5=9B=9E=E5=92=8C=E7=A1=AE=E8=AE=A4?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E5=BC=80=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../FinCollectionConfirmationFeign.java | 6 ++- ...inCollectionConfirmationFeignFallback.java | 7 +++- .../FinSelectedReceivablesDetailedVo.java | 4 +- .../FinCollectionConfirmationMapper.java | 8 ++++ .../FinCollectionConfirmationRest.java | 9 ++++- .../FinCollectionConfirmationService.java | 39 ++++++++++++++++++- .../FinSelectedReceivablesDetailedMapper.java | 12 +++--- ...FinSelectedReceivablesDetailedService.java | 9 +++-- ...nUncollectedReceivablesDetailedMapper.java | 5 +++ ...UncollectedReceivablesDetailedService.java | 5 +++ 10 files changed, 89 insertions(+), 15 deletions(-) diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmationFeign.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmationFeign.java index b2c10fc025..31f10fea22 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmationFeign.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmationFeign.java @@ -72,7 +72,11 @@ public interface FinCollectionConfirmationFeign { @ApiOperation("出纳确认") @PostMapping("/cashierConfirm") - public ResultBean cashierConfirm(); + public ResultBean cashierConfirm(@RequestParam("sid") String sid); + + @ApiOperation("出纳驳回") + @PutMapping("/cashierReject") + public ResultBean cashierReject(@RequestParam("sid") String sid); /*---------------------App接口 ---------------------*/ diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmationFeignFallback.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmationFeignFallback.java index 680218db38..ebb2deabd7 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmationFeignFallback.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmationFeignFallback.java @@ -69,7 +69,12 @@ public class FinCollectionConfirmationFeignFallback implements FinCollectionConf } @Override - public ResultBean cashierConfirm() { + public ResultBean cashierConfirm(String sid) { + return null; + } + + @Override + public ResultBean cashierReject(String sid) { return null; } diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedVo.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedVo.java index 66bd9fb16a..d4a345bb6f 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedVo.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedVo.java @@ -48,7 +48,9 @@ import lombok.Data; @Data public class FinSelectedReceivablesDetailedVo implements Vo { - + @ApiModelProperty("已选应收款项sid") + private String sid; // 已选应收款项sid + @ApiModelProperty("创建人接口") private String createByName; // 创建人接口 diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationMapper.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationMapper.java index 3c8604ddee..f544a70b8e 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationMapper.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationMapper.java @@ -31,9 +31,11 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Constants; import com.yxt.anrui.fin.api.fincollectionconfirmation.*; +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 org.apache.ibatis.annotations.Update; import java.util.List; @@ -77,4 +79,10 @@ public interface FinCollectionConfirmationMapper extends BaseMapper finSelectedReceivablesDetailedVos1 = finSelectedReceivablesDetailedService.fetchByAuditState(); + int auditState = 3; + List finSelectedReceivablesDetailedVos1 = finSelectedReceivablesDetailedService.fetchByAuditState(sid,auditState); for (FinSelectedReceivablesDetailedVo finSelectedReceivablesDetailedVo : finSelectedReceivablesDetailedVos1) { BigDecimal subscriptionMoney1 = new BigDecimal(finSelectedReceivablesDetailedVo.getSubscriptionMoney()); subscriptionMoney = subscriptionMoney.add(subscriptionMoney1); @@ -389,4 +390,40 @@ public class FinCollectionConfirmationService extends MybatisBaseService finSelectedReceivablesDetailedVos = finSelectedReceivablesDetailedService.fetchByAuditState(sid,auditState); + for (FinSelectedReceivablesDetailedVo finSelectedReceivablesDetailedVo : finSelectedReceivablesDetailedVos) { + String vin = finSelectedReceivablesDetailedVo.getVIN(); + String receivablesName = finSelectedReceivablesDetailedVo.getReceivablesName(); + BigDecimal subscriptionMoney = new BigDecimal(finSelectedReceivablesDetailedVo.getSubscriptionMoney()); + FinUncollectedReceivablesDetailedVo finUncollectedReceivablesDetailedVo = finUncollectedReceivablesDetailedService.fetchByVinAndRecName(vin, receivablesName); + String sid1 = finUncollectedReceivablesDetailedVo.getSid(); + BigDecimal currentReceivableMoney = new BigDecimal(finUncollectedReceivablesDetailedVo.getCurrentReceivableMoney()); + String curRecMoney = String.valueOf(currentReceivableMoney.add(subscriptionMoney)); + finUncollectedReceivablesDetailedService.updateCurRecMoneyBySid(curRecMoney,sid1); + } + FinCollectionConfirmation finCollectionConfirmation = fetchBySid(sid); + BigDecimal collectionMoney = finCollectionConfirmation.getCollectionMoney(); + finCollectionConfirmation.setBalance(collectionMoney); + FinCollectionConfirmationDto finCollectionConfirmationDto = new FinCollectionConfirmationDto(); + BeanUtil.copyProperties(finCollectionConfirmation,finCollectionConfirmationDto); + updateBySid(finCollectionConfirmationDto,finCollectionConfirmationDto.getSid()); + return rb.success().setMsg("驳回成功"); + } + + public ResultBean cashierConfirm(String sid) { + ResultBean rb = ResultBean.fireFail(); + baseMapper.cashierConfirm(sid); + int auditState = 1; + List finSelectedReceivablesDetailedVos = finSelectedReceivablesDetailedService.fetchByAuditState(sid,auditState); + for (FinSelectedReceivablesDetailedVo finSelectedReceivablesDetailedVo : finSelectedReceivablesDetailedVos) { + String sid1 = finSelectedReceivablesDetailedVo.getSid(); + finSelectedReceivablesDetailedService.cashierConfirm(sid1); + } + return rb.success().setMsg("款项确认成功"); + } } \ No newline at end of file diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedMapper.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedMapper.java index fc0535ca08..dad0dd1bec 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedMapper.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedMapper.java @@ -34,10 +34,7 @@ import com.yxt.anrui.fin.api.fincollectionconfirmation.AppFinSelectedReceivables import com.yxt.anrui.fin.api.fincollectionconfirmation.AppFinSelectedReceivablesPaymentDetailsVo; import com.yxt.anrui.fin.api.finselectedreceivablesdetailed.FinSelectedReceivablesDetailed; import com.yxt.anrui.fin.api.finselectedreceivablesdetailed.FinSelectedReceivablesDetailedVo; -import org.apache.ibatis.annotations.Delete; -import org.apache.ibatis.annotations.Mapper; -import org.apache.ibatis.annotations.Param; -import org.apache.ibatis.annotations.Select; +import org.apache.ibatis.annotations.*; import java.util.List; @@ -84,6 +81,9 @@ public interface FinSelectedReceivablesDetailedMapper extends BaseMapper getPaymentDetailsList(@Param("sidList") List sidList, IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); - @Select("select * from fin_selected_receivables_detailed where auditState = #{auditState}") - List fetchByAuditState(int auditState); + @Select("select * from fin_selected_receivables_detailed where collSid = #{sid} and auditState = #{auditState}") + List fetchByAuditState(@Param("sid") String sid,@Param("auditState") Integer auditState); + + @Update("update fin_selected_receivables_detailed set auditState = 3 where sid = #{sid}") + void cashierConfirm(String sid); } \ No newline at end of file diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedService.java index abc9067042..0ed4f64904 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedService.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedService.java @@ -182,8 +182,11 @@ public class FinSelectedReceivablesDetailedService extends MybatisBaseService fetchByAuditState() { - int auditState = 3; - return baseMapper.fetchByAuditState(auditState); + public List fetchByAuditState(String sid,Integer auditState) { + return baseMapper.fetchByAuditState(sid,auditState); + } + + public void cashierConfirm(String sid) { + baseMapper.cashierConfirm(sid); } } \ 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 0f96557347..28620965ab 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 @@ -34,7 +34,9 @@ import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.FinUncollectedRec import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; +import org.apache.ibatis.annotations.Update; +import java.math.BigDecimal; import java.util.List; /** @@ -64,4 +66,7 @@ public interface FinUncollectedReceivablesDetailedMapper extends BaseMapper selectListVo(); FinUncollectedReceivablesDetailedVo fetchByVinAndRecName(@Param("vin") String vin, @Param("receivablesName") String receivablesName); + + @Update("update fin_uncollected_receivables_detailed set currentReceivableMoney = #{curRecMoney} where sid = #{sid}") + void updateCurRecMoneyBySid(String curRecMoney, String sid); } \ No newline at end of file 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 b47fdcaab7..e4a36ffea0 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 @@ -36,6 +36,7 @@ import org.apache.commons.lang3.StringUtils; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; +import java.math.BigDecimal; import java.util.List; /** @@ -93,4 +94,8 @@ public class FinUncollectedReceivablesDetailedService extends MybatisBaseService public FinUncollectedReceivablesDetailedVo fetchByVinAndRecName(String vin, String receivablesName) { return baseMapper.fetchByVinAndRecName(vin,receivablesName); } + + public void updateCurRecMoneyBySid(String curRecMoney, String sid) { + baseMapper.updateCurRecMoneyBySid(curRecMoney,sid); + } } \ No newline at end of file From 699bf330832b958f0c49e4786b7bc994df99cf09 Mon Sep 17 00:00:00 2001 From: God <10745413@qq.com> Date: Mon, 18 Apr 2022 14:30:13 +0800 Subject: [PATCH 3/8] =?UTF-8?q?=E6=AC=BE=E9=A1=B9=E7=A1=AE=E8=AE=A4?= =?UTF-8?q?=E7=A7=BB=E5=8A=A8=E4=BD=8D=E7=BD=AE=E5=90=8E=EF=BC=8C=E5=90=88?= =?UTF-8?q?=E5=90=8C=E5=AE=A1=E6=A0=B8=E6=AC=BE=E9=A1=B9=E4=BF=9D=E5=AD=98?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- anrui-base/anrui-base-biz/pom.xml | 6 ++ .../com/yxt/anrui/base/BaseApplication.java | 2 +- .../commoncontract/CommonContractRest.java | 58 +++++++++---------- .../FinAccountCategoryFeign.java | 4 +- .../FinAccountingDimensionFeign.java | 4 +- .../FinAccountingElementsFeign.java | 4 +- .../FinGinvoiceapplyFeign.java | 4 +- .../FinGinvoiceapplyInfoFeign.java | 4 +- 8 files changed, 46 insertions(+), 40 deletions(-) diff --git a/anrui-base/anrui-base-biz/pom.xml b/anrui-base/anrui-base-biz/pom.xml index 02c04aa8a3..27fbe6d277 100644 --- a/anrui-base/anrui-base-biz/pom.xml +++ b/anrui-base/anrui-base-biz/pom.xml @@ -89,6 +89,12 @@ 4.0.1 compile + + com.yxt.anrui.fin + anrui-fin-api + 0.0.1 + compile + diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/BaseApplication.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/BaseApplication.java index ce0c8d0dc5..436a4764b3 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/BaseApplication.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/BaseApplication.java @@ -12,7 +12,7 @@ import org.springframework.cloud.openfeign.EnableFeignClients; "com.yxt.common.base.config", "com.yxt.anrui.base" }) -@EnableFeignClients(basePackages = {"com.yxt.anrui.portal", "com.yxt.anrui.buscenter", "com.yxt.anrui.riskcenter", "com.yxt.anrui.scm","com.yxt.anrui.crm","com.yxt.anrui.flowable"}) +@EnableFeignClients(basePackages = {"com.yxt.anrui.portal", "com.yxt.anrui.buscenter", "com.yxt.anrui.riskcenter", "com.yxt.anrui.scm","com.yxt.anrui.crm","com.yxt.anrui.flowable","com.yxt.anrui.fin"}) public class BaseApplication { public static void main(String[] args) { diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractRest.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractRest.java index 9ac4bcae74..4f3e90b8e2 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractRest.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractRest.java @@ -15,8 +15,8 @@ import com.yxt.anrui.buscenter.api.busorderdiscount.BusOrderDiscountVo; import com.yxt.anrui.buscenter.api.busordermodel.BusOrderModel; import com.yxt.anrui.buscenter.api.busordermodel.BusOrderModelVo; import com.yxt.anrui.buscenter.api.busordervehicle.BusOrderVehicleVo; -import com.yxt.anrui.buscenter.api.busuncollectedreceivablesdetailed.BusUncollectedReceivablesDetailedDto; -import com.yxt.anrui.buscenter.api.busuncollectedreceivablesdetailed.BusUncollectedReceivablesDetailedFeign; +import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.FinUncollectedReceivablesDetailedDto; +import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.FinUncollectedReceivablesDetailedFeign; import com.yxt.common.base.config.component.FileUploadComponent; import com.yxt.common.base.utils.ExportExcelUtils; import com.yxt.common.base.utils.StringUtils; @@ -73,7 +73,7 @@ public class CommonContractRest implements CommonContractFeign { @Autowired private FileUploadComponent fileUploadComponent; @Autowired - private BusUncollectedReceivablesDetailedFeign busUncollectedReceivablesDetailedFeign; + private FinUncollectedReceivablesDetailedFeign finUncollectedReceivablesDetailedFeign; @Autowired private BusOrderFeign busOrderFeign; @@ -141,32 +141,32 @@ public class CommonContractRest implements CommonContractFeign { String deposit = busOrderDepositVo.getDeposit(); int fictitious = 1; for (BusOrderVehicleVo vehicleDto : vehicleDtos) { - BusUncollectedReceivablesDetailedDto busUncollectedReceivablesDetailedDepositDto = new BusUncollectedReceivablesDetailedDto(); - busUncollectedReceivablesDetailedDepositDto.setVIN(StringUtils.isNotBlank(vehicleDto.getVINNo()) ? vehicleDto.getVINNo() : String.valueOf(fictitious++)); - busUncollectedReceivablesDetailedDepositDto.setReceivablesName("订金"); - busUncollectedReceivablesDetailedDepositDto.setCurrentReceivableMoney(deposit); - busUncollectedReceivablesDetailedDepositDto.setContractNo(busOrderDto.getContractNo()); - busUncollectedReceivablesDetailedDepositDto.setContractSid(commonContract.getSid()); - busUncollectedReceivablesDetailedDepositDto.setCustomerName(busOrderDto.getCustomerName()); - busUncollectedReceivablesDetailedDepositDto.setCustomerSid(busOrderDto.getCustomerSid()); - busUncollectedReceivablesDetailedDepositDto.setCustomerPhone(busOrderDto.getMobile()); - busUncollectedReceivablesDetailedDepositDto.setUseOrgSid(busOrderDto.getUseOrgSid()); - busUncollectedReceivablesDetailedDepositDto.setCreateBySid(busOrderDto.getStaffSid()); - busUncollectedReceivablesDetailedDepositDto.setCreateByName(busOrderDto.getStaffName()); - busUncollectedReceivablesDetailedFeign.saveOrUpdate(busUncollectedReceivablesDetailedDepositDto); - BusUncollectedReceivablesDetailedDto busUncollectedReceivablesDetailedSingleDto = new BusUncollectedReceivablesDetailedDto(); - busUncollectedReceivablesDetailedSingleDto.setVIN(StringUtils.isNotBlank(vehicleDto.getVINNo()) ? vehicleDto.getVINNo() : String.valueOf(fictitious++)); - busUncollectedReceivablesDetailedSingleDto.setReceivablesName("车款"); - busUncollectedReceivablesDetailedSingleDto.setCurrentReceivableMoney(String.valueOf(Single_price)); - busUncollectedReceivablesDetailedSingleDto.setContractNo(busOrderDto.getContractNo()); - busUncollectedReceivablesDetailedSingleDto.setContractSid(commonContract.getSid()); - busUncollectedReceivablesDetailedSingleDto.setCustomerName(busOrderDto.getCustomerName()); - busUncollectedReceivablesDetailedSingleDto.setCustomerSid(busOrderDto.getCustomerSid()); - busUncollectedReceivablesDetailedSingleDto.setCustomerPhone(busOrderDto.getMobile()); - busUncollectedReceivablesDetailedSingleDto.setUseOrgSid(busOrderDto.getUseOrgSid()); - busUncollectedReceivablesDetailedSingleDto.setCreateBySid(busOrderDto.getStaffSid()); - busUncollectedReceivablesDetailedSingleDto.setCreateByName(busOrderDto.getStaffName()); - busUncollectedReceivablesDetailedFeign.saveOrUpdate(busUncollectedReceivablesDetailedSingleDto); + FinUncollectedReceivablesDetailedDto finUncollectedReceivablesDetailedDepositDto = new FinUncollectedReceivablesDetailedDto(); + finUncollectedReceivablesDetailedDepositDto.setVIN(StringUtils.isNotBlank(vehicleDto.getVINNo()) ? vehicleDto.getVINNo() : String.valueOf(fictitious++)); + finUncollectedReceivablesDetailedDepositDto.setReceivablesName("订金"); + finUncollectedReceivablesDetailedDepositDto.setCurrentReceivableMoney(deposit); + finUncollectedReceivablesDetailedDepositDto.setContractNo(busOrderDto.getContractNo()); + finUncollectedReceivablesDetailedDepositDto.setContractSid(commonContract.getSid()); + finUncollectedReceivablesDetailedDepositDto.setCustomerName(busOrderDto.getCustomerName()); + finUncollectedReceivablesDetailedDepositDto.setCustomerSid(busOrderDto.getCustomerSid()); + finUncollectedReceivablesDetailedDepositDto.setCustomerPhone(busOrderDto.getMobile()); + finUncollectedReceivablesDetailedDepositDto.setUseOrgSid(busOrderDto.getUseOrgSid()); + finUncollectedReceivablesDetailedDepositDto.setCreateBySid(busOrderDto.getStaffSid()); + finUncollectedReceivablesDetailedDepositDto.setCreateByName(busOrderDto.getStaffName()); + finUncollectedReceivablesDetailedFeign.saveOrUpdate(finUncollectedReceivablesDetailedDepositDto); + FinUncollectedReceivablesDetailedDto finUncollectedReceivablesDetailedSingleDto = new FinUncollectedReceivablesDetailedDto(); + finUncollectedReceivablesDetailedSingleDto.setVIN(StringUtils.isNotBlank(vehicleDto.getVINNo()) ? vehicleDto.getVINNo() : String.valueOf(fictitious++)); + finUncollectedReceivablesDetailedSingleDto.setReceivablesName("车款"); + finUncollectedReceivablesDetailedSingleDto.setCurrentReceivableMoney(String.valueOf(Single_price)); + finUncollectedReceivablesDetailedSingleDto.setContractNo(busOrderDto.getContractNo()); + finUncollectedReceivablesDetailedSingleDto.setContractSid(commonContract.getSid()); + finUncollectedReceivablesDetailedSingleDto.setCustomerName(busOrderDto.getCustomerName()); + finUncollectedReceivablesDetailedSingleDto.setCustomerSid(busOrderDto.getCustomerSid()); + finUncollectedReceivablesDetailedSingleDto.setCustomerPhone(busOrderDto.getMobile()); + finUncollectedReceivablesDetailedSingleDto.setUseOrgSid(busOrderDto.getUseOrgSid()); + finUncollectedReceivablesDetailedSingleDto.setCreateBySid(busOrderDto.getStaffSid()); + finUncollectedReceivablesDetailedSingleDto.setCreateByName(busOrderDto.getStaffName()); + finUncollectedReceivablesDetailedFeign.saveOrUpdate(finUncollectedReceivablesDetailedSingleDto); } return rb.success().setData(commonContract.getSid()); } diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finaccountCategory/FinAccountCategoryFeign.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finaccountCategory/FinAccountCategoryFeign.java index 3117ec3243..7dfaf6c137 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finaccountCategory/FinAccountCategoryFeign.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finaccountCategory/FinAccountCategoryFeign.java @@ -50,8 +50,8 @@ import java.util.List; */ @Api(tags = "对应金蝶系统的科目类别表") @FeignClient( - contextId = "anrui_fin-FinAccountCategory", - name = "anrui_fin", + contextId = "anrui-fin-FinAccountCategory", + name = "anrui-fin", path = "finaccountcategory", fallback = FinAccountCategoryFeignFallback.class) public interface FinAccountCategoryFeign { diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finaccountingdimension/FinAccountingDimensionFeign.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finaccountingdimension/FinAccountingDimensionFeign.java index 5c761395c0..3da314f6be 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finaccountingdimension/FinAccountingDimensionFeign.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finaccountingdimension/FinAccountingDimensionFeign.java @@ -50,8 +50,8 @@ import java.util.List; */ @Api(tags = " 对应金蝶系统的核算维度表") @FeignClient( - contextId = "anrui_fin-FinAccountingDimension", - name = "anrui_fin", + contextId = "anrui-fin-FinAccountingDimension", + name = "anrui-fin", path = "finaccountingdimension", fallback = FinAccountingDimensionFeignFallback.class) public interface FinAccountingDimensionFeign { diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finaccountingelements/FinAccountingElementsFeign.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finaccountingelements/FinAccountingElementsFeign.java index b08426407a..97c147f3cd 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finaccountingelements/FinAccountingElementsFeign.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finaccountingelements/FinAccountingElementsFeign.java @@ -50,8 +50,8 @@ import java.util.List; */ @Api(tags = "对应金蝶系统的会计要素表") @FeignClient( - contextId = "anrui_fin-FinAccountingElements", - name = "anrui_fin", + contextId = "anrui-fin-FinAccountingElements", + name = "anrui-fin", path = "finaccountingelements", fallback = FinAccountingElementsFeignFallback.class) public interface FinAccountingElementsFeign { diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finginvoiceapply/FinGinvoiceapplyFeign.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finginvoiceapply/FinGinvoiceapplyFeign.java index f6e1bd8b9e..2faad01c6c 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finginvoiceapply/FinGinvoiceapplyFeign.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finginvoiceapply/FinGinvoiceapplyFeign.java @@ -26,8 +26,8 @@ import java.util.List; */ @Api(tags = "公司开票申请单") @FeignClient( - contextId = "anrui_fin-FinGinvoiceapply", - name = "anrui_fin", + contextId = "anrui-fin-FinGinvoiceapply", + name = "anrui-fin", path = "v1/finginvoiceapply", fallback = FinGinvoiceapplyFeignFallback.class) public interface FinGinvoiceapplyFeign { diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finginvoiceapplyinfo/FinGinvoiceapplyInfoFeign.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finginvoiceapplyinfo/FinGinvoiceapplyInfoFeign.java index bda0101765..9d5220c305 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finginvoiceapplyinfo/FinGinvoiceapplyInfoFeign.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finginvoiceapplyinfo/FinGinvoiceapplyInfoFeign.java @@ -26,8 +26,8 @@ import java.util.List; */ @Api(tags = "公司开票申请单开票信息") @FeignClient( - contextId = "anrui_fin-FinGinvoiceapplyInfo", - name = "anrui_fin", + contextId = "anrui-fin-FinGinvoiceapplyInfo", + name = "anrui-fin", path = "v1/finginvoiceapplyinfo", fallback = FinGinvoiceapplyInfoFeignFallback.class) public interface FinGinvoiceapplyInfoFeign { From 94dbc2cea324ec559d1d6bc211f34dbaad17e8a4 Mon Sep 17 00:00:00 2001 From: God <10745413@qq.com> Date: Mon, 18 Apr 2022 14:36:05 +0800 Subject: [PATCH 4/8] =?UTF-8?q?=E6=AC=BE=E9=A1=B9=E7=A1=AE=E8=AE=A4?= =?UTF-8?q?=E7=A7=BB=E5=8A=A8=E4=BD=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../FinUncollectedReceivablesDetailed.java | 85 +++++++++++++++++++ 1 file changed, 85 insertions(+) create mode 100644 anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailed.java diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailed.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailed.java new file mode 100644 index 0000000000..9cebfabc5d --- /dev/null +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailed.java @@ -0,0 +1,85 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.yxt.common.core.domain.BaseEntity; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.math.BigDecimal; + +/** + * Project: anrui-fin(销售相关)
+ * File: FinUncollectedReceivablesDetailed.java
+ * Class: com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.FinUncollectedReceivablesDetailed
+ * 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 +@TableName("fin_uncollected_receivables_detailed") +public class FinUncollectedReceivablesDetailed extends BaseEntity { + private static final long serialVersionUID = 1L; + + + @ApiModelProperty("创建人接口") + private String createByName; // 创建人接口 + + @ApiModelProperty("合同sid") + private String contractSid; // 合同sid + + @ApiModelProperty("合同编号") + private String contractNo; // 合同编号 + + @ApiModelProperty("客户sid") + private String customerSid; // 客户sid + + @ApiModelProperty("客户名称") + private String customerName; // 客户名称 + + @ApiModelProperty("车架号") + private String VIN; // 车架号 + + @ApiModelProperty("分公司sid") + private String useOrgSid; // 分公司sid + + @ApiModelProperty("联系电话") + private String customerPhone; // 联系电话 + + @ApiModelProperty("应收项目名称") + private String receivablesName; // 应收项目名称 + + @ApiModelProperty("当前应收金额") + private BigDecimal currentReceivableMoney; // 当前应收金额 +} From 7ca31631a87352aa5031844ab62e34d0d985368d Mon Sep 17 00:00:00 2001 From: God <10745413@qq.com> Date: Mon, 18 Apr 2022 15:04:07 +0800 Subject: [PATCH 5/8] =?UTF-8?q?=E5=90=88=E5=90=8C=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E5=88=86=E9=A1=B5=E5=A4=9A=E6=9D=A1=E4=BB=B6=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../base/biz/commoncontract/CommonContractService.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java index 1e818e719c..85e814a825 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java @@ -130,7 +130,7 @@ public class CommonContractService extends MybatisBaseService Date: Mon, 18 Apr 2022 15:39:47 +0800 Subject: [PATCH 6/8] =?UTF-8?q?=E6=AC=BE=E9=A1=B9=E7=A1=AE=E8=AE=A4?= =?UTF-8?q?=E5=AE=8C=E5=96=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AppFinSelectedReceivablesDetailedDto.java | 6 +- .../FinCollectionConfirmationService.java | 109 +++++++++++++++--- 2 files changed, 99 insertions(+), 16 deletions(-) diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finselectedreceivablesdetailed/AppFinSelectedReceivablesDetailedDto.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finselectedreceivablesdetailed/AppFinSelectedReceivablesDetailedDto.java index 0d60ec68c7..150e085528 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finselectedreceivablesdetailed/AppFinSelectedReceivablesDetailedDto.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finselectedreceivablesdetailed/AppFinSelectedReceivablesDetailedDto.java @@ -31,6 +31,8 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.math.BigDecimal; + /** * Project: anrui-fin(销售相关)
* File: FinCustomerBillDetailedDto.java
@@ -49,11 +51,11 @@ import lombok.Data; public class AppFinSelectedReceivablesDetailedDto implements Dto { @ApiModelProperty("应收金额") - private String receivable; + private BigDecimal receivable; @ApiModelProperty("车架号") private String vin; @ApiModelProperty("认款金额") - private String confirmMoney; + private BigDecimal confirmMoney; @ApiModelProperty("合同号") private String contractId; @ApiModelProperty("应收项目") 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 323eeb62c8..350b9a247f 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 @@ -32,6 +32,7 @@ import com.yxt.anrui.base.api.commonappendix.CommonAppendixDto; import com.yxt.anrui.base.api.commonappendix.CommonAppendixFeign; import com.yxt.anrui.base.api.commonappendix.CommonAttachTypeEnum; import com.yxt.anrui.fin.api.fincollectionconfirmation.*; +import com.yxt.anrui.fin.api.finselectedreceivablesdetailed.AppFinSelectedReceivablesDetailedDto; import com.yxt.anrui.fin.api.finselectedreceivablesdetailed.FinSelectedReceivablesDetailed; import com.yxt.anrui.fin.api.finselectedreceivablesdetailed.FinSelectedReceivablesDetailedDto; import com.yxt.anrui.fin.api.finselectedreceivablesdetailed.FinSelectedReceivablesDetailedVo; @@ -54,6 +55,7 @@ import org.springframework.transaction.annotation.Transactional; import java.math.BigDecimal; import java.util.List; +import java.util.Optional; /** * Project: anrui-fin(销售相关)
@@ -126,7 +128,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService finSelectedReceivablesDetailedVos1 = finSelectedReceivablesDetailedService.fetchByAuditState(sid,auditState); + List finSelectedReceivablesDetailedVos1 = finSelectedReceivablesDetailedService.fetchByAuditState(sid, auditState); for (FinSelectedReceivablesDetailedVo finSelectedReceivablesDetailedVo : finSelectedReceivablesDetailedVos1) { BigDecimal subscriptionMoney1 = new BigDecimal(finSelectedReceivablesDetailedVo.getSubscriptionMoney()); subscriptionMoney = subscriptionMoney.add(subscriptionMoney1); @@ -306,16 +308,36 @@ public class FinCollectionConfirmationService extends MybatisBaseService payFiles = dto.getPayFiles(); + String payFilePath = ""; 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); + if (payFile != null) { + payFilePath = payFile.replace(fileUploadComponent.getUrlPrefix(), ""); + commonAppendixDto.setLinkSid(sid); + commonAppendixDto.setFilePath(payFilePath); + commonAppendixDto.setCreateBySid(staffSid); + commonAppendixDto.setAttachType(CommonAttachTypeEnum.PAYMENT_VOUCHER.getAttachType()); + commonAppendixFeign.save(commonAppendixDto); + } + payFilePath += payFilePath + ","; + } + if (StringUtils.isNotBlank(payFilePath)) { + finCollectionConfirmation.setPaymentVoucherUrl(payFilePath); + } + List finSelectedReceivablesDetailedVos = finSelectedReceivablesDetailedService.fetchByCillSid(sid); + BigDecimal totalSubscriptionMone = null; + for (FinSelectedReceivablesDetailedVo finSelectedReceivablesDetailedVo : finSelectedReceivablesDetailedVos) { + BigDecimal subscriptionMoney = new BigDecimal(finSelectedReceivablesDetailedVo.getSubscriptionMoney()); + totalSubscriptionMone = totalSubscriptionMone.add(subscriptionMoney); } + BigDecimal collectionMoney = finCollectionConfirmation.getCollectionMoney(); + BigDecimal subtract = collectionMoney.subtract(totalSubscriptionMone); + if (subtract.compareTo(BigDecimal.ZERO) < 0) { + return rb.setMsg("已选应收款项金额已超出该确认单应收金额总额，请重新核对"); + } + finCollectionConfirmation.setBalance(totalSubscriptionMone); + finCollectionConfirmation.setAuditState(1); + save(finCollectionConfirmation); return rb.success(); } @@ -343,7 +365,66 @@ public class FinCollectionConfirmationService extends MybatisBaseService paymentDetails = dto.getPaymentDetail(); + CommonAppendixDto commonAppendixDto = new CommonAppendixDto(); + FinCollectionConfirmation finCollectionConfirmation = new FinCollectionConfirmation(); + finCollectionConfirmation.setCollectionDate(dto.getCollectionDate()); + finCollectionConfirmation.setCollectionBank(dto.getCollectionBank()); + finCollectionConfirmation.setCollectionBankNum(dto.getCollectionNum()); + finCollectionConfirmation.setCollectionMoney(dto.getPaymentMoney()); + finCollectionConfirmation.setCollectionTypeKey(dto.getCollectionTypeKey()); + finCollectionConfirmation.setCollectionTypeValue(dto.getCollectionType()); + finCollectionConfirmation.setPayerName(dto.getPaymentName()); + finCollectionConfirmation.setCollectionMoney(dto.getPaymentMoney()); + finCollectionConfirmation.setRemarks(dto.getRemarks()); + for (AppFinSelectedReceivablesDetailedDto paymentDetail : paymentDetails) { + FinSelectedReceivablesDetailed finSelectedReceivablesDetailed = new FinSelectedReceivablesDetailed(); + finSelectedReceivablesDetailed.setCurrentReceivableMoney(paymentDetail.getReceivable()); + finSelectedReceivablesDetailed.setVIN(paymentDetail.getVin()); + finSelectedReceivablesDetailed.setSubscriptionMoney(paymentDetail.getConfirmMoney()); + finSelectedReceivablesDetailed.setContractNo(paymentDetail.getContractId()); + finSelectedReceivablesDetailed.setReceivablesName(paymentDetail.getProjectName()); + finSelectedReceivablesDetailed.setContractSid(paymentDetail.getContractSid()); + finSelectedReceivablesDetailed.setCustomerName(paymentDetail.getName()); + finSelectedReceivablesDetailed.setCustomerPhone(paymentDetail.getMobile()); + finSelectedReceivablesDetailed.setSubscriptionDate(paymentDetail.getConfirmDate()); + finSelectedReceivablesDetailed.setCollSid(dto.getSid()); + finSelectedReceivablesDetailedService.save(finSelectedReceivablesDetailed); + //已选应收款项-车架号 + String vin = finSelectedReceivablesDetailed.getVIN(); + //已选应收款项-应收项目名称 + String receivablesName = finSelectedReceivablesDetailed.getReceivablesName(); + FinUncollectedReceivablesDetailedVo finUncollectedReceivablesDetailedVo = finUncollectedReceivablesDetailedService.fetchByVinAndRecName(vin, receivablesName); + //应收未收款项-当前应收金额 + BigDecimal currentReceivableMoney = new BigDecimal(finUncollectedReceivablesDetailedVo.getCurrentReceivableMoney()); + //已选应收款项-认款金额 + BigDecimal subscriptionMoney = finSelectedReceivablesDetailed.getSubscriptionMoney(); + BigDecimal subtract = currentReceivableMoney.subtract(subscriptionMoney); + if (subtract.compareTo(BigDecimal.ZERO) < 0) { + return rb.setMsg("认款金额超出应收金额，请重新输入"); + } + finUncollectedReceivablesDetailedVo.setCurrentReceivableMoney(String.format("%.0f", subtract)); + FinUncollectedReceivablesDetailedDto finUncollectedReceivablesDetailedDto = new FinUncollectedReceivablesDetailedDto(); + BeanUtil.copyProperties(finUncollectedReceivablesDetailedVo, finUncollectedReceivablesDetailedDto); + finUncollectedReceivablesDetailedService.updateBySid(finUncollectedReceivablesDetailedDto, finUncollectedReceivablesDetailedDto.getSid()); + } + List payConfirmFiles = dto.getPayConfirmFiles(); + String remFilePath = ""; + for (String payFilePath : payConfirmFiles) { + if (payFilePath != null) { + remFilePath = payFilePath.replace(fileUploadComponent.getUrlPrefix(), ""); + commonAppendixDto.setLinkSid(dto.getSid()); + commonAppendixDto.setFilePath(payFilePath); + commonAppendixDto.setCreateBySid(staffSid); + commonAppendixDto.setAttachType(CommonAttachTypeEnum.PAYMENT_VOUCHER.getAttachType()); + commonAppendixFeign.save(commonAppendixDto); + } + remFilePath += remFilePath + ","; + } + finCollectionConfirmation.setRemittanceConfirmationUrl(remFilePath); + return rb.success(); } /** @@ -395,7 +476,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService finSelectedReceivablesDetailedVos = finSelectedReceivablesDetailedService.fetchByAuditState(sid,auditState); + List finSelectedReceivablesDetailedVos = finSelectedReceivablesDetailedService.fetchByAuditState(sid, auditState); for (FinSelectedReceivablesDetailedVo finSelectedReceivablesDetailedVo : finSelectedReceivablesDetailedVos) { String vin = finSelectedReceivablesDetailedVo.getVIN(); String receivablesName = finSelectedReceivablesDetailedVo.getReceivablesName(); @@ -404,14 +485,14 @@ public class FinCollectionConfirmationService extends MybatisBaseService finSelectedReceivablesDetailedVos = finSelectedReceivablesDetailedService.fetchByAuditState(sid,auditState); + List finSelectedReceivablesDetailedVos = finSelectedReceivablesDetailedService.fetchByAuditState(sid, auditState); for (FinSelectedReceivablesDetailedVo finSelectedReceivablesDetailedVo : finSelectedReceivablesDetailedVos) { String sid1 = finSelectedReceivablesDetailedVo.getSid(); finSelectedReceivablesDetailedService.cashierConfirm(sid1); From 2e22d58eb77c5cbf3e900e90e8c9c2929d74888a Mon Sep 17 00:00:00 2001 From: God <10745413@qq.com> Date: Mon, 18 Apr 2022 16:11:17 +0800 Subject: [PATCH 7/8] =?UTF-8?q?=E5=90=88=E5=90=8C=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E7=BC=96=E8=BE=91=E5=AE=A1=E6=A0=B8=E5=AD=97=E6=AE=B5=E8=B0=83?= =?UTF-8?q?=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../base/api/commoncontract/CommonContractVo.java | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/CommonContractVo.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/CommonContractVo.java index 5a64eae5e5..b6d0f624b5 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/CommonContractVo.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/CommonContractVo.java @@ -32,14 +32,24 @@ public class CommonContractVo implements Vo { @ApiModelProperty("合同sid") private String sid; + @ApiModelProperty("业务sid") + private String busSid; @ApiModelProperty("合同编号") private String contractNo; + @ApiModelProperty("合同类型key") + private String contractTypeKey; @ApiModelProperty("经办人") private String staffName; @ApiModelProperty("甲方名称") private String partyA; @ApiModelProperty("乙方名称") private String partyB; + @ApiModelProperty("车型名称") + private String modelName; + @ApiModelProperty("台数") + private String num; + @ApiModelProperty("单价") + private String price; @ApiModelProperty("合同金额") private String contractAmount; @ApiModelProperty("合同附件") From b6b3379710f60db0c7f881d4e6ea86393ad8fa26 Mon Sep 17 00:00:00 2001 From: God <10745413@qq.com> Date: Mon, 18 Apr 2022 16:14:27 +0800 Subject: [PATCH 8/8] =?UTF-8?q?=E5=90=88=E5=90=8C=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E7=BC=96=E8=BE=91=E5=AE=A1=E6=A0=B8=E5=AD=97=E6=AE=B5=E8=B0=83?= =?UTF-8?q?=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../yxt/anrui/base/api/commoncontract/CommonContract.java | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/CommonContract.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/CommonContract.java index 60012391fb..55817cd242 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/CommonContract.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/CommonContract.java @@ -83,4 +83,11 @@ public class CommonContract extends BaseEntity { @ApiModelProperty("现场签署图片附件") private String sceneSignUrl; + + @ApiModelProperty("车型名称") + private String modelName; + @ApiModelProperty("台数") + private Integer num; + @ApiModelProperty("单价") + private BigDecimal price; }