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 1 year ago
parent
855017c305 9b0bd9ed4a
commit
cd7c32a75c
61 changed files with 779 additions and 502 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseaccadjapply/BaseAccadjApplyService.java
  2. 4
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseoutsourcingapplication/BaseOutsourcingApplicationService.java
  3. 1
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.xml
  4. 2
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclestate/BaseVehicleStateService.java
  5. 32
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java
  6. 2
      anrui-base/anrui-base-biz/src/main/resources/application-test.yml
  7. 21
      anrui-base/anrui-base-biz/src/main/resources/ftl/dai_existingvehicles.ftl
  8. 21
      anrui-base/anrui-base-biz/src/main/resources/ftl/dai_orderacar.ftl
  9. 21
      anrui-base/anrui-base-biz/src/main/resources/ftl/existingvehicles.ftl
  10. 21
      anrui-base/anrui-base-biz/src/main/resources/ftl/orderacar.ftl
  11. 29
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandoverpreparevehicle/BusHandoverPrepareVehicleMapper.xml
  12. 22
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandoverpreparevehicle/BusHandoverPrepareVehicleService.java
  13. 34
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandoverwait/BusHandoverWaitMapper.xml
  14. 14
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandoverwait/BusHandoverWaitService.java
  15. 183
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java
  16. 2
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordermodel/BusSalesOrderModelService.java
  17. 3
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleMapper.java
  18. 4
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleService.java
  19. 2
      anrui-buscenter/anrui-buscenter-biz/src/main/resources/application-test.yml
  20. 2
      anrui-crm/anrui-crm-biz/src/main/resources/application-test.yml
  21. 2
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/voucher/GeneralVoucher.java
  22. 226
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationService.java
  23. 23
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java
  24. 40
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/FinKingDeeFeignRest.java
  25. 2
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/voucher/VoucherService.java
  26. 2
      anrui-fin/anrui-fin-biz/src/main/resources/application-test.yml
  27. 2
      anrui-flowable/anrui-flowable-biz/src/main/resources/application-test.yml
  28. 2
      anrui-gateway/src/main/resources/application-test.yml
  29. 1
      anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserRest.java
  30. 4
      anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserService.java
  31. 2
      anrui-portal/anrui-portal-biz/src/main/resources/application-test.yml
  32. 2
      anrui-reportcenter/anrui-reportcenter-biz/src/main/resources/application-test.yml
  33. 2
      anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbuckleapply/LoanBuckleHistoryRecord.java
  34. 3
      anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbuckleapplyrecord/LoanBuckleApplyRecord.java
  35. 1
      anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymenthistory/LoanRepaymentHistory.java
  36. 1
      anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymenthistory/RepaymentHistoryVoForBuckle.java
  37. 21
      anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymenthistory/RepaymentHistoryVoForBuckleNew.java
  38. 1
      anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymentplandetails/LoanRepaymentPlanDetails.java
  39. 182
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbuckleapply/LoanBuckleApplyService.java
  40. 6
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbuckleplanhistory/LoanBucklePlanHistoryMapper.java
  41. 4
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbuckleplanhistory/LoanBucklePlanHistoryService.java
  42. 16
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitprep/LoanHomevisitPrepService.java
  43. 3
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymenthistory/LoanRepaymentHistoryMapper.xml
  44. 117
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymenthistory/LoanRepaymentHistoryService.java
  45. 2
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentplandetails/LoanRepaymentPlanDetailsMapper.java
  46. 82
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentplandetails/LoanRepaymentPlanDetailsMapper.xml
  47. 6
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentplandetails/LoanRepaymentPlanDetailsService.java
  48. 2
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentplandetails/ScheduledRepaymentPlanDetailsService.java
  49. 2
      anrui-riskcenter/anrui-riskcenter-biz/src/main/resources/application-test.yml
  50. 10
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinbound/ScmApplyInboundService.java
  51. 2
      anrui-scm/anrui-scm-biz/src/main/resources/application-test.yml
  52. 2
      anrui-terminal/anrui-terminal-biz/src/main/resources/application-test.yml
  53. 12
      yxt-as/src/main/java/com/yxt/anrui/as/biz/asserviceitem/AsServiceItemService.java
  54. 14
      yxt-as/src/main/java/com/yxt/anrui/as/biz/asservicepackage/AsServicePackageService.java
  55. 13
      yxt-as/src/main/java/com/yxt/anrui/as/feign/base/basemanufacturer/BaseManufacturerFeign.java
  56. 8
      yxt-as/src/main/java/com/yxt/anrui/as/feign/base/basemanufacturer/BaseManufacturerFeignFallback.java
  57. 4
      yxt-as/src/main/java/com/yxt/anrui/as/feign/base/basemanufacturer/BaseManufacturerVo.java
  58. 16
      yxt-as/src/main/java/com/yxt/anrui/as/feign/wms/wmsInventory/WmsInventoryFeign.java
  59. 8
      yxt-as/src/main/java/com/yxt/anrui/as/feign/wms/wmsInventory/WmsInventoryFeignFallback.java
  60. 4
      yxt-as/src/main/java/com/yxt/anrui/as/feign/wms/wmsInventory/WmsInventoryPackageQuery.java
  61. 7
      yxt-as/src/main/java/com/yxt/anrui/as/feign/wms/wmsInventory/WmsInventoryPackageVo.java

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

@ -625,7 +625,7 @@ public class BaseAccadjApplyService extends MybatisBaseService<BaseAccadjApplyMa
StkInStock.FInStockEntry sf = new StkInStock.FInStockEntry();
String vinNo = baseInternalPurchaseVehicle.getVinNo();
//单价 目前放的是内销价 应该是厂家结算价 目前没有厂家结算价 需要后期修改为厂家结算价
sf.setFPrice(baseInternalPurchaseVehicle.getCostPrice() + "");
sf.setFPrice(baseInternalPurchaseVehicle.getWitPinMoney() + "");
//车辆类型
BaseVehicle baseVehicleDRCL = baseVehicleService.selVehicleByVinNoAndOrgSid(vinNo, callInOrgSid);
String manufacturerSid = baseVehicleDRCL.getManufacturerSid();

4
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseoutsourcingapplication/BaseOutsourcingApplicationService.java
View File

@ -192,6 +192,10 @@ public class BaseOutsourcingApplicationService extends MybatisBaseService<BaseOu
String sid = dto.getSid();
BigDecimal guidedPrice = dto.getGuidedPrice();
BigDecimal purchasePrice = dto.getPurchasePrice();
Integer num = dto.getNum();
if (num < 1){
return rb.setMsg("台数不能少于1台");
}
if (guidedPrice == null) {
return rb.setMsg("销售指导价不能为空");
}

1
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.xml
View File

@ -1218,6 +1218,7 @@
FROM base_vehicle bv
WHERE vinNo = #{vinNo}
AND isDelete = 0
AND vehicleState != "0004"
</select>
<select id="getPcVinByWarehouseSid" resultType="com.yxt.anrui.base.api.basevehicle.AppScmWarehouseVinVo">

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

@ -36,6 +36,8 @@ public class BaseVehicleStateService extends MybatisBaseService<BaseVehicleState
if (baseVehicleState != null) {
if (BaseVehicleStateEnum.OperateTypeEnum.DDBA_PASS.getTypeKey().equals(operateType)) {
//销售订单办理通过后更新业务阶段为出库开票、小状态为待出库，款项状态为0
baseVehicleState.setSaleTypeKey(dto.getSaleTypeKey());
baseVehicleState.setFinSourceKey(dto.getFinSourceKey());
baseVehicleState.setFinState("0");
baseVehicleState.setCarryVehicleState("0");
baseVehicleState.setCarryInvoiceState("0");

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

@ -806,6 +806,14 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
String ftl = "";
AppOrderPriceInfoVo priceInfo = appOrderDetailsVo.getPriceInfo();
AppOrderModelInfoVo orderModelInfoVo = appOrderDetailsVo.getModelInfo();
ResultBean<CrmCustomerTempVo> crmResultBean = crmCustomerTempFeign.fetchSid(appOrderDetailsVo.getCustomerSid());
if (crmResultBean.getSuccess()) {
CrmCustomerTempVo crmCustomerTempVo = crmResultBean.getData();
String idNo = crmCustomerTempVo.getIDNumber();
map.put("carSaleCustomerName",crmCustomerTempVo.getName());
map.put("carSaleIdNo",idNo);
map.put("carSaleAddr",crmCustomerTempVo.getAddress());
}
//车架号集合
List<String> stringList = new ArrayList<>();
//查询台数
@ -920,6 +928,14 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
String ftl = "";
AppOrderPriceInfoVo priceInfo = appOrderDetailsVo.getPriceInfo();
AppOrderModelInfoVo orderModelInfoVo = appOrderDetailsVo.getModelInfo();
ResultBean<CrmCustomerTempVo> crmResultBean = crmCustomerTempFeign.fetchSid(appOrderDetailsVo.getCustomerSid());
if (crmResultBean.getSuccess()) {
CrmCustomerTempVo crmCustomerTempVo = crmResultBean.getData();
String idNo = crmCustomerTempVo.getIDNumber();
map.put("carSaleCustomerName",crmCustomerTempVo.getName());
map.put("carSaleIdNo",idNo);
map.put("carSaleAddr",crmCustomerTempVo.getAddress());
}
//车架号集合
List<String> stringList = new ArrayList<>();
//查询台数
@ -1608,6 +1624,14 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
String ftl = "";
AppOrderPriceInfoVo priceInfo = appOrderDetailsVo.getPriceInfo();
AppOrderModelInfoVo orderModelInfoVo = appOrderDetailsVo.getModelInfo();
ResultBean<CrmCustomerTempVo> crmResultBean = crmCustomerTempFeign.fetchSid(appOrderDetailsVo.getCustomerSid());
if (crmResultBean.getSuccess()) {
CrmCustomerTempVo crmCustomerTempVo = crmResultBean.getData();
String idNo = crmCustomerTempVo.getIDNumber();
map.put("carSaleCustomerName",crmCustomerTempVo.getName());
map.put("carSaleIdNo",idNo);
map.put("carSaleAddr",crmCustomerTempVo.getAddress());
}
//车架号集合
List<String> stringList = new ArrayList<>();
//查询台数
@ -1701,6 +1725,14 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
String ftl = "";
AppOrderPriceInfoVo priceInfo = appOrderDetailsVo.getPriceInfo();
AppOrderModelInfoVo orderModelInfoVo = appOrderDetailsVo.getModelInfo();
ResultBean<CrmCustomerTempVo> crmResultBean = crmCustomerTempFeign.fetchSid(appOrderDetailsVo.getCustomerSid());
if (crmResultBean.getSuccess()) {
CrmCustomerTempVo crmCustomerTempVo = crmResultBean.getData();
String idNo = crmCustomerTempVo.getIDNumber();
map.put("carSaleCustomerName",crmCustomerTempVo.getName());
map.put("carSaleIdNo",idNo);
map.put("carSaleAddr",crmCustomerTempVo.getAddress());
}
//车架号集合
List<String> stringList = new ArrayList<>();
//查询台数

2
anrui-base/anrui-base-biz/src/main/resources/application-test.yml
View File

@ -17,7 +17,7 @@ spring:
max-idle: 8 #连接池中的最大空闲连接
max-wait: -1 # 连接池最大阻塞等待时间（使用负值表示没有限制）
min-idle: 0 # 连接池中的最小空闲连接
password:
password: 123456
port: 6379
timeout: 0 # 连接超时时间（毫秒）

21
anrui-base/anrui-base-biz/src/main/resources/ftl/dai_existingvehicles.ftl
View File

@ -1151,7 +1151,12 @@
<w:sz-cs w:val="19"/>
<w:u w:val="single"/>
</w:rPr>
<w:t> </w:t>
<#--<w:t> </w:t>-->
<#if carSaleCustomerName??>
<w:t> ${carSaleCustomerName!} </w:t>
<#else>
<w:t> </w:t>
</#if>
</w:r>
<w:r wsp:rsidRPr="00B738F3">
<w:rPr>
@ -1214,7 +1219,12 @@
<w:sz-cs w:val="20"/>
<w:u w:val="single"/>
</w:rPr>
<w:t> </w:t>
<#--<w:t> </w:t>-->
<#if carSaleIdNo??>
<w:t> ${carSaleIdNo!} </w:t>
<#else>
<w:t> </w:t>
</#if>
</w:r>
<w:r wsp:rsidRPr="00B738F3">
<w:rPr>
@ -1278,7 +1288,12 @@
<w:sz-cs w:val="20"/>
<w:u w:val="single"/>
</w:rPr>
<w:t> </w:t>
<#--<w:t> </w:t>-->
<#if carSaleAddr??>
<w:t>${carSaleAddr!} </w:t>
<#else>
<w:t> </w:t>
</#if>
</w:r>
<w:r wsp:rsidRPr="00B738F3">
<w:rPr>

21
anrui-base/anrui-base-biz/src/main/resources/ftl/dai_orderacar.ftl
View File

@ -1084,7 +1084,12 @@
<w:sz-cs w:val="19"/>
<w:u w:val="single"/>
</w:rPr>
<w:t> </w:t>
<#--<w:t> </w:t>-->
<#if carSaleCustomerName??>
<w:t> ${carSaleCustomerName!} </w:t>
<#else>
<w:t> </w:t>
</#if>
</w:r>
<w:r wsp:rsidRPr="0086369C">
<w:rPr>
@ -1153,7 +1158,12 @@
<w:sz-cs w:val="20"/>
<w:u w:val="single"/>
</w:rPr>
<w:t> </w:t>
<#--<w:t> </w:t>-->
<#if carSaleIdNo??>
<w:t> ${carSaleIdNo!} </w:t>
<#else>
<w:t> </w:t>
</#if>
</w:r>
<w:r wsp:rsidRPr="0086369C">
<w:rPr>
@ -1223,7 +1233,12 @@
<w:sz-cs w:val="20"/>
<w:u w:val="single"/>
</w:rPr>
<w:t> </w:t>
<#--<w:t> </w:t>-->
<#if carSaleAddr??>
<w:t>${carSaleAddr!} </w:t>
<#else>
<w:t> </w:t>
</#if>
</w:r>
<w:r wsp:rsidRPr="0086369C">
<w:rPr>

21
anrui-base/anrui-base-biz/src/main/resources/ftl/existingvehicles.ftl
View File

@ -1039,7 +1039,12 @@
<w:sz-cs w:val="19"/>
<w:u w:val="single"/>
</w:rPr>
<w:t> </w:t>
<#-- <w:t> </w:t>-->
<#if carSaleCustomerName??>
<w:t> ${carSaleCustomerName!} </w:t>
<#else>
<w:t> </w:t>
</#if>
</w:r>
<w:r wsp:rsidRPr="000B0934">
<w:rPr>
@ -1102,7 +1107,12 @@
<w:sz-cs w:val="20"/>
<w:u w:val="single"/>
</w:rPr>
<w:t> </w:t>
<#--<w:t> </w:t>-->
<#if carSaleIdNo??>
<w:t> ${carSaleIdNo!} </w:t>
<#else>
<w:t> </w:t>
</#if>
</w:r>
<w:r wsp:rsidRPr="000B0934">
<w:rPr>
@ -1166,7 +1176,12 @@
<w:sz-cs w:val="20"/>
<w:u w:val="single"/>
</w:rPr>
<w:t> </w:t>
<#--<w:t> </w:t>-->
<#if carSaleAddr??>
<w:t>${carSaleAddr!} </w:t>
<#else>
<w:t> </w:t>
</#if>
</w:r>
<w:r wsp:rsidRPr="000B0934">
<w:rPr>

21
anrui-base/anrui-base-biz/src/main/resources/ftl/orderacar.ftl
View File

@ -1166,7 +1166,12 @@
<w:sz-cs w:val="19"/>
<w:u w:val="single"/>
</w:rPr>
<w:t> </w:t>
<#--<w:t> </w:t>-->
<#if carSaleCustomerName??>
<w:t> ${carSaleCustomerName!} </w:t>
<#else>
<w:t> </w:t>
</#if>
</w:r>
<w:r wsp:rsidRPr="0071392F">
<w:rPr>
@ -1229,7 +1234,12 @@
<w:sz-cs w:val="20"/>
<w:u w:val="single"/>
</w:rPr>
<w:t> </w:t>
<#--<w:t> </w:t>-->
<#if carSaleIdNo??>
<w:t> ${carSaleIdNo!} </w:t>
<#else>
<w:t> </w:t>
</#if>
</w:r>
<w:r wsp:rsidRPr="0071392F">
<w:rPr>
@ -1293,7 +1303,12 @@
<w:sz-cs w:val="20"/>
<w:u w:val="single"/>
</w:rPr>
<w:t> </w:t>
<#--<w:t> </w:t>-->
<#if carSaleAddr??>
<w:t>${carSaleAddr!} </w:t>
<#else>
<w:t> </w:t>
</#if>
</w:r>
<w:r wsp:rsidRPr="0071392F">
<w:rPr>

29
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandoverpreparevehicle/BusHandoverPrepareVehicleMapper.xml
View File

@ -16,23 +16,18 @@
</select>
<select id="selByMainSid"
resultType="com.yxt.anrui.buscenter.api.bushandoverpreparevehicle.AppBusHandoverPrepareVehicleInfoVo">
select sid,
mainSid,
vinNo,
vinSid,
<!-- invoicingState as invoicingStateb,
certificateState as certificateStateb,
policyState as policyStateb,
onBoardDataState as onBoardDataStateb,
otherDataState as otherDataStateb,-->
invoicingState ,
certificateState,
policyState,
onBoardDataState,
otherDataState,
remarks
from bus_handover_prepare_vehicle
where mainSid = #{sid}
select bhv.sid,
bhv.mainSid,
bhv.vinNo,
bhv.vinSid,
bhv.invoicingState ,
bhv.certificateState,
bhv.policyState,
bhv.onBoardDataState,
bhv.otherDataState,
bhv.remarks
from bus_handover_prepare_vehicle bhv
where bhv.mainSid = #{sid}
</select>
<select id="selectByApplySid"

22
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandoverpreparevehicle/BusHandoverPrepareVehicleService.java
View File

@ -183,28 +183,6 @@ public class BusHandoverPrepareVehicleService extends MybatisBaseService<BusHand
return list;
}
/* public void saveState(AppStateDateDto dto) {
String sid = dto.getSid();
String key = dto.getKey();
String vin = dto.getVin();
if ("01".equals(key)) {
baseMapper.saveInvoiceState(sid, vin);
}
if ("02".equals(key)) {
baseMapper.saveCertificateState(sid, vin);
}
if ("03".equals(key)) {
baseMapper.savePolicyState(sid, vin);
}
if ("04".equals(key)) {
baseMapper.saveOnBoardState(sid, vin);
}
if ("05".equals(key)) {
baseMapper.saveOtherDataState(sid, vin);
}
}*/
public void deleteByMainSid(String sid) {
baseMapper.deleteByMainSid(sid);
}

34
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandoverwait/BusHandoverWaitMapper.xml
View File

@ -6,7 +6,10 @@
bh.customerName,
bh.payTypeValue,
bh.modelName,
bh.payStateValue
bh.payStateValue,
(select count(*) from bus_handover_wait bw left join anrui_base.base_vehicle bv on bv.sid = bw.vinSid
where bw.contractNo = bh.contractNo
and bw.isDelete = 0 and length(bv.vinNo)>8) as nums
from bus_handover_wait bh
<where>
${ew.sqlSegment}
@ -19,28 +22,31 @@
, '%')
</if>
</where>
group by bh.contractNo
group by bh.contractNo having nums>0
</select>
<select id="selectByNo" resultType="com.yxt.anrui.buscenter.api.bushandoverwait.BusHandoverWaitListVo">
select vinNo, vinSid,sid
from bus_handover_wait
where contractNo = #{contractNo}
and isDelete = 0
select bw.vinNo, bw.vinSid,bw.sid
from bus_handover_wait bw
left join anrui_base.base_vehicle bv on bv.sid = bw.vinSid
where bw.contractNo = #{contractNo}
and bw.isDelete = 0
</select>
<select id="selectListPageVo"
resultType="com.yxt.anrui.buscenter.api.bushandoverwait.BusHandoverWaitListPageVo">
select
sid,
contractNo,
customerName,
payTypeValue,
payStateValue,
vinNo,
modelName
from bus_handover_wait
bw.sid,
bw.contractNo,
bw.customerName,
bw.payTypeValue,
bw.payStateValue,
bw.vinNo,
bw.modelName
from bus_handover_wait bw
left join anrui_base.base_vehicle bv on bv.sid = bw.vinSid
<where>
${ew.sqlSegment}
and length(bv.vinNo)>8
</where>
</select>

14
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandoverwait/BusHandoverWaitService.java
View File

@ -85,13 +85,13 @@ public class BusHandoverWaitService extends MybatisBaseService<BusHandoverWaitMa
// 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
QueryWrapper<BusHandoverWait> qw = new QueryWrapper<>();
if (StringUtils.isNotBlank(query.getContractNo())) {
qw.like("contractNo", query.getContractNo());
qw.like("bw.contractNo", query.getContractNo());
}
if (StringUtils.isNotBlank(query.getVinNo())) {
qw.like("vinNo", query.getVinNo());
qw.like("bw.vinNo", query.getVinNo());
}
if (StringUtils.isNotBlank(query.getCustomerName())) {
qw.like("customerName", query.getCustomerName());
qw.like("bw.customerName", query.getCustomerName());
}
// //查询已提交交车办理车辆
// ResultBean<List<BusHandoverItems>> resultBean = busHandoverItemsService.getItemsList();
@ -103,10 +103,10 @@ public class BusHandoverWaitService extends MybatisBaseService<BusHandoverWaitMa
// qw.notIn("vinSid", vinSidList);
// }
// }
qw.eq("createBySid", query.getUserSid());
qw.eq("useOrgSid", query.getUseOrgSid());
qw.eq("isDelete", 0);
qw.orderByDesc("createTime");
qw.eq("bw.createBySid", query.getUserSid());
qw.eq("bw.useOrgSid", query.getUseOrgSid());
qw.eq("bw.isDelete", 0);
qw.orderByDesc("bw.createTime");
return qw;
}

183
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java
View File

@ -487,7 +487,7 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
/*************************************************主车信息*****************************************************/
BusSalesOrderModelDetailsVo busSalesOrderModelDetailsVo = busSalesOrderModelService.details(entity.getSid());
if (busSalesOrderModelDetailsVo != null) {
String modelSidAndConfigSid = baseMapper.selectByMcSid(busSalesOrderModelDetailsVo.getModelSid(),busSalesOrderModelDetailsVo.getModelConfigSid(),vo.getUseOrgSid());
String modelSidAndConfigSid = baseMapper.selectByMcSid(busSalesOrderModelDetailsVo.getModelSid(), busSalesOrderModelDetailsVo.getModelConfigSid(), vo.getUseOrgSid());
busSalesOrderModelDetailsVo.setModelSidAndConfigSid(modelSidAndConfigSid);
//查询现车车辆
if (BusSalesOrderConstantUtils.TypeEnum.EXISTING_CAR.getCode().equals(entity.getType())) {
@ -1876,6 +1876,8 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
} else {
vo.setMain(true);
}
}else{
vo.setMain(true);
}
}
} else {
@ -2029,26 +2031,27 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
record.setClosingDate("-");
}
record.setShowFinancialBtn(false);
/*LoanSolutions data = loanSolutionsFeign.getOneByOrderSid(record.getSaleOrderSid()).getData();
if (null != data) {
if (StringUtils.isNotBlank(record.getSaleOrderState())) {
if (record.getSaleOrderState().equals("已办结")) {
//查询金融方案
LoanSolutions solutions = loanSolutionsFeign.getOneByOrderSid(record.getSaleOrderSid()).getData();
if (solutions != null) {
String solutionsSid = solutions.getSid();
BusSolutionsChange busSolutionsChange = busSolutionsChangeService.selectBySolutionSid(solutionsSid);
if (null != busSolutionsChange) {
if (busSolutionsChange.getNodeState().equals("终止") || busSolutionsChange.getNodeState().equals("已办结")) {
record.setShowFinancialBtn(true);
}
} else {
record.setShowFinancialBtn(true);
}
}
}
}
}*/
//是否显示金融方案变更按钮
// LoanSolutions data = loanSolutionsFeign.getOneByOrderSid(record.getSaleOrderSid()).getData();
// if (null != data) {
// if (StringUtils.isNotBlank(record.getSaleOrderState())) {
// if (record.getSaleOrderState().equals("已办结")) {
// //查询金融方案
// LoanSolutions solutions = loanSolutionsFeign.getOneByOrderSid(record.getSaleOrderSid()).getData();
// if (solutions != null) {
// String solutionsSid = solutions.getSid();
// BusSolutionsChange busSolutionsChange = busSolutionsChangeService.selectBySolutionSid(solutionsSid);
// if (null != busSolutionsChange) {
// if (busSolutionsChange.getNodeState().equals("终止") || busSolutionsChange.getNodeState().equals("已办结")) {
// record.setShowFinancialBtn(true);
// }
// } else {
// record.setShowFinancialBtn(true);
// }
// }
// }
// }
// }
@ -2068,10 +2071,11 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
}
}*/
List<String> vinSids = busSalesOrderVehicleService.selectBySalesOrderSid(record.getSaleOrderSid());
List<String> vinSids2 = busSalesOrderVehicleService.selectBySalesOrderSid2(record.getSaleOrderSid());
vinSids.removeAll(Collections.singleton(null));
if (vinSids.size() > 0) {
int i = busHandoverService.selectByCount(record.getContractId(), vinSids);
if (record.isShowStopBtn() && i < vinSids.size()) {
if (record.isShowStopBtn() && i < vinSids2.size()) {
record.setShowStopBtn(true);
} else {
record.setShowStopBtn(false);
@ -2246,18 +2250,18 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
if (StringUtils.isBlank(dto.getUserSid())) {
return rb.setMsg("用户sid不能为空");
}
if("1".equals(dto.getPayTypeKey())){
if(StringUtils.isBlank(dto.getAffiliatedOrgSid())){
if ("1".equals(dto.getPayTypeKey())) {
if (StringUtils.isBlank(dto.getAffiliatedOrgSid())) {
return rb.setMsg("开票信息为必选项");
}
}else{
} else {
dto.setAffiliatedOrgNameChoose("");
dto.setAffiliatedOrgSid("");
}
if(StringUtils.isNotBlank(dto.getAffiliatedOrgSid())){
if("02".equals(dto.getBillingTypeKey())){//增值税
if (StringUtils.isNotBlank(dto.getAffiliatedOrgSid())) {
if ("02".equals(dto.getBillingTypeKey())) {//增值税
CrmCustomerTemp crmCustomerTemp = baseMapper.selectCrm(dto.getAffiliatedOrgSid());
if(crmCustomerTemp != null){
if (crmCustomerTemp != null) {
return rb.setMsg("个人不能开具增值税专用发票");
}
}
@ -2290,12 +2294,12 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
busSalesOrder.setAffiliatedCompany(dto.getAffiliatedOrgNameChoose());
busSalesOrder.setAffiliatedCompanySid(dto.getAffiliatedOrgSid());
FinCompanyInvoicing finCompanyInvoicing = baseMapper.selectDis(dto.getAffiliatedOrgSid());
if(finCompanyInvoicing == null){
if (finCompanyInvoicing == null) {
CrmCustomerTemp crmCustomerTemp = baseMapper.selectCrm(dto.getAffiliatedOrgSid());
if(crmCustomerTemp != null){
if (crmCustomerTemp != null) {
busSalesOrder.setAffiliatedCompanyType(1);
}
}else{
} else {
busSalesOrder.setAffiliatedCompanyType(0);
}
}
@ -2376,12 +2380,12 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
busSalesOrder.setAffiliatedCompany(dto.getAffiliatedOrgNameChoose());
busSalesOrder.setAffiliatedCompanySid(dto.getAffiliatedOrgSid());
FinCompanyInvoicing finCompanyInvoicing = baseMapper.selectDis(dto.getAffiliatedOrgSid());
if(finCompanyInvoicing == null){
if (finCompanyInvoicing == null) {
CrmCustomerTemp crmCustomerTemp = baseMapper.selectCrm(dto.getAffiliatedOrgSid());
if(crmCustomerTemp != null){
if (crmCustomerTemp != null) {
busSalesOrder.setAffiliatedCompanyType(1);
}
}else{
} else {
busSalesOrder.setAffiliatedCompanyType(0);
}
}
@ -3294,7 +3298,7 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
return rb.setMsg("此销售类型下金融方案不能为空");
}
}
if(StringUtils.isBlank(busSalesOrder.getFinancePlan())){
if (StringUtils.isBlank(busSalesOrder.getFinancePlan())) {
return rb.setMsg("单据信息中付款方式请选择");
}
return rb.success();
@ -5483,34 +5487,10 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
orderContractQuery.setUserSid(busSalesOrder.getCreateBySid());
if (StringUtils.isBlank(busSalesOrder.getContractNo())) {
saveContract(orderContractQuery);
} else {
updateNo(bv.getBusinessSid(), busSalesOrder.getContractNo());
}
busSalesOrder = fetchBySid(bv.getBusinessSid());
//为三方金融和担保贷款
/* if ("2".equals(busSalesOrder.getFinancePlan()) || "2".equals(busSalesOrder.getPayTypeKey())) {
//根据销售订单sid查询金融方案
ResultBean<SolutionsDetailsVo> solutionsDetailsVoResultBean = loanSolutionsFeign.selectDetailsss(bv.getBusinessSid());
SolutionsDetailsVo solutionsDetailsVo = solutionsDetailsVoResultBean.getData();
if (solutionsDetailsVo != null) {
if (StringUtils.isNotBlank(solutionsDetailsVo.getTypeKey())) {
//推送车款
if ("02".equals(solutionsDetailsVo.getTypeKey())) {
//外部金融
createFin(vo, busSalesOrder, solutionsDetailsVo);
} else {
//自营非担保
createFinTwo(vo, busSalesOrder, solutionsDetailsVo);
}
} else {//担保贷款
createFinTwo(vo, busSalesOrder, solutionsDetailsVo);
}
} else {
//推送车款
createCarFin(vo, busSalesOrder);
}
} else {
//推送车款
createCarFin(vo, busSalesOrder);
}*/
//==============================修改车辆的持久状态组装数据
try {
ThreadFactory namedThreadFactory = new ThreadFactoryBuilder()
@ -5518,6 +5498,7 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
ExecutorService pool = new ThreadPoolExecutor(2, 100,
0L, TimeUnit.MILLISECONDS,
new LinkedBlockingQueue<Runnable>(1024), namedThreadFactory, new ThreadPoolExecutor.AbortPolicy());
BusSalesOrder finalBusSalesOrder2 = busSalesOrder;
Future future1 = pool.submit(() -> {
List<BaseVehicleStateDto> dtoList = new ArrayList<>();
List<BusSalesOrderVehicle> vehicleList = busSalesOrderVehicleService.selectListByOrderSid(bv.getBusinessSid());
@ -5532,6 +5513,33 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
}
baseVehicleStateDto.setSaleOrderSid(v.getSalesOrderSid());
baseVehicleStateDto.setBusSid(v.getSid());
baseVehicleStateDto.setSaleTypeKey(finalBusSalesOrder2.getPayTypeKey());
if ("2".equals(finalBusSalesOrder2.getPayTypeKey())) {//贷款
SolutionsDetailsVo loanSolutions = loanSolutionsFeign.selectDetailss(finalBusSalesOrder2.getSid()).getData();
if (loanSolutions != null) {
if (StringUtils.isBlank(loanSolutions.getTypeKey())) {
baseVehicleStateDto.setFinSourceKey("4");//担保
} else {
baseVehicleStateDto.setFinSourceKey("3");//自营非担保
}
}
} else {
if ("2".equals(finalBusSalesOrder2.getFinancePlan())) {
baseVehicleStateDto.setFinSourceKey(finalBusSalesOrder2.getFinancePlan());
SolutionsDetailsVo loanSolutions = loanSolutionsFeign.selectDetailss(finalBusSalesOrder2.getSid()).getData();
if (loanSolutions != null) {
if (StringUtils.isNotBlank(loanSolutions.getTypeKey())) {
if ("02".equals(loanSolutions.getTypeKey())) {
baseVehicleStateDto.setFinSourceKey("2");//三方金融
} else {
baseVehicleStateDto.setFinSourceKey("3");//自营非担保
}
}
}
} else {
baseVehicleStateDto.setFinSourceKey(finalBusSalesOrder2.getFinancePlan());
}
}
dtoList.add(baseVehicleStateDto);
});
ResultBean busVehicleStateResultBean = baseVehicleStateFeign.saveOrUpdate(dtoList);
@ -5635,6 +5643,45 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
}
public void updateNo(String sid, String contractNo) {
BusSalesOrder busSalesOrder = fetchBySid(sid);
ResultBean<AppOrderDetailsVo> resultBean = getSaleOrderDetails(sid);
AppOrderDetailsVo appOrderDetailsVo = resultBean.getData();
//查询销售订单的车型信息
AppOrderModelInfoVo appOrderModelInfoVo = appOrderDetailsVo.getModelInfo();
AppOrderPriceInfoVo priceInfo = appOrderDetailsVo.getPriceInfo();
AppOrderDepositInfoVo depositInfo = appOrderDetailsVo.getDepositInfo();
//添加推送至款项确认的应收未收明细中
List<VinListsVo> vinList = appOrderModelInfoVo.getVinListsVos();
//更新销售订单的临时号
if ("2".equals(appOrderDetailsVo.getPayTypeKey())) {//贷款
for (int i = 0; i < vinList.size(); i++) {
VinListsVo vinListsVo = vinList.get(i);
//销售订单中车辆表的sid
String salesOrderVinSid = vinList.get(i).getSid();
String temporaryNum = String.format("%02d", i + 1);
String temporaryNo = contractNo + temporaryNum;
String temporaryName = "";
if (vinListsVo.getVinNo() != null) {
temporaryName = appOrderDetailsVo.getName() + vinListsVo.getVinNo();
} else {
temporaryName = appOrderDetailsVo.getName() + temporaryNo;
}
//更新临时号
ResultBean busSalesOrderResultBean = busSalesOrderVehicleService.updateTemporaryNo(salesOrderVinSid, temporaryNo, temporaryName);
}
} else {
for (int i = 0; i < vinList.size(); i++) {
//销售订单中车辆表的sid
String salesOrderVinSid = vinList.get(i).getSid();
String temporaryNum = String.format("%02d", i + 1);
//更新临时号
ResultBean busSalesOrderResultBean = busSalesOrderVehicleService.updateTemporaryNo(salesOrderVinSid, temporaryNum, "");
}
}
}
/**
* 外部金融推送车款（去掉厂家贴息）
*
@ -6661,6 +6708,8 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
orderContractQuery.setUserSid(busSalesOrder.getCreateBySid());
if (StringUtils.isBlank(busSalesOrder.getContractNo())) {
saveContract(orderContractQuery);
} else {
updateNo(bv.getBusinessSid(), busSalesOrder.getContractNo());
}
}
} else {
@ -7126,10 +7175,10 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
ResultBean rb = ResultBean.fireFail();
BusSalesOrderIsDTKPJVo busSalesOrderIsDTKPJVo = new BusSalesOrderIsDTKPJVo();
String kpj = baseMapper.selKpj(contractNo);
if (StringUtils.isNotBlank(kpj)){
if (StringUtils.isNotBlank(kpj)) {
busSalesOrderIsDTKPJVo.setIsEdit(true);
busSalesOrderIsDTKPJVo.setOneBillMoney(kpj);
}else {
} else {
busSalesOrderIsDTKPJVo.setIsEdit(false);
busSalesOrderIsDTKPJVo.setOneBillMoney("");
}
@ -7168,8 +7217,8 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
newSalesOrder.setMobile(customerMobile);
ResultBean<CrmCustomerTempVo> crmCustomerTempVoResultBean = crmCustomerTempFeign.fetchSid(customerSid);
if (crmCustomerTempVoResultBean.getData() != null) {
newSalesOrder.setCustomerClass(crmCustomerTempVoResultBean.getData().getCustomerClass());
newSalesOrder.setCustomerClassKey(crmCustomerTempVoResultBean.getData().getCustomerClassKey());
newSalesOrder.setCustomerClass(crmCustomerTempVoResultBean.getData().getCustomerType());
newSalesOrder.setCustomerClassKey(crmCustomerTempVoResultBean.getData().getCustomerTypeKey());
}
}
saleOrderSave = this.save(newSalesOrder);
@ -7721,7 +7770,7 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
ResultBean rb = ResultBean.fireFail();
BusSalesOrderBorrower busSalesOrderBorrower = busSalesOrderBorrowerService.fetchBySid(sid);
//删除销售订单车辆表中的贷款人的名称
List<BusSalesOrderVehicle> busSalesOrderVehicleList = busSalesOrderVehicleService.selectByBorrowSid2(sid,busSalesOrderBorrower.getSalesOrderSid());
List<BusSalesOrderVehicle> busSalesOrderVehicleList = busSalesOrderVehicleService.selectByBorrowSid2(sid, busSalesOrderBorrower.getSalesOrderSid());
busSalesOrderVehicleList.removeAll(Collections.singleton(null));
if (!busSalesOrderVehicleList.isEmpty()) {
for (int i = 0; i < busSalesOrderVehicleList.size(); i++) {
@ -7776,7 +7825,7 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
//-------家访准备补充推送createBySid---------
homeVisitDto.setCreateBySid(busSalesOrder.getCreateBySid());
loanHomevisitPrepFeign.saveHomeVisit(homeVisitDto);
}else{
} else {
busSalesOrderBorrowerService.updateById(busSalesOrderBorrower);
}
}

2
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordermodel/BusSalesOrderModelService.java
View File

@ -692,7 +692,7 @@ public class BusSalesOrderModelService extends MybatisBaseService<BusSalesOrderM
}
List<BusSalesVehicleOrder> orderList = busSalesVehicleOrderService.selectByOrderSid(salesOrderSid);
orderList.removeAll(Collections.singleton(null));
if (vinList.size() > 0) {
if (orderList.size() > 0) {
List<String> topSidLists = orderList.stream().map(v -> v.getTopSid()).filter(StringUtils::isNotBlank).collect(Collectors.toList());
if (topSidLists.size() > 0) {
//清除上装信息

3
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleMapper.java
View File

@ -178,4 +178,7 @@ public interface BusSalesOrderVehicleMapper extends BaseMapper<BusSalesOrderVehi
@Update("update bus_sales_order_vehicle set reaRepaymentName = #{reaRepaymentName},reaRepaymentPhone = #{reaRepaymentPhone} where sid = #{saleVehSid}")
void maintReaRepayment(@Param("saleVehSid") String saleVehSid,@Param("reaRepaymentName") String reaRepaymentName,@Param("reaRepaymentPhone") String reaRepaymentPhone);
@Select("select sid from bus_sales_order_vehicle where salesOrderSid = #{saleOrderSid}")
List<String> selectBySalesOrderSid2(String saleOrderSid);
}

4
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleService.java
View File

@ -659,4 +659,8 @@ public class BusSalesOrderVehicleService extends MybatisBaseService<BusSalesOrde
int i = baseMapper.updateById(busSalesOrderVehicle);
return rb.success();
}
public List<String> selectBySalesOrderSid2(String saleOrderSid) {
return baseMapper.selectBySalesOrderSid2(saleOrderSid);
}
}

2
anrui-buscenter/anrui-buscenter-biz/src/main/resources/application-test.yml
View File

@ -21,7 +21,7 @@ spring:
max-idle: 8 #连接池中的最大空闲连接
max-wait: -1 # 连接池最大阻塞等待时间（使用负值表示没有限制）
min-idle: 0 # 连接池中的最小空闲连接
password:
password: 123456
port: 6379
timeout: 0 # 连接超时时间（毫秒）

2
anrui-crm/anrui-crm-biz/src/main/resources/application-test.yml
View File

@ -17,7 +17,7 @@ spring:
max-idle: 8 #连接池中的最大空闲连接
max-wait: -1 # 连接池最大阻塞等待时间（使用负值表示没有限制）
min-idle: 0 # 连接池中的最小空闲连接
password:
password: 123456
port: 6379
timeout: 0 # 连接超时时间（毫秒）

2
anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/voucher/GeneralVoucher.java
View File

@ -26,7 +26,7 @@ public class GeneralVoucher {
@Data
public static class GeneralVoucherDetail {
public String timeFlag; //应用于资金占用费计提凭证摘要标识 0代表上月 1代表本月
@ApiModelProperty("场景编码")
public String sceneCode;
@ApiModelProperty("资方简称")

226
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationService.java
View File

@ -451,7 +451,9 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
}
IPage page = PagerUtil.queryToPage(pq);
IPage<PcSelBillVinNoPageVo> pagging = baseMapper.getSelectVinsList(page, qw);
for (PcSelBillVinNoPageVo record : pagging.getRecords()) {
Iterator<PcSelBillVinNoPageVo> iterator = pagging.getRecords().iterator();
while (iterator.hasNext()){
PcSelBillVinNoPageVo record = iterator.next();
//车架号截取后八位
String vin = record.getVin();
record.setVin(vin.substring(vin.length() - 8));
@ -466,19 +468,19 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
BusSalesOrder busSalesOrder = busSalesOrderFeign.fetchBySid(record.getBusSalesOrderSid()).getData();
SolutionsDetailsVo solutionsDetailsVo = loanSolutionsFeign.selectDetails(record.getBusSalesOrderSid()).getData();
BusSalesOrderVehicle busSalesOrderVehicle = busSalesOrderVehicleFeign.selectByNoAndVinSid(record.getContractId(), record.getVinSid()).getData();
if ("2".equals(record.getSaleTypeKey())){
if (StringUtils.isBlank(solutionsDetailsVo.getTypeKey())){//担保
if ("2".equals(record.getSaleTypeKey())) {
if (StringUtils.isBlank(solutionsDetailsVo.getTypeKey())) {//担保
String jfkcSid = loanHomevisitInvestigateFeign.selSaleOrderSidAndBorrSid(record.getBusSalesOrderSid(), busSalesOrderVehicle.getBorrowerSid()).getData();
LoanHomevisitInvestigateCustomerDetailsVo loanHomevisitInvestigateCustomerDetailsVo = loanHomevisitInvestigateCustomerFeign.selectByMainSid(jfkcSid).getData();
BusSalesOrderBorrowerDetailsVo busSalesOrderBorrowerDetailsVo = busSalesOrderBorrowerFeign.fetchDetailsBySid(loanHomevisitInvestigateCustomerDetailsVo.getBorrowerSid()).getData();
CrmCustomerTempVo crmCustomerTempVo = crmCustomerTempFeign.fetchSid(busSalesOrderBorrowerDetailsVo.getCustomSid()).getData();
record.setInvoiceTypeKey(busSalesOrder.getBillingTypeKey());
record.setInvoiceType(busSalesOrder.getBillingType());
if ("1".equals(loanHomevisitInvestigateCustomerDetailsVo.getVehRegis())){
if ("1".equals(loanHomevisitInvestigateCustomerDetailsVo.getVehRegis())) {
record.setInvoiceName(loanHomevisitInvestigateCustomerDetailsVo.getBorrowerName());
record.setOpenTickSid(busSalesOrderBorrowerDetailsVo.getCustomSid());
record.setInvoiceInfo(crmCustomerTempVo.getIDNumber());
}else if ("2".equals(loanHomevisitInvestigateCustomerDetailsVo.getVehRegis())){
} else if ("2".equals(loanHomevisitInvestigateCustomerDetailsVo.getVehRegis())) {
FinCompanyInvoicingDetailsVo finCompanyInvoicingDetailsVo = finCompanyInvoicingService.selectInvoingByTaxpayerNo(loanHomevisitInvestigateCustomerDetailsVo.getAccCompRegistNum()).getData();
record.setInvoiceName(loanHomevisitInvestigateCustomerDetailsVo.getAccCompName());
record.setOpenTickSid(finCompanyInvoicingDetailsVo.getSid());
@ -500,17 +502,20 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
}
record.setInvoiceInfo(openTickRemarks);
}
}else if ("01".equals(solutionsDetailsVo.getTypeKey())){//非担保
} else if ("01".equals(solutionsDetailsVo.getTypeKey())) {//非担保
LoanNoGuaranteeCreditReviewDetailsVo loanNoGuaranteeCreditReviewDetailsVo = loanNoGuaranteeCreditReviewFeign.selByBorrSid(busSalesOrderVehicle.getBorrowerSid()).getData();
if (StringUtils.isBlank(loanNoGuaranteeCreditReviewDetailsVo.getAffiliatedCompany())){
iterator.remove();
}
BusSalesOrderBorrowerDetailsVo busSalesOrderBorrowerDetailsVo = busSalesOrderBorrowerFeign.fetchDetailsBySid(busSalesOrderVehicle.getBorrowerSid()).getData();
CrmCustomerTempVo crmCustomerTempVo = crmCustomerTempFeign.fetchSid(busSalesOrderBorrowerDetailsVo.getCustomSid()).getData();
record.setInvoiceTypeKey(busSalesOrder.getBillingTypeKey());
record.setInvoiceType(busSalesOrder.getBillingType());
if ("1".equals(loanNoGuaranteeCreditReviewDetailsVo.getType())){
if ("1".equals(loanNoGuaranteeCreditReviewDetailsVo.getType())) {
record.setInvoiceName(busSalesOrderBorrowerDetailsVo.getBorrowerName());
record.setOpenTickSid(busSalesOrderBorrowerDetailsVo.getCustomSid());
record.setInvoiceInfo(crmCustomerTempVo.getIDNumber());
}else if ("2".equals(loanNoGuaranteeCreditReviewDetailsVo.getType())){
} else if ("2".equals(loanNoGuaranteeCreditReviewDetailsVo.getType())) {
FinCompanyInvoicingDetailsVo finCompanyInvoicingDetailsVo = finCompanyInvoicingService.selectInvoingByName(loanNoGuaranteeCreditReviewDetailsVo.getAffiliatedCompany()).getData();
record.setInvoiceName(loanNoGuaranteeCreditReviewDetailsVo.getAffiliatedCompany());
record.setOpenTickSid(finCompanyInvoicingDetailsVo.getSid());
@ -573,10 +578,10 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
List<FinBillTrailerDto> finBillTrailers = dto.getFinBillTrailers();
List<FinBillVehicleDto> finBillVehicles = dto.getFinBillVehicles();
for (FinBillVehicleDto finBillVehicle : finBillVehicles) {
if ("02".equals(finBillVehicle.getBillTypeKey())){
if ("02".equals(finBillVehicle.getBillTypeKey())) {
String openTickSid = finBillVehicle.getOpenTickSid();
FinCompanyInvoicingDetailsVo finCompanyInvoicingDetailsVo = finCompanyInvoicingService.fetchDetailsVoBySid(openTickSid);
if (StringUtils.isBlank(finCompanyInvoicingDetailsVo.getSid())){
if (StringUtils.isBlank(finCompanyInvoicingDetailsVo.getSid())) {
return rb.setMsg("个人不能开具增值税专用发票");
}
}
@ -596,7 +601,7 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
finBillApplication.setArrearsMoney("0");
String allDownloadUrl = createContractNo(dto);
downloanVoUrl.setAllDownloadUrl(allDownloadUrl);
downloanVoUrl.setSid(dto.getSid());
downloanVoUrl.setSid(finBillApplication.getSid());
finBillApplication.setFileUrl(allDownloadUrl);
save(finBillApplication);
//主车开票信息
@ -938,7 +943,7 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
}
}
if("1".equals(busSalesOrder.getPayTypeKey())){
if ("1".equals(busSalesOrder.getPayTypeKey())) {
if (loanSolutions != null) {
if (!dto.getOneBillMoney().equals(loanSolutions.getMainVehicleAmount())) {
String remarks = "";
@ -1006,7 +1011,7 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
filesList.add(file);
}
}
if("1".equals(busSalesOrder.getPayTypeKey())){
if ("1".equals(busSalesOrder.getPayTypeKey())) {
Map<String, Object> finalCheckMap = checkMap;
if (!finalCheckMap.isEmpty()) {
Future<String> future3 = pool.submit(() -> {
@ -1037,7 +1042,7 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
fileUrl = typeName;
}
}
if(StringUtils.isNotBlank(fileUrl)){
if (StringUtils.isNotBlank(fileUrl)) {
FinBillApplication finBillApplication = fetchBySid(dto.getSid());
finBillApplication.setFileUrl(fileUrl);
baseMapper.updateById(finBillApplication);
@ -1093,7 +1098,7 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
sameOpenTickSidList.forEach(v -> {
//车架号
BaseVehicle baseVehicle = baseMapper.selectVinNoByVinSid(v.getVehSid());
if(baseVehicle != null){
if (baseVehicle != null) {
finalBillFileVo.setVinNo(baseVehicle.getVinNo());
}
List<FinBillTrailerDto> finBillTrailers = dto.getFinBillTrailers();
@ -1168,7 +1173,7 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
}
}
if("1".equals(busSalesOrder.getPayTypeKey())){
if ("1".equals(busSalesOrder.getPayTypeKey())) {
if (loanSolutions != null) {
if (busSalesOrderPrice.getSingleFinalPrice().compareTo(new BigDecimal(dto.getOneBillMoney())) != 0) {
String remarks = "";
@ -1236,7 +1241,7 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
filesList.add(file);
}
}
if("1".equals(busSalesOrder.getPayTypeKey())){
if ("1".equals(busSalesOrder.getPayTypeKey())) {
Map<String, Object> finalCheckMap = checkMap;
if (!finalCheckMap.isEmpty()) {
Future<String> future3 = pool.submit(() -> {
@ -1266,12 +1271,12 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
System.out.println("-========" + docPdfComponent.getUploadTemplateUrl() + typeName);
fileUrl = typeName;
}
}else{
if(StringUtils.isNotBlank(loanSolutions.getTypeKey())){//非担保、生成开票申请书和车辆登记合同
} else {
if (StringUtils.isNotBlank(loanSolutions.getTypeKey())) {//非担保、生成开票申请书和车辆登记合同
List<FinBillVehicleDto> finBillVehicles = dto.getFinBillVehicles();
for (FinBillVehicleDto v : finBillVehicles) {
BusSalesOrderVehicle busSalesOrderVehicle = baseMapper.selectByBorrowSid(dto.getContractNo(), v.getVehSid());
if(StringUtils.isNotBlank(busSalesOrderVehicle.getBorrowerSid())){
if (StringUtils.isNotBlank(busSalesOrderVehicle.getBorrowerSid())) {
LoanNoGuaranteeCreditReviewDetailsVo loanNoGuaranteeCreditReviewDetailsVo = loanNoGuaranteeCreditReviewFeign.selByBorrSid(busSalesOrderVehicle.getBorrowerSid()).getData();
if ("2".equals(loanNoGuaranteeCreditReviewDetailsVo.getType())) {//登记在挂靠公司
v.setOpenTickSid(loanNoGuaranteeCreditReviewDetailsVo.getAffiliatedCompanySid());
@ -1315,7 +1320,7 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
sameOpenTickSidList.forEach(v -> {
//车架号
BaseVehicle baseVehicle = baseMapper.selectVinNoByVinSid(v.getVehSid());
if(baseVehicle != null){
if (baseVehicle != null) {
finalBillFileVo.setVinNo(baseVehicle.getVinNo());
}
List<FinBillTrailerDto> finBillTrailers = dto.getFinBillTrailers();
@ -1525,7 +1530,7 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
BusSalesOrder busSalesOrder = busSalesOrderFeign.selectOrderByContractNo(contractNo).getData();
SolutionsDetailsVo solutionsDetailsVo = loanSolutionsFeign.selectDetails(busSalesOrder.getSid()).getData();
BigDecimal oneBillMoney;
if ("2".equals(entity.getSaleTypeKey())){
if ("2".equals(entity.getSaleTypeKey())) {
oneBillMoney = new BigDecimal(solutionsDetailsVo.getMainVehicleAmount());
vo.setOneBillMoney(oneBillMoney.toString());
vo.setTotalBillMoney(oneBillMoney.multiply(new BigDecimal(finBillVehicleVos.size())).toString());
@ -1533,7 +1538,7 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
vo.setOpenTickTypeValue(busSalesOrder.getBillingType());
vo.setNoEditInvoiceTypeAndName(true);
vo.setNoEditInvoiceMoney(true);
}else {
} else {
oneBillMoney = entity.getOneBillMoney();
if (oneBillMoney != null) {
vo.setTotalBillMoney(entity.getOneBillMoney().multiply(new BigDecimal(finBillVehicleVos.size())).toString());
@ -1550,19 +1555,19 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
finBillVehicleVo.setCertificatePhoto(clhgeImages);
}
BusSalesOrderVehicle busSalesOrderVehicle = busSalesOrderVehicleFeign.selectByNoAndVinSid(contractNo, finBillVehicleVo.getVehSid()).getData();
if ("2".equals(entity.getSaleTypeKey())){
if ("01".equals(busSalesOrder.getFinancePlan())){//担保
if ("2".equals(entity.getSaleTypeKey())) {
if ("01".equals(busSalesOrder.getFinancePlan())) {//担保
String jfkcSid = loanHomevisitInvestigateFeign.selSaleOrderSidAndBorrSid(busSalesOrder.getSid(), busSalesOrderVehicle.getBorrowerSid()).getData();
LoanHomevisitInvestigateCustomerDetailsVo loanHomevisitInvestigateCustomerDetailsVo = loanHomevisitInvestigateCustomerFeign.selectByMainSid(jfkcSid).getData();
BusSalesOrderBorrowerDetailsVo busSalesOrderBorrowerDetailsVo = busSalesOrderBorrowerFeign.fetchDetailsBySid(busSalesOrderVehicle.getBorrowerSid()).getData();
CrmCustomerTempVo crmCustomerTempVo = crmCustomerTempFeign.fetchSid(busSalesOrderBorrowerDetailsVo.getCustomSid()).getData();
finBillVehicleVo.setBillTypeKey(busSalesOrder.getBillingTypeKey());
finBillVehicleVo.setBillTypeValue(busSalesOrder.getBillingType());
if ("1".equals(loanHomevisitInvestigateCustomerDetailsVo.getVehRegis())){
if ("1".equals(loanHomevisitInvestigateCustomerDetailsVo.getVehRegis())) {
finBillVehicleVo.setOpenTickName(loanHomevisitInvestigateCustomerDetailsVo.getBorrowerName());
finBillVehicleVo.setOpenTickSid(busSalesOrderBorrowerDetailsVo.getCustomSid());
finBillVehicleVo.setInvoiceInfo(crmCustomerTempVo.getIDNumber());
}else if ("2".equals(loanHomevisitInvestigateCustomerDetailsVo.getVehRegis())){
} else if ("2".equals(loanHomevisitInvestigateCustomerDetailsVo.getVehRegis())) {
FinCompanyInvoicingDetailsVo finCompanyInvoicingDetailsVo = finCompanyInvoicingService.selectInvoingByTaxpayerNo(loanHomevisitInvestigateCustomerDetailsVo.getAccCompRegistNum()).getData();
finBillVehicleVo.setOpenTickName(loanHomevisitInvestigateCustomerDetailsVo.getAccCompName());
finBillVehicleVo.setOpenTickSid(finCompanyInvoicingDetailsVo.getSid());
@ -1584,17 +1589,17 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
}
finBillVehicleVo.setInvoiceInfo(openTickRemarks);
}
}else if ("02".equals(busSalesOrder.getFinancePlan())){//非担保
} else if ("02".equals(busSalesOrder.getFinancePlan())) {//非担保
LoanNoGuaranteeCreditReviewDetailsVo loanNoGuaranteeCreditReviewDetailsVo = loanNoGuaranteeCreditReviewFeign.selByBorrSid(busSalesOrderVehicle.getBorrowerSid()).getData();
BusSalesOrderBorrowerDetailsVo busSalesOrderBorrowerDetailsVo = busSalesOrderBorrowerFeign.fetchDetailsBySid(busSalesOrderVehicle.getBorrowerSid()).getData();
CrmCustomerTempVo crmCustomerTempVo = crmCustomerTempFeign.fetchSid(busSalesOrderBorrowerDetailsVo.getCustomSid()).getData();
finBillVehicleVo.setBillTypeKey(busSalesOrder.getBillingTypeKey());
finBillVehicleVo.setBillTypeValue(busSalesOrder.getBillingType());
if ("1".equals(loanNoGuaranteeCreditReviewDetailsVo.getType())){
if ("1".equals(loanNoGuaranteeCreditReviewDetailsVo.getType())) {
finBillVehicleVo.setOpenTickName(loanNoGuaranteeCreditReviewDetailsVo.getBorrowerName());
finBillVehicleVo.setOpenTickSid(busSalesOrderBorrowerDetailsVo.getCustomSid());
finBillVehicleVo.setInvoiceInfo(crmCustomerTempVo.getIDNumber());
}else if ("2".equals(loanNoGuaranteeCreditReviewDetailsVo.getType())){
} else if ("2".equals(loanNoGuaranteeCreditReviewDetailsVo.getType())) {
FinCompanyInvoicingDetailsVo finCompanyInvoicingDetailsVo = finCompanyInvoicingService.selectInvoingByName(loanNoGuaranteeCreditReviewDetailsVo.getAffiliatedCompany()).getData();
finBillVehicleVo.setOpenTickName(loanNoGuaranteeCreditReviewDetailsVo.getAffiliatedCompany());
finBillVehicleVo.setOpenTickSid(finCompanyInvoicingDetailsVo.getSid());
@ -1731,8 +1736,8 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
}
//生成的合同下载地址
String allDownloadUrl = "";
if(StringUtils.isNotBlank(entity.getFileUrl())){
allDownloadUrl = docPdfComponent.getPrefixTemplateUrl()+entity.getFileUrl();
if (StringUtils.isNotBlank(entity.getFileUrl())) {
allDownloadUrl = docPdfComponent.getPrefixTemplateUrl() + entity.getFileUrl();
vo.setAllDownloadUrl(allDownloadUrl);
}
int contractBtns = 0;
@ -1743,18 +1748,18 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
BusSalesOrderPrice busSalesOrderPrice = baseMapper.selectByPrices(busSalesOrder.getSid());
if ("1".equals(busSalesOrder.getPayTypeKey())) {//全款
contractBtns = 1;
}else{
if(StringUtils.isNotBlank(loanSolutions.getTypeKey())){
} else {
if (StringUtils.isNotBlank(loanSolutions.getTypeKey())) {
contractBtns = 2;
}
}
vo.setContractBtns(contractBtns);
//销售订单开票sid
if(StringUtils.isNotBlank(busSalesOrder.getAffiliatedCompanySid())){
if (StringUtils.isNotBlank(busSalesOrder.getAffiliatedCompanySid())) {
vo.setOrderInvoiceSid(busSalesOrder.getAffiliatedCompanySid());
}
if(busSalesOrderPrice != null){
if(busSalesOrderPrice.getSingleFinalPrice() != null){
if (busSalesOrderPrice != null) {
if (busSalesOrderPrice.getSingleFinalPrice() != null) {
vo.setOrderInvoicePrice(busSalesOrderPrice.getSingleFinalPrice().toString());
}
}
@ -2385,8 +2390,11 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
variables.put("isdbdk", "2".equals(busSalesOrder.getPayTypeKey()));
//判断是否是高低开，若是，则isAdj网关参数为true=============添加
BusSalesOrderPrice data = busSalesOrderFeign.selectByContractNo(contractNo).getData();
if (data != null) {
variables.put("isAdj", !data.getSingleFinalPrice().equals(finBillApplication.getOneBillMoney()));
int i = data.getSingleFinalPrice().compareTo(finBillApplication.getOneBillMoney());
if (i == 0) {
variables.put("isAdj", false);
} else {
variables.put("isAdj", true);
}
Map<String, Object> appMap = new HashMap<>();
appMap.put("sid", businessSid);
@ -2902,10 +2910,10 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
List<FinBillTrailerDto> finBillTrailers = dto.getFinBillTrailers();
List<FinBillVehicleDto> finBillVehicles = dto.getFinBillVehicles();
for (FinBillVehicleDto finBillVehicle : finBillVehicles) {
if ("02".equals(finBillVehicle.getBillTypeKey())){
if ("02".equals(finBillVehicle.getBillTypeKey())) {
String openTickSid = finBillVehicle.getOpenTickSid();
FinCompanyInvoicingDetailsVo finCompanyInvoicingDetailsVo = finCompanyInvoicingService.fetchDetailsVoBySid(openTickSid);
if (StringUtils.isBlank(finCompanyInvoicingDetailsVo.getSid())){
if (StringUtils.isBlank(finCompanyInvoicingDetailsVo.getSid())) {
return rb.setMsg("个人不能开具增值税专用发票");
}
}
@ -3231,10 +3239,10 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
List<FinBillTrailerDto> finBillTrailers = dto.getFinBillTrailers();
List<FinBillVehicleDto> finBillVehicles = dto.getFinBillVehicles();
for (FinBillVehicleDto finBillVehicle : finBillVehicles) {
if ("02".equals(finBillVehicle.getBillTypeKey())){
if ("02".equals(finBillVehicle.getBillTypeKey())) {
String openTickSid = finBillVehicle.getOpenTickSid();
FinCompanyInvoicingDetailsVo finCompanyInvoicingDetailsVo = finCompanyInvoicingService.fetchDetailsVoBySid(openTickSid);
if (StringUtils.isBlank(finCompanyInvoicingDetailsVo.getSid())){
if (StringUtils.isBlank(finCompanyInvoicingDetailsVo.getSid())) {
return rb.setMsg("个人不能开具增值税专用发票");
}
}
@ -4673,18 +4681,18 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
BusSalesOrderPrice busSalesOrderPrice = baseMapper.selectByPrices(busSalesOrder.getSid());
if ("1".equals(busSalesOrder.getPayTypeKey())) {//全款
contractBtns = 1;
}else{
if(StringUtils.isNotBlank(loanSolutions.getTypeKey())){
} else {
if (StringUtils.isNotBlank(loanSolutions.getTypeKey())) {
contractBtns = 2;
}
}
finBillApplicationDetailsVo.setContractBtns(contractBtns);
//销售订单开票sid
if(StringUtils.isNotBlank(busSalesOrder.getAffiliatedCompanySid())){
if (StringUtils.isNotBlank(busSalesOrder.getAffiliatedCompanySid())) {
finBillApplicationDetailsVo.setOrderInvoiceSid(busSalesOrder.getAffiliatedCompanySid());
}
if(busSalesOrderPrice != null){
if(busSalesOrderPrice.getSingleFinalPrice() != null){
if (busSalesOrderPrice != null) {
if (busSalesOrderPrice.getSingleFinalPrice() != null) {
finBillApplicationDetailsVo.setOrderInvoicePrice(busSalesOrderPrice.getSingleFinalPrice().toString());
}
}
@ -5740,20 +5748,20 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
SolutionsDetailsVo solutionsDetailsVo = loanSolutionsFeign.selectDetails(busSalesOrder.getSid()).getData();
billApplicationIInfoVoss = baseMapper.selectByContractNos(contractId);
BigDecimal oneBillMoney;
if ("2".equals(busSalesOrder.getPayTypeKey())){
if ("2".equals(busSalesOrder.getPayTypeKey())) {
oneBillMoney = new BigDecimal(solutionsDetailsVo.getMainVehicleAmount());
billApplicationIInfoVoss.setInvoiceMoney(oneBillMoney.toString());
billApplicationIInfoVoss.setInvoiceTotal(oneBillMoney.multiply(new BigDecimal(vins.size())).toString());
billApplicationIInfoVoss.setNoEditInvoiceTypeAndName(true);
billApplicationIInfoVoss.setNoEditInvoiceMoney(true);
}else {
} else {
oneBillMoney = busSalesOrder.getOneBillMoney();
if (oneBillMoney != null) {
billApplicationIInfoVoss.setInvoiceMoney(oneBillMoney.toString());
billApplicationIInfoVoss.setInvoiceTotal(oneBillMoney.multiply(new BigDecimal(vins.size())).toString());
billApplicationIInfoVoss.setNoEditInvoiceTypeAndName(false);
billApplicationIInfoVoss.setNoEditInvoiceMoney(true);
}else {
} else {
billApplicationIInfoVoss.setNoEditInvoiceTypeAndName(false);
billApplicationIInfoVoss.setNoEditInvoiceMoney(false);
}
@ -5794,19 +5802,19 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
}
//贷款主车初始化开票名称、开票类型
BusSalesOrderVehicle busSalesOrderVehicle = busSalesOrderVehicleFeign.selectByNoAndVinSid(contractId, vins.get(i)).getData();
if ("2".equals(busSalesOrder.getPayTypeKey())){
if (StringUtils.isBlank(solutionsDetailsVo.getTypeKey())){//担保
if ("2".equals(busSalesOrder.getPayTypeKey())) {
if (StringUtils.isBlank(solutionsDetailsVo.getTypeKey())) {//担保
String jfkcSid = loanHomevisitInvestigateFeign.selSaleOrderSidAndBorrSid(busSalesOrder.getSid(), busSalesOrderVehicle.getBorrowerSid()).getData();
LoanHomevisitInvestigateCustomerDetailsVo loanHomevisitInvestigateCustomerDetailsVo = loanHomevisitInvestigateCustomerFeign.selectByMainSid(jfkcSid).getData();
BusSalesOrderBorrowerDetailsVo busSalesOrderBorrowerDetailsVo = busSalesOrderBorrowerFeign.fetchDetailsBySid(busSalesOrderVehicle.getBorrowerSid()).getData();
CrmCustomerTempVo crmCustomerTempVo = crmCustomerTempFeign.fetchSid(busSalesOrderBorrowerDetailsVo.getCustomSid()).getData();
vinListVos1.setInvoiceTypeKey(busSalesOrder.getBillingTypeKey());
vinListVos1.setInvoiceType(busSalesOrder.getBillingType());
if ("1".equals(loanHomevisitInvestigateCustomerDetailsVo.getVehRegis())){
if ("1".equals(loanHomevisitInvestigateCustomerDetailsVo.getVehRegis())) {
vinListVos1.setInvoiceName(loanHomevisitInvestigateCustomerDetailsVo.getBorrowerName());
vinListVos1.setOpenTickSid(busSalesOrderBorrowerDetailsVo.getCustomSid());
vinListVos1.setInvoiceInfo(crmCustomerTempVo.getIDNumber());
}else if ("2".equals(loanHomevisitInvestigateCustomerDetailsVo.getVehRegis())){
} else if ("2".equals(loanHomevisitInvestigateCustomerDetailsVo.getVehRegis())) {
FinCompanyInvoicingDetailsVo finCompanyInvoicingDetailsVo = finCompanyInvoicingService.selectInvoingByTaxpayerNo(loanHomevisitInvestigateCustomerDetailsVo.getAccCompRegistNum()).getData();
vinListVos1.setInvoiceName(loanHomevisitInvestigateCustomerDetailsVo.getAccCompName());
vinListVos1.setOpenTickSid(finCompanyInvoicingDetailsVo.getSid());
@ -5828,17 +5836,17 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
}
vinListVos1.setInvoiceInfo(openTickRemarks);
}
}else if ("01".equals(solutionsDetailsVo.getTypeKey())){//非担保
} else if ("01".equals(solutionsDetailsVo.getTypeKey())) {//非担保
LoanNoGuaranteeCreditReviewDetailsVo loanNoGuaranteeCreditReviewDetailsVo = loanNoGuaranteeCreditReviewFeign.selByBorrSid(busSalesOrderVehicle.getBorrowerSid()).getData();
BusSalesOrderBorrowerDetailsVo busSalesOrderBorrowerDetailsVo = busSalesOrderBorrowerFeign.fetchDetailsBySid(busSalesOrderVehicle.getBorrowerSid()).getData();
CrmCustomerTempVo crmCustomerTempVo = crmCustomerTempFeign.fetchSid(busSalesOrderBorrowerDetailsVo.getCustomSid()).getData();
vinListVos1.setInvoiceTypeKey(busSalesOrder.getBillingTypeKey());
vinListVos1.setInvoiceType(busSalesOrder.getBillingType());
if ("1".equals(loanNoGuaranteeCreditReviewDetailsVo.getType())){
if ("1".equals(loanNoGuaranteeCreditReviewDetailsVo.getType())) {
vinListVos1.setInvoiceName(busSalesOrderBorrowerDetailsVo.getBorrowerName());
vinListVos1.setOpenTickSid(busSalesOrderBorrowerDetailsVo.getCustomSid());
vinListVos1.setInvoiceInfo(crmCustomerTempVo.getIDNumber());
}else if ("2".equals(loanNoGuaranteeCreditReviewDetailsVo.getType())){
} else if ("2".equals(loanNoGuaranteeCreditReviewDetailsVo.getType())) {
FinCompanyInvoicingDetailsVo finCompanyInvoicingDetailsVo = finCompanyInvoicingService.selectInvoingByName(loanNoGuaranteeCreditReviewDetailsVo.getAffiliatedCompany()).getData();
vinListVos1.setInvoiceName(loanNoGuaranteeCreditReviewDetailsVo.getAffiliatedCompany());
vinListVos1.setOpenTickSid(finCompanyInvoicingDetailsVo.getSid());
@ -5875,18 +5883,18 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
BusSalesOrderPrice busSalesOrderPrice = baseMapper.selectByPrices(busSalesOrder.getSid());
if ("1".equals(busSalesOrder.getPayTypeKey())) {//全款
contractBtns = 1;
}else{
if(StringUtils.isNotBlank(loanSolutions.getTypeKey())){
} else {
if (StringUtils.isNotBlank(loanSolutions.getTypeKey())) {
contractBtns = 2;
}
}
billApplicationIInfoVoss.setContractBtns(contractBtns);
//销售订单开票sid
if(StringUtils.isNotBlank(busSalesOrder.getAffiliatedCompanySid())){
if (StringUtils.isNotBlank(busSalesOrder.getAffiliatedCompanySid())) {
billApplicationIInfoVoss.setOrderInvoiceSid(busSalesOrder.getAffiliatedCompanySid());
}
if(busSalesOrderPrice != null){
if(busSalesOrderPrice.getSingleFinalPrice() != null){
if (busSalesOrderPrice != null) {
if (busSalesOrderPrice.getSingleFinalPrice() != null) {
billApplicationIInfoVoss.setOrderInvoicePrice(busSalesOrderPrice.getSingleFinalPrice().toString());
}
}
@ -5899,7 +5907,7 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
return rb.success().setData(finBillApplicationDetailsVo);
}
public String createContractNo(FinBillApplicationDto dto){
public String createContractNo(FinBillApplicationDto dto) {
/* try {
ThreadFactory namedThreadFactory = new ThreadFactoryBuilder()
.setNameFormat("demo-pool-%d").build();
@ -5922,92 +5930,92 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
BusSalesOrderModel busSalesOrderModel = baseMapper.selectByOrderSid(busSalesOrder.getSid());
BusSalesOrderPrice busSalesOrderPrice = baseMapper.selectByPrices(busSalesOrder.getSid());
int contractBts = 0;
if("1".equals(busSalesOrder.getPayTypeKey())){
if ("1".equals(busSalesOrder.getPayTypeKey())) {
contractBts = 1;
}else{
if(StringUtils.isNotBlank(loanSolutions.getTypeKey())){
} else {
if (StringUtils.isNotBlank(loanSolutions.getTypeKey())) {
contractBts = 2;
}
}
if(StringUtils.isBlank(dto.getSid())){//新增的，与销售订单数据作对比
switch (contractBts){
if (StringUtils.isBlank(dto.getSid())) {//新增的，与销售订单数据作对比
switch (contractBts) {
case 1:
//全款,与销售订单的价格不一样，就notice
if(StringUtils.isNotBlank(dto.getOneBillMoney()) && new BigDecimal(dto.getOneBillMoney()).compareTo(busSalesOrderPrice.getSingleFinalPrice()) !=0){
if (StringUtils.isNotBlank(dto.getOneBillMoney()) && new BigDecimal(dto.getOneBillMoney()).compareTo(busSalesOrderPrice.getSingleFinalPrice()) != 0) {
showNotice = true;
}else{
} else {
//与销售订单的价格一致，判断是否与销售订单的开票名称不一致的情况
List<FinBillVehicleDto> finBillVehicleDtoList = dto.getFinBillVehicles();
finBillVehicleDtoList = finBillVehicleDtoList.stream().filter(v->!v.getOpenTickSid().equals(busSalesOrder.getAffiliatedCompanySid())).collect(Collectors.toList());
finBillVehicleDtoList = finBillVehicleDtoList.stream().filter(v -> !v.getOpenTickSid().equals(busSalesOrder.getAffiliatedCompanySid())).collect(Collectors.toList());
finBillVehicleDtoList.removeAll(Collections.singleton(null));
showNotice = finBillVehicleDtoList.size()>0;
showNotice = finBillVehicleDtoList.size() > 0;
}
break;
case 2:
showNotice = dto.getFinBillVehicles().size()>0;
showNotice = dto.getFinBillVehicles().size() > 0;
break;
}
}else{//若是修改的话，且生成过合同的情况下，则与旧数据作对比
} else {//若是修改的话，且生成过合同的情况下，则与旧数据作对比
FinBillApplication finBillApplication = fetchBySid(dto.getSid());
if(StringUtils.isBlank(finBillApplication.getFileUrl())){
switch (contractBts){
if (StringUtils.isBlank(finBillApplication.getFileUrl())) {
switch (contractBts) {
case 1:
//全款,与销售订单的价格不一样，就notice
if(StringUtils.isNotBlank(dto.getOneBillMoney()) && new BigDecimal(dto.getOneBillMoney()).compareTo(busSalesOrderPrice.getSingleFinalPrice()) !=0){
if (StringUtils.isNotBlank(dto.getOneBillMoney()) && new BigDecimal(dto.getOneBillMoney()).compareTo(busSalesOrderPrice.getSingleFinalPrice()) != 0) {
showNotice = true;
}else{
} else {
//与销售订单的价格一致，判断是否与销售订单的开票名称不一致的情况
List<FinBillVehicleDto> finBillVehicleDtoList = dto.getFinBillVehicles();
finBillVehicleDtoList = finBillVehicleDtoList.stream().filter(v->!v.getOpenTickSid().equals(busSalesOrder.getAffiliatedCompanySid())).collect(Collectors.toList());
finBillVehicleDtoList = finBillVehicleDtoList.stream().filter(v -> !v.getOpenTickSid().equals(busSalesOrder.getAffiliatedCompanySid())).collect(Collectors.toList());
finBillVehicleDtoList.removeAll(Collections.singleton(null));
showNotice = finBillVehicleDtoList.size()>0;
showNotice = finBillVehicleDtoList.size() > 0;
}
break;
case 2:
showNotice = dto.getFinBillVehicles().size()>0;
showNotice = dto.getFinBillVehicles().size() > 0;
break;
}
}else{
} else {
//若有合同，则与旧数据作对比
boolean isTrue = false;
List<FinBillVehicleVo> finBillVehicleVos = finBillVehicleService.fetchByMainSid(dto.getSid());
List<FinBillVehicleDto> finBillVehicleVosNew = dto.getFinBillVehicles();
switch (contractBts){
switch (contractBts) {
case 1:
//全款,与销售订单的价格不一样，则与旧数据作对比
if(new BigDecimal(dto.getOneBillMoney()).compareTo(busSalesOrderPrice.getSingleFinalPrice()) != 0){
if (new BigDecimal(dto.getOneBillMoney()).compareTo(busSalesOrderPrice.getSingleFinalPrice()) != 0) {
isTrue = true;
}else{
} else {
//与销售订单的价格一致，判断是否与销售订单的开票名称不一致的情况，若有不一致的情况，则与旧数据作对比
finBillVehicleVosNew = finBillVehicleVosNew.stream().filter(v->!v.getOpenTickSid().equals(busSalesOrder.getAffiliatedCompanySid())).collect(Collectors.toList());
finBillVehicleVosNew = finBillVehicleVosNew.stream().filter(v -> !v.getOpenTickSid().equals(busSalesOrder.getAffiliatedCompanySid())).collect(Collectors.toList());
finBillVehicleVosNew.removeAll(Collections.singleton(null));
isTrue = finBillVehicleVosNew.size()>0;
isTrue = finBillVehicleVosNew.size() > 0;
}
if(isTrue){
if(new BigDecimal(dto.getOneBillMoney()).compareTo(finBillApplication.getOneBillMoney()) != 0){
if (isTrue) {
if (new BigDecimal(dto.getOneBillMoney()).compareTo(finBillApplication.getOneBillMoney()) != 0) {
showNotice = true;
}else{
} else {
//如果数量发生变化，则生成合同
if(finBillVehicleVos.size() != finBillVehicleVosNew.size()){
if (finBillVehicleVos.size() != finBillVehicleVosNew.size()) {
showNotice = true;
}else{//数量没发生变化，车辆发生变化，则生成合同
} else {//数量没发生变化，车辆发生变化，则生成合同
List<String> stringList1 = finBillVehicleVos.stream().map(FinBillVehicleVo::getVehSid).collect(Collectors.toList());
List<String> stringList2 = finBillVehicleVosNew.stream().map(FinBillVehicleDto::getVehSid).collect(Collectors.toList());
Set<String> stringSet3 = new HashSet<>();
stringSet3.addAll(stringList1);
stringSet3.addAll(stringList2);
if(stringSet3.size() != stringList1.size()){
if (stringSet3.size() != stringList1.size()) {
showNotice = true;
}else{
} else {
//车辆没发生变化，查询开票信息是否发生变化
for (int i = 0; i < finBillVehicleVos.size(); i++) {
String vehSid = finBillVehicleVos.get(i).getVehSid();
String openTickSid = finBillVehicleVos.get(i).getOpenTickSid();
String openTickSidNew = finBillVehicleVosNew.stream().filter(vv->vehSid.equals(vv.getVehSid())).collect(Collectors.toList()).get(0).getOpenTickSid();
if(!openTickSid.equals(openTickSidNew)){
String openTickSidNew = finBillVehicleVosNew.stream().filter(vv -> vehSid.equals(vv.getVehSid())).collect(Collectors.toList()).get(0).getOpenTickSid();
if (!openTickSid.equals(openTickSidNew)) {
showNotice = true;
break;
}
@ -6020,35 +6028,35 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
case 2:
//车辆数量发生变化，
if(finBillVehicleVos.size() != finBillVehicleVosNew.size()){
if (finBillVehicleVos.size() != finBillVehicleVosNew.size()) {
showNotice = true;
}else{
} else {
List<String> stringList1 = finBillVehicleVos.stream().map(FinBillVehicleVo::getVehSid).collect(Collectors.toList());
List<String> stringList2 = finBillVehicleVosNew.stream().map(FinBillVehicleDto::getVehSid).collect(Collectors.toList());
Set<String> stringSet3 = new HashSet<>();
stringSet3.addAll(stringList1);
stringSet3.addAll(stringList2);
if(stringSet3.size() != stringList1.size()){
if (stringSet3.size() != stringList1.size()) {
showNotice = true;
}
}
break;
}
if(!showNotice && !isTrue){
if (!showNotice && !isTrue) {
allDownloadUrl = finBillApplication.getFileUrl();
}
}
}
if(showNotice){
if (showNotice) {
allDownloadUrl = getFileUrlNew(dto);
}
return allDownloadUrl;
}
public List<String> castList(Object obj, Class<String> clazz){
public List<String> castList(Object obj, Class<String> clazz) {
List<String> result = new ArrayList<>();
if(obj instanceof List<?>){
for (Object o : (List<?>) obj){
if (obj instanceof List<?>) {
for (Object o : (List<?>) obj) {
result.add(clazz.cast(o));
}
return result;
@ -6061,8 +6069,8 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
DownloanVoUrl downloanVoUrl = new DownloanVoUrl();
ResultBean<DownloanVoUrl> resultBean = saveOrUpdateDto(dto);
String allDownloadUrl = resultBean.getData().getAllDownloadUrl();
if(StringUtils.isNotBlank(allDownloadUrl)){
downloanVoUrl.setAllDownloadUrl(docPdfComponent.getPrefixTemplateUrl()+allDownloadUrl);
if (StringUtils.isNotBlank(allDownloadUrl)) {
downloanVoUrl.setAllDownloadUrl(docPdfComponent.getPrefixTemplateUrl() + allDownloadUrl);
}
downloanVoUrl.setSid(resultBean.getData().getSid());
return rb.success().setData(downloanVoUrl);
@ -6073,8 +6081,8 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
DownloanVoUrl downloanVoUrl = new DownloanVoUrl();
ResultBean<DownloanVoUrl> resultBean = saveOrUpdateDtoQK(dto);
String allDownloadUrl = resultBean.getData().getAllDownloadUrl();
if(StringUtils.isNotBlank(allDownloadUrl)){
downloanVoUrl.setAllDownloadUrl(docPdfComponent.getPrefixTemplateUrl()+allDownloadUrl);
if (StringUtils.isNotBlank(allDownloadUrl)) {
downloanVoUrl.setAllDownloadUrl(docPdfComponent.getPrefixTemplateUrl() + allDownloadUrl);
}
downloanVoUrl.setSid(resultBean.getData().getSid());
return rb.success().setData(downloanVoUrl);

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

@ -3891,24 +3891,10 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
}
//认资金占用费消减平台资金占用费
if (v.getReceivablesName().equals("资金占用费")) {
try {
ThreadFactory namedThreadFactory = new ThreadFactoryBuilder()
.setNameFormat("demo-pool-%d").build();
ExecutorService pool = new org.apache.tomcat.util.threads.ThreadPoolExecutor(1, 10,
1000, TimeUnit.MILLISECONDS,
new LinkedBlockingQueue<Runnable>(1024), namedThreadFactory, new org.apache.tomcat.util.threads.ThreadPoolExecutor.AbortPolicy());
//推送资金占用费收款凭证
Future future1 = pool.submit(() -> {
pushFundVoucher(v, sid);
});
//推送资金占用费收款凭证
Future future = pool.submit(() -> {
pushFeeVoucher(v, sid);
});
} catch (Exception e) {
e.printStackTrace();
log.error("推送数据失败=========================" + e.getMessage());
}
//推送资金占用费计提凭证
pushFundVoucher(v, sid);
//推送资金占用费出纳确认后
pushFeeVoucher(v, sid);
}
if ("月还".equals(v.getReceivablesName())
|| "垫资方逾期利息".equals(v.getReceivablesName())
@ -4009,6 +3995,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
return rb.success().setMsg("款项确认成功");
}
private void pushFundVoucher(FinSelectedReceivablesDetailedVo v, String sid) {
String planSid = "";
FinCollectionConfirmation finCollectionConfirmation = fetchBySid(sid);

40
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/FinKingDeeFeignRest.java
View File

@ -653,14 +653,18 @@ public class FinKingDeeFeignRest implements FinKingDeeFeign {
String[] split = format.split("-");
String month = split[1];
String m = "";
if (month.equals("01")) {
m = "12";
} else {
m = String.valueOf(Integer.parseInt(month) - 1);
if (voucherDetail.getTimeFlag().equals("0")) {
if (month.equals("01")) {
m = "12";
} else {
m = String.valueOf(Integer.parseInt(month) - 1);
}
} else if (voucherDetail.getTimeFlag().equals("1")) {
m = String.valueOf(Integer.parseInt(month));
}
if (voucherDetail.getSceneCode().equals("借方")) {
Voucher.VoucherResultDetailDto dto1 = new Voucher.VoucherResultDetailDto(); //借方
dto1.setSummary("计提" + m + "逾期利息");
dto1.setSummary("计提" + m + "月逾期利息");
dto1.setSubjectNo("1201.02.02");
dto1.setDimensionDept(voucherDetail.getDeptCode());
dto1.setDimensionCustom(voucherDetail.getCustomerCode());
@ -669,7 +673,7 @@ public class FinKingDeeFeignRest implements FinKingDeeFeign {
}
if (voucherDetail.getSceneCode().equals("贷方")) {
Voucher.VoucherResultDetailDto dto2 = new Voucher.VoucherResultDetailDto(); //贷方
dto2.setSummary("计提" + m + "逾期利息");
dto2.setSummary("计提" + m + "月逾期利息");
dto2.setSubjectNo("2191.05.00");
dto2.setDimensionDept(voucherDetail.getDeptCode());
// dto2.setDimensionCustom(voucherDetail.getCustomerCode());
@ -700,14 +704,16 @@ public class FinKingDeeFeignRest implements FinKingDeeFeign {
newVoucher.setAccountBook(voucher.getUseOrgCode());
newVoucher.setVoucherNo(voucher.getUseOrgCode());
}
DictCommonVo dictCommonVo = dictCommonFeign.selectBykey(voucher.getPayTypeCode(), "payVoucherType").getData();
if (null != dictCommonVo) {
SysMappingListInfoQuery query = new SysMappingListInfoQuery();
query.setDictSid(dictCommonVo.getSid());
List<SysMappingInfoVo> data = sysMappingFeign.selectMappingListInfo(query).getData();
if (!data.isEmpty()) {
SysMappingInfoVo sysMappingInfoVo = data.get(0);
payType = sysMappingInfoVo.getMap_itemKey();
if (StringUtils.isNotBlank(voucher.getPayTypeCode())) {
DictCommonVo dictCommonVo = dictCommonFeign.selectBykey(voucher.getPayTypeCode(), "payVoucherType").getData();
if (null != dictCommonVo) {
SysMappingListInfoQuery query = new SysMappingListInfoQuery();
query.setDictSid(dictCommonVo.getSid());
List<SysMappingInfoVo> data = sysMappingFeign.selectMappingListInfo(query).getData();
if (!data.isEmpty()) {
SysMappingInfoVo sysMappingInfoVo = data.get(0);
payType = sysMappingInfoVo.getMap_itemKey();
}
}
}
List<CollectionVoucher.CollectionVoucherDetail> voucherDetails = voucher.getVoucherDetails();
@ -727,11 +733,13 @@ public class FinKingDeeFeignRest implements FinKingDeeFeign {
dto2.setDimensionCustom(voucherDetail.getCustomerCode());
} else if (voucherDetail.getSceneCode().equals(SceneCodeEnum.FUND_VOUCHER2.getCode())) {
//确认收入
String date = sdf.format(voucherDetail.getDataTime());
String[] split = date.split(".");
SimpleDateFormat sdfnew = new SimpleDateFormat("yyyy-MM-dd");
String date = sdfnew.format(voucherDetail.getDataTime());
String[] split = date.split("-");
String month = split[1];
dto1.setSummary(month + "月逾期利息确认收入");
dto1.setSubjectNo("2191.05.00");
dto1.setDimensionDept(voucherDetail.getDeptCode());
dto2.setSummary(month + "月逾期利息确认收入");
dto2.setSubjectNo("6002.01.19");
dto2.setDimensionDept(voucherDetail.getDeptCode());

2
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/voucher/VoucherService.java
View File

@ -35,7 +35,7 @@ public class VoucherService extends FinKingDeeService {
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
map_fEntityModel_.put("FDate", sdf.format(new Date()));
//凭证字
map_fEntityModel_.put("FVOUCHERGROUPID", "PRE001");
map_fEntityModel_.put("FVOUCHERGROUPID", "PZZ34");
List<Voucher.VoucherResultDetailDto> voucherResultDetailDtos = voucher.getResultDetails() == null ? new ArrayList<>() : voucher.getResultDetails();
//准备 物料列表的数据
ResultBean<List<Map<String, String>>> vehicleListMap = createVehicleListsForReceivableBill(voucherResultDetailDtos);

2
anrui-fin/anrui-fin-biz/src/main/resources/application-test.yml
View File

@ -16,7 +16,7 @@ spring:
max-idle: 8 #连接池中的最大空闲连接
max-wait: -1 # 连接池最大阻塞等待时间（使用负值表示没有限制）
min-idle: 0 # 连接池中的最小空闲连接
password:
password: 123456
port: 6379
timeout: 0 # 连接超时时间（毫秒）
image:

2
anrui-flowable/anrui-flowable-biz/src/main/resources/application-test.yml
View File

@ -17,7 +17,7 @@ spring:
max-idle: 8 #连接池中的最大空闲连接
max-wait: -1 # 连接池最大阻塞等待时间（使用负值表示没有限制）
min-idle: 0 # 连接池中的最小空闲连接
password:
password: 123456
port: 6379
timeout: 0 # 连接超时时间（毫秒）

2
anrui-gateway/src/main/resources/application-test.yml
View File

@ -14,6 +14,6 @@ spring:
max-idle: 8 #连接池中的最大空闲连接
max-wait: -1 # 连接池最大阻塞等待时间（使用负值表示没有限制）
min-idle: 0 # 连接池中的最小空闲连接
password:
password: 123456
port: 6379
timeout: 0 # 连接超时时间（毫秒）

1
anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserRest.java
View File

@ -540,6 +540,7 @@ public class SysUserRest implements SysUserFeign {
return new ResultBean<SysUserVo>().fail().setMsg("请重新登录");
}
SysUser user = sysUserService.selectByUserName(userName);
user.setToken(token);
SysUserVo userInfoOneVo = sysUserService.selectUserOne(user);
if (userInfoOneVo == null) {
return new ResultBean<SysUserVo>().fail().setMsg("该用户不是公司员工");

4
anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserService.java
View File

@ -73,8 +73,8 @@ public class SysUserService extends MybatisBaseService<SysUserMapper, SysUser> {
/**
* 设置redis的过期时间为4小时
*/
// public static final long USERS_REDIS_SESSION_TL_PC = 4 * 3600;
public static final long USERS_REDIS_SESSION_TL_PC = 60;
public static final long USERS_REDIS_SESSION_TL_PC = 4 * 3600;
// public static final long USERS_REDIS_SESSION_TL_PC = 60;
public static final long USERS_REDIS_SESSION_TL_App = 24 * 15 * 3600;
/**
* 验证码长度

2
anrui-portal/anrui-portal-biz/src/main/resources/application-test.yml
View File

@ -17,7 +17,7 @@ spring:
max-idle: 8 #连接池中的最大空闲连接
max-wait: -1 # 连接池最大阻塞等待时间（使用负值表示没有限制）
min-idle: 0 # 连接池中的最小空闲连接
password:
password: 123456
port: 6379
timeout: 0 # 连接超时时间（毫秒）

2
anrui-reportcenter/anrui-reportcenter-biz/src/main/resources/application-test.yml
View File

@ -17,7 +17,7 @@ spring:
max-idle: 8 #连接池中的最大空闲连接
max-wait: -1 # 连接池最大阻塞等待时间（使用负值表示没有限制）
min-idle: 0 # 连接池中的最小空闲连接
password:
password: 123456
port: 6379
timeout: 0 # 连接超时时间（毫秒）

2
anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbuckleapply/LoanBuckleHistoryRecord.java
View File

@ -41,7 +41,7 @@ public class LoanBuckleHistoryRecord {
// private String outstandingMoney;
@ApiModelProperty("实还日期")
private String actualDate;
private String payState;
private List<String> historySids = new ArrayList<>();
}

3
anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbuckleapplyrecord/LoanBuckleApplyRecord.java
View File

@ -26,5 +26,6 @@ public class LoanBuckleApplyRecord extends BaseEntity {
private String repaymentHistorySid;
@ApiModelProperty("实还金额")
private BigDecimal actualMoney;
@ApiModelProperty("还款状态（0正常还款，1逾期还款）")
private Integer payState;
}

1
anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymenthistory/LoanRepaymentHistory.java
View File

@ -52,4 +52,5 @@ public class LoanRepaymentHistory extends BaseEntity {
private Date updateTime;
@ApiModelProperty("收款单据编号")
private String skdBillNo;
private Integer payState; //还款状态（0正常还款，1逾期还款）
}

1
anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymenthistory/RepaymentHistoryVoForBuckle.java
View File

@ -46,4 +46,5 @@ public class RepaymentHistoryVoForBuckle {
private String planDetailSid;
private String updateState; //更新状态
private String updateTime; //更新日期
private String payState;
}

21
anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymenthistory/RepaymentHistoryVoForBuckleNew.java
View File

@ -0,0 +1,21 @@
package com.yxt.anrui.riskcenter.api.loanrepaymenthistory;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.math.BigDecimal;
/**
* @author Fan
* @description
* @date 2024/3/20 11:51
*/
@Data
public class RepaymentHistoryVoForBuckleNew {
private String rule;
private String sid;
@ApiModelProperty("实还金额")
private BigDecimal actualMoney;
}

1
anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymentplandetails/LoanRepaymentPlanDetails.java
View File

@ -78,7 +78,6 @@ public class LoanRepaymentPlanDetails extends BaseEntity {
private BigDecimal fund; //资金占用费
private Integer overdue; //是否曾逾期（0是，1否）
private Integer oweState; //是否转累欠状态（0是，1否）
private Integer payState; //还款状态（0正常还款，1逾期还款）
private Date updateTime; //更新日期
}

182
anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbuckleapply/LoanBuckleApplyService.java
View File

@ -50,6 +50,7 @@ import com.yxt.anrui.riskcenter.api.loanfile.LoanFileEnum;
import com.yxt.anrui.riskcenter.api.loanmonthlyaccrualrecord.LoanMonthlyAccrualRecord;
import com.yxt.anrui.riskcenter.api.loanrepaymenthistory.LoanRepaymentHistory;
import com.yxt.anrui.riskcenter.api.loanrepaymenthistory.LoanRepaymentHistoryRecordVo;
import com.yxt.anrui.riskcenter.api.loanrepaymentplandetails.LoanPlanDetailsVoForLateVoucher;
import com.yxt.anrui.riskcenter.api.loanrepaymentplandetails.LoanRepaymentPlanDetails;
import com.yxt.anrui.riskcenter.biz.loanbuckleapplyrecord.LoanBuckleApplyRecordService;
import com.yxt.anrui.riskcenter.biz.loanbuckleplanhistory.LoanBucklePlanHistoryService;
@ -264,6 +265,7 @@ public class LoanBuckleApplyService extends MybatisBaseService<LoanBuckleApplyMa
if (StringUtils.isNotBlank(record.getActualMoney())) {
applyRecord.setActualMoney(new BigDecimal(record.getActualMoney()));
}
applyRecord.setPayState(Integer.parseInt(record.getPayState()));
loanBuckleApplyRecordService.insert(applyRecord);
List<String> historySids = record.getHistorySids();
if (!historySids.isEmpty()) {
@ -309,6 +311,7 @@ public class LoanBuckleApplyService extends MybatisBaseService<LoanBuckleApplyMa
if (StringUtils.isNotBlank(record.getActualMoney())) {
applyRecord.setActualMoney(new BigDecimal(record.getActualMoney()));
}
applyRecord.setPayState(Integer.parseInt(record.getPayState()));
loanBuckleApplyRecordService.insert(applyRecord);
List<String> historySids = record.getHistorySids();
if (!historySids.isEmpty()) {
@ -601,22 +604,6 @@ public class LoanBuckleApplyService extends MybatisBaseService<LoanBuckleApplyMa
//流程中的参数赋值
Map<String, Object> variables = new HashMap<>();
Map<String, Object> appMap = new HashMap<>();
//若有网关，则赋值网关中判断的字段。
// boolean isTure = true;
// //去查询是否同意
// if (StringUtils.isNotBlank(loanCustomerRecord.getSalesUserSid())) {
// if (!loanCustomerRecord.getCreateBySid().equals(loanCustomerRecord.getSalesUserSid())) {
// isTure = false;
// }
// }
// variables.put("isTure", isTure);
// if (bv.getTaskDefKey().equals("Activity_1078xxs")) {
// if (StringUtils.isNotBlank(loanCustomerRecord.getManageSid())) {
// bv.setNextNodeUserSids(loanCustomerRecord.getManageSid());
// } else {
// bv.setNextNodeUserSids(ProcDefEnum.DEFAUL_TADMIN_SID.getProDefId());
// }
// }
variables.put("businessSid", businessSid);
appMap.put("sid", businessSid);
variables.put("app", appMap);
@ -625,6 +612,7 @@ public class LoanBuckleApplyService extends MybatisBaseService<LoanBuckleApplyMa
if (!resultBean.getSuccess()) {
return rb.setMsg(resultBean.getMsg());
}
UpdateFlowFieldVo ufVo = resultBean.getData();
int i = updateFlowFiled(BeanUtil.beanToMap(resultBean.getData()));
if ("Event_end".equals(resultBean.getData().getTaskDefKey())) {
LoanBuckleApply buckleApply = fetchBySid(businessSid);
@ -649,39 +637,118 @@ public class LoanBuckleApplyService extends MybatisBaseService<LoanBuckleApplyMa
}
}
}
// List<LoanBuckleApplyRecord> applyRecords = loanBuckleApplyRecordService.selByMainSid(businessSid);
// if (!applyRecords.isEmpty()) {
// for (LoanBuckleApplyRecord applyRecord : applyRecords) {
// LoanRepaymentHistory repaymentHistory = loanRepaymentHistoryService.fetchBySid(applyRecord.getRepaymentHistorySid());
// if (null != repaymentHistory) {
// repaymentHistory.setBuckle("审核通过");
// repaymentHistory.setBuckleKey("003");
// repaymentHistory.setClosingDate(new DateTime());
// loanRepaymentHistoryService.updateById(repaymentHistory);
// }
// }
// }
try {
ThreadFactory namedThreadFactory = new ThreadFactoryBuilder()
.setNameFormat("demo-pool-%d").build();
ExecutorService pool = new org.apache.tomcat.util.threads.ThreadPoolExecutor(1, 10,
1000, TimeUnit.MILLISECONDS,
new LinkedBlockingQueue<Runnable>(1024), namedThreadFactory, new org.apache.tomcat.util.threads.ThreadPoolExecutor.AbortPolicy());
//推送划扣凭证
Future future = pool.submit(() -> {
pushBuckleVoucher(businessSid);
});
} catch (Exception e) {
e.printStackTrace();
log.error("推送数据失败=========================" + e.getMessage());
return rb.setMsg("推送数据失败");
}
//推送划扣凭证
pushBuckleVoucher(businessSid);
//推送转累欠凭证
pushLaterBuckleVoucher(businessSid);
} else {
//极光推送
loanBuckleApply = fetchBySid(businessSid);
MessageFlowableQuery messageFlowableQuery = new MessageFlowableQuery();
MessageFlowVo messageFlowVo = new MessageFlowVo();
BeanUtil.copyProperties(ufVo, messageFlowVo);
messageFlowVo.setProcDefId(loanBuckleApply.getProcDefId());
messageFlowVo.setProcInsId(loanBuckleApply.getProcInstId());
messageFlowableQuery.setUfVo(messageFlowVo);
messageFlowableQuery.setAppMap(appMap);
messageFlowableQuery.setBusinessSid(businessSid);
messageFlowableQuery.setModuleName("划扣申请");
messageFlowableQuery.setMsgContent(loanBuckleApply.getApplyName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批");
messageFlowableQuery.setMsgTitle("划扣申请");
ResultBean<String> stringResultBean = messageFeign.pushMessage(messageFlowableQuery);
}
return rb.success().setData(resultBean.getData());
} else {
return rb.setMsg("操作失败!提交的数据不一致");
}
}
private void pushLaterBuckleVoucher(String businessSid) {
List<LoanBuckleApplyRecord> records = loanBuckleApplyRecordService.selByMainSid(businessSid);
if (!records.isEmpty()) {
List<String> planSids = new ArrayList<>();
List<String> finalPlanSids = new ArrayList<>();
records.stream().forEach(r -> {
planSids.add(r.getRepaymentHistorySid());
});
if (!planSids.isEmpty()) {
List<LoanPlanDetailsVoForLateVoucher> vouchers = loanRepaymentPlanDetailsService.selPushLaterVoucherOnBuckle(planSids);
if (!vouchers.isEmpty()) {
GeneralVoucher generalVoucher = new GeneralVoucher();
List<GeneralVoucher.GeneralVoucherDetail> voucherDetails = new ArrayList<>();
for (LoanPlanDetailsVoForLateVoucher planDetails : vouchers) {
finalPlanSids.add(planDetails.getPlanSid());
GeneralVoucher.GeneralVoucherDetail voucherDetail = new GeneralVoucher.GeneralVoucherDetail();
if (StringUtils.isNotBlank(planDetails.getUseOrgSid())) {
String useOrgSid = planDetails.getUseOrgSid();
SysOrganizationVo organizationVo = sysOrganizationFeign.fetchBySid(useOrgSid).getData();
if (null != organizationVo) {
generalVoucher.setUseOrgCode(organizationVo.getOrgCode());
}
}
if (StringUtils.isNotBlank(planDetails.getDeptSid())) {
String deptSid = planDetails.getDeptSid();
SysOrganizationVo organizationDeptVo = sysOrganizationFeign.fetchBySid(deptSid).getData();
if (null != organizationDeptVo) {
voucherDetail.setDeptCode(organizationDeptVo.getOrgCode());
}
}
BusSalesOrderVehicle busSalesOrderVehicle = busSalesOrderVehicleFeign.details(planDetails.getBusVinSid()).getData();
BusSalesOrder salesOrder = busSalesOrderFeign.fetchBySid(planDetails.getSalesOrderSid()).getData();
if (null != salesOrder) {
if (null != busSalesOrderVehicle) {
String customerNumber = "";
//判断财务系统是否有客户
Boolean aBoolean = finKingDeeFeign.customerExistState(busSalesOrderVehicle.getTemporaryNo()).getData();
String linkNo = "";
BusSalesOrderBorrowerDetailsVo borrowerDetailsVo = busSalesOrderBorrowerFeign.fetchDetailsBySid(busSalesOrderVehicle.getBorrowerSid()).getData();
if (!aBoolean) {
// List<BdCustomer> bdCustomers = new ArrayList<>();
BdCustomer bdCustomer = new BdCustomer();
bdCustomer.setFNumber(busSalesOrderVehicle.getTemporaryNo());
bdCustomer.setFShortName(salesOrder.getContractNo());
BasePurchaseSystemDetailsVo data = basePurchaseSystemFeign.fetchDetailsByDeptSid(salesOrder.getPurchaseSystemSid()).getData();
bdCustomer.setTOrgIds(data.getOrgCode());
if (org.apache.commons.lang3.StringUtils.isNotBlank(busSalesOrderVehicle.getLinkNo())) {
String vinNo = busSalesOrderVehicle.getLinkNo();
if (vinNo.length() > 8) {
linkNo = vinNo.substring(vinNo.length() - 8);
} else {
linkNo = busSalesOrderVehicle.getLinkNo();
}
if (null != borrowerDetailsVo) {
bdCustomer.setFName(borrowerDetailsVo.getBorrowerName() + linkNo);
}
} else {
if (null != borrowerDetailsVo) {
bdCustomer.setFName(borrowerDetailsVo.getBorrowerName() + busSalesOrderVehicle.getTemporaryNo());
}
}
// bdCustomers.add(bdCustomer);
ResultBean<String> resultBean = finKingDeeFeign.draftBdCustomer(bdCustomer);
if (resultBean.getSuccess()) {
customerNumber = bdCustomer.getFNumber();
}
} else {
customerNumber = busSalesOrderVehicle.getTemporaryNo();
}
voucherDetail.setCustomerCode(customerNumber);
}
}
if (StringUtils.isNotBlank(planDetails.getOutstandingMoney())) {
voucherDetail.setAmount(new BigDecimal(planDetails.getOutstandingMoney()));
}
voucherDetails.add(voucherDetail);
}
generalVoucher.setVoucherDetails(voucherDetails);
finKingDeeFeign.saveLateVoucher(generalVoucher);
}
}
if (!finalPlanSids.isEmpty()) {
int i = loanRepaymentPlanDetailsService.updateOweState(finalPlanSids);
}
}
}
private void pushBuckleVoucher(String businessSid) {
List<LoanBuckleApplyRecord> records = loanBuckleApplyRecordService.selByMainSid(businessSid);
@ -692,20 +759,20 @@ public class LoanBuckleApplyService extends MybatisBaseService<LoanBuckleApplyMa
LoanRepaymentPlanDetails planDetails = loanRepaymentPlanDetailsService.fetchBySid(v.getRepaymentHistorySid());
if (null != planDetails) {
GeneralVoucher.GeneralVoucherDetail voucherDetail = new GeneralVoucher.GeneralVoucherDetail();
String state = loanRepaymentPlanDetailsService.selForPushBuckleVoucher(v.getRepaymentHistorySid());
if (StringUtils.isNotBlank(state)) {
if (state.equals("2")) {
voucherDetail.setSceneCode("01");
} else {
if (planDetails.getPayState() == 1) {
voucherDetail.setSceneCode("01");
// oweState 是否转累欠状态（0是，1否）
Integer oweState = planDetails.getOweState();
if (oweState == 1) {
voucherDetail.setSceneCode("01");
} else if (oweState == 0) {
BigDecimal paymentMoney = planDetails.getPaymentMoney();
if (null != paymentMoney) {
if (paymentMoney.compareTo(BigDecimal.ZERO) > 0) {
voucherDetail.setSceneCode("03");
} else {
if (state.equals("0")) {
voucherDetail.setSceneCode("03");
} else if (state.equals("1")) {
voucherDetail.setSceneCode("02");
}
voucherDetail.setSceneCode("02");
}
} else {
voucherDetail.setSceneCode("02");
}
}
String bankName = loanRepaymentPlanDetailsService.getBankNameByMainOrOtherPolicy(planDetails);
@ -1120,8 +1187,7 @@ public class LoanBuckleApplyService extends MybatisBaseService<LoanBuckleApplyMa
return rb.setMsg("删除的数据中包含已经提交审批的数据，删除失败");
}
}
loanBuckleApply.setIsDelete(1);
int i = baseMapper.updateById(loanBuckleApply);
int i = baseMapper.deleteById(loanBuckleApply);
if (i == 0) {
return rb.setMsg("删除失败");
}
@ -1143,6 +1209,8 @@ public class LoanBuckleApplyService extends MybatisBaseService<LoanBuckleApplyMa
}
}
}
loanBuckleApplyRecordService.deleteByMainSid(sid);
loanBucklePlanHistoryService.deleteByMainSid(sid);
}
return ResultBean.fireSuccess().setMsg("删除成功");
}

6
anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbuckleplanhistory/LoanBucklePlanHistoryMapper.java
View File

@ -3,6 +3,7 @@ package com.yxt.anrui.riskcenter.biz.loanbuckleplanhistory;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.yxt.anrui.riskcenter.api.loanbuckleapplyrecord.LoanBuckleApplyRecord;
import com.yxt.anrui.riskcenter.api.loanbuckleplanhistory.LoanBucklePlanHistory;
import org.apache.ibatis.annotations.Delete;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
@ -13,4 +14,9 @@ import java.util.List;
public interface LoanBucklePlanHistoryMapper extends BaseMapper<LoanBucklePlanHistory> {
List<String> fetchByMainSidAndPlanSid(@Param("sid") String sid, @Param("repaymentHistorySid") String repaymentHistorySid);
@Delete(" DELETE\n" +
" FROM loan_buckle_plan_history\n" +
" WHERE mainSid = #{sid}")
void deleteByMainSid(@Param("sid")String sid);
}

4
anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbuckleplanhistory/LoanBucklePlanHistoryService.java
View File

@ -19,4 +19,8 @@ public class LoanBucklePlanHistoryService extends MybatisBaseService<LoanBuckleP
public List<String> fetchByMainSidAndPlanSid(String sid, String repaymentHistorySid) {
return baseMapper.fetchByMainSidAndPlanSid(sid,repaymentHistorySid);
}
public void deleteByMainSid(String sid) {
baseMapper.deleteByMainSid(sid);
}
}

16
anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitprep/LoanHomevisitPrepService.java
View File

@ -450,20 +450,20 @@ public class LoanHomevisitPrepService extends MybatisBaseService<LoanHomevisitPr
}
printConfirmDto.setSalesOrderVehicles(salesOrderVehicles);
List<File> filesList = new ArrayList<>();
//贷款车辆买卖合同
/*//贷款车辆买卖合同
List<String> dkclmmhts = dkclmmht(printConfirmDto, conSetUpKey);
//生成车辆融资协议
List<String> clrzxyUrls = generateCLRZXY(printConfirmDto, conSetUpKey);
//生成还款协议
List<String> hkxyUrls = hkxy(printConfirmDto, conSetUpKey);
//代管车辆委托书
List<String> dgclwtsUrls = dgclwts(printConfirmDto, conSetUpKey);
List<String> dgclwtsUrls = dgclwts(printConfirmDto, conSetUpKey);*/
//判断是否为高低开
BusSalesOrderPrice data = busSalesOrderFeign.selectByContractNoOne(printConfirmDto.getContractNo()).getData();
//查询金融方案
SolutionsDetailsVo solutionsDetailsVo = loanSolutionsService.selectDetails(busSalesOrder.getSid()).getData();
//判断是否为高低开，若是则生成开票申请书
List<String> kpsqsUrls = new ArrayList<>();
/*List<String> kpsqsUrls = new ArrayList<>();
if (!data.getSingleFinalPrice().equals(solutionsDetailsVo.getMainVehicleAmount())) {
//开票申请书
kpsqsUrls = kpsqs(printConfirmDto, conSetUpKey);
@ -477,11 +477,11 @@ public class LoanHomevisitPrepService extends MybatisBaseService<LoanHomevisitPr
//接收车辆确认书
List<String> jsclqrsUrls = jsclqrs(printConfirmDto, conSetUpKey);
//接收车辆委托书
List<String> jsclwtsUrls = jsclwts(printConfirmDto, conSetUpKey);
List<String> jsclwtsUrls = jsclwts(printConfirmDto, conSetUpKey);*/
//销售订单上装信息
List<BusSalesOrderMakeupDetailsVo> busSalesOrderMakeupDetailsVoList = busSalesOrderMakeupFeign.selectTopByOrderSid(busSalesOrder.getSid()).getData();
//查询金融方案中挂车信息
List<String> cljszcghtUrls = new ArrayList<>();
/* List<String> cljszcghtUrls = new ArrayList<>();
if ((busSalesOrderMakeupDetailsVoList != null && busSalesOrderMakeupDetailsVoList.size() > 0) || solutionsDetailsVo.isTrailerAmountCb()){
//生成车辆及上装采购合同
cljszcghtUrls = cljszcght(printConfirmDto, conSetUpKey);
@ -490,8 +490,8 @@ public class LoanHomevisitPrepService extends MybatisBaseService<LoanHomevisitPr
if ("0".equals(homeKcCust.getIsSecurity())) {
//生成公司股东会对外担保决议
gsgddwdbjyUrls = gsgddwdbjy(printConfirmDto, conSetUpKey);
}
if (dkclmmhts != null && dkclmmhts.size() > 0) {
}*/
/*if (dkclmmhts != null && dkclmmhts.size() > 0) {
for (String dkclmmht : dkclmmhts) {
File file = new File(docPdfComponent.getUploadTemplateUrl() + dkclmmht);
filesList.add(file);
@ -550,7 +550,7 @@ public class LoanHomevisitPrepService extends MybatisBaseService<LoanHomevisitPr
File file = new File(docPdfComponent.getUploadTemplateUrl() + gsgddwdbjyUrl);
filesList.add(file);
}
}
}*/
//合并pdf文件
if (filesList.size() > 0) {
String dateStr = DateUtil.format(new Date(), "yyyyMMdd");

3
anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymenthistory/LoanRepaymentHistoryMapper.xml
View File

@ -197,7 +197,8 @@
h.actualMoney,
h.buckle,
h.returnWay,
h.planDetailSid
h.planDetailSid,
h.payState
FROM
loan_repayment_history AS h
LEFT JOIN loan_repayment_plan_details AS p ON h.planDetailSid = p.sid

117
anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymenthistory/LoanRepaymentHistoryService.java
View File

@ -705,15 +705,19 @@ public class LoanRepaymentHistoryService extends MybatisBaseService<LoanRepaymen
for (String historySid : histories) {
LoanRepaymentHistory repaymentHistory = fetchBySid(historySid);
if (null != repaymentHistory) {
repaymentHistory.setUpdateState("1");
repaymentHistory.setUpdateTime(new DateTime());
baseMapper.updateById(repaymentHistory);
LoanRepaymentPlanDetails planDetails = loanRepaymentPlanDetailsService.fetchBySid(repaymentHistory.getPlanDetailSid());
if (null != planDetails) {
bankContractNos.add(planDetails.getBankContractNo());
pSids.add(planDetails.getSid());
useOrgSid = planDetails.getUseOrgSid();
//判断当期还款计划是否曾逾期
if (planDetails.getOverdue() == 0) {
repaymentHistory.setPayState(1);
}
}
repaymentHistory.setUpdateState("1");
repaymentHistory.setUpdateTime(new DateTime());
baseMapper.updateById(repaymentHistory);
}
}
Map<String, String> map = new HashMap<>();
@ -761,22 +765,6 @@ public class LoanRepaymentHistoryService extends MybatisBaseService<LoanRepaymen
//对当前涉及的还款计划是否为中车类是否有垫款
if (!pSids.isEmpty()) {
for (String pSid : pSids) {
//判断当前期数是正常还款还是逾期还款
LoanRepaymentPlanDetails details = loanRepaymentPlanDetailsService.fetchBySid(pSid);
if (null != details) {
if (details.getPayState() == 0) {
CheckPayStateVo checkPayStateVo = loanRepaymentPlanDetailsService.checkPayState(pSid);
if (null != checkPayStateVo) {
if (checkPayStateVo.getCheckState().equals("0")) {
BigDecimal money = new BigDecimal(checkPayStateVo.getActualMoney());
if (money.compareTo(BigDecimal.ZERO) > 0) {
details.setPayState(1);
loanRepaymentPlanDetailsService.updateById(details);
}
}
}
}
}
String reAdvances = loanRepaymentPlanDetailsService.reAdvancesOrPaymentMoney(pSid);
if (StringUtils.isNotBlank(reAdvances)) {
if (reAdvances.equals("0")) {
@ -814,8 +802,6 @@ public class LoanRepaymentHistoryService extends MybatisBaseService<LoanRepaymen
}
}
}
pushLateVoucher(pushUseOrgSid);
} else {
return rb.setMsg("暂无可更新的还款记录");
}
@ -928,11 +914,27 @@ public class LoanRepaymentHistoryService extends MybatisBaseService<LoanRepaymen
Map<String, BigDecimal> newMap = new HashMap<>();
Map<String, List<String>> stringListMap = new HashMap<>();
Set<String> planSids = new HashSet<>();
List<RepaymentHistoryVoForBuckleNew> newList = new ArrayList<>();
if (!histories.isEmpty()) {
countMoney = histories.stream()
.collect(Collectors.groupingBy(RepaymentHistoryVoForBuckle::getPlanDetailSid, CollectorsUtil.summingBigDecimal(RepaymentHistoryVoForBuckle::getActualMoney)));
sids = histories.stream()
.collect(Collectors.groupingBy(RepaymentHistoryVoForBuckle::getPlanDetailSid, Collectors.mapping(RepaymentHistoryVoForBuckle::getSid, Collectors.toList())));
histories.stream().forEach(h -> {
RepaymentHistoryVoForBuckleNew r = new RepaymentHistoryVoForBuckleNew();
if (StringUtils.isNotBlank(h.getPlanDetailSid()) && StringUtils.isNotBlank(h.getPayState())) {
r.setRule(h.getPlanDetailSid() + "!" + h.getPayState());
}
if (StringUtils.isNotBlank(h.getSid())) {
r.setSid(h.getSid());
}
if (null != h.getActualMoney()) {
r.setActualMoney(h.getActualMoney());
}
newList.add(r);
});
if (!newList.isEmpty()) {
countMoney = newList.stream()
.collect(Collectors.groupingBy(RepaymentHistoryVoForBuckleNew::getRule, CollectorsUtil.summingBigDecimal(RepaymentHistoryVoForBuckleNew::getActualMoney)));
sids = newList.stream()
.collect(Collectors.groupingBy(RepaymentHistoryVoForBuckleNew::getRule, Collectors.mapping(RepaymentHistoryVoForBuckleNew::getSid, Collectors.toList())));
}
}
for (Map.Entry<String, BigDecimal> entry : countMoney.entrySet()) {
if (entry.getValue().compareTo(BigDecimal.ZERO) > 0) {
@ -948,10 +950,18 @@ public class LoanRepaymentHistoryService extends MybatisBaseService<LoanRepaymen
}
for (Map.Entry<String, List<String>> entry : stringListMap.entrySet()) {
LoanBuckleHistoryRecord record = new LoanBuckleHistoryRecord();
record.setRecordSid(entry.getKey());
String planSid = "";
String payState = "";
if (StringUtils.isNotBlank(entry.getKey())) {
String[] split = entry.getKey().split("!");
planSid = split[0];
payState = split[1];
}
record.setRecordSid(planSid);
record.setPayState(payState);
record.setHistorySids(entry.getValue());
record.setActualMoney(newMap.get(entry.getKey()).toString());
LoanRepaymentPlanDetails planDetails = loanRepaymentPlanDetailsService.fetchBySid(entry.getKey());
LoanRepaymentPlanDetails planDetails = loanRepaymentPlanDetailsService.fetchBySid(planSid);
if (null != planDetails) {
if (StringUtils.isNotBlank(planDetails.getLoanContractNo())) {
record.setLoanContractNo(planDetails.getLoanContractNo());
@ -977,40 +987,6 @@ public class LoanRepaymentHistoryService extends MybatisBaseService<LoanRepaymen
}
historyRecords.add(record);
}
// if (!histories.isEmpty()) {
// for (LoanRepaymentHistoryVo history : histories) {
// String planDetailSid = history.getPlanDetailSid();
// List<LoanRepaymentHistory> historyList = baseMapper.selByPlanSid(planDetailSid);
// if (!historyList.isEmpty()) {
// BigDecimal actualMoney = new BigDecimal(0);
// for (LoanRepaymentHistory repaymentHistory : historyList) {
// actualMoney = repaymentHistory.getActualMoney().add(actualMoney);
// }
// if (actualMoney.compareTo(BigDecimal.ZERO) == -1) {
// planSids.add(planDetailSid);
// }
// }
// }
// }
// Iterator<LoanRepaymentHistoryVo> it = histories.iterator();
// while (it.hasNext()) {
// LoanRepaymentHistoryVo historyVo = it.next();
// if (!planSids.isEmpty()) {
// if (planSids.contains(historyVo.getPlanDetailSid())) {
// it.remove();
// }
// }
// }
// if (!histories.isEmpty()) {
// for (LoanRepaymentHistoryVo history : histories) {
// LoanBuckleHistoryRecord record = new LoanBuckleHistoryRecord();
// LoanRepaymentHistoryRecordVo recordVo = baseMapper.buckleInfo(history.getSid());
// if (null != recordVo) {
// BeanUtil.copyProperties(recordVo, record);
// }
// historyRecords.add(record);
// }
// }
vo.setRecords(historyRecords);
return rb.success().setData(vo);
}
@ -1650,24 +1626,6 @@ public class LoanRepaymentHistoryService extends MybatisBaseService<LoanRepaymen
LocalDate localDate = LocalDate.now().minusDays(1);
String formatDate = localDate.format(DateTimeFormatter.ofPattern("yyyy-MM-dd"));
int i = baseMapper.updateTimeByPlanSids(stringList, formatDate);
for (String pSid : stringList) {
//判断当前期数是正常还款还是逾期还款
LoanRepaymentPlanDetails details = loanRepaymentPlanDetailsService.fetchBySid(pSid);
if (null != details) {
if (details.getPayState() == 0) {
CheckPayStateVo checkPayStateVo = loanRepaymentPlanDetailsService.checkPayState(pSid);
if (null != checkPayStateVo) {
if (checkPayStateVo.getCheckState().equals("0")) {
BigDecimal money = new BigDecimal(checkPayStateVo.getActualMoney());
if (money.compareTo(BigDecimal.ZERO) > 0) {
details.setPayState(1);
loanRepaymentPlanDetailsService.updateById(details);
}
}
}
}
}
}
}
//判断当期是否逾期
List<HistoryOverDueVo> overDueVoList = loanRepaymentPlanDetailsService.overDueVoList(useOrgSid);
@ -1682,7 +1640,6 @@ public class LoanRepaymentHistoryService extends MybatisBaseService<LoanRepaymen
int i = loanRepaymentPlanDetailsService.updateOverDueState(planSids);
}
}
pushLateVoucher(useOrgSid);
}
return rb.success();
}

2
anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentplandetails/LoanRepaymentPlanDetailsMapper.java
View File

@ -75,4 +75,6 @@ public interface LoanRepaymentPlanDetailsMapper extends BaseMapper<LoanRepayment
CheckPayStateVo checkPayState(@Param("pSid") String pSid);
LoanPlanDetailsVoForFundVoucher pushFund(@Param("sid") String sid);
List<LoanPlanDetailsVoForLateVoucher> selPushLaterVoucherOnBuckle(@Param("planSids") List<String> planSids);
}

82
anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentplandetails/LoanRepaymentPlanDetailsMapper.xml
View File

@ -681,4 +681,86 @@
AND b.sid = #{sid}
) c
</select>
<select id="selPushLaterVoucherOnBuckle"
resultType="com.yxt.anrui.riskcenter.api.loanrepaymentplandetails.LoanPlanDetailsVoForLateVoucher">
SELECT b.loanContractNo,
b.sid AS planSid,
CASE
WHEN (b.outstandingMoney + b.bankBeInter + b.fund) >
0 THEN
'0'
WHEN (b.outstandingMoney + b.bankBeInter + b.fund) &lt;= 0 THEN
'1'
END AS overdueState,
b.outstandingMoney,
b.useOrgSid,
b.deptSid,
b.busVinSid,
b.salesOrderSid
FROM (
SELECT a.*,
IFNULL((SELECT (fjj.reveivableMoney - fjj.m)
FROM (SELECT IFNULL((SELECT SUM(subscriptionMoney)
FROM anrui_fin.fin_selected_receivables_detailed as s
WHERE s.auditState = '3'
and s.receivablesSid = fj.sid), 0) as m,
fj.*
FROM (SELECT j.busSid, j.sid, j.reveivableMoney
FROM anrui_fin.fin_uncollected_receivables_detailed_jr as j
WHERE j.payCostTitleKey = '006') as fj) as fjj
WHERE fjj.busSid = a.sid), 0) as fund
FROM (
SELECT pd.loanContractNo,
pd.oweState,
pd.dueDate,
pd.useOrgSid,
pd.deptSid,
pd.busVinSid,
pd.sid,
pd.dueMoney,
pd.overdue,
pd.salesOrderSid,
t.repaidMoney,
t.outstandingMoney,
IFNULL(pd.paymentInterest, 0) AS bankBeInter,
pd.overdue AS dueOverdue,
pd.updateTime AS updateDate
FROM loan_repayment_plan_details AS pd
LEFT JOIN anrui_buscenter.bus_sales_order AS s ON s.sid = pd.salesOrderSid
LEFT JOIN (
SELECT p.sid,
IFNULL((
SELECT SUM(
IFNULL(h.actualMoney, 0))
FROM loan_repayment_history AS h
WHERE h.planDetailSid = p.sid
AND h.updateState = '1'
),
0
) AS repaidMoney,
IFNULL(
(
p.dueMoney - IFNULL((
SELECT SUM(
IFNULL(h.actualMoney, 0))
FROM loan_repayment_history AS h
WHERE h.planDetailSid = p.sid
AND h.updateState = '1'
),
0
)),
0
) AS outstandingMoney
FROM loan_repayment_plan_details AS p
) AS t ON pd.sid = t.sid
) AS a
WHERE a.dueDate &lt;= a.updateDate
AND a.oweState = 1
) AS b
WHERE b.overdue = '0'
AND b.sid IN
<foreach collection="planSids" item="item" index="index" open="(" separator="," close=")">
#{item}
</foreach>
</select>
</mapper>

6
anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentplandetails/LoanRepaymentPlanDetailsService.java
View File

@ -217,6 +217,7 @@ public class LoanRepaymentPlanDetailsService extends MybatisBaseService<LoanRepa
generalVoucher.setUseOrgCode(organizationVo.getOrgCode());
}
GeneralVoucher.GeneralVoucherDetail voucherDetail1 = new GeneralVoucher.GeneralVoucherDetail();
voucherDetail1.setTimeFlag("1");
voucherDetail1.setSceneCode("贷方");
voucherDetail1.setDataTime(new DateTime());
voucherDetail1.setAmount(v.getDuePushMoney());
@ -235,6 +236,7 @@ public class LoanRepaymentPlanDetailsService extends MybatisBaseService<LoanRepa
String deptSid = salesOrder.getOrgSid();
GeneralVoucher.GeneralVoucherDetail voucherDetail = new GeneralVoucher.GeneralVoucherDetail();
voucherDetail.setSceneCode("借方");
voucherDetail.setTimeFlag("1");
voucherDetail.setDataTime(new DateTime());
SysOrganizationVo organizationDeptVo = sysOrganizationFeign.fetchBySid(deptSid).getData();
if (null != organizationDeptVo) {
@ -298,4 +300,8 @@ public class LoanRepaymentPlanDetailsService extends MybatisBaseService<LoanRepa
}
return rb.success();
}
public List<LoanPlanDetailsVoForLateVoucher> selPushLaterVoucherOnBuckle(List<String> planSids) {
return baseMapper.selPushLaterVoucherOnBuckle(planSids);
}
}

2
anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentplandetails/ScheduledRepaymentPlanDetailsService.java
View File

@ -184,6 +184,7 @@ public class ScheduledRepaymentPlanDetailsService {
voucherDetail1.setSceneCode("贷方");
voucherDetail1.setDataTime(new DateTime());
voucherDetail1.setAmount(result);
voucherDetail1.setTimeFlag("0");
List<SysOrganizationVo> deptVo = sysOrganizationFeign.selectChildrenListBySid(u).getData();
if (!deptVo.isEmpty()) {
deptVo.stream().forEach(d -> {
@ -200,6 +201,7 @@ public class ScheduledRepaymentPlanDetailsService {
String deptSid = salesOrder.getOrgSid();
GeneralVoucher.GeneralVoucherDetail voucherDetail = new GeneralVoucher.GeneralVoucherDetail();
voucherDetail.setSceneCode("借方");
voucherDetail.setTimeFlag("0");
voucherDetail.setDataTime(new DateTime());
SysOrganizationVo organizationDeptVo = sysOrganizationFeign.fetchBySid(deptSid).getData();
if (null != organizationDeptVo) {

2
anrui-riskcenter/anrui-riskcenter-biz/src/main/resources/application-test.yml
View File

@ -17,7 +17,7 @@ spring:
max-idle: 8 #连接池中的最大空闲连接
max-wait: -1 # 连接池最大阻塞等待时间（使用负值表示没有限制）
min-idle: 0 # 连接池中的最小空闲连接
password:
password: 123456
port: 6379
timeout: 0 # 连接超时时间（毫秒）
image:

10
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinbound/ScmApplyInboundService.java
View File

@ -1040,11 +1040,11 @@ public class ScmApplyInboundService extends MybatisBaseService<ScmApplyInboundMa
if (vinNo.length() != 17) {
return new ResultBean().fail().setMsg(scmApplyInboundVehicleDto.getVinNo() + "车架号输入不正确");
}
}
//判断相同车架号在整个集团中是否存在非退库的
Integer count = baseVehicleFeign.selectVinNo(scmApplyInboundVehicleDto.getVinNo().substring(scmApplyInboundVehicleDto.getVinNo().length() - 8)).getData();
if (count > 0){
return new ResultBean().fail().setMsg(scmApplyInboundVehicleDto.getVinNo() + "在集团中存在未退库的车辆，无法入库");
//判断相同车架号在整个集团中是否存在非退库的
Integer count = baseVehicleFeign.selectVinNo(scmApplyInboundVehicleDto.getVinNo().substring(scmApplyInboundVehicleDto.getVinNo().length() - 8)).getData();
if (count > 0){
return new ResultBean().fail().setMsg(scmApplyInboundVehicleDto.getVinNo() + "在集团中存在未退库的车辆，无法入库");
}
}
}
/*int vinCount = 0;

2
anrui-scm/anrui-scm-biz/src/main/resources/application-test.yml
View File

@ -16,7 +16,7 @@ spring:
max-idle: 8 #连接池中的最大空闲连接
max-wait: -1 # 连接池最大阻塞等待时间（使用负值表示没有限制）
min-idle: 0 # 连接池中的最小空闲连接
password:
password: 123456
port: 6379
timeout: 0 # 连接超时时间（毫秒）
image:

2
anrui-terminal/anrui-terminal-biz/src/main/resources/application-test.yml
View File

@ -13,7 +13,7 @@ spring:
max-idle: 8 #连接池中的最大空闲连接
max-wait: -1 # 连接池最大阻塞等待时间（使用负值表示没有限制）
min-idle: 0 # 连接池中的最小空闲连接
password:
password: 123456
port: 6379
timeout: 0 # 连接超时时间（毫秒）

12
yxt-as/src/main/java/com/yxt/anrui/as/biz/asserviceitem/AsServiceItemService.java
View File

@ -8,8 +8,8 @@ import com.yxt.anrui.as.api.asserviceitem.*;
import com.yxt.anrui.as.feign.base.basevehiclemodel.BaseVehModelVo;
import com.yxt.anrui.as.feign.base.basevehiclemodel.BaseVehicleModelFeign;
import com.yxt.anrui.as.feign.portal.sysstafforg.SysStaffOrgFeign;
import com.yxt.anrui.as.feign.wms.wmsmanufacturer.WmsManufacturerFeign;
import com.yxt.anrui.as.feign.wms.wmsmanufacturer.WmsManufacturerVo;
import com.yxt.anrui.as.feign.base.basemanufacturer.BaseManufacturerFeign;
import com.yxt.anrui.as.feign.base.basemanufacturer.BaseManufacturerVo;
import com.yxt.common.base.service.MybatisBaseService;
import com.yxt.common.base.utils.PagerUtil;
import com.yxt.common.base.utils.StringUtils;
@ -30,7 +30,7 @@ import java.util.List;
public class AsServiceItemService extends MybatisBaseService<AsServiceItemMapper, AsServiceItem> {
@Resource
private WmsManufacturerFeign wmsManufacturerFeign;
private BaseManufacturerFeign baseManufacturerFeign;
@Resource
private BaseVehicleModelFeign baseVehicleModelFeign;
@Autowired
@ -101,9 +101,9 @@ public class AsServiceItemService extends MybatisBaseService<AsServiceItemMapper
if (orgSidByPath.getSuccess()) {
useOrgSid = orgSidByPath.getData();
}
List<WmsManufacturerVo> wmsManufacturerVos = wmsManufacturerFeign.getAllTypeByUseOrgSid(useOrgSid).getData();
if (!wmsManufacturerVos.isEmpty()) {
for (WmsManufacturerVo wmsManufacturerVo : wmsManufacturerVos) {
List<BaseManufacturerVo> manufacturerVos = baseManufacturerFeign.getAllTypeByUseOrgSid(useOrgSid).getData();
if (!manufacturerVos.isEmpty()) {
for (BaseManufacturerVo wmsManufacturerVo : manufacturerVos) {
ManufacturerVo vo = new ManufacturerVo();
vo.setManufacturerSid(wmsManufacturerVo.getSid());
vo.setManufacturer(wmsManufacturerVo.getManufacturerName());

14
yxt-as/src/main/java/com/yxt/anrui/as/biz/asservicepackage/AsServicePackageService.java
View File

@ -36,9 +36,9 @@ import com.yxt.anrui.as.biz.asservicepackageaitem.AsServicePackageAitemService;
import com.yxt.anrui.as.biz.asservicepackagegoods.AsServicePackageGoodsService;
import com.yxt.anrui.as.biz.asservicepackagesitem.AsServicePackageSitemService;
import com.yxt.anrui.as.feign.portal.sysstafforg.SysStaffOrgFeign;
import com.yxt.anrui.as.feign.wms.wmsgoods.WmsGoodsFeign;
import com.yxt.anrui.as.feign.wms.wmsgoods.WmsGoodsPackageQuery;
import com.yxt.anrui.as.feign.wms.wmsgoods.WmsGoodsPackageVo;
import com.yxt.anrui.as.feign.wms.wmsInventory.WmsInventoryFeign;
import com.yxt.anrui.as.feign.wms.wmsInventory.WmsInventoryPackageQuery;
import com.yxt.anrui.as.feign.wms.wmsInventory.WmsInventoryPackageVo;
import com.yxt.common.core.result.ResultBean;
import org.apache.commons.lang3.StringUtils;
import com.yxt.common.base.service.MybatisBaseService;
@ -78,7 +78,7 @@ public class AsServicePackageService extends MybatisBaseService<AsServicePackage
@Autowired
private AsServicePackageSitemService asServicePackageSitemService;
@Resource
private WmsGoodsFeign wmsGoodsFeign;
private WmsInventoryFeign wmsInventoryFeign;
private QueryWrapper<AsServicePackage> createQueryWrapper(AsServicePackageQuery query) {
// todo: 这里根据具体业务调整查询条件
@ -282,7 +282,7 @@ public class AsServicePackageService extends MybatisBaseService<AsServicePackage
}
public PagerVo<GoodsListVo> selGoodsInfo(PagerQuery<PackageGoodsQuery> pq) {
PagerQuery<WmsGoodsPackageQuery> query = new PagerQuery<>();
PagerQuery<WmsInventoryPackageQuery> query = new PagerQuery<>();
BeanUtil.copyProperties(pq, query);
PackageGoodsQuery params = pq.getParams();
// ResultBean<String> orgSidByPath = sysStaffOrgFeign.getOrgSidByPath(params.getOrgPath());
@ -291,10 +291,10 @@ public class AsServicePackageService extends MybatisBaseService<AsServicePackage
// WmsGoodsPackageQuery queryParams = query.getParams();
// queryParams.setUseOrgSid(useOrgSid);
// }
ResultBean<PagerVo<WmsGoodsPackageVo>> voResultBean = wmsGoodsFeign.getPackageGoodsVo(query);
ResultBean<PagerVo<WmsInventoryPackageVo>> voResultBean = wmsInventoryFeign.getPackageGoodsVo(query);
PagerVo<GoodsListVo> vo = new PagerVo<>();
if (voResultBean.getSuccess()) {
PagerVo<WmsGoodsPackageVo> data = voResultBean.getData();
PagerVo<WmsInventoryPackageVo> data = voResultBean.getData();
BeanUtil.copyProperties(data, vo);
}
return vo;

13
yxt-as/src/main/java/com/yxt/anrui/as/feign/wms/wmsmanufacturer/WmsManufacturerFeign.java → yxt-as/src/main/java/com/yxt/anrui/as/feign/base/basemanufacturer/BaseManufacturerFeign.java
View File

@ -1,11 +1,10 @@
package com.yxt.anrui.as.feign.wms.wmsmanufacturer;
package com.yxt.anrui.as.feign.base.basemanufacturer;
import com.yxt.common.core.result.ResultBean;
import io.swagger.annotations.ApiOperation;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.ResponseBody;
import java.util.List;
@ -15,15 +14,15 @@ import java.util.List;
* @date: 2024/3/7
**/
@FeignClient(
contextId = "yxt-wms-WmsManufacturer",
name = "yxt-wms",
contextId = "yxt-wms-BaseManufacturer",
name = "yxt-base",
path = "apiadmin/base/basemanufacturer",
fallback = WmsManufacturerFeignFallback.class
fallback = BaseManufacturerFeignFallback.class
)
public interface WmsManufacturerFeign {
public interface BaseManufacturerFeign {
@ApiOperation("查询分公司下所有的厂家")
@GetMapping("/getAllTypeByUseOrgSid")
public ResultBean<List<WmsManufacturerVo>> getAllTypeByUseOrgSid(@RequestParam("useOrgSid") String useOrgSid);
public ResultBean<List<BaseManufacturerVo>> getAllTypeByUseOrgSid(@RequestParam("useOrgSid") String useOrgSid);
}

8
yxt-as/src/main/java/com/yxt/anrui/as/feign/wms/wmsmanufacturer/WmsManufacturerFeignFallback.java → yxt-as/src/main/java/com/yxt/anrui/as/feign/base/basemanufacturer/BaseManufacturerFeignFallback.java
View File

@ -23,11 +23,9 @@
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.anrui.as.feign.wms.wmsmanufacturer;
package com.yxt.anrui.as.feign.base.basemanufacturer;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
import org.springframework.stereotype.Component;
import java.util.List;
@ -46,11 +44,11 @@ import java.util.List;
* @since 1.0
*/
@Component
public class WmsManufacturerFeignFallback implements WmsManufacturerFeign {
public class BaseManufacturerFeignFallback implements BaseManufacturerFeign {
@Override
public ResultBean<List<WmsManufacturerVo>> getAllTypeByUseOrgSid(String useOrgSid) {
public ResultBean<List<BaseManufacturerVo>> getAllTypeByUseOrgSid(String useOrgSid) {
return null;
}
}

4
yxt-as/src/main/java/com/yxt/anrui/as/feign/wms/wmsmanufacturer/WmsManufacturerVo.java → yxt-as/src/main/java/com/yxt/anrui/as/feign/base/basemanufacturer/BaseManufacturerVo.java
View File

@ -1,4 +1,4 @@
package com.yxt.anrui.as.feign.wms.wmsmanufacturer;
package com.yxt.anrui.as.feign.base.basemanufacturer;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
@ -11,7 +11,7 @@ import java.util.Date;
* @date 2024/3/7 14:29
*/
@Data
public class WmsManufacturerVo {
public class BaseManufacturerVo {
private String id;
private String sid;
private String lockVersion;

16
yxt-as/src/main/java/com/yxt/anrui/as/feign/wms/wmsgoods/WmsGoodsFeign.java → yxt-as/src/main/java/com/yxt/anrui/as/feign/wms/wmsInventory/WmsInventoryFeign.java
View File

@ -1,16 +1,12 @@
package com.yxt.anrui.as.feign.wms.wmsgoods;
package com.yxt.anrui.as.feign.wms.wmsInventory;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
import io.swagger.annotations.ApiOperation;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestParam;
import java.util.List;
/**
* @description: 商品基础信息
@ -18,14 +14,14 @@ import java.util.List;
* @date: 2024/3/7
**/
@FeignClient(
contextId = "yxt-wms-WmsGoods",
contextId = "yxt-wms-WmsInventory",
name = "yxt-wms",
path = "apiadmin/base/wmsgoods",
fallback = WmsGoodsFeignFallback.class
path = "apiadmin/inventory/wmsinventory",
fallback = WmsInventoryFeignFallback.class
)
public interface WmsGoodsFeign {
public interface WmsInventoryFeign {
@ApiOperation("查询分公司下所有的商品信息")
@PostMapping("/getPackageGoodsVo")
public ResultBean<PagerVo<WmsGoodsPackageVo>> getPackageGoodsVo(@RequestBody PagerQuery<WmsGoodsPackageQuery> pq);
public ResultBean<PagerVo<WmsInventoryPackageVo>> getPackageGoodsVo(@RequestBody PagerQuery<WmsInventoryPackageQuery> pq);
}

8
yxt-as/src/main/java/com/yxt/anrui/as/feign/wms/wmsgoods/WmsGoodsFeignFallback.java → yxt-as/src/main/java/com/yxt/anrui/as/feign/wms/wmsInventory/WmsInventoryFeignFallback.java
View File

@ -23,15 +23,13 @@
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.anrui.as.feign.wms.wmsgoods;
package com.yxt.anrui.as.feign.wms.wmsInventory;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
import org.springframework.stereotype.Component;
import java.util.List;
/**
* Project: anrui-fin(安瑞财务) <br/>
* File: FinManufacturerBankFeignFallback.java <br/>
@ -46,11 +44,11 @@ import java.util.List;
* @since 1.0
*/
@Component
public class WmsGoodsFeignFallback implements WmsGoodsFeign {
public class WmsInventoryFeignFallback implements WmsInventoryFeign {
@Override
public ResultBean<PagerVo<WmsGoodsPackageVo>> getPackageGoodsVo(PagerQuery<WmsGoodsPackageQuery> pq) {
public ResultBean<PagerVo<WmsInventoryPackageVo>> getPackageGoodsVo(PagerQuery<WmsInventoryPackageQuery> pq) {
return null;
}
}

4
yxt-as/src/main/java/com/yxt/anrui/as/feign/wms/wmsgoods/WmsGoodsPackageQuery.java → yxt-as/src/main/java/com/yxt/anrui/as/feign/wms/wmsInventory/WmsInventoryPackageQuery.java
View File

@ -1,4 +1,4 @@
package com.yxt.anrui.as.feign.wms.wmsgoods;
package com.yxt.anrui.as.feign.wms.wmsInventory;
import com.yxt.common.core.query.Query;
import io.swagger.annotations.ApiModelProperty;
@ -10,7 +10,7 @@ import lombok.Data;
* @date 2024/3/12 15:33
*/
@Data
public class WmsGoodsPackageQuery implements Query {
public class WmsInventoryPackageQuery implements Query {
private String useOrgSid;
@ApiModelProperty("商品名称")
private String goodsName; // 商品名称

7
yxt-as/src/main/java/com/yxt/anrui/as/feign/wms/wmsgoods/WmsGoodsPackageVo.java → yxt-as/src/main/java/com/yxt/anrui/as/feign/wms/wmsInventory/WmsInventoryPackageVo.java
View File

@ -1,18 +1,15 @@
package com.yxt.anrui.as.feign.wms.wmsgoods;
package com.yxt.anrui.as.feign.wms.wmsInventory;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.Date;
/**
* @author Fan
* @description
* @date 2024/3/7 14:29
*/
@Data
public class WmsGoodsPackageVo {
public class WmsInventoryPackageVo {
@ApiModelProperty("商品sid")
private String goodsSid; // 商品sid
@ApiModelProperty("商品名称")
Write Preview
Loading…
Cancel
Save