yxt_develop
/
anrui
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge remote-tracking branch 'origin/master'

master
yunuo970428 3 years ago
parent
70a6fda665 b6b3379710
commit
d24ad460d6
58 changed files with 1089 additions and 963 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 5
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeignFallback.java
  2. 7
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/CommonContract.java
  3. 10
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/CommonContractVo.java
  4. 6
      anrui-base/anrui-base-biz/pom.xml
  5. 2
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/BaseApplication.java
  6. 58
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractRest.java
  7. 6
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java
  8. 396
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/buscollectionconfirmation/BusCollectionConfirmationService.java
  9. 23
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busuncollectedreceivablesdetailed/BusUncollectedReceivablesDetailedMapper.xml
  10. 4
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finaccountCategory/FinAccountCategoryFeign.java
  11. 4
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finaccountingdimension/FinAccountingDimensionFeign.java
  12. 4
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finaccountingelements/FinAccountingElementsFeign.java
  13. 8
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/AppFinCollectionConfirmationDto.java
  14. 8
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/AppFinCollectionConfirmationInitVo.java
  15. 4
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/AppFinCollectionConfirmationPageVo.java
  16. 4
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/AppFinCollectionConfirmationQuery.java
  17. 4
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/AppFinSelectedReceivablesPaymentDetailsQuery.java
  18. 4
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/AppFinSelectedReceivablesPaymentDetailsVo.java
  19. 12
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmation.java
  20. 4
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmationAppendixDto.java
  21. 15
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmationDetailsVo.java
  22. 20
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmationDto.java
  23. 46
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmationFeign.java
  24. 43
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmationFeignFallback.java
  25. 11
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmationQuery.java
  26. 11
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmationVo.java
  27. 4
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finginvoiceapply/FinGinvoiceapplyFeign.java
  28. 4
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finginvoiceapplyinfo/FinGinvoiceapplyInfoFeign.java
  29. 16
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finselectedreceivablesdetailed/AppFinSelectedReceivablesDetailedDto.java
  30. 12
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finselectedreceivablesdetailed/FinSelectedReceivablesDetailed.java
  31. 11
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedDto.java
  32. 32
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedFeign.java
  33. 22
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedFeignFallback.java
  34. 11
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedQuery.java
  35. 13
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedVo.java
  36. 12
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailed.java
  37. 11
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedDto.java
  38. 33
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedFeign.java
  39. 24
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedFeignFallback.java
  40. 11
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedQuery.java
  41. 11
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedVo.java
  42. 36
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationMapper.java
  43. 18
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationMapper.xml
  44. 79
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationRest.java
  45. 510
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java
  46. 52
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedMapper.java
  47. 14
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedMapper.xml
  48. 35
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedRest.java
  49. 89
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedService.java
  50. 35
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedMapper.java
  51. 23
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedMapper.xml
  52. 41
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedRest.java
  53. 46
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedService.java
  54. 6
      anrui-terminal/anrui-terminal-api/pom.xml
  55. 26
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/AppFinCollectionConfirmationFeign.java
  56. 20
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/AppFinCollectionConfirmationFeignFallback.java
  57. 40
      anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/finance/AppFinCollectionConfirmationRest.java
  58. 34
      anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/finance/AppFinCollectionConfirmationService.java

5
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeignFallback.java
View File

@ -109,11 +109,6 @@ public class BaseVehicleFeignFallback implements BaseVehicleFeign {
return null; return null;
} }
@Override
public ResultBean updateByVinNo(BaseVehicleUpdateQuery baseVehicleUpdateQuery) {
return null;
}
@Override @Override
public ResultBean<Boolean> selectStateByVinNo(List<String> vinNoList) { public ResultBean<Boolean> selectStateByVinNo(List<String> vinNoList) {
return null; return null;

7
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/CommonContract.java
View File

@ -83,4 +83,11 @@ public class CommonContract extends BaseEntity {
@ApiModelProperty("现场签署图片附件") @ApiModelProperty("现场签署图片附件")
private String sceneSignUrl; private String sceneSignUrl;
@ApiModelProperty("车型名称")
private String modelName;
@ApiModelProperty("台数")
private Integer num;
@ApiModelProperty("单价")
private BigDecimal price;
} }

10
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/CommonContractVo.java
View File

@ -32,14 +32,24 @@ public class CommonContractVo implements Vo {
@ApiModelProperty("合同sid") @ApiModelProperty("合同sid")
private String sid; private String sid;
@ApiModelProperty("业务sid")
private String busSid;
@ApiModelProperty("合同编号") @ApiModelProperty("合同编号")
private String contractNo; private String contractNo;
@ApiModelProperty("合同类型key")
private String contractTypeKey;
@ApiModelProperty("经办人") @ApiModelProperty("经办人")
private String staffName; private String staffName;
@ApiModelProperty("甲方名称") @ApiModelProperty("甲方名称")
private String partyA; private String partyA;
@ApiModelProperty("乙方名称") @ApiModelProperty("乙方名称")
private String partyB; private String partyB;
@ApiModelProperty("车型名称")
private String modelName;
@ApiModelProperty("台数")
private String num;
@ApiModelProperty("单价")
private String price;
@ApiModelProperty("合同金额") @ApiModelProperty("合同金额")
private String contractAmount; private String contractAmount;
@ApiModelProperty("合同附件") @ApiModelProperty("合同附件")

6
anrui-base/anrui-base-biz/pom.xml
View File

@ -89,6 +89,12 @@
<version>4.0.1</version> <version>4.0.1</version>
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
<dependency>
<groupId>com.yxt.anrui.fin</groupId>
<artifactId>anrui-fin-api</artifactId>
<version>0.0.1</version>
<scope>compile</scope>
</dependency>
</dependencies> </dependencies>

2
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/BaseApplication.java
View File

@ -12,7 +12,7 @@ import org.springframework.cloud.openfeign.EnableFeignClients;
"com.yxt.common.base.config", "com.yxt.common.base.config",
"com.yxt.anrui.base" "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 class BaseApplication {
public static void main(String[] args) { public static void main(String[] args) {

58
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractRest.java
View File

@ -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.BusOrderModel;
import com.yxt.anrui.buscenter.api.busordermodel.BusOrderModelVo; import com.yxt.anrui.buscenter.api.busordermodel.BusOrderModelVo;
import com.yxt.anrui.buscenter.api.busordervehicle.BusOrderVehicleVo; import com.yxt.anrui.buscenter.api.busordervehicle.BusOrderVehicleVo;
import com.yxt.anrui.buscenter.api.busuncollectedreceivablesdetailed.BusUncollectedReceivablesDetailedDto; import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.FinUncollectedReceivablesDetailedDto;
import com.yxt.anrui.buscenter.api.busuncollectedreceivablesdetailed.BusUncollectedReceivablesDetailedFeign; import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.FinUncollectedReceivablesDetailedFeign;
import com.yxt.common.base.config.component.FileUploadComponent; import com.yxt.common.base.config.component.FileUploadComponent;
import com.yxt.common.base.utils.ExportExcelUtils; import com.yxt.common.base.utils.ExportExcelUtils;
import com.yxt.common.base.utils.StringUtils; import com.yxt.common.base.utils.StringUtils;
@ -73,7 +73,7 @@ public class CommonContractRest implements CommonContractFeign {
@Autowired @Autowired
private FileUploadComponent fileUploadComponent; private FileUploadComponent fileUploadComponent;
@Autowired @Autowired
private BusUncollectedReceivablesDetailedFeign busUncollectedReceivablesDetailedFeign; private FinUncollectedReceivablesDetailedFeign finUncollectedReceivablesDetailedFeign;
@Autowired @Autowired
private BusOrderFeign busOrderFeign; private BusOrderFeign busOrderFeign;
@ -141,32 +141,32 @@ public class CommonContractRest implements CommonContractFeign {
String deposit = busOrderDepositVo.getDeposit(); String deposit = busOrderDepositVo.getDeposit();
int fictitious = 1; int fictitious = 1;
for (BusOrderVehicleVo vehicleDto : vehicleDtos) { for (BusOrderVehicleVo vehicleDto : vehicleDtos) {
BusUncollectedReceivablesDetailedDto busUncollectedReceivablesDetailedDepositDto = new BusUncollectedReceivablesDetailedDto(); FinUncollectedReceivablesDetailedDto finUncollectedReceivablesDetailedDepositDto = new FinUncollectedReceivablesDetailedDto();
busUncollectedReceivablesDetailedDepositDto.setVIN(StringUtils.isNotBlank(vehicleDto.getVINNo()) ? vehicleDto.getVINNo() : String.valueOf(fictitious++)); finUncollectedReceivablesDetailedDepositDto.setVIN(StringUtils.isNotBlank(vehicleDto.getVINNo()) ? vehicleDto.getVINNo() : String.valueOf(fictitious++));
busUncollectedReceivablesDetailedDepositDto.setReceivablesName("订金"); finUncollectedReceivablesDetailedDepositDto.setReceivablesName("订金");
busUncollectedReceivablesDetailedDepositDto.setCurrentReceivableMoney(deposit); finUncollectedReceivablesDetailedDepositDto.setCurrentReceivableMoney(deposit);
busUncollectedReceivablesDetailedDepositDto.setContractNo(busOrderDto.getContractNo()); finUncollectedReceivablesDetailedDepositDto.setContractNo(busOrderDto.getContractNo());
busUncollectedReceivablesDetailedDepositDto.setContractSid(commonContract.getSid()); finUncollectedReceivablesDetailedDepositDto.setContractSid(commonContract.getSid());
busUncollectedReceivablesDetailedDepositDto.setCustomerName(busOrderDto.getCustomerName()); finUncollectedReceivablesDetailedDepositDto.setCustomerName(busOrderDto.getCustomerName());
busUncollectedReceivablesDetailedDepositDto.setCustomerSid(busOrderDto.getCustomerSid()); finUncollectedReceivablesDetailedDepositDto.setCustomerSid(busOrderDto.getCustomerSid());
busUncollectedReceivablesDetailedDepositDto.setCustomerPhone(busOrderDto.getMobile()); finUncollectedReceivablesDetailedDepositDto.setCustomerPhone(busOrderDto.getMobile());
busUncollectedReceivablesDetailedDepositDto.setUseOrgSid(busOrderDto.getUseOrgSid()); finUncollectedReceivablesDetailedDepositDto.setUseOrgSid(busOrderDto.getUseOrgSid());
busUncollectedReceivablesDetailedDepositDto.setCreateBySid(busOrderDto.getStaffSid()); finUncollectedReceivablesDetailedDepositDto.setCreateBySid(busOrderDto.getStaffSid());
busUncollectedReceivablesDetailedDepositDto.setCreateByName(busOrderDto.getStaffName()); finUncollectedReceivablesDetailedDepositDto.setCreateByName(busOrderDto.getStaffName());
busUncollectedReceivablesDetailedFeign.saveOrUpdate(busUncollectedReceivablesDetailedDepositDto); finUncollectedReceivablesDetailedFeign.saveOrUpdate(finUncollectedReceivablesDetailedDepositDto);
BusUncollectedReceivablesDetailedDto busUncollectedReceivablesDetailedSingleDto = new BusUncollectedReceivablesDetailedDto(); FinUncollectedReceivablesDetailedDto finUncollectedReceivablesDetailedSingleDto = new FinUncollectedReceivablesDetailedDto();
busUncollectedReceivablesDetailedSingleDto.setVIN(StringUtils.isNotBlank(vehicleDto.getVINNo()) ? vehicleDto.getVINNo() : String.valueOf(fictitious++)); finUncollectedReceivablesDetailedSingleDto.setVIN(StringUtils.isNotBlank(vehicleDto.getVINNo()) ? vehicleDto.getVINNo() : String.valueOf(fictitious++));
busUncollectedReceivablesDetailedSingleDto.setReceivablesName("车款"); finUncollectedReceivablesDetailedSingleDto.setReceivablesName("车款");
busUncollectedReceivablesDetailedSingleDto.setCurrentReceivableMoney(String.valueOf(Single_price)); finUncollectedReceivablesDetailedSingleDto.setCurrentReceivableMoney(String.valueOf(Single_price));
busUncollectedReceivablesDetailedSingleDto.setContractNo(busOrderDto.getContractNo()); finUncollectedReceivablesDetailedSingleDto.setContractNo(busOrderDto.getContractNo());
busUncollectedReceivablesDetailedSingleDto.setContractSid(commonContract.getSid()); finUncollectedReceivablesDetailedSingleDto.setContractSid(commonContract.getSid());
busUncollectedReceivablesDetailedSingleDto.setCustomerName(busOrderDto.getCustomerName()); finUncollectedReceivablesDetailedSingleDto.setCustomerName(busOrderDto.getCustomerName());
busUncollectedReceivablesDetailedSingleDto.setCustomerSid(busOrderDto.getCustomerSid()); finUncollectedReceivablesDetailedSingleDto.setCustomerSid(busOrderDto.getCustomerSid());
busUncollectedReceivablesDetailedSingleDto.setCustomerPhone(busOrderDto.getMobile()); finUncollectedReceivablesDetailedSingleDto.setCustomerPhone(busOrderDto.getMobile());
busUncollectedReceivablesDetailedSingleDto.setUseOrgSid(busOrderDto.getUseOrgSid()); finUncollectedReceivablesDetailedSingleDto.setUseOrgSid(busOrderDto.getUseOrgSid());
busUncollectedReceivablesDetailedSingleDto.setCreateBySid(busOrderDto.getStaffSid()); finUncollectedReceivablesDetailedSingleDto.setCreateBySid(busOrderDto.getStaffSid());
busUncollectedReceivablesDetailedSingleDto.setCreateByName(busOrderDto.getStaffName()); finUncollectedReceivablesDetailedSingleDto.setCreateByName(busOrderDto.getStaffName());
busUncollectedReceivablesDetailedFeign.saveOrUpdate(busUncollectedReceivablesDetailedSingleDto); finUncollectedReceivablesDetailedFeign.saveOrUpdate(finUncollectedReceivablesDetailedSingleDto);
} }
return rb.success().setData(commonContract.getSid()); return rb.success().setData(commonContract.getSid());
} }

6
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java
View File

@ -130,7 +130,7 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
if (StringUtils.isNotBlank(query.getContractNo())) { if (StringUtils.isNotBlank(query.getContractNo())) {
qw.eq("contractNo", query.getContractNo()); qw.like("contractNo", query.getContractNo());
} }
if (StringUtils.isNotBlank(query.getContractTypeKey())) { if (StringUtils.isNotBlank(query.getContractTypeKey())) {
@ -139,11 +139,11 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
if (StringUtils.isNotBlank(query.getPartyA())) { if (StringUtils.isNotBlank(query.getPartyA())) {
qw.eq("partyA", query.getPartyA()); qw.like("partyA", query.getPartyA());
} }
if (StringUtils.isNotBlank(query.getPartyB())) { if (StringUtils.isNotBlank(query.getPartyB())) {
qw.eq("partyB", query.getPartyB()); qw.like("partyB", query.getPartyB());
} }
String createDateStart = query.getCreateDateStart(); String createDateStart = query.getCreateDateStart();

396
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/buscollectionconfirmation/BusCollectionConfirmationService.java
View File

@ -1,396 +0,0 @@
/*********************************************************
*********************************************************
******************** *******************
************* ************
******* _oo0oo_ *******
*** o8888888o ***
* 88" . "88 *
* (| -_- |) *
* 0\ = /0 *
* ___/`---'\___ *
* .' \\| |// '. *
* / \\||| : |||// \ *
* / _||||| -:- |||||- \ *
* | | \\\ - /// | | *
* | \_| ''\---/'' |_/ | *
* \ .-\__ '-' ___/-. / *
* ___'. .' /--.--\ `. .'___ *
* ."" '< `.___\_<|>_/___.' >' "". *
* | | : `- \`.;`\ _ /`;.`/ - ` : | | *
* \ \ `_. \_ __\ /__ _/ .-` / / *
* =====`-.____`.___ \_____/___.-`___.-'===== *
* `=---=' *
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.anrui.buscenter.biz.buscollectionconfirmation;
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.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.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.math.BigDecimal;
import java.util.List;
/**
* Project: anrui-buscenter(销售相关) <br/>
* File: BusCollectionConfirmationService.java <br/>
* Class: com.yxt.anrui.buscenter.biz.buscollectionconfirmation.BusCollectionConfirmationService <br/>
* Description: 收款确认表 业务逻辑. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2022-04-12 17:57:01 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Service
public class BusCollectionConfirmationService extends MybatisBaseService<BusCollectionConfirmationMapper, BusCollectionConfirmation> {
@Autowired
private BusSelectedReceivablesDetailedService busSelectedReceivablesDetailedService;
@Autowired
private BusUncollectedReceivablesDetailedService busUncollectedReceivablesDetailedService;
@Autowired
private CommonAppendixFeign commonAppendixFeign;
@Autowired
private FileUploadComponent fileUploadComponent;
@Autowired
private SysUserFeign sysUserFeign;
@Autowired
private SysOrganizationFeign sysOrganizationFeign;
private QueryWrapper<BusCollectionConfirmation> createQueryWrapper(BusCollectionConfirmationQuery query) {
// todo: 这里根据具体业务调整查询条件
// 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
QueryWrapper<BusCollectionConfirmation> qw = new QueryWrapper<>();
qw.eq("useOrgSid", query.getUseOrgSid());
if (StringUtils.isNotBlank(query.getCreateBySid())) {
qw.eq("createBySid", query.getCreateBySid());
}
if (StringUtils.isNotBlank(query.getCollectionDate())) {
qw.eq("collectionDate", query.getCollectionDate());
}
if (StringUtils.isNotBlank(query.getCollectionBank())) {
qw.eq("collectionBank", query.getCollectionBank());
}
if (StringUtils.isNotBlank(query.getCollectionTypeKey())) {
qw.eq("collectionTypeKey", query.getCollectionTypeKey());
}
if (StringUtils.isNotBlank(query.getSubscriptionState())) {
qw.eq("subscriptionState", query.getSubscriptionState());
}
return qw;
}
public PagerVo<BusCollectionConfirmationVo> listPageVo(PagerQuery<BusCollectionConfirmationQuery> pq) {
BusCollectionConfirmationQuery query = pq.getParams();
QueryWrapper<BusCollectionConfirmation> qw = createQueryWrapper(query);
IPage<BusCollectionConfirmation> page = PagerUtil.queryToPage(pq);
IPage<BusCollectionConfirmationVo> pagging = baseMapper.selectPageVo(page, qw);
List<BusCollectionConfirmationVo> records = pagging.getRecords();
for (BusCollectionConfirmationVo record : records) {
String s = "";
BigDecimal subscriptionMoney = null;
String sid = record.getSid();
List<BusSelectedReceivablesDetailedVo> busSelectedReceivablesDetailedVos = busSelectedReceivablesDetailedService.fetchByCillSid(sid);
for (BusSelectedReceivablesDetailedVo busSelectedReceivablesDetailedVo : busSelectedReceivablesDetailedVos) {
Integer auditState = busSelectedReceivablesDetailedVo.getAuditState();
s += auditState + ",";
}
if (!s.contains("3")) {
record.setSubscriptionState(1);
} else if (s.contains("3")) {
List<BusSelectedReceivablesDetailedVo> busSelectedReceivablesDetailedVos1 = busSelectedReceivablesDetailedService.fetchByAuditState();
for (BusSelectedReceivablesDetailedVo busSelectedReceivablesDetailedVo : busSelectedReceivablesDetailedVos1) {
BigDecimal subscriptionMoney1 = new BigDecimal(busSelectedReceivablesDetailedVo.getSubscriptionMoney());
subscriptionMoney = subscriptionMoney.add(subscriptionMoney1);
}
BigDecimal collectionMoney = new BigDecimal(record.getCollectionMoney());
if (collectionMoney.compareTo(subscriptionMoney) == 0) {
record.setSubscriptionState(3);
} else {
record.setSubscriptionState(2);
}
}
}
PagerVo<BusCollectionConfirmationVo> p = PagerUtil.pageToVo(pagging, null);
return p;
}
public ResultBean saveAllDto(BusCollectionConfirmationDto dto) {
ResultBean rb = ResultBean.fireFail();
BusCollectionConfirmation busCollectionConfirmation = new BusCollectionConfirmation();
List<BusSelectedReceivablesDetailedDto> busSelectedReceivablesDetailedDtos = dto.getBusSelectedReceivablesDetailedDtos();
CommonAppendixDto commonAppendixDto = new CommonAppendixDto();
List<BusCollectionConfirmationAppendixDto> paymentVoucherAppendixs = dto.getPaymentVoucherAppendixs();
List<BusCollectionConfirmationAppendixDto> remittanceConfirmationAppendixs = dto.getRemittanceConfirmationAppendixs();
String sid1 = busCollectionConfirmation.getSid();
BeanUtil.copyProperties(dto, busCollectionConfirmation);
busCollectionConfirmation.setSid(sid1);
String payFilePath = "";
String remFilePath = "";
for (BusCollectionConfirmationAppendixDto paymentVoucherAppendix : paymentVoucherAppendixs) {
BeanUtil.copyProperties(paymentVoucherAppendix, commonAppendixDto);
payFilePath = commonAppendixDto.getFilePath();
if (payFilePath.indexOf(fileUploadComponent.getUrlPrefix()) > -1) {
payFilePath = payFilePath.replace(fileUploadComponent.getUrlPrefix(), "");
commonAppendixDto.setLinkSid(sid1);
commonAppendixDto.setFilePath(payFilePath);
commonAppendixDto.setCreateBySid(dto.getStaffSid());
commonAppendixDto.setAttachType(CommonAttachTypeEnum.PAYMENT_VOUCHER.getAttachType());
commonAppendixFeign.save(commonAppendixDto);
}
payFilePath += payFilePath + ",";
}
busCollectionConfirmation.setPaymentVoucherUrl(payFilePath.substring(0, payFilePath.length() - 1));
for (BusCollectionConfirmationAppendixDto remittanceConfirmationAppendix : remittanceConfirmationAppendixs) {
BeanUtil.copyProperties(remittanceConfirmationAppendix, commonAppendixDto);
remFilePath = commonAppendixDto.getFilePath();
if (remFilePath.indexOf(fileUploadComponent.getUrlPrefix()) > -1) {
remFilePath = remFilePath.replace(fileUploadComponent.getUrlPrefix(), "");
commonAppendixDto.setLinkSid(sid1);
commonAppendixDto.setFilePath(remFilePath);
commonAppendixDto.setCreateBySid(dto.getStaffSid());
commonAppendixDto.setAttachType(CommonAttachTypeEnum.PAYMENT_VOUCHER.getAttachType());
commonAppendixFeign.save(commonAppendixDto);
}
remFilePath += remFilePath + ",";
}
busCollectionConfirmation.setRemittanceConfirmationUrl(remFilePath.substring(0, remFilePath.length() - 1));
for (BusSelectedReceivablesDetailedDto busSelectedReceivablesDetailedDto : busSelectedReceivablesDetailedDtos) {
BusSelectedReceivablesDetailed busSelectedReceivablesDetailed = new BusSelectedReceivablesDetailed();
BeanUtil.copyProperties(busSelectedReceivablesDetailedDto, busSelectedReceivablesDetailed);
busSelectedReceivablesDetailed.setCollSid(sid1);
busSelectedReceivablesDetailedService.save(busSelectedReceivablesDetailed);
//已选应收款项-车架号
String vin = busSelectedReceivablesDetailed.getVIN();
//已选应收款项-应收项目名称
String receivablesName = busSelectedReceivablesDetailed.getReceivablesName();
BusUncollectedReceivablesDetailedVo busUncollectedReceivablesDetailedVo = busUncollectedReceivablesDetailedService.fetchByVinAndRecName(vin, receivablesName);
//应收未收款项-当前应收金额
BigDecimal currentReceivableMoney = new BigDecimal(busUncollectedReceivablesDetailedVo.getCurrentReceivableMoney());
//已选应收款项-认款金额
BigDecimal subscriptionMoney = busSelectedReceivablesDetailed.getSubscriptionMoney();
BigDecimal subtract = currentReceivableMoney.subtract(subscriptionMoney);
if (subtract.compareTo(BigDecimal.ZERO) < 0) {
return rb.setMsg("认款金额超出应收金额，请重新输入");
}
busUncollectedReceivablesDetailedVo.setCurrentReceivableMoney(String.format("%.0f", subtract));
BusUncollectedReceivablesDetailedDto busUncollectedReceivablesDetailedDto = new BusUncollectedReceivablesDetailedDto();
BeanUtil.copyProperties(busUncollectedReceivablesDetailedVo, busUncollectedReceivablesDetailedDto);
busUncollectedReceivablesDetailedService.updateBySid(busUncollectedReceivablesDetailedDto, busUncollectedReceivablesDetailedDto.getSid());
}
List<BusSelectedReceivablesDetailedVo> busSelectedReceivablesDetailedVos = busSelectedReceivablesDetailedService.fetchByCillSid(sid1);
BigDecimal totalSubscriptionMone = null;
for (BusSelectedReceivablesDetailedVo busSelectedReceivablesDetailedVo : busSelectedReceivablesDetailedVos) {
BigDecimal subscriptionMoney = new BigDecimal(busSelectedReceivablesDetailedVo.getSubscriptionMoney());
totalSubscriptionMone = totalSubscriptionMone.add(subscriptionMoney);
}
BigDecimal collectionMoney = busCollectionConfirmation.getCollectionMoney();
BigDecimal subtract = collectionMoney.subtract(totalSubscriptionMone);
if (subtract.compareTo(BigDecimal.ZERO) < 0) {
return rb.setMsg("已选应收款项金额已超出该确认单应收金额总额，请重新核对");
}
busCollectionConfirmation.setBalance(totalSubscriptionMone);
busCollectionConfirmation.setAuditState(1);
save(busCollectionConfirmation);
return rb.success().setMsg("添加成功");
}
public ResultBean<BusCollectionConfirmationDetailsVo> fetchByAllSid(String sid) {
ResultBean rb = ResultBean.fireFail();
BusCollectionConfirmationDetailsVo busCollectionConfirmationDetailsVo = new BusCollectionConfirmationDetailsVo();
BusCollectionConfirmation busCollectionConfirmation = fetchBySid(sid);
BeanUtil.copyProperties(busCollectionConfirmation, busCollectionConfirmationDetailsVo);
List<BusSelectedReceivablesDetailedVo> busSelectedReceivablesDetailedVos = busSelectedReceivablesDetailedService.fetchByCillSid(sid);
busCollectionConfirmationDetailsVo.setBusSelectedReceivablesDetailedVos(busSelectedReceivablesDetailedVos);
return rb.success().setData(busCollectionConfirmationDetailsVo);
}
public ResultBean delAllBySids(String[] sids) {
ResultBean rb = ResultBean.fireFail();
delBySids(sids);
for (String sid : sids) {
busSelectedReceivablesDetailedService.deleteByCollSid(sid);
}
return rb.success().setMsg("删除成功");
}
/**
* 手机端—获取款项确认列表
*
* @param pagerQuery
* @
*/
public IPage<AppBusCollectionConfirmationPageVo> getCollectionConfirmList(PagerQuery<AppBusCollectionConfirmationQuery> pagerQuery) {
IPage<AppBusCollectionConfirmationQuery> page = PagerUtil.queryToPage(pagerQuery);
QueryWrapper<AppBusCollectionConfirmationPageVo> qw = appBuildQueryWrapper(pagerQuery.getParams());
IPage<AppBusCollectionConfirmationPageVo> collectionConfirmList = baseMapper.getCollectionConfirmList(page, qw);
for (AppBusCollectionConfirmationPageVo record : collectionConfirmList.getRecords()) {
Integer balance = record.getBalance();
String collectionBillState = record.getCollectionBillState();
if (balance <= 0 || collectionBillState.equals("1") || collectionBillState.equals("3")) {
record.setShowHandle(false);
}
record.setShowDownload(false);
List<BusSelectedReceivablesDetailedVo> busSelectedReceivablesDetailedVos = busSelectedReceivablesDetailedService.fetchByCillSid(record.getCollectionBillSid());
if (busSelectedReceivablesDetailedVos.size() > 0 || collectionBillState != "1") {
record.setShowDelete(false);
}
}
return collectionConfirmList;
}
/**
* 构造条件
*
* @param pagerQuery 查询条件
* @return
*/
private QueryWrapper<AppBusCollectionConfirmationPageVo> appBuildQueryWrapper(AppBusCollectionConfirmationQuery pagerQuery) {
QueryWrapper<AppBusCollectionConfirmationPageVo> qw = new QueryWrapper<>();
if (pagerQuery != null) {
if (com.yxt.common.base.utils.StringUtils.isNotBlank(pagerQuery.getName())) {//车架号
qw.like("bv.vinNo", pagerQuery.getName());
}
}
return qw;
}
/**
* 手机端—新增款项确认申请单
*
* @param dto
* @return
*/
@Transactional(rollbackFor = Exception.class)
public ResultBean addCollectionConfirm(AppBusCollectionConfirmationDto dto) {
ResultBean rb = ResultBean.fireFail();
String staffSid = sysUserFeign.getUserOrgInfoByUserSid(dto.getUserSid()).getData().getStaffSid();
BusCollectionConfirmation busCollectionConfirmation = new BusCollectionConfirmation();
CommonAppendixDto commonAppendixDto = new CommonAppendixDto();
String sid = busCollectionConfirmation.getSid();
busCollectionConfirmation.setSid(sid);
busCollectionConfirmation.setCollectionDate(dto.getCollectionDate());
busCollectionConfirmation.setCollectionBank(dto.getCollectionBank());
busCollectionConfirmation.setCollectionBankNum(dto.getCollectionNum());
busCollectionConfirmation.setCollectionMoney(dto.getPaymentMoney());
busCollectionConfirmation.setCollectionTypeKey(dto.getCollectionTypeKey());
busCollectionConfirmation.setCollectionTypeValue(dto.getCollectionType());
busCollectionConfirmation.setPayerName(dto.getPaymentName());
busCollectionConfirmation.setCollectionMoney(dto.getPaymentMoney());
busCollectionConfirmation.setRemarks(dto.getRemarks());
insert(busCollectionConfirmation);
List<String> payFiles = dto.getPayFiles();
for (String payFile : payFiles) {
String payFilePath = payFile.replace(fileUploadComponent.getUrlPrefix(), "");
commonAppendixDto.setLinkSid(sid);
commonAppendixDto.setFilePath(payFilePath);
commonAppendixDto.setCreateBySid(staffSid);
commonAppendixDto.setAttachType(CommonAttachTypeEnum.PAYMENT_VOUCHER.getAttachType());
commonAppendixFeign.save(commonAppendixDto);
}
return rb.success();
}
/**
* 手机端—初始化收款确认申请
*
* @param collectionBillSid
* @param userSid
* @return
*/
public ResultBean<AppBusCollectionConfirmationInitVo> initCollectionConfirm(String collectionBillSid, String userSid) {
ResultBean<AppBusCollectionConfirmationInitVo> rb = ResultBean.fireFail();
if (StringUtils.isNotBlank(userSid)) {
return rb.fail().setMsg("用户sid不能为空");
}
String useOrgSid = sysOrganizationFeign.getUseOrgByUserSid(userSid).getData().getSid();
AppBusCollectionConfirmationInitVo vo = baseMapper.initCollectionConfirm(collectionBillSid, useOrgSid);
return rb.success().setData(vo);
}
/**
* 手机端—提交款项确认申请
*
* @param dto
* @return
*/
public ResultBean submitCollectionConfirm(AppBusCollectionConfirmationDto dto) {
return null;
}
/**
* 手机端—删除收款确认单
*
* @param collectionBillSid
* @return
*/
@Transactional(rollbackFor = Exception.class)
public ResultBean deleteCollectionConfirm(String collectionBillSid) {
ResultBean rb = ResultBean.fireFail();
deleteBySid(collectionBillSid);
busSelectedReceivablesDetailedService.deleteByCollSid(collectionBillSid);
return rb.success().setMsg("删除成功");
}
/**
* 手机端—查询可使用款项明细列表
*
* @param pagerQuery
* @return
*/
public IPage<AppBusSelectedReceivablesPaymentDetailsVo> getPaymentDetailsList(PagerQuery<AppBusSelectedReceivablesPaymentDetailsQuery> pagerQuery) {
IPage<AppBusSelectedReceivablesPaymentDetailsQuery> page = PagerUtil.queryToPage(pagerQuery);
QueryWrapper<AppBusSelectedReceivablesPaymentDetailsVo> qw = appPaymentDetailsBuildQueryWrapper(pagerQuery.getParams());
List<String> sidList = pagerQuery.getParams().getSidList();
IPage<AppBusSelectedReceivablesPaymentDetailsVo> collectionConfirmList = busSelectedReceivablesDetailedService.getPaymentDetailsList(sidList, page, qw);
return collectionConfirmList;
}
/**
* 构造条件
*
* @param pagerQuery 查询条件
* @return
*/
private QueryWrapper<AppBusSelectedReceivablesPaymentDetailsVo> appPaymentDetailsBuildQueryWrapper(AppBusSelectedReceivablesPaymentDetailsQuery pagerQuery) {
QueryWrapper<AppBusSelectedReceivablesPaymentDetailsVo> qw = new QueryWrapper<>();
if (pagerQuery != null) {
if (com.yxt.common.base.utils.StringUtils.isNotBlank(pagerQuery.getName())) {//车架号
qw.like("bv.vinNo", pagerQuery.getName());
}
}
return qw;
}
}

23
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busuncollectedreceivablesdetailed/BusUncollectedReceivablesDetailedMapper.xml
View File

@ -1,23 +0,0 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.yxt.anrui.buscenter.biz.busuncollectedreceivablesdetailed.BusUncollectedReceivablesDetailedMapper">
<!-- <where> ${ew.sqlSegment} </where>-->
<!-- ${ew.customSqlSegment} -->
<select id="selectPageVo" resultType="com.yxt.anrui.buscenter.api.busuncollectedreceivablesdetailed.BusUncollectedReceivablesDetailedVo">
SELECT * FROM bus_uncollected_receivables_detailed <where> ${ew.sqlSegment} </where>
</select>
<select id="selectListAllVo" resultType="com.yxt.anrui.buscenter.api.busuncollectedreceivablesdetailed.BusUncollectedReceivablesDetailedVo">
SELECT * FROM bus_uncollected_receivables_detailed <where> ${ew.sqlSegment} </where>
</select>
<select id="fetchByVinAndRecName"
resultType="com.yxt.anrui.buscenter.api.busuncollectedreceivablesdetailed.BusUncollectedReceivablesDetailedVo">
SELECT
*
FROM
bus_uncollected_receivables_detailed
WHERE VIN = #{vin}
AND receivablesName = #{receivablesName}
</select>
</mapper>

4
anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finaccountCategory/FinAccountCategoryFeign.java
View File

@ -50,8 +50,8 @@ import java.util.List;
*/ */
@Api(tags = "对应金蝶系统的科目类别表") @Api(tags = "对应金蝶系统的科目类别表")
@FeignClient( @FeignClient(
contextId = "anrui_fin-FinAccountCategory", contextId = "anrui-fin-FinAccountCategory",
name = "anrui_fin", name = "anrui-fin",
path = "finaccountcategory", path = "finaccountcategory",
fallback = FinAccountCategoryFeignFallback.class) fallback = FinAccountCategoryFeignFallback.class)
public interface FinAccountCategoryFeign { public interface FinAccountCategoryFeign {

4
anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finaccountingdimension/FinAccountingDimensionFeign.java
View File

@ -50,8 +50,8 @@ import java.util.List;
*/ */
@Api(tags = " 对应金蝶系统的核算维度表") @Api(tags = " 对应金蝶系统的核算维度表")
@FeignClient( @FeignClient(
contextId = "anrui_fin-FinAccountingDimension", contextId = "anrui-fin-FinAccountingDimension",
name = "anrui_fin", name = "anrui-fin",
path = "finaccountingdimension", path = "finaccountingdimension",
fallback = FinAccountingDimensionFeignFallback.class) fallback = FinAccountingDimensionFeignFallback.class)
public interface FinAccountingDimensionFeign { public interface FinAccountingDimensionFeign {

4
anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finaccountingelements/FinAccountingElementsFeign.java
View File

@ -50,8 +50,8 @@ import java.util.List;
*/ */
@Api(tags = "对应金蝶系统的会计要素表") @Api(tags = "对应金蝶系统的会计要素表")
@FeignClient( @FeignClient(
contextId = "anrui_fin-FinAccountingElements", contextId = "anrui-fin-FinAccountingElements",
name = "anrui_fin", name = "anrui-fin",
path = "finaccountingelements", path = "finaccountingelements",
fallback = FinAccountingElementsFeignFallback.class) fallback = FinAccountingElementsFeignFallback.class)
public interface FinAccountingElementsFeign { public interface FinAccountingElementsFeign {

8
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
View File

@ -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 com.yxt.common.core.dto.Dto;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
@ -9,7 +9,7 @@ import java.math.BigDecimal;
import java.util.List; import java.util.List;
@Data @Data
public class AppBusCollectionConfirmationDto implements Dto { public class AppFinCollectionConfirmationDto implements Dto {
@ApiModelProperty("款项确认sid") @ApiModelProperty("款项确认sid")
private String sid; private String sid;
@ -57,7 +57,7 @@ public class AppBusCollectionConfirmationDto implements Dto {
private List<String> payFiles; private List<String> payFiles;
@ApiModelProperty("款项明细") @ApiModelProperty("款项明细")
private List<AppBusSelectedReceivablesDetailedDto> paymentDetail; private List<AppFinSelectedReceivablesDetailedDto> paymentDetail;
@ApiModelProperty("余额") @ApiModelProperty("余额")
private String balance; private String balance;

8
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
View File

@ -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 com.yxt.common.core.vo.Vo;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
@ -8,7 +8,7 @@ import lombok.Data;
import java.util.List; import java.util.List;
@Data @Data
public class AppBusCollectionConfirmationInitVo implements Vo { public class AppFinCollectionConfirmationInitVo implements Vo {
@ApiModelProperty("款项确认sid") @ApiModelProperty("款项确认sid")
private String sid; private String sid;
@ -56,7 +56,7 @@ public class AppBusCollectionConfirmationInitVo implements Vo {
private List<String> payFiles; private List<String> payFiles;
@ApiModelProperty("款项明细") @ApiModelProperty("款项明细")
private List<AppBusSelectedReceivablesDetailedDto> paymentDetail; private List<AppFinSelectedReceivablesDetailedDto> paymentDetail;
@ApiModelProperty("余额") @ApiModelProperty("余额")
private String balance; private String balance;

4
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
View File

@ -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 com.yxt.common.core.vo.Vo;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
@Data @Data
public class AppBusCollectionConfirmationPageVo implements Vo { public class AppFinCollectionConfirmationPageVo implements Vo {
@ApiModelProperty("确认单sid") @ApiModelProperty("确认单sid")
private String collectionBillSid; private String collectionBillSid;

4
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
View File

@ -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 com.yxt.common.core.query.Query;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
@Data @Data
public class AppBusCollectionConfirmationQuery implements Query { public class AppFinCollectionConfirmationQuery implements Query {
@ApiModelProperty("用户sid") @ApiModelProperty("用户sid")
private String userSid; private String userSid;

4
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
View File

@ -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 com.yxt.common.core.query.Query;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
@ -7,7 +7,7 @@ import lombok.Data;
import java.util.List; import java.util.List;
@Data @Data
public class AppBusSelectedReceivablesPaymentDetailsQuery implements Query { public class AppFinSelectedReceivablesPaymentDetailsQuery implements Query {
@ApiModelProperty("用户sid") @ApiModelProperty("用户sid")
private String userSid; private String userSid;

4
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
View File

@ -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 com.yxt.common.core.vo.Vo;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
@Data @Data
public class AppBusSelectedReceivablesPaymentDetailsVo implements Vo { public class AppFinSelectedReceivablesPaymentDetailsVo implements Vo {
@ApiModelProperty("合同编号") @ApiModelProperty("合同编号")
private String contractId; private String contractId;

12
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
View File

@ -23,7 +23,7 @@
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__********* *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/ *********************************************************/
package com.yxt.anrui.buscenter.api.buscollectionconfirmation; package com.yxt.anrui.fin.api.fincollectionconfirmation;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import com.yxt.common.core.domain.BaseEntity; import com.yxt.common.core.domain.BaseEntity;
@ -34,9 +34,9 @@ import lombok.Data;
import java.math.BigDecimal; import java.math.BigDecimal;
/** /**
* Project: anrui-buscenter(销售相关) <br/> * Project: anrui-fin(销售相关) <br/>
* File: BusCollectionConfirmation.java <br/> * File: FinCollectionConfirmation.java <br/>
* Class: com.yxt.anrui.buscenter.api.buscollectionconfirmation.BusCollectionConfirmation <br/> * Class: com.yxt.anrui.fin.api.fincollectionconfirmation.FinCollectionConfirmation <br/>
* Description: 收款确认表. <br/> * Description: 收款确认表. <br/>
* Copyright: Copyright (c) 2011 <br/> * Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/> * Company: https://gitee.com/liuzp315 <br/>
@ -48,8 +48,8 @@ import java.math.BigDecimal;
*/ */
@ApiModel(value = "收款确认表", description = "收款确认表") @ApiModel(value = "收款确认表", description = "收款确认表")
@Data @Data
@TableName("bus_collection_confirmation") @TableName("fin_collection_confirmation")
public class BusCollectionConfirmation extends BaseEntity { public class FinCollectionConfirmation extends BaseEntity {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
@ApiModelProperty("创建人接口") @ApiModelProperty("创建人接口")

4
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
View File

@ -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; import com.yxt.common.core.dto.Dto;
@ -21,7 +21,7 @@ import lombok.Data;
*/ */
@ApiModel(value = "公共附件表 数据传输对象", description = "公共附件表 数据传输对象") @ApiModel(value = "公共附件表 数据传输对象", description = "公共附件表 数据传输对象")
@Data @Data
public class BusCollectionConfirmationAppendixDto implements Dto { public class FinCollectionConfirmationAppendixDto implements Dto {
@ApiModelProperty("上传人sid") @ApiModelProperty("上传人sid")
private String createBySid; private String createBySid;

15
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
View File

@ -23,11 +23,10 @@
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__********* *********__佛祖保佑__永无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.FinSelectedReceivablesDetailedVo;
import com.yxt.anrui.buscenter.api.busselectedreceivablesdetailed.BusSelectedReceivablesDetailedVo;
import com.yxt.common.core.vo.Vo; import com.yxt.common.core.vo.Vo;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
@ -36,9 +35,9 @@ import lombok.Data;
import java.util.List; import java.util.List;
/** /**
* Project: anrui-buscenter(销售相关) <br/> * Project: anrui-fin(销售相关) <br/>
* File: BusCollectionConfirmationVo.java <br/> * File: FinCollectionConfirmationVo.java <br/>
* Class: com.yxt.anrui.buscenter.api.buscollectionconfirmation.BusCollectionConfirmationVo <br/> * Class: com.yxt.anrui.fin.api.fincollectionconfirmation.FinCollectionConfirmationVo <br/>
* Description: 收款确认表 视图数据对象. <br/> * Description: 收款确认表 视图数据对象. <br/>
* Copyright: Copyright (c) 2011 <br/> * Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/> * Company: https://gitee.com/liuzp315 <br/>
@ -50,7 +49,7 @@ import java.util.List;
*/ */
@ApiModel(value = "收款确认表 视图数据对象", description = "收款确认表 视图数据对象") @ApiModel(value = "收款确认表 视图数据对象", description = "收款确认表 视图数据对象")
@Data @Data
public class BusCollectionConfirmationDetailsVo implements Vo { public class FinCollectionConfirmationDetailsVo implements Vo {
@ApiModelProperty("创建人接口") @ApiModelProperty("创建人接口")
@ -78,5 +77,5 @@ public class BusCollectionConfirmationDetailsVo implements Vo {
@ApiModelProperty("分公司sid") @ApiModelProperty("分公司sid")
private String useOrgSid; // 分公司sid private String useOrgSid; // 分公司sid
@ApiModelProperty("已选应收款项明细") @ApiModelProperty("已选应收款项明细")
private List<BusSelectedReceivablesDetailedVo> busSelectedReceivablesDetailedVos; // 已选应收款项明细 private List<FinSelectedReceivablesDetailedVo> finSelectedReceivablesDetailedVos; // 已选应收款项明细
} }

20
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
View File

@ -23,12 +23,12 @@
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__********* *********__佛祖保佑__永无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 com.yxt.common.core.dto.Dto;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
@ -36,9 +36,9 @@ import lombok.Data;
import java.util.List; import java.util.List;
/** /**
* Project: anrui-buscenter(销售相关) <br/> * Project: anrui-fin(销售相关) <br/>
* File: BusCollectionConfirmationDto.java <br/> * File: FinCollectionConfirmationDto.java <br/>
* Class: com.yxt.anrui.buscenter.api.buscollectionconfirmation.BusCollectionConfirmationDto <br/> * Class: com.yxt.anrui.fin.api.fincollectionconfirmation.FinCollectionConfirmationDto <br/>
* Description: 收款确认表 数据传输对象. <br/> * Description: 收款确认表 数据传输对象. <br/>
* Copyright: Copyright (c) 2011 <br/> * Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/> * Company: https://gitee.com/liuzp315 <br/>
@ -50,7 +50,7 @@ import java.util.List;
*/ */
@ApiModel(value = "收款确认表 数据传输对象", description = "收款确认表 数据传输对象") @ApiModel(value = "收款确认表 数据传输对象", description = "收款确认表 数据传输对象")
@Data @Data
public class BusCollectionConfirmationDto implements Dto { public class FinCollectionConfirmationDto implements Dto {
@ApiModelProperty("收款确认单sid") @ApiModelProperty("收款确认单sid")
private String sid; // 收款确认单sid private String sid; // 收款确认单sid
@ -81,9 +81,9 @@ public class BusCollectionConfirmationDto implements Dto {
@ApiModelProperty("分公司sid") @ApiModelProperty("分公司sid")
private String useOrgSid; // 分公司sid private String useOrgSid; // 分公司sid
@ApiModelProperty("已选应收款项明细") @ApiModelProperty("已选应收款项明细")
private List<BusSelectedReceivablesDetailedDto> busSelectedReceivablesDetailedDtos; // 已选应收款项明细 private List<FinSelectedReceivablesDetailedDto> finSelectedReceivablesDetailedDtos; // 已选应收款项明细
@ApiModelProperty("打款凭证附件") @ApiModelProperty("打款凭证附件")
private List<BusCollectionConfirmationAppendixDto> paymentVoucherAppendixs; // 打款凭证附件 private List<FinCollectionConfirmationAppendixDto> paymentVoucherAppendixs; // 打款凭证附件
@ApiModelProperty("汇款确认书附件") @ApiModelProperty("汇款确认书附件")
private List<BusCollectionConfirmationAppendixDto> remittanceConfirmationAppendixs; // 汇款确认书附件 private List<FinCollectionConfirmationAppendixDto> remittanceConfirmationAppendixs; // 汇款确认书附件
} }

46
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
View File

@ -23,22 +23,20 @@
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__********* *********__佛祖保佑__永无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.query.PagerQuery;
import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo; 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.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import java.util.List;
/** /**
* Project: anrui-buscenter(销售相关) <br/> * Project: anrui-fin(销售相关) <br/>
* File: BusCollectionConfirmationFeign.java <br/> * File: FinCollectionConfirmationFeign.java <br/>
* Class: com.yxt.anrui.buscenter.api.buscollectionconfirmation.BusCollectionConfirmationFeign <br/> * Class: com.yxt.anrui.fin.api.fincollectionconfirmation.finCollectionConfirmationFeign <br/>
* Description: 收款确认表. <br/> * Description: 收款确认表. <br/>
* Copyright: Copyright (c) 2011 <br/> * Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/> * Company: https://gitee.com/liuzp315 <br/>
@ -50,19 +48,19 @@ import java.util.List;
*/ */
@Api(tags = "收款确认表") @Api(tags = "收款确认表")
@FeignClient( @FeignClient(
contextId = "anrui-buscenter-BusCollectionConfirmation", contextId = "anrui-fin-FinCollectionConfirmation",
name = "anrui-buscenter", name = "anrui-fin",
path = "buscollectionconfirmation", path = "fincollectionconfirmation",
fallback = BusCollectionConfirmationFeignFallback.class) fallback = FinCollectionConfirmationFeignFallback.class)
public interface BusCollectionConfirmationFeign { public interface FinCollectionConfirmationFeign {
@ApiOperation("根据条件分页查询数据的列表") @ApiOperation("根据条件分页查询数据的列表")
@PostMapping("/listPage") @PostMapping("/listPage")
public ResultBean<PagerVo<BusCollectionConfirmationVo>> listPage(@RequestBody PagerQuery<BusCollectionConfirmationQuery> pq); public ResultBean<PagerVo<FinCollectionConfirmationVo>> listPage(@RequestBody PagerQuery<FinCollectionConfirmationQuery> pq);
@ApiOperation("提交新增保存") @ApiOperation("提交新增保存")
@PostMapping("/save") @PostMapping("/save")
public ResultBean save(@RequestBody BusCollectionConfirmationDto dto); public ResultBean save(@RequestBody FinCollectionConfirmationDto dto);
@ApiOperation("根据sid批量删除") @ApiOperation("根据sid批量删除")
@PostMapping("/delBySids") @PostMapping("/delBySids")
@ -70,29 +68,33 @@ public interface BusCollectionConfirmationFeign {
@ApiOperation("编辑回显或详情") @ApiOperation("编辑回显或详情")
@GetMapping("/fetchBySid/{sid}") @GetMapping("/fetchBySid/{sid}")
public ResultBean<BusCollectionConfirmationDetailsVo> fetchBySid(@PathVariable("sid") String sid); public ResultBean<FinCollectionConfirmationDetailsVo> fetchBySid(@PathVariable("sid") String sid);
@ApiOperation("出纳确认") @ApiOperation("出纳确认")
@PostMapping("/cashierConfirm") @PostMapping("/cashierConfirm")
public ResultBean cashierConfirm(); public ResultBean cashierConfirm(@RequestParam("sid") String sid);
@ApiOperation("出纳驳回")
@PutMapping("/cashierReject")
public ResultBean cashierReject(@RequestParam("sid") String sid);
/*---------------------App接口 ---------------------*/ /*---------------------App接口 ---------------------*/
@ApiOperation("手机端—获取款项确认列表") @ApiOperation("手机端—获取款项确认列表")
@PostMapping("/getCollectionConfirmList") @PostMapping("/getCollectionConfirmList")
public ResultBean<PagerVo<AppBusCollectionConfirmationPageVo>> getCollectionConfirmList(@RequestBody PagerQuery<AppBusCollectionConfirmationQuery> pagerQuery); public ResultBean<PagerVo<AppFinCollectionConfirmationPageVo>> getCollectionConfirmList(@RequestBody PagerQuery<AppFinCollectionConfirmationQuery> pagerQuery);
@ApiOperation("手机端—新增款项确认申请单") @ApiOperation("手机端—新增款项确认申请单")
@PostMapping("/addCollectionConfirm") @PostMapping("/addCollectionConfirm")
public ResultBean addCollectionConfirm(@RequestBody AppBusCollectionConfirmationDto dto); public ResultBean addCollectionConfirm(@RequestBody AppFinCollectionConfirmationDto dto);
@ApiOperation("手机端—初始化收款确认申请") @ApiOperation("手机端—初始化收款确认申请")
@GetMapping("/initCollectionConfirm/{collectionBillSid}/{userSid}") @GetMapping("/initCollectionConfirm/{collectionBillSid}/{userSid}")
public ResultBean<AppBusCollectionConfirmationInitVo> initCollectionConfirm(@PathVariable("collectionBillSid") String collectionBillSid, @PathVariable("userSid") String userSid); public ResultBean<AppFinCollectionConfirmationInitVo> initCollectionConfirm(@PathVariable("collectionBillSid") String collectionBillSid, @PathVariable("userSid") String userSid);
@ApiOperation("手机端—提交款项确认申请") @ApiOperation("手机端—提交款项确认申请")
@PostMapping("/submitCollectionConfirm") @PostMapping("/submitCollectionConfirm")
public ResultBean submitCollectionConfirm(@RequestBody AppBusCollectionConfirmationDto dto); public ResultBean submitCollectionConfirm(@RequestBody AppFinCollectionConfirmationDto dto);
@ApiOperation("手机端—删除收款确认单") @ApiOperation("手机端—删除收款确认单")
@DeleteMapping("/deleteCollectionConfirm/{collectionBillSid}") @DeleteMapping("/deleteCollectionConfirm/{collectionBillSid}")
@ -100,5 +102,5 @@ public interface BusCollectionConfirmationFeign {
@ApiOperation("手机端—查询可使用款项明细列表") @ApiOperation("手机端—查询可使用款项明细列表")
@PostMapping("/getPaymentDetailsList") @PostMapping("/getPaymentDetailsList")
public ResultBean<PagerVo<AppBusSelectedReceivablesPaymentDetailsVo>> getPaymentDetailsList(@RequestBody PagerQuery<AppBusSelectedReceivablesPaymentDetailsQuery> pagerQuery); public ResultBean<PagerVo<AppFinSelectedReceivablesPaymentDetailsVo>> getPaymentDetailsList(@RequestBody PagerQuery<AppFinSelectedReceivablesPaymentDetailsQuery> pagerQuery);
} }

43
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
View File

@ -23,19 +23,17 @@
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__********* *********__佛祖保佑__永无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.query.PagerQuery;
import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo; import com.yxt.common.core.vo.PagerVo;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import java.util.List;
/** /**
* Project: anrui-buscenter(销售相关) <br/> * Project: anrui-fin(销售相关) <br/>
* File: BusCollectionConfirmationFeignFallback.java <br/> * File: FinCollectionConfirmationFeignFallback.java <br/>
* Class: com.yxt.anrui.buscenter.api.buscollectionconfirmation.BusCollectionConfirmationFeignFallback <br/> * Class: com.yxt.anrui.fin.api.fincollectionconfirmation.FinCollectionConfirmationFeignFallback <br/>
* Description: 收款确认表. <br/> * Description: 收款确认表. <br/>
* Copyright: Copyright (c) 2011 <br/> * Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/> * Company: https://gitee.com/liuzp315 <br/>
@ -46,52 +44,57 @@ import java.util.List;
* @since 1.0 * @since 1.0
*/ */
@Component @Component
public class BusCollectionConfirmationFeignFallback implements BusCollectionConfirmationFeign { public class FinCollectionConfirmationFeignFallback implements FinCollectionConfirmationFeign {
@Override @Override
public ResultBean<PagerVo<BusCollectionConfirmationVo>> listPage(PagerQuery<BusCollectionConfirmationQuery> pq){ public ResultBean<PagerVo<FinCollectionConfirmationVo>> listPage(PagerQuery<FinCollectionConfirmationQuery> pq){
ResultBean rb = ResultBean.fireFail(); ResultBean rb = ResultBean.fireFail();
return rb.setMsg("接口anrui-buscenter/buscollectionconfirmation/listPage无法访问"); return rb.setMsg("接口anrui-fin/fincollectionconfirmation/listPage无法访问");
} }
@Override @Override
public ResultBean save(BusCollectionConfirmationDto dto){ public ResultBean save(FinCollectionConfirmationDto dto){
return ResultBean.fireFail().setMsg("接口anrui-buscenter/buscollectionconfirmation/save无法访问"); return ResultBean.fireFail().setMsg("接口anrui-fin/fincollectionconfirmation/save无法访问");
} }
@Override @Override
public ResultBean delBySids( String[] sids){ public ResultBean delBySids( String[] sids){
return ResultBean.fireFail().setMsg("接口anrui-buscenter/buscollectionconfirmation/delBySids无法访问"); return ResultBean.fireFail().setMsg("接口anrui-fin/fincollectionconfirmation/delBySids无法访问");
} }
@Override @Override
public ResultBean<BusCollectionConfirmationDetailsVo> fetchBySid(String sid){ public ResultBean<FinCollectionConfirmationDetailsVo> fetchBySid(String sid){
ResultBean rb = ResultBean.fireFail(); ResultBean rb = ResultBean.fireFail();
return rb.setMsg("接口anrui-buscenter/buscollectionconfirmation/fetchBySid无法访问"); return rb.setMsg("接口anrui-fin/fincollectionconfirmation/fetchBySid无法访问");
}
@Override
public ResultBean cashierConfirm(String sid) {
return null;
} }
@Override @Override
public ResultBean cashierConfirm() { public ResultBean cashierReject(String sid) {
return null; return null;
} }
@Override @Override
public ResultBean<PagerVo<AppBusCollectionConfirmationPageVo>> getCollectionConfirmList(PagerQuery<AppBusCollectionConfirmationQuery> pagerQuery) { public ResultBean<PagerVo<AppFinCollectionConfirmationPageVo>> getCollectionConfirmList(PagerQuery<AppFinCollectionConfirmationQuery> pagerQuery) {
return null; return null;
} }
@Override @Override
public ResultBean addCollectionConfirm(AppBusCollectionConfirmationDto dto) { public ResultBean addCollectionConfirm(AppFinCollectionConfirmationDto dto) {
return null; return null;
} }
@Override @Override
public ResultBean<AppBusCollectionConfirmationInitVo> initCollectionConfirm(String collectionBillSid, String userSid) { public ResultBean<AppFinCollectionConfirmationInitVo> initCollectionConfirm(String collectionBillSid, String userSid) {
return null; return null;
} }
@Override @Override
public ResultBean submitCollectionConfirm(AppBusCollectionConfirmationDto dto) { public ResultBean submitCollectionConfirm(AppFinCollectionConfirmationDto dto) {
return null; return null;
} }
@ -101,7 +104,7 @@ public class BusCollectionConfirmationFeignFallback implements BusCollectionConf
} }
@Override @Override
public ResultBean<PagerVo<AppBusSelectedReceivablesPaymentDetailsVo>> getPaymentDetailsList(PagerQuery<AppBusSelectedReceivablesPaymentDetailsQuery> pagerQuery) { public ResultBean<PagerVo<AppFinSelectedReceivablesPaymentDetailsVo>> getPaymentDetailsList(PagerQuery<AppFinSelectedReceivablesPaymentDetailsQuery> pagerQuery) {
return null; return null;
} }
} }

11
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
View File

@ -23,19 +23,18 @@
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__********* *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/ *********************************************************/
package com.yxt.anrui.buscenter.api.buscollectionconfirmation; package com.yxt.anrui.fin.api.fincollectionconfirmation;
import com.yxt.common.core.query.Query; import com.yxt.common.core.query.Query;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
/** /**
* Project: anrui-buscenter(销售相关) <br/> * Project: anrui-fincenter(销售相关) <br/>
* File: BusCollectionConfirmationQuery.java <br/> * File: FinCollectionConfirmationQuery.java <br/>
* Class: com.yxt.anrui.buscenter.api.buscollectionconfirmation.BusCollectionConfirmationQuery <br/> * Class: com.yxt.anrui.fincenter.api.fincollectionconfirmation.FinCollectionConfirmationQuery <br/>
* Description: 收款确认表 查询条件. <br/> * Description: 收款确认表 查询条件. <br/>
* Copyright: Copyright (c) 2011 <br/> * Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/> * Company: https://gitee.com/liuzp315 <br/>
@ -47,7 +46,7 @@ import lombok.Data;
*/ */
@ApiModel(value = "收款确认表 查询条件", description = "收款确认表 查询条件") @ApiModel(value = "收款确认表 查询条件", description = "收款确认表 查询条件")
@Data @Data
public class BusCollectionConfirmationQuery implements Query { public class FinCollectionConfirmationQuery implements Query {
@ApiModelProperty("收款日期") @ApiModelProperty("收款日期")
private String collectionDate; // 收款日期 private String collectionDate; // 收款日期

11
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
View File

@ -23,19 +23,18 @@
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__********* *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/ *********************************************************/
package com.yxt.anrui.buscenter.api.buscollectionconfirmation; package com.yxt.anrui.fin.api.fincollectionconfirmation;
import com.yxt.common.core.vo.Vo; import com.yxt.common.core.vo.Vo;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
/** /**
* Project: anrui-buscenter(销售相关) <br/> * Project: anrui-fin(销售相关) <br/>
* File: BusCollectionConfirmationVo.java <br/> * File: FinCollectionConfirmationVo.java <br/>
* Class: com.yxt.anrui.buscenter.api.buscollectionconfirmation.BusCollectionConfirmationVo <br/> * Class: com.yxt.anrui.fin.api.fincollectionconfirmation.FinCollectionConfirmationVo <br/>
* Description: 收款确认表 视图数据对象. <br/> * Description: 收款确认表 视图数据对象. <br/>
* Copyright: Copyright (c) 2011 <br/> * Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/> * Company: https://gitee.com/liuzp315 <br/>
@ -47,7 +46,7 @@ import lombok.Data;
*/ */
@ApiModel(value = "收款确认表 视图数据对象", description = "收款确认表 视图数据对象") @ApiModel(value = "收款确认表 视图数据对象", description = "收款确认表 视图数据对象")
@Data @Data
public class BusCollectionConfirmationVo implements Vo { public class FinCollectionConfirmationVo implements Vo {
@ApiModelProperty("收款确认单sid") @ApiModelProperty("收款确认单sid")
private String sid; // 收款确认单sid private String sid; // 收款确认单sid

4
anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finginvoiceapply/FinGinvoiceapplyFeign.java
View File

@ -26,8 +26,8 @@ import java.util.List;
*/ */
@Api(tags = "公司开票申请单") @Api(tags = "公司开票申请单")
@FeignClient( @FeignClient(
contextId = "anrui_fin-FinGinvoiceapply", contextId = "anrui-fin-FinGinvoiceapply",
name = "anrui_fin", name = "anrui-fin",
path = "v1/finginvoiceapply", path = "v1/finginvoiceapply",
fallback = FinGinvoiceapplyFeignFallback.class) fallback = FinGinvoiceapplyFeignFallback.class)
public interface FinGinvoiceapplyFeign { public interface FinGinvoiceapplyFeign {

4
anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finginvoiceapplyinfo/FinGinvoiceapplyInfoFeign.java
View File

@ -26,8 +26,8 @@ import java.util.List;
*/ */
@Api(tags = "公司开票申请单开票信息") @Api(tags = "公司开票申请单开票信息")
@FeignClient( @FeignClient(
contextId = "anrui_fin-FinGinvoiceapplyInfo", contextId = "anrui-fin-FinGinvoiceapplyInfo",
name = "anrui_fin", name = "anrui-fin",
path = "v1/finginvoiceapplyinfo", path = "v1/finginvoiceapplyinfo",
fallback = FinGinvoiceapplyInfoFeignFallback.class) fallback = FinGinvoiceapplyInfoFeignFallback.class)
public interface FinGinvoiceapplyInfoFeign { public interface FinGinvoiceapplyInfoFeign {

16
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
View File

@ -23,7 +23,7 @@
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__********* *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/ *********************************************************/
package com.yxt.anrui.buscenter.api.busselectedreceivablesdetailed; package com.yxt.anrui.fin.api.finselectedreceivablesdetailed;
import com.yxt.common.core.dto.Dto; import com.yxt.common.core.dto.Dto;
@ -31,10 +31,12 @@ import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import java.math.BigDecimal;
/** /**
* Project: anrui-buscenter(销售相关) <br/> * Project: anrui-fin(销售相关) <br/>
* File: BusCustomerBillDetailedDto.java <br/> * File: FinCustomerBillDetailedDto.java <br/>
* Class: com.yxt.anrui.buscenter.api.buscustomerbilldetailed.BusCustomerBillDetailedDto <br/> * Class: com.yxt.anrui.fin.api.fincustomerbilldetailed.FinCustomerBillDetailedDto <br/>
* Description: 客户账单明细表 数据传输对象. <br/> * Description: 客户账单明细表 数据传输对象. <br/>
* Copyright: Copyright (c) 2011 <br/> * Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/> * Company: https://gitee.com/liuzp315 <br/>
@ -46,14 +48,14 @@ import lombok.Data;
*/ */
@ApiModel(value = "客户账单明细表 数据传输对象", description = "客户账单明细表 数据传输对象") @ApiModel(value = "客户账单明细表 数据传输对象", description = "客户账单明细表 数据传输对象")
@Data @Data
public class AppBusSelectedReceivablesDetailedDto implements Dto { public class AppFinSelectedReceivablesDetailedDto implements Dto {
@ApiModelProperty("应收金额") @ApiModelProperty("应收金额")
private String receivable; private BigDecimal receivable;
@ApiModelProperty("车架号") @ApiModelProperty("车架号")
private String vin; private String vin;
@ApiModelProperty("认款金额") @ApiModelProperty("认款金额")
private String confirmMoney; private BigDecimal confirmMoney;
@ApiModelProperty("合同号") @ApiModelProperty("合同号")
private String contractId; private String contractId;
@ApiModelProperty("应收项目") @ApiModelProperty("应收项目")

12
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
View File

@ -23,7 +23,7 @@
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__********* *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/ *********************************************************/
package com.yxt.anrui.buscenter.api.busselectedreceivablesdetailed; package com.yxt.anrui.fin.api.finselectedreceivablesdetailed;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import com.yxt.common.core.domain.BaseEntity; import com.yxt.common.core.domain.BaseEntity;
@ -34,9 +34,9 @@ import lombok.Data;
import java.math.BigDecimal; import java.math.BigDecimal;
/** /**
* Project: anrui-buscenter(销售相关) <br/> * Project: anrui-fin(销售相关) <br/>
* File: BusSelectedReceivablesDetailed.java <br/> * File: FinSelectedReceivablesDetailed.java <br/>
* Class: com.yxt.anrui.buscenter.api.busselectedreceivablesdetailed.BusSelectedReceivablesDetailed <br/> * Class: com.yxt.anrui.fin.api.finselectedreceivablesdetailed.FinSelectedReceivablesDetailed <br/>
* Description: 已选应收款项明细表. <br/> * Description: 已选应收款项明细表. <br/>
* Copyright: Copyright (c) 2011 <br/> * Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/> * Company: https://gitee.com/liuzp315 <br/>
@ -48,8 +48,8 @@ import java.math.BigDecimal;
*/ */
@ApiModel(value = "已选应收款项明细表", description = "已选应收款项明细表") @ApiModel(value = "已选应收款项明细表", description = "已选应收款项明细表")
@Data @Data
@TableName("bus_selected_receivables_detailed") @TableName("fin_selected_receivables_detailed")
public class BusSelectedReceivablesDetailed extends BaseEntity { public class FinSelectedReceivablesDetailed extends BaseEntity {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
@ApiModelProperty("创建人接口") @ApiModelProperty("创建人接口")

11
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
View File

@ -23,19 +23,18 @@
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__********* *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/ *********************************************************/
package com.yxt.anrui.buscenter.api.busselectedreceivablesdetailed; package com.yxt.anrui.fin.api.finselectedreceivablesdetailed;
import com.yxt.common.core.dto.Dto; import com.yxt.common.core.dto.Dto;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
/** /**
* Project: anrui-buscenter(销售相关) <br/> * Project: anrui-fin(销售相关) <br/>
* File: BusSelectedReceivablesDetailedDto.java <br/> * File: FinSelectedReceivablesDetailedDto.java <br/>
* Class: com.yxt.anrui.buscenter.api.busselectedreceivablesdetailed.BusSelectedReceivablesDetailedDto <br/> * Class: com.yxt.anrui.fin.api.finselectedreceivablesdetailed.FinSelectedReceivablesDetailedDto <br/>
* Description: 已选应收款项明细表 数据传输对象. <br/> * Description: 已选应收款项明细表 数据传输对象. <br/>
* Copyright: Copyright (c) 2011 <br/> * Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/> * Company: https://gitee.com/liuzp315 <br/>
@ -47,7 +46,7 @@ import lombok.Data;
*/ */
@ApiModel(value = "已选应收款项明细表 数据传输对象", description = "已选应收款项明细表 数据传输对象") @ApiModel(value = "已选应收款项明细表 数据传输对象", description = "已选应收款项明细表 数据传输对象")
@Data @Data
public class BusSelectedReceivablesDetailedDto implements Dto { public class FinSelectedReceivablesDetailedDto implements Dto {
@ApiModelProperty("创建人接口") @ApiModelProperty("创建人接口")
private String createByName; // 创建人接口 private String createByName; // 创建人接口

32
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
View File

@ -23,22 +23,20 @@
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__********* *********__佛祖保佑__永无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.Api;
import io.swagger.annotations.ApiOperation; 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.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.PostMapping;
import java.util.List; import org.springframework.web.bind.annotation.RequestBody;
/** /**
* Project: anrui-buscenter(销售相关) <br/> * Project: anrui-fin(销售相关) <br/>
* File: BusSelectedReceivablesDetailedFeign.java <br/> * File: FinSelectedReceivablesDetailedFeign.java <br/>
* Class: com.yxt.anrui.buscenter.api.busselectedreceivablesdetailed.BusSelectedReceivablesDetailedFeign <br/> * Class: com.yxt.anrui.fin.api.finselectedreceivablesdetailed.FinSelectedReceivablesDetailedFeign <br/>
* Description: 已选应收款项明细表. <br/> * Description: 已选应收款项明细表. <br/>
* Copyright: Copyright (c) 2011 <br/> * Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/> * Company: https://gitee.com/liuzp315 <br/>
@ -50,17 +48,17 @@ import java.util.List;
*/ */
@Api(tags = "已选应收款项明细表") @Api(tags = "已选应收款项明细表")
@FeignClient( @FeignClient(
contextId = "anrui-buscenter-BusSelectedReceivablesDetailed", contextId = "anrui-fin-FinSelectedReceivablesDetailed",
name = "anrui-buscenter", name = "anrui-fin",
path = "busselectedreceivablesdetailed", path = "finselectedreceivablesdetailed",
fallback = BusSelectedReceivablesDetailedFeignFallback.class) fallback = FinSelectedReceivablesDetailedFeignFallback.class)
public interface BusSelectedReceivablesDetailedFeign { public interface FinSelectedReceivablesDetailedFeign {
@ApiOperation("新增保存") @ApiOperation("新增保存")
@PostMapping("/save") @PostMapping("/save")
public ResultBean save(@RequestBody BusSelectedReceivablesDetailedDto dto); public ResultBean save(@RequestBody FinSelectedReceivablesDetailedDto dto);
@ApiOperation("修改保存") @ApiOperation("修改保存")
@PostMapping("/update/{sid}") @PostMapping("/update/{sid}")
public ResultBean update(@RequestBody BusSelectedReceivablesDetailedDto dto, @PathVariable("sid") String sid); public ResultBean update(@RequestBody FinSelectedReceivablesDetailedDto dto, @PathVariable("sid") String sid);
} }

22
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
View File

@ -23,19 +23,15 @@
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__********* *********__佛祖保佑__永无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.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import java.util.List;
/** /**
* Project: anrui-buscenter(销售相关) <br/> * Project: anrui-fin(销售相关) <br/>
* File: BusSelectedReceivablesDetailedFeignFallback.java <br/> * File: FinSelectedReceivablesDetailedFeignFallback.java <br/>
* Class: com.yxt.anrui.buscenter.api.busselectedreceivablesdetailed.BusSelectedReceivablesDetailedFeignFallback <br/> * Class: com.yxt.anrui.fin.api.finselectedreceivablesdetailed.FinSelectedReceivablesDetailedFeignFallback <br/>
* Description: 已选应收款项明细表. <br/> * Description: 已选应收款项明细表. <br/>
* Copyright: Copyright (c) 2011 <br/> * Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/> * Company: https://gitee.com/liuzp315 <br/>
@ -46,16 +42,16 @@ import java.util.List;
* @since 1.0 * @since 1.0
*/ */
@Component @Component
public class BusSelectedReceivablesDetailedFeignFallback implements BusSelectedReceivablesDetailedFeign { public class FinSelectedReceivablesDetailedFeignFallback implements FinSelectedReceivablesDetailedFeign {
@Override @Override
public ResultBean save(BusSelectedReceivablesDetailedDto dto){ public ResultBean save(FinSelectedReceivablesDetailedDto dto){
return ResultBean.fireFail().setMsg("接口anrui-buscenter/busselectedreceivablesdetailed/save无法访问"); return ResultBean.fireFail().setMsg("接口anrui-fin/finselectedreceivablesdetailed/save无法访问");
} }
@Override @Override
public ResultBean update(BusSelectedReceivablesDetailedDto dto, String sid){ public ResultBean update(FinSelectedReceivablesDetailedDto dto, String sid){
return ResultBean.fireFail().setMsg("接口anrui-buscenter/busselectedreceivablesdetailed/update无法访问"); return ResultBean.fireFail().setMsg("接口anrui-fin/finselectedreceivablesdetailed/update无法访问");
} }
} }

11
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
View File

@ -23,19 +23,18 @@
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__********* *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/ *********************************************************/
package com.yxt.anrui.buscenter.api.busselectedreceivablesdetailed; package com.yxt.anrui.fin.api.finselectedreceivablesdetailed;
import com.yxt.common.core.query.Query; import com.yxt.common.core.query.Query;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
/** /**
* Project: anrui-buscenter(销售相关) <br/> * Project: anrui-fin(销售相关) <br/>
* File: BusSelectedReceivablesDetailedQuery.java <br/> * File: FinSelectedReceivablesDetailedQuery.java <br/>
* Class: com.yxt.anrui.buscenter.api.busselectedreceivablesdetailed.BusSelectedReceivablesDetailedQuery <br/> * Class: com.yxt.anrui.fin.api.finselectedreceivablesdetailed.FinSelectedReceivablesDetailedQuery <br/>
* Description: 已选应收款项明细表 查询条件. <br/> * Description: 已选应收款项明细表 查询条件. <br/>
* Copyright: Copyright (c) 2011 <br/> * Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/> * Company: https://gitee.com/liuzp315 <br/>
@ -47,7 +46,7 @@ import lombok.Data;
*/ */
@ApiModel(value = "已选应收款项明细表 查询条件", description = "已选应收款项明细表 查询条件") @ApiModel(value = "已选应收款项明细表 查询条件", description = "已选应收款项明细表 查询条件")
@Data @Data
public class BusSelectedReceivablesDetailedQuery implements Query { public class FinSelectedReceivablesDetailedQuery implements Query {
@ApiModelProperty("创建人接口") @ApiModelProperty("创建人接口")

13
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
View File

@ -23,19 +23,18 @@
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__********* *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/ *********************************************************/
package com.yxt.anrui.buscenter.api.busselectedreceivablesdetailed; package com.yxt.anrui.fin.api.finselectedreceivablesdetailed;
import com.yxt.common.core.vo.Vo; import com.yxt.common.core.vo.Vo;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
/** /**
* Project: anrui-buscenter(销售相关) <br/> * Project: anrui-fin(销售相关) <br/>
* File: BusSelectedReceivablesDetailedVo.java <br/> * File: FinSelectedReceivablesDetailedVo.java <br/>
* Class: com.yxt.anrui.buscenter.api.busselectedreceivablesdetailed.BusSelectedReceivablesDetailedVo <br/> * Class: com.yxt.anrui.fin.api.finselectedreceivablesdetailed.FinSelectedReceivablesDetailedVo <br/>
* Description: 已选应收款项明细表 视图数据对象. <br/> * Description: 已选应收款项明细表 视图数据对象. <br/>
* Copyright: Copyright (c) 2011 <br/> * Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/> * Company: https://gitee.com/liuzp315 <br/>
@ -47,8 +46,10 @@ import lombok.Data;
*/ */
@ApiModel(value = "已选应收款项明细表 视图数据对象", description = "已选应收款项明细表 视图数据对象") @ApiModel(value = "已选应收款项明细表 视图数据对象", description = "已选应收款项明细表 视图数据对象")
@Data @Data
public class BusSelectedReceivablesDetailedVo implements Vo { public class FinSelectedReceivablesDetailedVo implements Vo {
@ApiModelProperty("已选应收款项sid")
private String sid; // 已选应收款项sid
@ApiModelProperty("创建人接口") @ApiModelProperty("创建人接口")
private String createByName; // 创建人接口 private String createByName; // 创建人接口

12
anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busuncollectedreceivablesdetailed/BusUncollectedReceivablesDetailed.java → anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailed.java
View File

@ -23,7 +23,7 @@
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__********* *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/ *********************************************************/
package com.yxt.anrui.buscenter.api.busuncollectedreceivablesdetailed; package com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import com.yxt.common.core.domain.BaseEntity; import com.yxt.common.core.domain.BaseEntity;
@ -34,9 +34,9 @@ import lombok.Data;
import java.math.BigDecimal; import java.math.BigDecimal;
/** /**
* Project: anrui-buscenter(销售相关) <br/> * Project: anrui-fin(销售相关) <br/>
* File: BusUncollectedReceivablesDetailed.java <br/> * File: FinUncollectedReceivablesDetailed.java <br/>
* Class: com.yxt.anrui.buscenter.api.busuncollectedreceivablesdetailed.BusUncollectedReceivablesDetailed <br/> * Class: com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.FinUncollectedReceivablesDetailed <br/>
* Description: 应收未收款项明细表. <br/> * Description: 应收未收款项明细表. <br/>
* Copyright: Copyright (c) 2011 <br/> * Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/> * Company: https://gitee.com/liuzp315 <br/>
@ -48,8 +48,8 @@ import java.math.BigDecimal;
*/ */
@ApiModel(value = "应收未收款项明细表", description = "应收未收款项明细表") @ApiModel(value = "应收未收款项明细表", description = "应收未收款项明细表")
@Data @Data
@TableName("bus_uncollected_receivables_detailed") @TableName("fin_uncollected_receivables_detailed")
public class BusUncollectedReceivablesDetailed extends BaseEntity { public class FinUncollectedReceivablesDetailed extends BaseEntity {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;

11
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
View File

@ -23,19 +23,18 @@
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__********* *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/ *********************************************************/
package com.yxt.anrui.buscenter.api.busuncollectedreceivablesdetailed; package com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed;
import com.yxt.common.core.dto.Dto; import com.yxt.common.core.dto.Dto;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
/** /**
* Project: anrui-buscenter(销售相关) <br/> * Project: anrui-fin(销售相关) <br/>
* File: BusUncollectedReceivablesDetailedDto.java <br/> * File: FinUncollectedReceivablesDetailedDto.java <br/>
* Class: com.yxt.anrui.buscenter.api.busuncollectedreceivablesdetailed.BusUncollectedReceivablesDetailedDto <br/> * Class: com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.FinUncollectedReceivablesDetailedDto <br/>
* Description: 应收未收款项明细表 数据传输对象. <br/> * Description: 应收未收款项明细表 数据传输对象. <br/>
* Copyright: Copyright (c) 2011 <br/> * Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/> * Company: https://gitee.com/liuzp315 <br/>
@ -47,7 +46,7 @@ import lombok.Data;
*/ */
@ApiModel(value = "应收未收款项明细表 数据传输对象", description = "应收未收款项明细表 数据传输对象") @ApiModel(value = "应收未收款项明细表 数据传输对象", description = "应收未收款项明细表 数据传输对象")
@Data @Data
public class BusUncollectedReceivablesDetailedDto implements Dto { public class FinUncollectedReceivablesDetailedDto implements Dto {
@ApiModelProperty("应收未收款项sid") @ApiModelProperty("应收未收款项sid")
private String sid; // 应收未收款项sid private String sid; // 应收未收款项sid

33
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
View File

@ -23,22 +23,23 @@
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__********* *********__佛祖保佑__永无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.Api;
import io.swagger.annotations.ApiOperation; 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.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; import java.util.List;
/** /**
* Project: anrui-buscenter(销售相关) <br/> * Project: anrui-fin(销售相关) <br/>
* File: BusUncollectedReceivablesDetailedFeign.java <br/> * File: FinUncollectedReceivablesDetailedFeign.java <br/>
* Class: com.yxt.anrui.buscenter.api.busuncollectedreceivablesdetailed.BusUncollectedReceivablesDetailedFeign <br/> * Class: com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.FinUncollectedReceivablesDetailedFeign <br/>
* Description: 应收未收款项明细表. <br/> * Description: 应收未收款项明细表. <br/>
* Copyright: Copyright (c) 2011 <br/> * Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/> * Company: https://gitee.com/liuzp315 <br/>
@ -50,22 +51,22 @@ import java.util.List;
*/ */
@Api(tags = "应收未收款项明细表") @Api(tags = "应收未收款项明细表")
@FeignClient( @FeignClient(
contextId = "anrui-buscenter-BusUncollectedReceivablesDetailed", contextId = "anrui-fin-FinUncollectedReceivablesDetailed",
name = "anrui-buscenter", name = "anrui-fin",
path = "busuncollectedreceivablesdetailed", path = "finuncollectedreceivablesdetailed",
fallback = BusUncollectedReceivablesDetailedFeignFallback.class) fallback = FinUncollectedReceivablesDetailedFeignFallback.class)
public interface BusUncollectedReceivablesDetailedFeign { public interface FinUncollectedReceivablesDetailedFeign {
@ApiOperation("根据条件查询所有数据列表") @ApiOperation("根据条件查询所有数据列表")
@PostMapping("/listAll") @PostMapping("/listAll")
public ResultBean<List<BusUncollectedReceivablesDetailedVo>> listAll(@RequestBody BusUncollectedReceivablesDetailedQuery query); public ResultBean<List<FinUncollectedReceivablesDetailedVo>> listAll(@RequestBody FinUncollectedReceivablesDetailedQuery query);
@ApiOperation("新增或修改保存") @ApiOperation("新增或修改保存")
@PostMapping("/saveOrUpdate") @PostMapping("/saveOrUpdate")
public ResultBean saveOrUpdate(@RequestBody BusUncollectedReceivablesDetailedDto dto); public ResultBean saveOrUpdate(@RequestBody FinUncollectedReceivablesDetailedDto dto);
@ApiOperation("根据SID获取一条记录") @ApiOperation("根据SID获取一条记录")
@GetMapping("/fetchBySid/{sid}") @GetMapping("/fetchBySid/{sid}")
public ResultBean<BusUncollectedReceivablesDetailedVo> fetchBySid(@PathVariable("sid") String sid); public ResultBean<FinUncollectedReceivablesDetailedVo> fetchBySid(@PathVariable("sid") String sid);
} }

24
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
View File

@ -23,19 +23,17 @@
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__********* *********__佛祖保佑__永无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.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import java.util.List; import java.util.List;
/** /**
* Project: anrui-buscenter(销售相关) <br/> * Project: anrui-fin(销售相关) <br/>
* File: BusUncollectedReceivablesDetailedFeignFallback.java <br/> * File: FinUncollectedReceivablesDetailedFeignFallback.java <br/>
* Class: com.yxt.anrui.buscenter.api.busuncollectedreceivablesdetailed.BusUncollectedReceivablesDetailedFeignFallback <br/> * Class: com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.FinUncollectedReceivablesDetailedFeignFallback <br/>
* Description: 应收未收款项明细表. <br/> * Description: 应收未收款项明细表. <br/>
* Copyright: Copyright (c) 2011 <br/> * Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/> * Company: https://gitee.com/liuzp315 <br/>
@ -46,22 +44,22 @@ import java.util.List;
* @since 1.0 * @since 1.0
*/ */
@Component @Component
public class BusUncollectedReceivablesDetailedFeignFallback implements BusUncollectedReceivablesDetailedFeign { public class FinUncollectedReceivablesDetailedFeignFallback implements FinUncollectedReceivablesDetailedFeign {
@Override @Override
public ResultBean<List<BusUncollectedReceivablesDetailedVo>> listAll(BusUncollectedReceivablesDetailedQuery query){ public ResultBean<List<FinUncollectedReceivablesDetailedVo>> listAll(FinUncollectedReceivablesDetailedQuery query){
ResultBean rb = ResultBean.fireFail(); ResultBean rb = ResultBean.fireFail();
return rb.setMsg("接口anrui-buscenter/busuncollectedreceivablesdetailed/listAll无法访问"); return rb.setMsg("接口anrui-fin/finuncollectedreceivablesdetailed/listAll无法访问");
} }
@Override @Override
public ResultBean saveOrUpdate(BusUncollectedReceivablesDetailedDto dto){ public ResultBean saveOrUpdate(FinUncollectedReceivablesDetailedDto dto){
return ResultBean.fireFail().setMsg("接口anrui-buscenter/busuncollectedreceivablesdetailed/saveOrUpdate无法访问"); return ResultBean.fireFail().setMsg("接口anrui-fin/finuncollectedreceivablesdetailed/saveOrUpdate无法访问");
} }
@Override @Override
public ResultBean<BusUncollectedReceivablesDetailedVo> fetchBySid(String sid){ public ResultBean<FinUncollectedReceivablesDetailedVo> fetchBySid(String sid){
ResultBean rb = ResultBean.fireFail(); ResultBean rb = ResultBean.fireFail();
return rb.setMsg("接口anrui-buscenter/busuncollectedreceivablesdetailed/fetchBySid无法访问"); return rb.setMsg("接口anrui-fin/finuncollectedreceivablesdetailed/fetchBySid无法访问");
} }
} }

11
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
View File

@ -23,19 +23,18 @@
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__********* *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/ *********************************************************/
package com.yxt.anrui.buscenter.api.busuncollectedreceivablesdetailed; package com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed;
import com.yxt.common.core.query.Query; import com.yxt.common.core.query.Query;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
/** /**
* Project: anrui-buscenter(销售相关) <br/> * Project: anrui-fin(销售相关) <br/>
* File: BusUncollectedReceivablesDetailedQuery.java <br/> * File: FinUncollectedReceivablesDetailedQuery.java <br/>
* Class: com.yxt.anrui.buscenter.api.busuncollectedreceivablesdetailed.BusUncollectedReceivablesDetailedQuery <br/> * Class: com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.FinUncollectedReceivablesDetailedQuery <br/>
* Description: 应收未收款项明细表 查询条件. <br/> * Description: 应收未收款项明细表 查询条件. <br/>
* Copyright: Copyright (c) 2011 <br/> * Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/> * Company: https://gitee.com/liuzp315 <br/>
@ -47,7 +46,7 @@ import lombok.Data;
*/ */
@ApiModel(value = "应收未收款项明细表 查询条件", description = "应收未收款项明细表 查询条件") @ApiModel(value = "应收未收款项明细表 查询条件", description = "应收未收款项明细表 查询条件")
@Data @Data
public class BusUncollectedReceivablesDetailedQuery implements Query { public class FinUncollectedReceivablesDetailedQuery implements Query {
@ApiModelProperty("合同编号") @ApiModelProperty("合同编号")
private String contractNo; // 合同编号 private String contractNo; // 合同编号

11
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
View File

@ -23,19 +23,18 @@
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__********* *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/ *********************************************************/
package com.yxt.anrui.buscenter.api.busuncollectedreceivablesdetailed; package com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed;
import com.yxt.common.core.vo.Vo; import com.yxt.common.core.vo.Vo;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
/** /**
* Project: anrui-buscenter(销售相关) <br/> * Project: anrui-fin(销售相关) <br/>
* File: BusUncollectedReceivablesDetailedVo.java <br/> * File: FinUncollectedReceivablesDetailedVo.java <br/>
* Class: com.yxt.anrui.buscenter.api.busuncollectedreceivablesdetailed.BusUncollectedReceivablesDetailedVo <br/> * Class: com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.FinUncollectedReceivablesDetailedVo <br/>
* Description: 应收未收款项明细表 视图数据对象. <br/> * Description: 应收未收款项明细表 视图数据对象. <br/>
* Copyright: Copyright (c) 2011 <br/> * Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/> * Company: https://gitee.com/liuzp315 <br/>
@ -47,7 +46,7 @@ import lombok.Data;
*/ */
@ApiModel(value = "应收未收款项明细表 视图数据对象", description = "应收未收款项明细表 视图数据对象") @ApiModel(value = "应收未收款项明细表 视图数据对象", description = "应收未收款项明细表 视图数据对象")
@Data @Data
public class BusUncollectedReceivablesDetailedVo implements Vo { public class FinUncollectedReceivablesDetailedVo implements Vo {
@ApiModelProperty("应收未收款项sid") @ApiModelProperty("应收未收款项sid")
private String sid; // 应收未收款项sid private String sid; // 应收未收款项sid

36
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
View File

@ -23,25 +23,26 @@
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__********* *********__佛祖保佑__永无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.Wrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; 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.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Constants; import com.baomidou.mybatisplus.core.toolkit.Constants;
import com.yxt.anrui.buscenter.api.buscollectionconfirmation.*; import com.yxt.anrui.fin.api.fincollectionconfirmation.*;
import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.result.ResultBean;
import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select; import org.apache.ibatis.annotations.Select;
import org.apache.ibatis.annotations.Update;
import java.util.List; import java.util.List;
/** /**
* Project: anrui-buscenter(销售相关) <br/> * Project: anrui-fin(销售相关) <br/>
* File: BusCollectionConfirmationMapper.java <br/> * File: FinCollectionConfirmationMapper.java <br/>
* Class: com.yxt.anrui.buscenter.biz.buscollectionconfirmation.BusCollectionConfirmationMapper <br/> * Class: com.yxt.anrui.fin.biz.fincollectionconfirmation.FinCollectionConfirmationMapper <br/>
* Description: 收款确认表. <br/> * Description: 收款确认表. <br/>
* Copyright: Copyright (c) 2011 <br/> * Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/> * Company: https://gitee.com/liuzp315 <br/>
@ -52,17 +53,14 @@ import java.util.List;
* @since 1.0 * @since 1.0
*/ */
@Mapper @Mapper
public interface BusCollectionConfirmationMapper extends BaseMapper<BusCollectionConfirmation> { public interface FinCollectionConfirmationMapper extends BaseMapper<FinCollectionConfirmation> {
//@Update("update bus_collection_confirmation set name=#{msg} where id=#{id}")
//IPage<BusCollectionConfirmationVo> voPage(IPage<BusCollectionConfirmation> page, @Param(Constants.WRAPPER) QueryWrapper<BusCollectionConfirmation> qw);
IPage<BusCollectionConfirmationVo> selectPageVo(IPage<BusCollectionConfirmation> page, @Param(Constants.WRAPPER) Wrapper<BusCollectionConfirmation> qw); IPage<FinCollectionConfirmationVo> selectPageVo(IPage<FinCollectionConfirmation> page, @Param(Constants.WRAPPER) Wrapper<FinCollectionConfirmation> qw);
List<BusCollectionConfirmationVo> selectListAllVo(@Param(Constants.WRAPPER) Wrapper<BusCollectionConfirmation> qw); List<FinCollectionConfirmationVo> selectListAllVo(@Param(Constants.WRAPPER) Wrapper<FinCollectionConfirmation> qw);
@Select("select * from bus_collection_confirmation") @Select("select * from fin_collection_confirmation")
List<BusCollectionConfirmationVo> selectListVo(); List<FinCollectionConfirmationVo> selectListVo();
/** /**
* 手机端—获取款项确认列表 * 手机端—获取款项确认列表
@ -71,7 +69,7 @@ public interface BusCollectionConfirmationMapper extends BaseMapper<BusCollectio
* @param qw * @param qw
* @return * @return
*/ */
IPage<AppBusCollectionConfirmationPageVo> getCollectionConfirmList(IPage<AppBusCollectionConfirmationQuery> page, @Param(Constants.WRAPPER) QueryWrapper<AppBusCollectionConfirmationPageVo> qw); IPage<AppFinCollectionConfirmationPageVo> getCollectionConfirmList(IPage<AppFinCollectionConfirmationQuery> page, @Param(Constants.WRAPPER) QueryWrapper<AppFinCollectionConfirmationPageVo> qw);
/** /**
* 手机端—初始化收款确认申请 * 手机端—初始化收款确认申请
@ -80,5 +78,11 @@ public interface BusCollectionConfirmationMapper extends BaseMapper<BusCollectio
* @param useOrgSid * @param useOrgSid
* @return * @return
*/ */
AppBusCollectionConfirmationInitVo initCollectionConfirm(@Param("collectionBillSid") String collectionBillSid, @Param("useOrgSid") String useOrgSid); AppFinCollectionConfirmationInitVo initCollectionConfirm(@Param("collectionBillSid") String collectionBillSid, @Param("useOrgSid") String useOrgSid);
@Update("update fin_collection_confirmation set auditState = 2 where sid = #{sid}")
void cashierReject(String sid);
@Update("update fin_collection_confirmation set auditState = 3 where sid = #{sid}")
void cashierConfirm(String sid);
} }

18
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
View File

@ -1,23 +1,23 @@
<?xml version="1.0" encoding="UTF-8" ?> <?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.yxt.anrui.buscenter.biz.buscollectionconfirmation.BusCollectionConfirmationMapper"> <mapper namespace="com.yxt.anrui.fin.biz.fincollectionconfirmation.FinCollectionConfirmationMapper">
<!-- <where> ${ew.sqlSegment} </where>--> <!-- <where> ${ew.sqlSegment} </where>-->
<!-- ${ew.customSqlSegment} --> <!-- ${ew.customSqlSegment} -->
<select id="selectPageVo" <select id="selectPageVo"
resultType="com.yxt.anrui.buscenter.api.buscollectionconfirmation.BusCollectionConfirmationVo"> resultType="com.yxt.anrui.fin.api.fincollectionconfirmation.FinCollectionConfirmationVo">
SELECT * FROM bus_collection_confirmation SELECT * FROM fin_collection_confirmation
<where>${ew.sqlSegment}</where> <where>${ew.sqlSegment}</where>
</select> </select>
<select id="selectListAllVo" <select id="selectListAllVo"
resultType="com.yxt.anrui.buscenter.api.buscollectionconfirmation.BusCollectionConfirmationVo"> resultType="com.yxt.anrui.fin.api.fincollectionconfirmation.FinCollectionConfirmationVo">
SELECT * FROM bus_collection_confirmation SELECT * FROM fin_collection_confirmation
<where>${ew.sqlSegment}</where> <where>${ew.sqlSegment}</where>
</select> </select>
<!--手机端—获取款项确认列表--> <!--手机端—获取款项确认列表-->
<select id="getCollectionConfirmList" <select id="getCollectionConfirmList"
resultType="com.yxt.anrui.buscenter.api.buscollectionconfirmation.AppBusCollectionConfirmationPageVo"> resultType="com.yxt.anrui.fin.api.fincollectionconfirmation.AppFinCollectionConfirmationPageVo">
select sid AS collectionBillSid, select sid AS collectionBillSid,
collectionBankNum AS collectionNum, collectionBankNum AS collectionNum,
subscriptionState AS collectionBillState, subscriptionState AS collectionBillState,
@ -28,13 +28,13 @@
collectionMoney, collectionMoney,
remarks, remarks,
balance balance
from bus_collection_confirmation from fin_collection_confirmation
<where> <where>
${ew.sqlSegment} ${ew.sqlSegment}
</where> </where>
</select> </select>
<select id="initCollectionConfirm" <select id="initCollectionConfirm"
resultType="com.yxt.anrui.buscenter.api.buscollectionconfirmation.AppBusCollectionConfirmationInitVo"> resultType="com.yxt.anrui.fin.api.fincollectionconfirmation.AppFinCollectionConfirmationInitVo">
SELECT sid AS collectionBillSid, SELECT sid AS collectionBillSid,
collectionBankNum AS collectionNum, collectionBankNum AS collectionNum,
subscriptionState AS collectionBillState, subscriptionState AS collectionBillState,
@ -45,7 +45,7 @@
collectionMoney, collectionMoney,
remarks, remarks,
balance balance
FROM bus_collection_confirmation FROM fin_collection_confirmation
WHERE sid = #{collectionBillSid} WHERE sid = #{collectionBillSid}
AND useOrgSid = #{useOrgSid} AND useOrgSid = #{useOrgSid}
</select> </select>

79
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
View File

@ -23,12 +23,10 @@
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__********* *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/ *********************************************************/
package com.yxt.anrui.buscenter.biz.buscollectionconfirmation; package com.yxt.anrui.fin.biz.fincollectionconfirmation;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.yxt.anrui.base.api.basevehicle.AppCurrentCarModelByPageListVo; import com.yxt.anrui.fin.api.fincollectionconfirmation.*;
import com.yxt.anrui.base.api.basevehicle.BaseVehicleVo;
import com.yxt.anrui.buscenter.api.buscollectionconfirmation.*;
import com.yxt.common.base.utils.PagerUtil; import com.yxt.common.base.utils.PagerUtil;
import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean; 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.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import java.util.List;
/** /**
* Project: anrui-buscenter(销售相关) <br/> * Project: anrui-fin(销售相关) <br/>
* File: BusCollectionConfirmationFeignFallback.java <br/> * File: FinCollectionConfirmationFeignFallback.java <br/>
* Class: com.yxt.anrui.buscenter.biz.buscollectionconfirmation.BusCollectionConfirmationRest <br/> * Class: com.yxt.anrui.fin.biz.fincollectionconfirmation.FinCollectionConfirmationRest <br/>
* Description: 收款确认表. <br/> * Description: 收款确认表. <br/>
* Copyright: Copyright (c) 2011 <br/> * Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/> * Company: https://gitee.com/liuzp315 <br/>
@ -54,46 +50,51 @@ import java.util.List;
* @since 1.0 * @since 1.0
*/ */
@Api(tags = "收款确认表") @Api(tags = "收款确认表")
@RestController("com.yxt.anrui.buscenter.biz.buscollectionconfirmation.BusCollectionConfirmationRest") @RestController("com.yxt.anrui.fin.biz.fincollectionconfirmation.FinCollectionConfirmationRest")
@RequestMapping("/buscollectionconfirmation") @RequestMapping("/fincollectionconfirmation")
public class BusCollectionConfirmationRest implements BusCollectionConfirmationFeign { public class FinCollectionConfirmationRest implements FinCollectionConfirmationFeign {
@Autowired @Autowired
private BusCollectionConfirmationService busCollectionConfirmationService; private FinCollectionConfirmationService finCollectionConfirmationService;
@Override @Override
@ApiOperation("根据条件分页查询数据的列表") @ApiOperation("根据条件分页查询数据的列表")
@PostMapping("/listPage") @PostMapping("/listPage")
public ResultBean<PagerVo<BusCollectionConfirmationVo>> listPage(@RequestBody PagerQuery<BusCollectionConfirmationQuery> pq) { public ResultBean<PagerVo<FinCollectionConfirmationVo>> listPage(@RequestBody PagerQuery<FinCollectionConfirmationQuery> pq) {
ResultBean rb = ResultBean.fireFail(); ResultBean rb = ResultBean.fireFail();
PagerVo<BusCollectionConfirmationVo> pv = busCollectionConfirmationService.listPageVo(pq); PagerVo<FinCollectionConfirmationVo> pv = finCollectionConfirmationService.listPageVo(pq);
return rb.success().setData(pv); return rb.success().setData(pv);
} }
@Override @Override
@ApiOperation("提交新增保存") @ApiOperation("提交新增保存")
@PostMapping("/save") @PostMapping("/save")
public ResultBean save(@RequestBody BusCollectionConfirmationDto dto) { public ResultBean save(@RequestBody FinCollectionConfirmationDto dto) {
return busCollectionConfirmationService.saveAllDto(dto); return finCollectionConfirmationService.saveAllDto(dto);
} }
@Override @Override
@ApiOperation("根据sid批量删除") @ApiOperation("根据sid批量删除")
@PostMapping("/delBySids") @PostMapping("/delBySids")
public ResultBean delBySids(@RequestBody String[] sids) { public ResultBean delBySids(@RequestBody String[] sids) {
return busCollectionConfirmationService.delAllBySids(sids); return finCollectionConfirmationService.delAllBySids(sids);
} }
@Override @Override
@ApiOperation("根据SID获取一条记录") @ApiOperation("根据SID获取一条记录")
@GetMapping("/fetchBySid/{sid}") @GetMapping("/fetchBySid/{sid}")
public ResultBean<BusCollectionConfirmationDetailsVo> fetchBySid(@PathVariable("sid") String sid) { public ResultBean<FinCollectionConfirmationDetailsVo> fetchBySid(@PathVariable("sid") String sid) {
return busCollectionConfirmationService.fetchByAllSid(sid); return finCollectionConfirmationService.fetchByAllSid(sid);
}
@Override
public ResultBean cashierConfirm(String sid) {
return finCollectionConfirmationService.cashierConfirm(sid);
} }
@Override @Override
public ResultBean cashierConfirm() { public ResultBean cashierReject(String sid) {
return null; return finCollectionConfirmationService.cashierReject(sid);
} }
/** /**
@ -103,11 +104,11 @@ public class BusCollectionConfirmationRest implements BusCollectionConfirmationF
* @return * @return
*/ */
@Override @Override
public ResultBean<PagerVo<AppBusCollectionConfirmationPageVo>> getCollectionConfirmList(PagerQuery<AppBusCollectionConfirmationQuery> pagerQuery) { public ResultBean<PagerVo<AppFinCollectionConfirmationPageVo>> getCollectionConfirmList(PagerQuery<AppFinCollectionConfirmationQuery> pagerQuery) {
PagerVo<AppBusCollectionConfirmationPageVo> page = new PagerVo<>(); PagerVo<AppFinCollectionConfirmationPageVo> page = new PagerVo<>();
IPage<AppBusCollectionConfirmationPageVo> iPage = busCollectionConfirmationService.getCollectionConfirmList(pagerQuery); IPage<AppFinCollectionConfirmationPageVo> iPage = finCollectionConfirmationService.getCollectionConfirmList(pagerQuery);
PagerVo<AppBusCollectionConfirmationPageVo> pagerVo = PagerUtil.pageToVo(iPage, page); PagerVo<AppFinCollectionConfirmationPageVo> pagerVo = PagerUtil.pageToVo(iPage, page);
return new ResultBean<PagerVo<AppBusCollectionConfirmationPageVo>>().success().setData(pagerVo); return new ResultBean<PagerVo<AppFinCollectionConfirmationPageVo>>().success().setData(pagerVo);
} }
/** /**
@ -117,8 +118,8 @@ public class BusCollectionConfirmationRest implements BusCollectionConfirmationF
* @return * @return
*/ */
@Override @Override
public ResultBean addCollectionConfirm(AppBusCollectionConfirmationDto dto) { public ResultBean addCollectionConfirm(AppFinCollectionConfirmationDto dto) {
return busCollectionConfirmationService.addCollectionConfirm(dto); return finCollectionConfirmationService.addCollectionConfirm(dto);
} }
/** /**
@ -129,8 +130,8 @@ public class BusCollectionConfirmationRest implements BusCollectionConfirmationF
* @return * @return
*/ */
@Override @Override
public ResultBean<AppBusCollectionConfirmationInitVo> initCollectionConfirm(String collectionBillSid, String userSid) { public ResultBean<AppFinCollectionConfirmationInitVo> initCollectionConfirm(String collectionBillSid, String userSid) {
return busCollectionConfirmationService.initCollectionConfirm(collectionBillSid, userSid); return finCollectionConfirmationService.initCollectionConfirm(collectionBillSid, userSid);
} }
/** /**
@ -140,8 +141,8 @@ public class BusCollectionConfirmationRest implements BusCollectionConfirmationF
* @return * @return
*/ */
@Override @Override
public ResultBean submitCollectionConfirm(AppBusCollectionConfirmationDto dto) { public ResultBean submitCollectionConfirm(AppFinCollectionConfirmationDto dto) {
return busCollectionConfirmationService.submitCollectionConfirm(dto); return finCollectionConfirmationService.submitCollectionConfirm(dto);
} }
/** /**
@ -152,7 +153,7 @@ public class BusCollectionConfirmationRest implements BusCollectionConfirmationF
*/ */
@Override @Override
public ResultBean deleteCollectionConfirm(String collectionBillSid) { public ResultBean deleteCollectionConfirm(String collectionBillSid) {
return busCollectionConfirmationService.deleteCollectionConfirm(collectionBillSid); return finCollectionConfirmationService.deleteCollectionConfirm(collectionBillSid);
} }
/** /**
@ -162,10 +163,10 @@ public class BusCollectionConfirmationRest implements BusCollectionConfirmationF
* @return * @return
*/ */
@Override @Override
public ResultBean<PagerVo<AppBusSelectedReceivablesPaymentDetailsVo>> getPaymentDetailsList(PagerQuery<AppBusSelectedReceivablesPaymentDetailsQuery> pagerQuery) { public ResultBean<PagerVo<AppFinSelectedReceivablesPaymentDetailsVo>> getPaymentDetailsList(PagerQuery<AppFinSelectedReceivablesPaymentDetailsQuery> pagerQuery) {
PagerVo<AppBusSelectedReceivablesPaymentDetailsVo> page = new PagerVo<>(); PagerVo<AppFinSelectedReceivablesPaymentDetailsVo> page = new PagerVo<>();
IPage<AppBusSelectedReceivablesPaymentDetailsVo> iPage = busCollectionConfirmationService.getPaymentDetailsList(pagerQuery); IPage<AppFinSelectedReceivablesPaymentDetailsVo> iPage = finCollectionConfirmationService.getPaymentDetailsList(pagerQuery);
PagerVo<AppBusSelectedReceivablesPaymentDetailsVo> pagerVo = PagerUtil.pageToVo(iPage, page); PagerVo<AppFinSelectedReceivablesPaymentDetailsVo> pagerVo = PagerUtil.pageToVo(iPage, page);
return new ResultBean<PagerVo<AppBusSelectedReceivablesPaymentDetailsVo>>().success().setData(pagerVo); return new ResultBean<PagerVo<AppFinSelectedReceivablesPaymentDetailsVo>>().success().setData(pagerVo);
} }
} }

510
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java
View File

@ -0,0 +1,510 @@
/*********************************************************
*********************************************************
******************** *******************
************* ************
******* _oo0oo_ *******
*** o8888888o ***
* 88" . "88 *
* (| -_- |) *
* 0\ = /0 *
* ___/`---'\___ *
* .' \\| |// '. *
* / \\||| : |||// \ *
* / _||||| -:- |||||- \ *
* | | \\\ - /// | | *
* | \_| ''\---/'' |_/ | *
* \ .-\__ '-' ___/-. / *
* ___'. .' /--.--\ `. .'___ *
* ."" '< `.___\_<|>_/___.' >' "". *
* | | : `- \`.;`\ _ /`;.`/ - ` : | | *
* \ \ `_. \_ __\ /__ _/ .-` / / *
* =====`-.____`.___ \_____/___.-`___.-'===== *
* `=---=' *
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
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.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;
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 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;
import java.math.BigDecimal;
import java.util.List;
import java.util.Optional;
/**
* Project: anrui-fin(销售相关) <br/>
* File: FinCollectionConfirmationService.java <br/>
* Class: com.yxt.anrui.fin.biz.fincollectionconfirmation.FinCollectionConfirmationService <br/>
* Description: 收款确认表 业务逻辑. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2022-04-12 17:57:01 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Service
public class FinCollectionConfirmationService extends MybatisBaseService<FinCollectionConfirmationMapper, FinCollectionConfirmation> {
@Autowired
private FinSelectedReceivablesDetailedService finSelectedReceivablesDetailedService;
@Autowired
private FinUncollectedReceivablesDetailedService finUncollectedReceivablesDetailedService;
@Autowired
private CommonAppendixFeign commonAppendixFeign;
@Autowired
private FileUploadComponent fileUploadComponent;
@Autowired
private SysUserFeign sysUserFeign;
@Autowired
private SysOrganizationFeign sysOrganizationFeign;
private QueryWrapper<FinCollectionConfirmation> createQueryWrapper(FinCollectionConfirmationQuery query) {
// todo: 这里根据具体业务调整查询条件
// 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
QueryWrapper<FinCollectionConfirmation> qw = new QueryWrapper<>();
qw.eq("useOrgSid", query.getUseOrgSid());
if (StringUtils.isNotBlank(query.getCreateBySid())) {
qw.eq("createBySid", query.getCreateBySid());
}
if (StringUtils.isNotBlank(query.getCollectionDate())) {
qw.eq("collectionDate", query.getCollectionDate());
}
if (StringUtils.isNotBlank(query.getCollectionBank())) {
qw.eq("collectionBank", query.getCollectionBank());
}
if (StringUtils.isNotBlank(query.getCollectionTypeKey())) {
qw.eq("collectionTypeKey", query.getCollectionTypeKey());
}
if (StringUtils.isNotBlank(query.getSubscriptionState())) {
qw.eq("subscriptionState", query.getSubscriptionState());
}
return qw;
}
public PagerVo<FinCollectionConfirmationVo> listPageVo(PagerQuery<FinCollectionConfirmationQuery> pq) {
FinCollectionConfirmationQuery query = pq.getParams();
QueryWrapper<FinCollectionConfirmation> qw = createQueryWrapper(query);
IPage<FinCollectionConfirmation> page = PagerUtil.queryToPage(pq);
IPage<FinCollectionConfirmationVo> pagging = baseMapper.selectPageVo(page, qw);
List<FinCollectionConfirmationVo> records = pagging.getRecords();
for (FinCollectionConfirmationVo record : records) {
String s = "";
BigDecimal subscriptionMoney = null;
String sid = record.getSid();
List<FinSelectedReceivablesDetailedVo> 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")) {
int auditState = 3;
List<FinSelectedReceivablesDetailedVo> finSelectedReceivablesDetailedVos1 = finSelectedReceivablesDetailedService.fetchByAuditState(sid, auditState);
for (FinSelectedReceivablesDetailedVo finSelectedReceivablesDetailedVo : finSelectedReceivablesDetailedVos1) {
BigDecimal subscriptionMoney1 = new BigDecimal(finSelectedReceivablesDetailedVo.getSubscriptionMoney());
subscriptionMoney = subscriptionMoney.add(subscriptionMoney1);
}
BigDecimal collectionMoney = new BigDecimal(record.getCollectionMoney());
if (collectionMoney.compareTo(subscriptionMoney) == 0) {
record.setSubscriptionState(3);
} else {
record.setSubscriptionState(2);
}
}
}
PagerVo<FinCollectionConfirmationVo> p = PagerUtil.pageToVo(pagging, null);
return p;
}
public ResultBean saveAllDto(FinCollectionConfirmationDto dto) {
ResultBean rb = ResultBean.fireFail();
FinCollectionConfirmation finCollectionConfirmation = new FinCollectionConfirmation();
List<FinSelectedReceivablesDetailedDto> finSelectedReceivablesDetailedDtos = dto.getFinSelectedReceivablesDetailedDtos();
CommonAppendixDto commonAppendixDto = new CommonAppendixDto();
List<FinCollectionConfirmationAppendixDto> paymentVoucherAppendixs = dto.getPaymentVoucherAppendixs();
List<FinCollectionConfirmationAppendixDto> remittanceConfirmationAppendixs = dto.getRemittanceConfirmationAppendixs();
String sid1 = finCollectionConfirmation.getSid();
BeanUtil.copyProperties(dto, finCollectionConfirmation);
finCollectionConfirmation.setSid(sid1);
String payFilePath = "";
String remFilePath = "";
for (FinCollectionConfirmationAppendixDto paymentVoucherAppendix : paymentVoucherAppendixs) {
BeanUtil.copyProperties(paymentVoucherAppendix, commonAppendixDto);
payFilePath = commonAppendixDto.getFilePath();
if (payFilePath.indexOf(fileUploadComponent.getUrlPrefix()) > -1) {
payFilePath = payFilePath.replace(fileUploadComponent.getUrlPrefix(), "");
commonAppendixDto.setLinkSid(sid1);
commonAppendixDto.setFilePath(payFilePath);
commonAppendixDto.setCreateBySid(dto.getStaffSid());
commonAppendixDto.setAttachType(CommonAttachTypeEnum.PAYMENT_VOUCHER.getAttachType());
commonAppendixFeign.save(commonAppendixDto);
}
payFilePath += payFilePath + ",";
}
finCollectionConfirmation.setPaymentVoucherUrl(payFilePath.substring(0, payFilePath.length() - 1));
for (FinCollectionConfirmationAppendixDto remittanceConfirmationAppendix : remittanceConfirmationAppendixs) {
BeanUtil.copyProperties(remittanceConfirmationAppendix, commonAppendixDto);
remFilePath = commonAppendixDto.getFilePath();
if (remFilePath.indexOf(fileUploadComponent.getUrlPrefix()) > -1) {
remFilePath = remFilePath.replace(fileUploadComponent.getUrlPrefix(), "");
commonAppendixDto.setLinkSid(sid1);
commonAppendixDto.setFilePath(remFilePath);
commonAppendixDto.setCreateBySid(dto.getStaffSid());
commonAppendixDto.setAttachType(CommonAttachTypeEnum.PAYMENT_VOUCHER.getAttachType());
commonAppendixFeign.save(commonAppendixDto);
}
remFilePath += remFilePath + ",";
}
finCollectionConfirmation.setRemittanceConfirmationUrl(remFilePath.substring(0, remFilePath.length() - 1));
for (FinSelectedReceivablesDetailedDto finSelectedReceivablesDetailedDto : finSelectedReceivablesDetailedDtos) {
FinSelectedReceivablesDetailed finSelectedReceivablesDetailed = new FinSelectedReceivablesDetailed();
BeanUtil.copyProperties(finSelectedReceivablesDetailedDto, finSelectedReceivablesDetailed);
finSelectedReceivablesDetailed.setCollSid(sid1);
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<FinSelectedReceivablesDetailedVo> finSelectedReceivablesDetailedVos = finSelectedReceivablesDetailedService.fetchByCillSid(sid1);
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().setMsg("添加成功");
}
public ResultBean<FinCollectionConfirmationDetailsVo> fetchByAllSid(String sid) {
ResultBean rb = ResultBean.fireFail();
FinCollectionConfirmationDetailsVo finCollectionConfirmationDetailsVo = new FinCollectionConfirmationDetailsVo();
FinCollectionConfirmation finCollectionConfirmation = fetchBySid(sid);
BeanUtil.copyProperties(finCollectionConfirmation, finCollectionConfirmationDetailsVo);
List<FinSelectedReceivablesDetailedVo> 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) {
finSelectedReceivablesDetailedService.deleteByCollSid(sid);
}
return rb.success().setMsg("删除成功");
}
/**
* 手机端—获取款项确认列表
*
* @param pagerQuery
* @
*/
public IPage<AppFinCollectionConfirmationPageVo> getCollectionConfirmList(PagerQuery<AppFinCollectionConfirmationQuery> pagerQuery) {
IPage<AppFinCollectionConfirmationQuery> page = PagerUtil.queryToPage(pagerQuery);
QueryWrapper<AppFinCollectionConfirmationPageVo> qw = appBuildQueryWrapper(pagerQuery.getParams());
IPage<AppFinCollectionConfirmationPageVo> 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<FinSelectedReceivablesDetailedVo> finSelectedReceivablesDetailedVos = finSelectedReceivablesDetailedService.fetchByCillSid(record.getCollectionBillSid());
if (finSelectedReceivablesDetailedVos.size() > 0 || collectionBillState != "1") {
record.setShowDelete(false);
}
}
return collectionConfirmList;
}
/**
* 构造条件
*
* @param pagerQuery 查询条件
* @return
*/
private QueryWrapper<AppFinCollectionConfirmationPageVo> appBuildQueryWrapper(AppFinCollectionConfirmationQuery pagerQuery) {
QueryWrapper<AppFinCollectionConfirmationPageVo> qw = new QueryWrapper<>();
if (pagerQuery != null) {
if (com.yxt.common.base.utils.StringUtils.isNotBlank(pagerQuery.getName())) {//车架号
qw.like("bv.vinNo", pagerQuery.getName());
}
}
return qw;
}
/**
* 手机端—新增款项确认申请单
*
* @param dto
* @return
*/
@Transactional(rollbackFor = Exception.class)
public ResultBean addCollectionConfirm(AppFinCollectionConfirmationDto dto) {
ResultBean rb = ResultBean.fireFail();
String staffSid = sysUserFeign.getUserOrgInfoByUserSid(dto.getUserSid()).getData().getStaffSid();
FinCollectionConfirmation finCollectionConfirmation = new FinCollectionConfirmation();
CommonAppendixDto commonAppendixDto = new CommonAppendixDto();
String sid = finCollectionConfirmation.getSid();
finCollectionConfirmation.setSid(sid);
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());
List<String> payFiles = dto.getPayFiles();
String payFilePath = "";
for (String payFile : payFiles) {
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<FinSelectedReceivablesDetailedVo> 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();
}
/**
* 手机端—初始化收款确认申请
*
* @param collectionBillSid
* @param userSid
* @return
*/
public ResultBean<AppFinCollectionConfirmationInitVo> initCollectionConfirm(String collectionBillSid, String userSid) {
ResultBean<AppFinCollectionConfirmationInitVo> rb = ResultBean.fireFail();
if (StringUtils.isNotBlank(userSid)) {
return rb.fail().setMsg("用户sid不能为空");
}
String useOrgSid = sysOrganizationFeign.getUseOrgByUserSid(userSid).getData().getSid();
AppFinCollectionConfirmationInitVo vo = baseMapper.initCollectionConfirm(collectionBillSid, useOrgSid);
return rb.success().setData(vo);
}
/**
* 手机端—提交款项确认申请
*
* @param dto
* @return
*/
public ResultBean submitCollectionConfirm(AppFinCollectionConfirmationDto dto) {
ResultBean rb = ResultBean.fireFail();
String staffSid = sysUserFeign.getUserOrgInfoByUserSid(dto.getUserSid()).getData().getStaffSid();
List<AppFinSelectedReceivablesDetailedDto> 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<String> 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();
}
/**
* 手机端—删除收款确认单
*
* @param collectionBillSid
* @return
*/
@Transactional(rollbackFor = Exception.class)
public ResultBean deleteCollectionConfirm(String collectionBillSid) {
ResultBean rb = ResultBean.fireFail();
deleteBySid(collectionBillSid);
finSelectedReceivablesDetailedService.deleteByCollSid(collectionBillSid);
return rb.success().setMsg("删除成功");
}
/**
* 手机端—查询可使用款项明细列表
*
* @param pagerQuery
* @return
*/
public IPage<AppFinSelectedReceivablesPaymentDetailsVo> getPaymentDetailsList(PagerQuery<AppFinSelectedReceivablesPaymentDetailsQuery> pagerQuery) {
IPage<AppFinSelectedReceivablesPaymentDetailsQuery> page = PagerUtil.queryToPage(pagerQuery);
QueryWrapper<AppFinSelectedReceivablesPaymentDetailsVo> qw = appPaymentDetailsBuildQueryWrapper(pagerQuery.getParams());
List<String> sidList = pagerQuery.getParams().getSidList();
IPage<AppFinSelectedReceivablesPaymentDetailsVo> collectionConfirmList = finSelectedReceivablesDetailedService.getPaymentDetailsList(sidList, page, qw);
return collectionConfirmList;
}
/**
* 构造条件
*
* @param pagerQuery 查询条件
* @return
*/
private QueryWrapper<AppFinSelectedReceivablesPaymentDetailsVo> appPaymentDetailsBuildQueryWrapper(AppFinSelectedReceivablesPaymentDetailsQuery pagerQuery) {
QueryWrapper<AppFinSelectedReceivablesPaymentDetailsVo> qw = new QueryWrapper<>();
if (pagerQuery != null) {
if (com.yxt.common.base.utils.StringUtils.isNotBlank(pagerQuery.getName())) {//车架号
qw.like("bv.vinNo", pagerQuery.getName());
}
}
return qw;
}
public ResultBean cashierReject(String sid) {
ResultBean rb = ResultBean.fireFail();
baseMapper.cashierReject(sid);
int auditState = 1;
List<FinSelectedReceivablesDetailedVo> 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<FinSelectedReceivablesDetailedVo> finSelectedReceivablesDetailedVos = finSelectedReceivablesDetailedService.fetchByAuditState(sid, auditState);
for (FinSelectedReceivablesDetailedVo finSelectedReceivablesDetailedVo : finSelectedReceivablesDetailedVos) {
String sid1 = finSelectedReceivablesDetailedVo.getSid();
finSelectedReceivablesDetailedService.cashierConfirm(sid1);
}
return rb.success().setMsg("款项确认成功");
}
}

52
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
View File

@ -23,28 +23,25 @@
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__********* *********__佛祖保佑__永无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.Wrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; 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.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Constants; import com.baomidou.mybatisplus.core.toolkit.Constants;
import com.yxt.anrui.buscenter.api.buscollectionconfirmation.AppBusSelectedReceivablesPaymentDetailsQuery; import com.yxt.anrui.fin.api.fincollectionconfirmation.AppFinSelectedReceivablesPaymentDetailsQuery;
import com.yxt.anrui.buscenter.api.buscollectionconfirmation.AppBusSelectedReceivablesPaymentDetailsVo; import com.yxt.anrui.fin.api.fincollectionconfirmation.AppFinSelectedReceivablesPaymentDetailsVo;
import org.apache.ibatis.annotations.Delete; import com.yxt.anrui.fin.api.finselectedreceivablesdetailed.FinSelectedReceivablesDetailed;
import org.apache.ibatis.annotations.Mapper; import com.yxt.anrui.fin.api.finselectedreceivablesdetailed.FinSelectedReceivablesDetailedVo;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.*;
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; import java.util.List;
/** /**
* Project: anrui-buscenter(销售相关) <br/> * Project: anrui-fin(销售相关) <br/>
* File: BusSelectedReceivablesDetailedMapper.java <br/> * File: FinSelectedReceivablesDetailedMapper.java <br/>
* Class: com.yxt.anrui.buscenter.biz.busselectedreceivablesdetailed.BusSelectedReceivablesDetailedMapper <br/> * Class: com.yxt.anrui.fin.biz.finselectedreceivablesdetailed.FinSelectedReceivablesDetailedMapper <br/>
* Description: 已选应收款项明细表. <br/> * Description: 已选应收款项明细表. <br/>
* Copyright: Copyright (c) 2011 <br/> * Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/> * Company: https://gitee.com/liuzp315 <br/>
@ -55,23 +52,23 @@ import java.util.List;
* @since 1.0 * @since 1.0
*/ */
@Mapper @Mapper
public interface BusSelectedReceivablesDetailedMapper extends BaseMapper<BusSelectedReceivablesDetailed> { public interface FinSelectedReceivablesDetailedMapper extends BaseMapper<FinSelectedReceivablesDetailed> {
//@Update("update bus_selected_receivables_detailed set name=#{msg} where id=#{id}") //@Update("update fin_selected_receivables_detailed set name=#{msg} where id=#{id}")
//IPage<BusSelectedReceivablesDetailedVo> voPage(IPage<BusSelectedReceivablesDetailed> page, @Param(Constants.WRAPPER) QueryWrapper<BusSelectedReceivablesDetailed> qw); //IPage<FinSelectedReceivablesDetailedVo> voPage(IPage<FinSelectedReceivablesDetailed> page, @Param(Constants.WRAPPER) QueryWrapper<FinSelectedReceivablesDetailed> qw);
IPage<BusSelectedReceivablesDetailedVo> selectPageVo(IPage<BusSelectedReceivablesDetailed> page, @Param(Constants.WRAPPER) Wrapper<BusSelectedReceivablesDetailed> qw); IPage<FinSelectedReceivablesDetailedVo> selectPageVo(IPage<FinSelectedReceivablesDetailed> page, @Param(Constants.WRAPPER) Wrapper<FinSelectedReceivablesDetailed> qw);
List<BusSelectedReceivablesDetailedVo> selectListAllVo(@Param(Constants.WRAPPER) Wrapper<BusSelectedReceivablesDetailed> qw); List<FinSelectedReceivablesDetailedVo> selectListAllVo(@Param(Constants.WRAPPER) Wrapper<FinSelectedReceivablesDetailed> qw);
@Select("select * from bus_selected_receivables_detailed") @Select("select * from fin_selected_receivables_detailed")
List<BusSelectedReceivablesDetailedVo> selectListVo(); List<FinSelectedReceivablesDetailedVo> 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); void deleteByCollSid(String sid);
@Select("select * from bus_selected_receivables_detailed where collSid = #{sid}") @Select("select * from fin_selected_receivables_detailed where collSid = #{sid}")
List<BusSelectedReceivablesDetailedVo> fetchByCillSid(String sid); List<FinSelectedReceivablesDetailedVo> fetchByCillSid(String sid);
/** /**
@ -81,9 +78,12 @@ public interface BusSelectedReceivablesDetailedMapper extends BaseMapper<BusSele
* @param qw * @param qw
* @return * @return
*/ */
IPage<AppBusSelectedReceivablesPaymentDetailsVo> getPaymentDetailsList(@Param("sidList") List<String> sidList, IPage<AppBusSelectedReceivablesPaymentDetailsQuery> page, @Param(Constants.WRAPPER) QueryWrapper<AppBusSelectedReceivablesPaymentDetailsVo> qw); IPage<AppFinSelectedReceivablesPaymentDetailsVo> getPaymentDetailsList(@Param("sidList") List<String> sidList, IPage<AppFinSelectedReceivablesPaymentDetailsQuery> page, @Param(Constants.WRAPPER) QueryWrapper<AppFinSelectedReceivablesPaymentDetailsVo> qw);
@Select("select * from fin_selected_receivables_detailed where collSid = #{sid} and auditState = #{auditState}")
List<FinSelectedReceivablesDetailedVo> fetchByAuditState(@Param("sid") String sid,@Param("auditState") Integer auditState);
@Select("select * from bus_selected_receivables_detailed where auditState = #{auditState}") @Update("update fin_selected_receivables_detailed set auditState = 3 where sid = #{sid}")
List<BusSelectedReceivablesDetailedVo> fetchByAuditState(int auditState); void cashierConfirm(String sid);
} }

14
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
View File

@ -1,19 +1,19 @@
<?xml version="1.0" encoding="UTF-8" ?> <?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.yxt.anrui.buscenter.biz.busselectedreceivablesdetailed.BusSelectedReceivablesDetailedMapper"> <mapper namespace="com.yxt.anrui.fin.biz.finselectedreceivablesdetailed.FinSelectedReceivablesDetailedMapper">
<!-- <where> ${ew.sqlSegment} </where>--> <!-- <where> ${ew.sqlSegment} </where>-->
<!-- ${ew.customSqlSegment} --> <!-- ${ew.customSqlSegment} -->
<select id="selectPageVo" <select id="selectPageVo"
resultType="com.yxt.anrui.buscenter.api.busselectedreceivablesdetailed.BusSelectedReceivablesDetailedVo"> resultType="com.yxt.anrui.fin.api.finselectedreceivablesdetailed.FinSelectedReceivablesDetailedVo">
SELECT * FROM bus_selected_receivables_detailed SELECT * FROM fin_selected_receivables_detailed
<where> <where>
${ew.sqlSegment} ${ew.sqlSegment}
</where> </where>
</select> </select>
<select id="selectListAllVo" <select id="selectListAllVo"
resultType="com.yxt.anrui.buscenter.api.busselectedreceivablesdetailed.BusSelectedReceivablesDetailedVo"> resultType="com.yxt.anrui.fin.api.finselectedreceivablesdetailed.FinSelectedReceivablesDetailedVo">
SELECT * FROM bus_selected_receivables_detailed SELECT * FROM fin_selected_receivables_detailed
<where> <where>
${ew.sqlSegment} ${ew.sqlSegment}
</where> </where>
@ -21,7 +21,7 @@
<!--手机端—查询可使用款项明细列表--> <!--手机端—查询可使用款项明细列表-->
<select id="getPaymentDetailsList" <select id="getPaymentDetailsList"
resultType="com.yxt.anrui.buscenter.api.buscollectionconfirmation.AppBusSelectedReceivablesPaymentDetailsVo"> resultType="com.yxt.anrui.fin.api.fincollectionconfirmation.AppFinSelectedReceivablesPaymentDetailsVo">
SELECT SELECT
<!--合同编号--> <!--合同编号-->
-- AS contractId, -- AS contractId,
@ -43,7 +43,7 @@
-- subscriptionDate AS confirmDate, -- subscriptionDate AS confirmDate,
<!--认款状态--> <!--认款状态-->
-- AS `state` -- AS `state`
FROM bus_selected_receivables_detailed bsrd WHERE bsrd.sid NOT IN FROM fin_selected_receivables_detailed bsrd WHERE bsrd.sid NOT IN
<foreach collection="sidList" item="sids" index="index" separator="," open="(" close=")"> <foreach collection="sidList" item="sids" index="index" separator="," open="(" close=")">
#{sids} #{sids}
</foreach> </foreach>

35
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
View File

@ -23,27 +23,20 @@
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__********* *********__佛祖保佑__永无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.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*; 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(销售相关) <br/> * Project: anrui-fin(销售相关) <br/>
* File: BusSelectedReceivablesDetailedFeignFallback.java <br/> * File: FinSelectedReceivablesDetailedFeignFallback.java <br/>
* Class: com.yxt.anrui.buscenter.biz.busselectedreceivablesdetailed.BusSelectedReceivablesDetailedRest <br/> * Class: com.yxt.anrui.fin.biz.finselectedreceivablesdetailed.FinSelectedReceivablesDetailedRest <br/>
* Description: 已选应收款项明细表. <br/> * Description: 已选应收款项明细表. <br/>
* Copyright: Copyright (c) 2011 <br/> * Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/> * Company: https://gitee.com/liuzp315 <br/>
@ -54,28 +47,28 @@ import com.yxt.anrui.buscenter.api.busselectedreceivablesdetailed.BusSelectedRec
* @since 1.0 * @since 1.0
*/ */
@Api(tags = "已选应收款项明细表") @Api(tags = "已选应收款项明细表")
@RestController("com.yxt.anrui.buscenter.biz.busselectedreceivablesdetailed.BusSelectedReceivablesDetailedRest") @RestController("com.yxt.anrui.fin.biz.finselectedreceivablesdetailed.FinSelectedReceivablesDetailedRest")
@RequestMapping("/busselectedreceivablesdetailed") @RequestMapping("/finselectedreceivablesdetailed")
public class BusSelectedReceivablesDetailedRest implements BusSelectedReceivablesDetailedFeign { public class FinSelectedReceivablesDetailedRest implements FinSelectedReceivablesDetailedFeign {
@Autowired @Autowired
private BusSelectedReceivablesDetailedService busSelectedReceivablesDetailedService; private FinSelectedReceivablesDetailedService finSelectedReceivablesDetailedService;
@Override @Override
@ApiOperation("新增保存") @ApiOperation("新增保存")
@PostMapping("/save") @PostMapping("/save")
public ResultBean save(@RequestBody BusSelectedReceivablesDetailedDto dto){ public ResultBean save(@RequestBody FinSelectedReceivablesDetailedDto dto){
ResultBean rb = ResultBean.fireFail(); ResultBean rb = ResultBean.fireFail();
busSelectedReceivablesDetailedService.saveOrUpdateDto(dto); finSelectedReceivablesDetailedService.saveOrUpdateDto(dto);
return rb.success(); return rb.success();
} }
@Override @Override
@ApiOperation("修改保存") @ApiOperation("修改保存")
@PostMapping("/update/{sid}") @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(); ResultBean rb = ResultBean.fireFail();
busSelectedReceivablesDetailedService.updateBySid(dto.toMap(),sid); finSelectedReceivablesDetailedService.updateBySid(dto.toMap(),sid);
return rb.success(); return rb.success();
} }
} }

89
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
View File

@ -23,34 +23,30 @@
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__********* *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/ *********************************************************/
package com.yxt.anrui.buscenter.biz.busselectedreceivablesdetailed; package com.yxt.anrui.fin.biz.finselectedreceivablesdetailed;
import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.BeanUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.yxt.anrui.buscenter.api.buscollectionconfirmation.AppBusSelectedReceivablesPaymentDetailsQuery; import com.yxt.anrui.fin.api.fincollectionconfirmation.AppFinSelectedReceivablesPaymentDetailsQuery;
import com.yxt.anrui.buscenter.api.buscollectionconfirmation.AppBusSelectedReceivablesPaymentDetailsVo; import com.yxt.anrui.fin.api.fincollectionconfirmation.AppFinSelectedReceivablesPaymentDetailsVo;
import org.apache.commons.lang3.StringUtils; 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.service.MybatisBaseService;
import com.yxt.common.base.utils.PagerUtil; import com.yxt.common.base.utils.PagerUtil;
import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo; import com.yxt.common.core.vo.PagerVo;
import com.yxt.anrui.buscenter.api.busselectedreceivablesdetailed.BusSelectedReceivablesDetailed; import org.apache.commons.lang3.StringUtils;
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.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import java.util.List; import java.util.List;
/** /**
* Project: anrui-buscenter(销售相关) <br/> * Project: anrui-fin(销售相关) <br/>
* File: BusSelectedReceivablesDetailedService.java <br/> * File: FinSelectedReceivablesDetailedService.java <br/>
* Class: com.yxt.anrui.buscenter.biz.busselectedreceivablesdetailed.BusSelectedReceivablesDetailedService <br/> * Class: com.yxt.anrui.fin.biz.finselectedreceivablesdetailed.FinSelectedReceivablesDetailedService <br/>
* Description: 已选应收款项明细表 业务逻辑. <br/> * Description: 已选应收款项明细表 业务逻辑. <br/>
* Copyright: Copyright (c) 2011 <br/> * Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/> * Company: https://gitee.com/liuzp315 <br/>
@ -61,25 +57,25 @@ import java.util.List;
* @since 1.0 * @since 1.0
*/ */
@Service @Service
public class BusSelectedReceivablesDetailedService extends MybatisBaseService<BusSelectedReceivablesDetailedMapper, BusSelectedReceivablesDetailed> { public class FinSelectedReceivablesDetailedService extends MybatisBaseService<FinSelectedReceivablesDetailedMapper, FinSelectedReceivablesDetailed> {
public PagerVo<BusSelectedReceivablesDetailed> listPage(PagerQuery<BusSelectedReceivablesDetailedQuery> pq) { public PagerVo<FinSelectedReceivablesDetailed> listPage(PagerQuery<FinSelectedReceivablesDetailedQuery> pq) {
BusSelectedReceivablesDetailedQuery query = pq.getParams(); FinSelectedReceivablesDetailedQuery query = pq.getParams();
QueryWrapper<BusSelectedReceivablesDetailed> qw = createQueryWrapper(query); QueryWrapper<FinSelectedReceivablesDetailed> qw = createQueryWrapper(query);
IPage<BusSelectedReceivablesDetailed> page = PagerUtil.queryToPage(pq); IPage<FinSelectedReceivablesDetailed> page = PagerUtil.queryToPage(pq);
IPage<BusSelectedReceivablesDetailed> pagging = baseMapper.selectPage(page, qw); IPage<FinSelectedReceivablesDetailed> pagging = baseMapper.selectPage(page, qw);
PagerVo<BusSelectedReceivablesDetailed> p = PagerUtil.pageToVo(pagging, null); PagerVo<FinSelectedReceivablesDetailed> p = PagerUtil.pageToVo(pagging, null);
return p; return p;
} }
public List<BusSelectedReceivablesDetailed> listAll(BusSelectedReceivablesDetailedQuery query) { public List<FinSelectedReceivablesDetailed> listAll(FinSelectedReceivablesDetailedQuery query) {
QueryWrapper<BusSelectedReceivablesDetailed> qw = createQueryWrapper(query); QueryWrapper<FinSelectedReceivablesDetailed> qw = createQueryWrapper(query);
return baseMapper.selectList(qw); return baseMapper.selectList(qw);
} }
private QueryWrapper<BusSelectedReceivablesDetailed> createQueryWrapper(BusSelectedReceivablesDetailedQuery query) { private QueryWrapper<FinSelectedReceivablesDetailed> createQueryWrapper(FinSelectedReceivablesDetailedQuery query) {
// todo: 这里根据具体业务调整查询条件 // todo: 这里根据具体业务调整查询条件
// 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName())); // 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
QueryWrapper<BusSelectedReceivablesDetailed> qw = new QueryWrapper<>(); QueryWrapper<FinSelectedReceivablesDetailed> qw = new QueryWrapper<>();
if (StringUtils.isNotBlank(query.getCreateByName())) { if (StringUtils.isNotBlank(query.getCreateByName())) {
@ -136,33 +132,33 @@ public class BusSelectedReceivablesDetailedService extends MybatisBaseService<Bu
return qw; return qw;
} }
public PagerVo<BusSelectedReceivablesDetailedVo> listPageVo(PagerQuery<BusSelectedReceivablesDetailedQuery> pq) { public PagerVo<FinSelectedReceivablesDetailedVo> listPageVo(PagerQuery<FinSelectedReceivablesDetailedQuery> pq) {
BusSelectedReceivablesDetailedQuery query = pq.getParams(); FinSelectedReceivablesDetailedQuery query = pq.getParams();
QueryWrapper<BusSelectedReceivablesDetailed> qw = createQueryWrapper(query); QueryWrapper<FinSelectedReceivablesDetailed> qw = createQueryWrapper(query);
IPage<BusSelectedReceivablesDetailed> page = PagerUtil.queryToPage(pq); IPage<FinSelectedReceivablesDetailed> page = PagerUtil.queryToPage(pq);
IPage<BusSelectedReceivablesDetailedVo> pagging = baseMapper.selectPageVo(page, qw); IPage<FinSelectedReceivablesDetailedVo> pagging = baseMapper.selectPageVo(page, qw);
PagerVo<BusSelectedReceivablesDetailedVo> p = PagerUtil.pageToVo(pagging, null); PagerVo<FinSelectedReceivablesDetailedVo> p = PagerUtil.pageToVo(pagging, null);
return p; return p;
} }
public List<BusSelectedReceivablesDetailedVo> listAllVo(BusSelectedReceivablesDetailedQuery query) { public List<FinSelectedReceivablesDetailedVo> listAllVo(FinSelectedReceivablesDetailedQuery query) {
QueryWrapper<BusSelectedReceivablesDetailed> qw = createQueryWrapper(query); QueryWrapper<FinSelectedReceivablesDetailed> qw = createQueryWrapper(query);
return baseMapper.selectListAllVo(qw); return baseMapper.selectListAllVo(qw);
} }
public List<BusSelectedReceivablesDetailedVo> listVo() { public List<FinSelectedReceivablesDetailedVo> listVo() {
return baseMapper.selectListVo(); return baseMapper.selectListVo();
} }
public void saveOrUpdateDto(BusSelectedReceivablesDetailedDto dto) { public void saveOrUpdateDto(FinSelectedReceivablesDetailedDto dto) {
BusSelectedReceivablesDetailed entity = new BusSelectedReceivablesDetailed(); FinSelectedReceivablesDetailed entity = new FinSelectedReceivablesDetailed();
dto.fillEntity(entity); dto.fillEntity(entity);
this.saveOrUpdate(entity); this.saveOrUpdate(entity);
} }
public BusSelectedReceivablesDetailedVo fetchByIdVo(String id) { public FinSelectedReceivablesDetailedVo fetchByIdVo(String id) {
BusSelectedReceivablesDetailed entity = this.fetchById(id); FinSelectedReceivablesDetailed entity = this.fetchById(id);
BusSelectedReceivablesDetailedVo vo = new BusSelectedReceivablesDetailedVo(); FinSelectedReceivablesDetailedVo vo = new FinSelectedReceivablesDetailedVo();
BeanUtil.copyProperties(entity, vo); BeanUtil.copyProperties(entity, vo);
return vo; return vo;
} }
@ -171,7 +167,7 @@ public class BusSelectedReceivablesDetailedService extends MybatisBaseService<Bu
baseMapper.deleteByCollSid(sid); baseMapper.deleteByCollSid(sid);
} }
public List<BusSelectedReceivablesDetailedVo> fetchByCillSid(String sid) { public List<FinSelectedReceivablesDetailedVo> fetchByCillSid(String sid) {
return baseMapper.fetchByCillSid(sid); return baseMapper.fetchByCillSid(sid);
} }
@ -182,12 +178,15 @@ public class BusSelectedReceivablesDetailedService extends MybatisBaseService<Bu
* @param qw * @param qw
* @return * @return
*/ */
public IPage<AppBusSelectedReceivablesPaymentDetailsVo> getPaymentDetailsList(List<String> sidList, IPage<AppBusSelectedReceivablesPaymentDetailsQuery> page, QueryWrapper<AppBusSelectedReceivablesPaymentDetailsVo> qw) { public IPage<AppFinSelectedReceivablesPaymentDetailsVo> getPaymentDetailsList(List<String> sidList, IPage<AppFinSelectedReceivablesPaymentDetailsQuery> page, QueryWrapper<AppFinSelectedReceivablesPaymentDetailsVo> qw) {
return baseMapper.getPaymentDetailsList(sidList, page, qw); return baseMapper.getPaymentDetailsList(sidList, page, qw);
} }
public List<BusSelectedReceivablesDetailedVo> fetchByAuditState() { public List<FinSelectedReceivablesDetailedVo> fetchByAuditState(String sid,Integer auditState) {
int auditState = 3; return baseMapper.fetchByAuditState(sid,auditState);
return baseMapper.fetchByAuditState(auditState); }
public void cashierConfirm(String sid) {
baseMapper.cashierConfirm(sid);
} }
} }

35
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
View File

@ -23,24 +23,26 @@
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__********* *********__佛祖保佑__永无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.conditions.Wrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Constants; 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.Mapper;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select; import org.apache.ibatis.annotations.Select;
import com.yxt.anrui.buscenter.api.busuncollectedreceivablesdetailed.BusUncollectedReceivablesDetailed; import org.apache.ibatis.annotations.Update;
import com.yxt.anrui.buscenter.api.busuncollectedreceivablesdetailed.BusUncollectedReceivablesDetailedVo;
import java.math.BigDecimal;
import java.util.List; import java.util.List;
/** /**
* Project: anrui-buscenter(销售相关) <br/> * Project: anrui-fin(销售相关) <br/>
* File: BusUncollectedReceivablesDetailedMapper.java <br/> * File: FinUncollectedReceivablesDetailedMapper.java <br/>
* Class: com.yxt.anrui.buscenter.biz.busuncollectedreceivablesdetailed.BusUncollectedReceivablesDetailedMapper <br/> * Class: com.yxt.anrui.fin.biz.finuncollectedreceivablesdetailed.FinUncollectedReceivablesDetailedMapper <br/>
* Description: 应收未收款项明细表. <br/> * Description: 应收未收款项明细表. <br/>
* Copyright: Copyright (c) 2011 <br/> * Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/> * Company: https://gitee.com/liuzp315 <br/>
@ -51,17 +53,20 @@ import java.util.List;
* @since 1.0 * @since 1.0
*/ */
@Mapper @Mapper
public interface BusUncollectedReceivablesDetailedMapper extends BaseMapper<BusUncollectedReceivablesDetailed> { public interface FinUncollectedReceivablesDetailedMapper extends BaseMapper<FinUncollectedReceivablesDetailed> {
//@Update("update fin_uncollected_receivables_detailed set name=#{msg} where id=#{id}")
//IPage<FinUncollectedReceivablesDetailedVo> voPage(IPage<FinUncollectedReceivablesDetailed> page, @Param(Constants.WRAPPER) QueryWrapper<FinUncollectedReceivablesDetailed> qw);
//@Update("update bus_uncollected_receivables_detailed set name=#{msg} where id=#{id}") IPage<FinUncollectedReceivablesDetailedVo> selectPageVo(IPage<FinUncollectedReceivablesDetailed> page, @Param(Constants.WRAPPER) Wrapper<FinUncollectedReceivablesDetailed> qw);
//IPage<BusUncollectedReceivablesDetailedVo> voPage(IPage<BusUncollectedReceivablesDetailed> page, @Param(Constants.WRAPPER) QueryWrapper<BusUncollectedReceivablesDetailed> qw);
IPage<BusUncollectedReceivablesDetailedVo> selectPageVo(IPage<BusUncollectedReceivablesDetailed> page, @Param(Constants.WRAPPER) Wrapper<BusUncollectedReceivablesDetailed> qw); List<FinUncollectedReceivablesDetailedVo> selectListAllVo(@Param(Constants.WRAPPER) Wrapper<FinUncollectedReceivablesDetailed> qw);
List<BusUncollectedReceivablesDetailedVo> selectListAllVo(@Param(Constants.WRAPPER) Wrapper<BusUncollectedReceivablesDetailed> qw); @Select("select * from fin_uncollected_receivables_detailed")
List<FinUncollectedReceivablesDetailedVo> selectListVo();
@Select("select * from bus_uncollected_receivables_detailed") FinUncollectedReceivablesDetailedVo fetchByVinAndRecName(@Param("vin") String vin, @Param("receivablesName") String receivablesName);
List<BusUncollectedReceivablesDetailedVo> selectListVo();
BusUncollectedReceivablesDetailedVo 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);
} }

23
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedMapper.xml
View File

@ -0,0 +1,23 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.yxt.anrui.fin.biz.finuncollectedreceivablesdetailed.FinUncollectedReceivablesDetailedMapper">
<!-- <where> ${ew.sqlSegment} </where>-->
<!-- ${ew.customSqlSegment} -->
<select id="selectPageVo" resultType="com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.FinUncollectedReceivablesDetailedVo">
SELECT * FROM fin_uncollected_receivables_detailed <where> ${ew.sqlSegment} </where>
</select>
<select id="selectListAllVo" resultType="com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.FinUncollectedReceivablesDetailedVo">
SELECT * FROM fin_uncollected_receivables_detailed <where> ${ew.sqlSegment} </where>
</select>
<select id="fetchByVinAndRecName"
resultType="com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.FinUncollectedReceivablesDetailedVo">
SELECT
*
FROM
fin_uncollected_receivables_detailed
WHERE VIN = #{vin}
AND receivablesName = #{receivablesName}
</select>
</mapper>

41
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
View File

@ -23,29 +23,24 @@
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__********* *********__佛祖保佑__永无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.anrui.fin.api.finuncollectedreceivablesdetailed.FinUncollectedReceivablesDetailedDto;
import com.yxt.common.core.query.PagerQuery; 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.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import java.util.List; 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(销售相关) <br/> * Project: anrui-fin(销售相关) <br/>
* File: BusUncollectedReceivablesDetailedFeignFallback.java <br/> * File: FinUncollectedReceivablesDetailedFeignFallback.java <br/>
* Class: com.yxt.anrui.buscenter.biz.busuncollectedreceivablesdetailed.BusUncollectedReceivablesDetailedRest <br/> * Class: com.yxt.anrui.fin.biz.finuncollectedreceivablesdetailed.FinUncollectedReceivablesDetailedRest <br/>
* Description: 应收未收款项明细表. <br/> * Description: 应收未收款项明细表. <br/>
* Copyright: Copyright (c) 2011 <br/> * Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/> * Company: https://gitee.com/liuzp315 <br/>
@ -56,35 +51,35 @@ import com.yxt.anrui.buscenter.api.busuncollectedreceivablesdetailed.BusUncollec
* @since 1.0 * @since 1.0
*/ */
@Api(tags = "应收未收款项明细表") @Api(tags = "应收未收款项明细表")
@RestController("com.yxt.anrui.buscenter.biz.busuncollectedreceivablesdetailed.BusUncollectedReceivablesDetailedRest") @RestController("com.yxt.anrui.fin.biz.finuncollectedreceivablesdetailed.FinUncollectedReceivablesDetailedRest")
@RequestMapping("/busuncollectedreceivablesdetailed") @RequestMapping("/finuncollectedreceivablesdetailed")
public class BusUncollectedReceivablesDetailedRest implements BusUncollectedReceivablesDetailedFeign { public class FinUncollectedReceivablesDetailedRest implements FinUncollectedReceivablesDetailedFeign {
@Autowired @Autowired
private BusUncollectedReceivablesDetailedService busUncollectedReceivablesDetailedService; private FinUncollectedReceivablesDetailedService finUncollectedReceivablesDetailedService;
@Override @Override
@ApiOperation("根据条件查询所有数据列表") @ApiOperation("根据条件查询所有数据列表")
@PostMapping("/listAll") @PostMapping("/listAll")
public ResultBean<List<BusUncollectedReceivablesDetailedVo>> listAll(@RequestBody BusUncollectedReceivablesDetailedQuery query){ public ResultBean<List<FinUncollectedReceivablesDetailedVo>> listAll(@RequestBody FinUncollectedReceivablesDetailedQuery query){
ResultBean rb = ResultBean.fireFail(); ResultBean rb = ResultBean.fireFail();
List<BusUncollectedReceivablesDetailedVo> list = busUncollectedReceivablesDetailedService.listAllVo(query); List<FinUncollectedReceivablesDetailedVo> list = finUncollectedReceivablesDetailedService.listAllVo(query);
return rb.success().setData(list); return rb.success().setData(list);
} }
@Override @Override
@ApiOperation("新增或修改保存") @ApiOperation("新增或修改保存")
@PostMapping("/saveOrUpdate") @PostMapping("/saveOrUpdate")
public ResultBean saveOrUpdate(@RequestBody BusUncollectedReceivablesDetailedDto dto){ public ResultBean saveOrUpdate(@RequestBody FinUncollectedReceivablesDetailedDto dto){
return busUncollectedReceivablesDetailedService.saveOrUpdateDto(dto); return finUncollectedReceivablesDetailedService.saveOrUpdateDto(dto);
} }
@Override @Override
@ApiOperation("根据SID获取一条记录") @ApiOperation("根据SID获取一条记录")
@GetMapping("/fetchBySid/{sid}") @GetMapping("/fetchBySid/{sid}")
public ResultBean<BusUncollectedReceivablesDetailedVo> fetchBySid(@PathVariable("sid") String sid){ public ResultBean<FinUncollectedReceivablesDetailedVo> fetchBySid(@PathVariable("sid") String sid){
ResultBean rb = ResultBean.fireFail(); ResultBean rb = ResultBean.fireFail();
BusUncollectedReceivablesDetailedVo vo = new BusUncollectedReceivablesDetailedVo(); FinUncollectedReceivablesDetailedVo vo = new FinUncollectedReceivablesDetailedVo();
return rb.success().setData(vo); return rb.success().setData(vo);
} }
} }

46
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
View File

@ -23,32 +23,26 @@
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__********* *********__佛祖保佑__永无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.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.FinUncollectedReceivablesDetailed;
import org.apache.commons.lang3.StringUtils; 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.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.result.ResultBean;
import com.yxt.common.core.vo.PagerVo; import org.apache.commons.lang3.StringUtils;
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.springframework.beans.BeanUtils; import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import java.math.BigDecimal;
import java.util.List; import java.util.List;
/** /**
* Project: anrui-buscenter(销售相关) <br/> * Project: anrui-fin(销售相关) <br/>
* File: BusUncollectedReceivablesDetailedService.java <br/> * File: FinUncollectedReceivablesDetailedService.java <br/>
* Class: com.yxt.anrui.buscenter.biz.busuncollectedreceivablesdetailed.BusUncollectedReceivablesDetailedService <br/> * Class: com.yxt.anrui.fin.biz.finuncollectedreceivablesdetailed.FinUncollectedReceivablesDetailedService <br/>
* Description: 应收未收款项明细表 业务逻辑. <br/> * Description: 应收未收款项明细表 业务逻辑. <br/>
* Copyright: Copyright (c) 2011 <br/> * Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/> * Company: https://gitee.com/liuzp315 <br/>
@ -59,11 +53,11 @@ import java.util.List;
* @since 1.0 * @since 1.0
*/ */
@Service @Service
public class BusUncollectedReceivablesDetailedService extends MybatisBaseService<BusUncollectedReceivablesDetailedMapper, BusUncollectedReceivablesDetailed> { public class FinUncollectedReceivablesDetailedService extends MybatisBaseService<FinUncollectedReceivablesDetailedMapper, FinUncollectedReceivablesDetailed> {
private QueryWrapper<BusUncollectedReceivablesDetailed> createQueryWrapper(BusUncollectedReceivablesDetailedQuery query) { private QueryWrapper<FinUncollectedReceivablesDetailed> createQueryWrapper(FinUncollectedReceivablesDetailedQuery query) {
// todo: 这里根据具体业务调整查询条件 // todo: 这里根据具体业务调整查询条件
// 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName())); // 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
QueryWrapper<BusUncollectedReceivablesDetailed> qw = new QueryWrapper<>(); QueryWrapper<FinUncollectedReceivablesDetailed> qw = new QueryWrapper<>();
qw.ne("currentReceivableMoney",0); qw.ne("currentReceivableMoney",0);
qw.eq("useOrgSid", query.getUseOrgSid()); qw.eq("useOrgSid", query.getUseOrgSid());
qw.eq("createBySid",query.getCreateBySid()); qw.eq("createBySid",query.getCreateBySid());
@ -79,15 +73,15 @@ public class BusUncollectedReceivablesDetailedService extends MybatisBaseService
return qw; return qw;
} }
public List<BusUncollectedReceivablesDetailedVo> listAllVo(BusUncollectedReceivablesDetailedQuery query) { public List<FinUncollectedReceivablesDetailedVo> listAllVo(FinUncollectedReceivablesDetailedQuery query) {
QueryWrapper<BusUncollectedReceivablesDetailed> qw = createQueryWrapper(query); QueryWrapper<FinUncollectedReceivablesDetailed> qw = createQueryWrapper(query);
return baseMapper.selectListAllVo(qw); return baseMapper.selectListAllVo(qw);
} }
public ResultBean saveOrUpdateDto(BusUncollectedReceivablesDetailedDto dto){ public ResultBean saveOrUpdateDto(FinUncollectedReceivablesDetailedDto dto){
ResultBean rb = ResultBean.fireFail(); ResultBean rb = ResultBean.fireFail();
String sid = dto.getSid(); String sid = dto.getSid();
BusUncollectedReceivablesDetailed entity = new BusUncollectedReceivablesDetailed(); FinUncollectedReceivablesDetailed entity = new FinUncollectedReceivablesDetailed();
if (StringUtils.isBlank(sid)){//新增 if (StringUtils.isBlank(sid)){//新增
BeanUtils.copyProperties(dto,entity); BeanUtils.copyProperties(dto,entity);
save(entity); save(entity);
@ -97,7 +91,11 @@ public class BusUncollectedReceivablesDetailedService extends MybatisBaseService
return rb.success().setMsg("修改成功"); return rb.success().setMsg("修改成功");
} }
public BusUncollectedReceivablesDetailedVo fetchByVinAndRecName(String vin, String receivablesName) { public FinUncollectedReceivablesDetailedVo fetchByVinAndRecName(String vin, String receivablesName) {
return baseMapper.fetchByVinAndRecName(vin,receivablesName); return baseMapper.fetchByVinAndRecName(vin,receivablesName);
} }
public void updateCurRecMoneyBySid(String curRecMoney, String sid) {
baseMapper.updateCurRecMoneyBySid(curRecMoney,sid);
}
} }

6
anrui-terminal/anrui-terminal-api/pom.xml
View File

@ -41,6 +41,12 @@
<version>0.0.1</version> <version>0.0.1</version>
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
<dependency>
<groupId>com.yxt.anrui.fin</groupId>
<artifactId>anrui-fin-api</artifactId>
<version>0.0.1</version>
<scope>compile</scope>
</dependency>
</dependencies> </dependencies>

26
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/AppBusCollectionConfirmationFeign.java → anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/AppFinCollectionConfirmationFeign.java
View File

@ -25,7 +25,7 @@
*********************************************************/ *********************************************************/
package com.yxt.anrui.terminal.api.finance; 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.query.PagerQuery;
import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo; import com.yxt.common.core.vo.PagerVo;
@ -35,9 +35,9 @@ import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
/** /**
* Project: anrui-buscenter(销售相关) <br/> * Project: anrui-fin(销售相关) <br/>
* File: BusCollectionConfirmationFeign.java <br/> * File: FinCollectionConfirmationFeign.java <br/>
* Class: com.yxt.anrui.buscenter.api.buscollectionconfirmation.BusCollectionConfirmationFeign <br/> * Class: com.yxt.anrui.fin.api.fincollectionconfirmation.FinCollectionConfirmationFeign <br/>
* Description: 收款确认表. <br/> * Description: 收款确认表. <br/>
* Copyright: Copyright (c) 2011 <br/> * Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/> * Company: https://gitee.com/liuzp315 <br/>
@ -49,27 +49,27 @@ import org.springframework.web.bind.annotation.*;
*/ */
@Api(tags = "收款确认表") @Api(tags = "收款确认表")
@FeignClient( @FeignClient(
contextId = "anrui-buscenter-BusCollectionConfirmation", contextId = "anrui-fin-FinCollectionConfirmation",
name = "anrui-buscenter", name = "anrui-fin",
path = "v1/collectionConfirm", path = "v1/collectionConfirm",
fallback = AppBusCollectionConfirmationFeignFallback.class) fallback = AppFinCollectionConfirmationFeignFallback.class)
public interface AppBusCollectionConfirmationFeign { public interface AppFinCollectionConfirmationFeign {
@ApiOperation("手机端—获取款项确认列表") @ApiOperation("手机端—获取款项确认列表")
@PostMapping("/getCollectionConfirmList") @PostMapping("/getCollectionConfirmList")
public ResultBean<PagerVo<AppBusCollectionConfirmationPageVo>> getCollectionConfirmList(@RequestBody PagerQuery<AppBusCollectionConfirmationQuery> pagerQuery); public ResultBean<PagerVo<AppFinCollectionConfirmationPageVo>> getCollectionConfirmList(@RequestBody PagerQuery<AppFinCollectionConfirmationQuery> pagerQuery);
@ApiOperation("手机端—新增款项确认申请单") @ApiOperation("手机端—新增款项确认申请单")
@PostMapping("/addCollectionConfirm") @PostMapping("/addCollectionConfirm")
public ResultBean addCollectionConfirm(@RequestBody AppBusCollectionConfirmationDto dto); public ResultBean addCollectionConfirm(@RequestBody AppFinCollectionConfirmationDto dto);
@ApiOperation("手机端—初始化收款确认申请") @ApiOperation("手机端—初始化收款确认申请")
@GetMapping("/initCollectionConfirm/{collectionBillSid}/{userSid}") @GetMapping("/initCollectionConfirm/{collectionBillSid}/{userSid}")
public ResultBean<AppBusCollectionConfirmationInitVo> initCollectionConfirm(@PathVariable("collectionBillSid") String collectionBillSid, @PathVariable("userSid") String userSid); public ResultBean<AppFinCollectionConfirmationInitVo> initCollectionConfirm(@PathVariable("collectionBillSid") String collectionBillSid, @PathVariable("userSid") String userSid);
@ApiOperation("手机端—提交款项确认申请") @ApiOperation("手机端—提交款项确认申请")
@PostMapping("/submitCollectionConfirm") @PostMapping("/submitCollectionConfirm")
public ResultBean submitCollectionConfirm(@RequestBody AppBusCollectionConfirmationDto dto); public ResultBean submitCollectionConfirm(@RequestBody AppFinCollectionConfirmationDto dto);
@ApiOperation("手机端—删除收款确认单") @ApiOperation("手机端—删除收款确认单")
@DeleteMapping("/deleteCollectionConfirm/{collectionBillSid}") @DeleteMapping("/deleteCollectionConfirm/{collectionBillSid}")
@ -77,5 +77,5 @@ public interface AppBusCollectionConfirmationFeign {
@ApiOperation("手机端—查询可使用款项明细列表") @ApiOperation("手机端—查询可使用款项明细列表")
@PostMapping("/getPaymentDetailsList") @PostMapping("/getPaymentDetailsList")
public ResultBean<PagerVo<AppBusSelectedReceivablesPaymentDetailsVo>> getPaymentDetailsList(@RequestBody PagerQuery<AppBusSelectedReceivablesPaymentDetailsQuery> pagerQuery); public ResultBean<PagerVo<AppFinSelectedReceivablesPaymentDetailsVo>> getPaymentDetailsList(@RequestBody PagerQuery<AppFinSelectedReceivablesPaymentDetailsQuery> pagerQuery);
} }

20
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/AppBusCollectionConfirmationFeignFallback.java → anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/AppFinCollectionConfirmationFeignFallback.java
View File

@ -25,16 +25,16 @@
*********************************************************/ *********************************************************/
package com.yxt.anrui.terminal.api.finance; 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.query.PagerQuery;
import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo; import com.yxt.common.core.vo.PagerVo;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
/** /**
* Project: anrui-buscenter(销售相关) <br/> * Project: anrui-fin(销售相关) <br/>
* File: BusCollectionConfirmationFeignFallback.java <br/> * File: FinCollectionConfirmationFeignFallback.java <br/>
* Class: com.yxt.anrui.buscenter.api.buscollectionconfirmation.BusCollectionConfirmationFeignFallback <br/> * Class: com.yxt.anrui.fin.api.fincollectionconfirmation.FinCollectionConfirmationFeignFallback <br/>
* Description: 收款确认表. <br/> * Description: 收款确认表. <br/>
* Copyright: Copyright (c) 2011 <br/> * Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/> * Company: https://gitee.com/liuzp315 <br/>
@ -45,26 +45,26 @@ import org.springframework.stereotype.Component;
* @since 1.0 * @since 1.0
*/ */
@Component @Component
public class AppBusCollectionConfirmationFeignFallback implements AppBusCollectionConfirmationFeign { public class AppFinCollectionConfirmationFeignFallback implements AppFinCollectionConfirmationFeign {
@Override @Override
public ResultBean<PagerVo<AppBusCollectionConfirmationPageVo>> getCollectionConfirmList(PagerQuery<AppBusCollectionConfirmationQuery> pagerQuery) { public ResultBean<PagerVo<AppFinCollectionConfirmationPageVo>> getCollectionConfirmList(PagerQuery<AppFinCollectionConfirmationQuery> pagerQuery) {
return null; return null;
} }
@Override @Override
public ResultBean addCollectionConfirm(AppBusCollectionConfirmationDto dto) { public ResultBean addCollectionConfirm(AppFinCollectionConfirmationDto dto) {
return null; return null;
} }
@Override @Override
public ResultBean<AppBusCollectionConfirmationInitVo> initCollectionConfirm(String collectionBillSid, String userSid) { public ResultBean<AppFinCollectionConfirmationInitVo> initCollectionConfirm(String collectionBillSid, String userSid) {
return null; return null;
} }
@Override @Override
public ResultBean submitCollectionConfirm(AppBusCollectionConfirmationDto dto) { public ResultBean submitCollectionConfirm(AppFinCollectionConfirmationDto dto) {
return null; return null;
} }
@ -74,7 +74,7 @@ public class AppBusCollectionConfirmationFeignFallback implements AppBusCollecti
} }
@Override @Override
public ResultBean<PagerVo<AppBusSelectedReceivablesPaymentDetailsVo>> getPaymentDetailsList(PagerQuery<AppBusSelectedReceivablesPaymentDetailsQuery> pagerQuery) { public ResultBean<PagerVo<AppFinSelectedReceivablesPaymentDetailsVo>> getPaymentDetailsList(PagerQuery<AppFinSelectedReceivablesPaymentDetailsQuery> pagerQuery) {
return null; return null;
} }
} }

40
anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/finance/AppBusCollectionConfirmationRest.java → anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/finance/AppFinCollectionConfirmationRest.java
View File

@ -25,8 +25,8 @@
*********************************************************/ *********************************************************/
package com.yxt.anrui.terminal.biz.finance; package com.yxt.anrui.terminal.biz.finance;
import com.yxt.anrui.buscenter.api.buscollectionconfirmation.*; import com.yxt.anrui.fin.api.fincollectionconfirmation.*;
import com.yxt.anrui.terminal.api.finance.AppBusCollectionConfirmationFeign; import com.yxt.anrui.terminal.api.finance.AppFinCollectionConfirmationFeign;
import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo; import com.yxt.common.core.vo.PagerVo;
@ -35,9 +35,9 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
/** /**
* Project: anrui-buscenter(销售相关) <br/> * Project: anrui-fin(销售相关) <br/>
* File: BusCollectionConfirmationFeignFallback.java <br/> * File: FinCollectionConfirmationFeignFallback.java <br/>
* Class: com.yxt.anrui.buscenter.biz.buscollectionconfirmation.BusCollectionConfirmationRest <br/> * Class: com.yxt.anrui.fin.biz.fincollectionconfirmation.FinCollectionConfirmationRest <br/>
* Description: 收款确认表. <br/> * Description: 收款确认表. <br/>
* Copyright: Copyright (c) 2011 <br/> * Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/> * Company: https://gitee.com/liuzp315 <br/>
@ -48,12 +48,12 @@ import org.springframework.web.bind.annotation.*;
* @since 1.0 * @since 1.0
*/ */
@Api(tags = "收款确认表") @Api(tags = "收款确认表")
@RestController("com.yxt.anrui.buscenter.biz.buscollectionconfirmation.BusCollectionConfirmationRest") @RestController("com.yxt.anrui.fin.biz.fincollectionconfirmation.FinCollectionConfirmationRest")
@RequestMapping("/buscollectionconfirmation") @RequestMapping("/fincollectionconfirmation")
public class AppBusCollectionConfirmationRest implements AppBusCollectionConfirmationFeign { public class AppFinCollectionConfirmationRest implements AppFinCollectionConfirmationFeign {
@Autowired @Autowired
private AppBusCollectionConfirmationService appbusCollectionConfirmationService; private AppFinCollectionConfirmationService appfinCollectionConfirmationService;
/** /**
@ -63,8 +63,8 @@ public class AppBusCollectionConfirmationRest implements AppBusCollectionConfirm
* @return * @return
*/ */
@Override @Override
public ResultBean<PagerVo<AppBusCollectionConfirmationPageVo>> getCollectionConfirmList(PagerQuery<AppBusCollectionConfirmationQuery> pagerQuery) { public ResultBean<PagerVo<AppFinCollectionConfirmationPageVo>> getCollectionConfirmList(PagerQuery<AppFinCollectionConfirmationQuery> pagerQuery) {
return appbusCollectionConfirmationService.getCollectionConfirmList(pagerQuery); return appfinCollectionConfirmationService.getCollectionConfirmList(pagerQuery);
} }
/** /**
@ -74,8 +74,8 @@ public class AppBusCollectionConfirmationRest implements AppBusCollectionConfirm
* @return * @return
*/ */
@Override @Override
public ResultBean addCollectionConfirm(AppBusCollectionConfirmationDto dto) { public ResultBean addCollectionConfirm(AppFinCollectionConfirmationDto dto) {
return appbusCollectionConfirmationService.addCollectionConfirm(dto); return appfinCollectionConfirmationService.addCollectionConfirm(dto);
} }
/** /**
@ -86,8 +86,8 @@ public class AppBusCollectionConfirmationRest implements AppBusCollectionConfirm
* @return * @return
*/ */
@Override @Override
public ResultBean<AppBusCollectionConfirmationInitVo> initCollectionConfirm(String collectionBillSid, String userSid) { public ResultBean<AppFinCollectionConfirmationInitVo> initCollectionConfirm(String collectionBillSid, String userSid) {
return appbusCollectionConfirmationService.initCollectionConfirm(collectionBillSid,userSid); return appfinCollectionConfirmationService.initCollectionConfirm(collectionBillSid,userSid);
} }
/** /**
@ -97,8 +97,8 @@ public class AppBusCollectionConfirmationRest implements AppBusCollectionConfirm
* @return * @return
*/ */
@Override @Override
public ResultBean submitCollectionConfirm(AppBusCollectionConfirmationDto dto) { public ResultBean submitCollectionConfirm(AppFinCollectionConfirmationDto dto) {
return appbusCollectionConfirmationService.submitCollectionConfirm(dto); return appfinCollectionConfirmationService.submitCollectionConfirm(dto);
} }
/** /**
@ -109,7 +109,7 @@ public class AppBusCollectionConfirmationRest implements AppBusCollectionConfirm
*/ */
@Override @Override
public ResultBean deleteCollectionConfirm(String collectionBillSid) { public ResultBean deleteCollectionConfirm(String collectionBillSid) {
return appbusCollectionConfirmationService.deleteCollectionConfirm(collectionBillSid); return appfinCollectionConfirmationService.deleteCollectionConfirm(collectionBillSid);
} }
/** /**
@ -119,7 +119,7 @@ public class AppBusCollectionConfirmationRest implements AppBusCollectionConfirm
* @return * @return
*/ */
@Override @Override
public ResultBean<PagerVo<AppBusSelectedReceivablesPaymentDetailsVo>> getPaymentDetailsList(PagerQuery<AppBusSelectedReceivablesPaymentDetailsQuery> pagerQuery) { public ResultBean<PagerVo<AppFinSelectedReceivablesPaymentDetailsVo>> getPaymentDetailsList(PagerQuery<AppFinSelectedReceivablesPaymentDetailsQuery> pagerQuery) {
return appbusCollectionConfirmationService.getPaymentDetailsList(pagerQuery); return appfinCollectionConfirmationService.getPaymentDetailsList(pagerQuery);
} }
} }

34
anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/finance/AppBusCollectionConfirmationService.java → anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/finance/AppFinCollectionConfirmationService.java
View File

@ -26,7 +26,7 @@
package com.yxt.anrui.terminal.biz.finance; 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.query.PagerQuery;
import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo; import com.yxt.common.core.vo.PagerVo;
@ -35,9 +35,9 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
/** /**
* Project: anrui-buscenter(销售相关) <br/> * Project: anrui-fin(销售相关) <br/>
* File: BusCollectionConfirmationService.java <br/> * File: FinCollectionConfirmationService.java <br/>
* Class: com.yxt.anrui.buscenter.biz.buscollectionconfirmation.BusCollectionConfirmationService <br/> * Class: com.yxt.anrui.fin.biz.fincollectionconfirmation.FinCollectionConfirmationService <br/>
* Description: 收款确认表 业务逻辑. <br/> * Description: 收款确认表 业务逻辑. <br/>
* Copyright: Copyright (c) 2011 <br/> * Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/> * Company: https://gitee.com/liuzp315 <br/>
@ -48,9 +48,9 @@ import org.springframework.stereotype.Service;
* @since 1.0 * @since 1.0
*/ */
@Service @Service
public class AppBusCollectionConfirmationService { public class AppFinCollectionConfirmationService {
@Autowired @Autowired
BusCollectionConfirmationFeign busCollectionConfirmationFeign; FinCollectionConfirmationFeign finCollectionConfirmationFeign;
/** /**
@ -59,8 +59,8 @@ public class AppBusCollectionConfirmationService {
* @param pagerQuery * @param pagerQuery
* @return * @return
*/ */
public ResultBean<PagerVo<AppBusCollectionConfirmationPageVo>> getCollectionConfirmList(PagerQuery<AppBusCollectionConfirmationQuery> pagerQuery) { public ResultBean<PagerVo<AppFinCollectionConfirmationPageVo>> getCollectionConfirmList(PagerQuery<AppFinCollectionConfirmationQuery> pagerQuery) {
return busCollectionConfirmationFeign.getCollectionConfirmList(pagerQuery); return finCollectionConfirmationFeign.getCollectionConfirmList(pagerQuery);
} }
/** /**
@ -69,8 +69,8 @@ public class AppBusCollectionConfirmationService {
* @param dto * @param dto
* @return * @return
*/ */
public ResultBean addCollectionConfirm(AppBusCollectionConfirmationDto dto) { public ResultBean addCollectionConfirm(AppFinCollectionConfirmationDto dto) {
return busCollectionConfirmationFeign.addCollectionConfirm(dto); return finCollectionConfirmationFeign.addCollectionConfirm(dto);
} }
/** /**
@ -80,8 +80,8 @@ public class AppBusCollectionConfirmationService {
* @param userSid * @param userSid
* @return * @return
*/ */
public ResultBean<AppBusCollectionConfirmationInitVo> initCollectionConfirm(String collectionBillSid, String userSid) { public ResultBean<AppFinCollectionConfirmationInitVo> initCollectionConfirm(String collectionBillSid, String userSid) {
return busCollectionConfirmationFeign.initCollectionConfirm(collectionBillSid, userSid); return finCollectionConfirmationFeign.initCollectionConfirm(collectionBillSid, userSid);
} }
/** /**
@ -90,8 +90,8 @@ public class AppBusCollectionConfirmationService {
* @param dto * @param dto
* @return * @return
*/ */
public ResultBean submitCollectionConfirm(AppBusCollectionConfirmationDto dto) { public ResultBean submitCollectionConfirm(AppFinCollectionConfirmationDto dto) {
return busCollectionConfirmationFeign.submitCollectionConfirm(dto); return finCollectionConfirmationFeign.submitCollectionConfirm(dto);
} }
/** /**
@ -102,7 +102,7 @@ public class AppBusCollectionConfirmationService {
* @return * @return
*/ */
public ResultBean deleteCollectionConfirm(String collectionBillSid) { public ResultBean deleteCollectionConfirm(String collectionBillSid) {
return busCollectionConfirmationFeign.deleteCollectionConfirm(collectionBillSid); return finCollectionConfirmationFeign.deleteCollectionConfirm(collectionBillSid);
} }
/** /**
@ -111,7 +111,7 @@ public class AppBusCollectionConfirmationService {
* @param pagerQuery * @param pagerQuery
* @return * @return
*/ */
public ResultBean<PagerVo<AppBusSelectedReceivablesPaymentDetailsVo>> getPaymentDetailsList(PagerQuery<AppBusSelectedReceivablesPaymentDetailsQuery> pagerQuery) { public ResultBean<PagerVo<AppFinSelectedReceivablesPaymentDetailsVo>> getPaymentDetailsList(PagerQuery<AppFinSelectedReceivablesPaymentDetailsQuery> pagerQuery) {
return busCollectionConfirmationFeign.getPaymentDetailsList(pagerQuery); return finCollectionConfirmationFeign.getPaymentDetailsList(pagerQuery);
} }
} }
Write Preview
Loading…
Cancel
Save