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

Merge remote-tracking branch 'origin/master'

master
dimengzhe 1 year ago
parent
2c2c7f8940 65028b463b
commit
b4ea7a10e3
18 changed files with 222 additions and 50 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/basevehiclestate/BaseVehicleStateService.java
  2. 5
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordervehicle/BusSalesOrderVehicleFeign.java
  3. 5
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordervehicle/BusSalesOrderVehicleFeignFallback.java
  4. 40
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderloancontract/BusSalesOrderLoancontractService.java
  5. 3
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleMapper.java
  6. 5
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleRest.java
  7. 6
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleService.java
  8. 4
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/capitalcreditresult/CapitalCreditResult.java
  9. 77
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationService.java
  10. 7
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/capitalcreditresult/OtherReceivableBillCreditResultService.java
  11. 2
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/capitalcreditresult/data_FEntity.json
  12. 2
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/capitalcreditresult/data_model.json
  13. 2
      anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigatefile/LoanHomeVisitInvestigateInitZMWJVo.java
  14. 2
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancapitalcreditresult/LoanCapitalCreditResultService.java
  15. 34
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitfileexamine/LoanHomevisitFileexamineService.java
  16. 40
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigate/LoanHomevisitInvestigateService.java
  17. 22
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loannoguaranteecreditreview/LoanNoGuaranteeCreditReviewService.java
  18. 14
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinbound/ScmApplyInboundService.java

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

@ -120,6 +120,8 @@ public class BaseVehicleStateService extends MybatisBaseService<BaseVehicleState
}else if(BaseVehicleStateEnum.OperateTypeEnum.LPSQTG.getTypeKey().equals(operateType)){
//领票申请通过后，修改发票状态为1
baseVehicleState.setInvoiceState("1");
}else if (BaseVehicleStateEnum.OperateTypeEnum.JFZLSH.getTypeKey().equals(operateType)){
baseVehicleState.setManageState("1");
}
baseMapper.updateById(baseVehicleState);
} else {

5
anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordervehicle/BusSalesOrderVehicleFeign.java
View File

@ -152,4 +152,9 @@ public interface BusSalesOrderVehicleFeign {
@PostMapping("/selbyContractSid")
@ResponseBody
ResultBean<List<BusSalesOrderVehicle>> selbyContractSid(@RequestParam("loanContractSid") String loanContractSid);
@ApiOperation("根据贷款人sid查询车辆")
@GetMapping("/selectByBorrowerSid")
@ResponseBody
ResultBean<List<BusSalesOrderVehicle>> selectByBorrowerSid(@RequestParam("borrowerSid") String borrowerSid);
}

5
anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordervehicle/BusSalesOrderVehicleFeignFallback.java
View File

@ -148,4 +148,9 @@ public class BusSalesOrderVehicleFeignFallback implements BusSalesOrderVehicleFe
return null;
}
@Override
public ResultBean<List<BusSalesOrderVehicle>> selectByBorrowerSid(String borrowerSid) {
return null;
}
}

40
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderloancontract/BusSalesOrderLoancontractService.java
View File

@ -49,10 +49,16 @@ import com.yxt.anrui.fin.api.kingdee.bdcustomer.BdCustomer;
import com.yxt.anrui.fin.api.kingdee.capitalcreditresult.CapitalCreditResult;
import com.yxt.anrui.fin.api.kingdee.capitalcreditresult.CwSystemYT;
import com.yxt.anrui.fin.api.kingdee.otherarreceivable.OtherReceivable;
import com.yxt.anrui.portal.api.dictcommon.DictCommonFeign;
import com.yxt.anrui.portal.api.dictcommon.DictCommonVo;
import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign;
import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo;
import com.yxt.anrui.portal.api.sysuser.PrivilegeQuery;
import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
import com.yxt.anrui.riskcenter.api.loanfinbank.LoanFinBankFeign;
import com.yxt.anrui.riskcenter.api.loanfinbank.LoanFinBankVo;
import com.yxt.anrui.riskcenter.api.loanfinpolicy.LoanFinPolicyFeign;
import com.yxt.anrui.riskcenter.api.loanfinpolicy.LoanFinPolicyVo;
import com.yxt.anrui.riskcenter.api.loanparameter.LoanParameter;
import com.yxt.anrui.riskcenter.api.loanparameter.LoanParameterQuery;
import com.yxt.anrui.riskcenter.api.loanparameter.LoanParameterVo;
@ -110,11 +116,17 @@ public class BusSalesOrderLoancontractService extends MybatisBaseService<BusSale
@Autowired
private SysOrganizationFeign sysOrganizationFeign;
@Autowired
private DictCommonFeign dictCommonFeign;
@Autowired
private FinKingDeeFeign finKingDeeFeign;
@Autowired
private BusSalesOrderBorrowerService busSalesOrderBorrowerService;
@Autowired
private BasePurchaseSystemFeign basePurchaseSystemFeign;
@Autowired
private LoanFinPolicyFeign loanFinPolicyFeign;
@Autowired
private LoanFinBankFeign loanFinBankFeign;
private QueryWrapper<BusSalesOrderLoancontract> createQueryWrapper(BusSalesOrderLoancontractQuery query) {
// todo: 这里根据具体业务调整查询条件
@ -401,6 +413,12 @@ public class BusSalesOrderLoancontractService extends MybatisBaseService<BusSale
BasePurchaseSystemDetailsVo basePurchaseSystemDetailsVo = basePurchaseSystemFeign.fetchDetailsByDeptSid(salesOrder.getPurchaseSystemSid()).getData();
creditResult.setCollectionOrg(basePurchaseSystemDetailsVo.getOrgCode());
creditResult.setBussDate(DateUtil.formatDate(new Date()));
SolutionsDetailsVo solutionsDetailsVo = loanSolutionsFeign.selectDetails(saleOrderSid).getData();
if (StringUtils.isNotBlank(solutionsDetailsVo.getPolicySid())){
LoanFinPolicyVo loanFinPolicyVo = loanFinPolicyFeign.details(solutionsDetailsVo.getPolicySid()).getData();
LoanFinBankVo loanFinBankVo = loanFinBankFeign.details(loanFinPolicyVo.getBankSid()).getData();
creditResult.setBankName(loanFinBankVo.getBankNo());
}
List<CapitalCreditResult.CapitalCreditResultDetailDto> collectionDetailDtoListOne = new ArrayList<>();
SysOrganizationVo sysOrganizationVo2 = sysOrganizationFeign.fetchBySid(salesOrder.getOrgSid()).getData();
//这是生成业务系统融资放款应收的逻辑：
@ -412,6 +430,8 @@ public class BusSalesOrderLoancontractService extends MybatisBaseService<BusSale
creditResultDetailDto.setDearDept(sysOrganizationVo2.getOrgCode());
creditResultDetailDto.setExTaxMoney("-" + resultBean.getData().getMoney());
creditResultDetailDto.setUseTo(CwSystemYT.RONGZI_FANGKUAN.getType());
DictCommonVo dictCommonVo = dictCommonFeign.selectBykey(CwSystemYT.RONGZI_FANGKUAN.getType(), "YT").getData();
creditResultDetailDto.setRemarks(dictCommonVo.getDictValue());
collectionDetailDtoListOne.add(creditResultDetailDto);
}
SolutionsDetailsVo solutions = loanSolutionsFeign.selectDetails(saleOrderSid).getData();
@ -424,6 +444,8 @@ public class BusSalesOrderLoancontractService extends MybatisBaseService<BusSale
creditResultDetailDto.setDearDept(sysOrganizationVo2.getOrgCode());
creditResultDetailDto.setExTaxMoney(solutions.getTrailerAmount());
creditResultDetailDto.setUseTo(CwSystemYT.GCDTK.getType());
DictCommonVo dictCommonVo = dictCommonFeign.selectBykey(CwSystemYT.GCDTK.getType(), "YT").getData();
creditResultDetailDto.setRemarks(dictCommonVo.getDictValue());
collectionDetailDtoListOne.add(creditResultDetailDto);
}
}
@ -434,6 +456,8 @@ public class BusSalesOrderLoancontractService extends MybatisBaseService<BusSale
creditResultDetailDto.setDearDept(sysOrganizationVo2.getOrgCode());
creditResultDetailDto.setExTaxMoney(solutions.getBondAmounts());
creditResultDetailDto.setUseTo(CwSystemYT.BOND_AMOUNTS.getType());
DictCommonVo dictCommonVo = dictCommonFeign.selectBykey(CwSystemYT.BOND_AMOUNTS.getType(), "YT").getData();
creditResultDetailDto.setRemarks(dictCommonVo.getDictValue());
collectionDetailDtoListOne.add(creditResultDetailDto);
}
//保险保证金
@ -442,6 +466,8 @@ public class BusSalesOrderLoancontractService extends MybatisBaseService<BusSale
creditResultDetailDto.setDearDept(sysOrganizationVo2.getOrgCode());
creditResultDetailDto.setExTaxMoney(solutions.getDepositPremium());
creditResultDetailDto.setUseTo(CwSystemYT.DEPOSIT_PREMIUM.getType());
DictCommonVo dictCommonVo = dictCommonFeign.selectBykey(CwSystemYT.DEPOSIT_PREMIUM.getType(), "YT").getData();
creditResultDetailDto.setRemarks(dictCommonVo.getDictValue());
collectionDetailDtoListOne.add(creditResultDetailDto);
}
//落户保证金
@ -450,6 +476,8 @@ public class BusSalesOrderLoancontractService extends MybatisBaseService<BusSale
creditResultDetailDto.setDearDept(sysOrganizationVo2.getOrgCode());
creditResultDetailDto.setExTaxMoney(solutions.getDepositSettle());
creditResultDetailDto.setUseTo(CwSystemYT.DEPOSIT_SETTLE.getType());
DictCommonVo dictCommonVo = dictCommonFeign.selectBykey(CwSystemYT.DEPOSIT_SETTLE.getType(), "YT").getData();
creditResultDetailDto.setRemarks(dictCommonVo.getDictValue());
collectionDetailDtoListOne.add(creditResultDetailDto);
}
//服务费
@ -458,6 +486,8 @@ public class BusSalesOrderLoancontractService extends MybatisBaseService<BusSale
creditResultDetailDto.setDearDept(sysOrganizationVo2.getOrgCode());
creditResultDetailDto.setUseTo(CwSystemYT.SERVICE_AMOUNT_DANBAO.getType());
creditResultDetailDto.setExTaxMoney(solutions.getServiceAmount());
DictCommonVo dictCommonVo = dictCommonFeign.selectBykey(CwSystemYT.SERVICE_AMOUNT_DANBAO.getType(), "YT").getData();
creditResultDetailDto.setRemarks(dictCommonVo.getDictValue());
collectionDetailDtoListOne.add(creditResultDetailDto);
}
//代收意外险
@ -466,6 +496,8 @@ public class BusSalesOrderLoancontractService extends MybatisBaseService<BusSale
creditResultDetailDto.setDearDept(sysOrganizationVo2.getOrgCode());
creditResultDetailDto.setUseTo(CwSystemYT.PROXY_ACCIDENT_PREMIUM.getType());
creditResultDetailDto.setExTaxMoney(solutions.getProxyAccidentPremium());
DictCommonVo dictCommonVo = dictCommonFeign.selectBykey(CwSystemYT.PROXY_ACCIDENT_PREMIUM.getType(), "YT").getData();
creditResultDetailDto.setRemarks(dictCommonVo.getDictValue());
collectionDetailDtoListOne.add(creditResultDetailDto);
}
//上牌费、运管费
@ -478,6 +510,8 @@ public class BusSalesOrderLoancontractService extends MybatisBaseService<BusSale
creditResultDetailDto.setDearDept(sysOrganizationVo2.getOrgCode());
creditResultDetailDto.setUseTo(CwSystemYT.SHANGPAI_YUNGUAN.getType());
creditResultDetailDto.setExTaxMoney(add.toString());
DictCommonVo dictCommonVo = dictCommonFeign.selectBykey(CwSystemYT.SHANGPAI_YUNGUAN.getType(), "YT").getData();
creditResultDetailDto.setRemarks(dictCommonVo.getDictValue());
collectionDetailDtoListOne.add(creditResultDetailDto);
}
//其它费用
@ -486,6 +520,8 @@ public class BusSalesOrderLoancontractService extends MybatisBaseService<BusSale
creditResultDetailDto.setDearDept(sysOrganizationVo2.getOrgCode());
creditResultDetailDto.setExTaxMoney(solutions.getOtherAmount());
creditResultDetailDto.setUseTo(CwSystemYT.OTHER_AMOUNT.getType());
DictCommonVo dictCommonVo = dictCommonFeign.selectBykey(CwSystemYT.OTHER_AMOUNT.getType(), "YT").getData();
creditResultDetailDto.setRemarks(dictCommonVo.getDictValue());
collectionDetailDtoListOne.add(creditResultDetailDto);
}
//补车价
@ -494,6 +530,8 @@ public class BusSalesOrderLoancontractService extends MybatisBaseService<BusSale
creditResultDetailDto.setDearDept(sysOrganizationVo2.getOrgCode());
creditResultDetailDto.setExTaxMoney(solutions.getVehOtherPrice());
creditResultDetailDto.setUseTo(CwSystemYT.VEH_OTHER_PRICE.getType());
DictCommonVo dictCommonVo = dictCommonFeign.selectBykey(CwSystemYT.VEH_OTHER_PRICE.getType(), "YT").getData();
creditResultDetailDto.setRemarks(dictCommonVo.getDictValue());
collectionDetailDtoListOne.add(creditResultDetailDto);
}
//留购价
@ -502,6 +540,8 @@ public class BusSalesOrderLoancontractService extends MybatisBaseService<BusSale
creditResultDetailDto.setDearDept(sysOrganizationVo2.getOrgCode());
creditResultDetailDto.setExTaxMoney(solutions.getNominalPrice());
creditResultDetailDto.setUseTo(CwSystemYT.NOMINAL_PRICE.getType());
DictCommonVo dictCommonVo = dictCommonFeign.selectBykey(CwSystemYT.NOMINAL_PRICE.getType(), "YT").getData();
creditResultDetailDto.setRemarks(dictCommonVo.getDictValue());
collectionDetailDtoListOne.add(creditResultDetailDto);
}*/
}

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

@ -171,4 +171,7 @@ public interface BusSalesOrderVehicleMapper extends BaseMapper<BusSalesOrderVehi
@Select("select * from bus_sales_order_vehicle where loanContractSid = #{loanContractSid}")
List<BusSalesOrderVehicle> selByLoanContractSid(String loanContractSid);
@Select("select * from bus_sales_order_vehicle where borrowerSid = #{borrowerSid}")
List<BusSalesOrderVehicle> selectByBorrowerSid(String borrowerSid);
}

5
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleRest.java
View File

@ -168,4 +168,9 @@ public class BusSalesOrderVehicleRest implements BusSalesOrderVehicleFeign {
List<BusSalesOrderVehicle> busSalesOrderVehicles = busSalesOrderVehicleService.selByLoanContractSid(loanContractSid);
return rb.success().setData(busSalesOrderVehicles);
}
@Override
public ResultBean<List<BusSalesOrderVehicle>> selectByBorrowerSid(String borrowerSid) {
return busSalesOrderVehicleService.selectByBorrowerSid(borrowerSid);
}
}

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

@ -639,4 +639,10 @@ public class BusSalesOrderVehicleService extends MybatisBaseService<BusSalesOrde
public List<BusSalesOrderVehicle> selByLoanContractSid(String loanContractSid) {
return baseMapper.selByLoanContractSid(loanContractSid);
}
public ResultBean<List<BusSalesOrderVehicle>> selectByBorrowerSid(String borrowerSid) {
ResultBean rb = ResultBean.fireFail();
List<BusSalesOrderVehicle> busSalesOrderVehicleList = baseMapper.selectByBorrowerSid(borrowerSid);
return rb.success().setData(busSalesOrderVehicleList);
}
}

4
anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/capitalcreditresult/CapitalCreditResult.java
View File

@ -28,6 +28,8 @@ public class CapitalCreditResult {
public String currency = "PRE001";
@ApiModelProperty("业务日期")
public String bussDate;
@ApiModelProperty("银行")
public String bankName;
@ApiModelProperty("收款明细")
public List<CapitalCreditResult.CapitalCreditResultDetailDto> resultDetails;
@ -43,5 +45,7 @@ public class CapitalCreditResult {
public String exTaxMoney;
@ApiModelProperty("用途")
public String useTo;
@ApiModelProperty("备注")
public String remarks;
}
}

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

@ -704,20 +704,23 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
List<FinBillTrailerVo> finBillTrailerVos = finBillTrailerService.fetchByMainSid(sid);
if (finBillTrailerVos.size() > 0) {
for (FinBillTrailerVo finBillTrailerVo : finBillTrailerVos) {
FinBillVehicleVo finBillVehicleVo = finBillVehicleService.fetchByMainSid(sid).get(0);
finBillTrailerVo.setInvoiceInfo(finBillVehicleVo.getOpenTickRemarks());
BaseTrailerDetailsVo baseTrailerDetailsVo = baseTrailerFeign.fetchByGcVinNoAndVehSid(finBillTrailerVo.getGcVinNo(), finBillVehicleVo.getVehSid()).getData();
List<CommonAppendixVo> commonAppendixVos = commonAppendixFeign.selByLinkSid(baseTrailerDetailsVo.getSid()).getData();
List<String> hgzImageUrls = new ArrayList<>();
for (CommonAppendixVo commonAppendixVo : commonAppendixVos) {
if (commonAppendixVo.getAttachType().equals("挂车合格证照片")) {
hgzImageUrls.add(commonAppendixVo.getFileUrl());
for (FinBillVehicleVo finBillVehicleVo : finBillVehicleVos) {
if (finBillTrailerVo.getVinNo().equals(finBillVehicleVo.getVinNo())){
finBillTrailerVo.setInvoiceInfo(finBillVehicleVo.getOpenTickRemarks());
BaseTrailerDetailsVo baseTrailerDetailsVo = baseTrailerFeign.fetchByGcVinNoAndVehSid(finBillTrailerVo.getGcVinNo(), finBillVehicleVo.getVehSid()).getData();
List<CommonAppendixVo> commonAppendixVos = commonAppendixFeign.selByLinkSid(baseTrailerDetailsVo.getSid()).getData();
List<String> hgzImageUrls = new ArrayList<>();
for (CommonAppendixVo commonAppendixVo : commonAppendixVos) {
if (commonAppendixVo.getAttachType().equals("挂车合格证照片")) {
hgzImageUrls.add(commonAppendixVo.getFileUrl());
}
}
finBillTrailerVo.setHgzImageUrl(hgzImageUrls);
if (finBillTrailerVo.getOneBillMoney() == null) {
finBillTrailerVo.setOneBillMoney(baseTrailerDetailsVo.getDealPrice());
}
}
}
finBillTrailerVo.setHgzImageUrl(hgzImageUrls);
if (finBillTrailerVo.getOneBillMoney() == null) {
finBillTrailerVo.setOneBillMoney(baseTrailerDetailsVo.getDealPrice());
}
}
vo.setFinBillTrailers(finBillTrailerVos);
}
@ -923,6 +926,31 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
busValcustFilingDto.setBusSid(finBillApplication.getSid());
busValcustFilingDto.setBusSource("0");
busValcustFilingFeign.save(busValcustFilingDto);
//获取销售专员userSid
List<String> receIveUserSidList = new ArrayList<>();
SysUserVo sysUserVo = sysUserFeign.selectByStaffsid(busSalesOrder.getStaffSid()).getData();
receIveUserSidList.add(sysUserVo.getSid());
//发送通知给销售专员
try {
ThreadFactory namedThreadFactory = new ThreadFactoryBuilder()
.setNameFormat("demo-pool-%d").build();
ExecutorService pool = new ThreadPoolExecutor(1, 10,
1000, TimeUnit.MILLISECONDS,
new LinkedBlockingQueue<Runnable>(1024), namedThreadFactory, new ThreadPoolExecutor.AbortPolicy());
Future future1 = pool.submit(() -> {
PushMessageQuery pushMessageQuery = new PushMessageQuery();
pushMessageQuery.setReceivedSids(receIveUserSidList);
pushMessageQuery.setModuleName("业务");
pushMessageQuery.setMsgContent("提醒：请对" + busSalesOrder.getContractNo() + "的开票申请进行价值客户备案。");
pushMessageQuery.setApp_type("2");
pushMessageQuery.setModuleSid("e25e13b5-f2ed-421f-bdb3-6f2eca2a3028");
pushMessageQuery.setMsgTitle("价值客户备案提醒");
// 消息推送
messageFeign.pushNoUriMessage(pushMessageQuery);
});
} catch (Exception e) {
e.printStackTrace();
}
} else {//不是高低开
for (FinBillVehicleVo finBillVehicleVo : finBillVehicleVos) {
int count = finVehicleInvoiceService.selectCountByVinSid(finBillVehicleVo.getVehSid());
@ -2663,6 +2691,31 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
busValcustFilingDto.setBusSid(finBillApplication.getSid());
busValcustFilingDto.setBusSource("0");
busValcustFilingFeign.save(busValcustFilingDto);
//获取销售专员userSid
List<String> receIveUserSidList = new ArrayList<>();
SysUserVo sysUserVo = sysUserFeign.selectByStaffsid(busSalesOrder.getStaffSid()).getData();
receIveUserSidList.add(sysUserVo.getSid());
//发送通知给销售专员
try {
ThreadFactory namedThreadFactory = new ThreadFactoryBuilder()
.setNameFormat("demo-pool-%d").build();
ExecutorService pool = new ThreadPoolExecutor(1, 10,
1000, TimeUnit.MILLISECONDS,
new LinkedBlockingQueue<Runnable>(1024), namedThreadFactory, new ThreadPoolExecutor.AbortPolicy());
Future future1 = pool.submit(() -> {
PushMessageQuery pushMessageQuery = new PushMessageQuery();
pushMessageQuery.setReceivedSids(receIveUserSidList);
pushMessageQuery.setModuleName("业务");
pushMessageQuery.setMsgContent("提醒：请对" + busSalesOrder.getContractNo() + "的开票申请进行价值客户备案。");
pushMessageQuery.setApp_type("2");
pushMessageQuery.setModuleSid("e25e13b5-f2ed-421f-bdb3-6f2eca2a3028");
pushMessageQuery.setMsgTitle("价值客户备案提醒");
// 消息推送
messageFeign.pushNoUriMessage(pushMessageQuery);
});
} catch (Exception e) {
e.printStackTrace();
}
}else{
int count = finVehicleInvoiceService.selectCountByVinSid(finBillVehicleVo.getVehSid());
if (count == 0) {

7
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/capitalcreditresult/OtherReceivableBillCreditResultService.java
View File

@ -59,6 +59,8 @@ public class OtherReceivableBillCreditResultService extends FinKingDeeService {
map_fEntityModel_.put("FSALEDEPTID", creditResult.getResultDetails().get(0).getDearDept());
//申请部门
map_fEntityModel_.put("FDEPARTMENTID", creditResult.getResultDetails().get(0).getDearDept());
//银行
map_fEntityModel_.put("F_PAEZ_Base", creditResult.getBankName());
List<CapitalCreditResult.CapitalCreditResultDetailDto> collectionDetails = creditResult.getResultDetails() == null ? new ArrayList<>() : creditResult.getResultDetails();
//准备 物料列表的数据
ResultBean<List<Map<String, String>>> vehicleListMap = createVehicleListsForReceivableBill(collectionDetails);
@ -73,9 +75,9 @@ public class OtherReceivableBillCreditResultService extends FinKingDeeService {
return rb.setMsg("其他应收单保存失败!");
}
log.info("其他应收单保存成功!");
String submitKD = getSubmitKD(resultBean1.getData(),KingDeeBillId.AR_OTHERRECEIVABLE.getID());
String submitKD = getSubmitKD(resultBean1.getData(), KingDeeBillId.AR_OTHERRECEIVABLE.getID());
ResultBean<String> resultBean2 = accessKingDeeInterface(KingDeeBillId.AR_OTHERRECEIVABLE.getID(), submitKD, KingDeeBillUrl.SUBMIT_URL.getURL());
if(!resultBean2.getSuccess()){
if (!resultBean2.getSuccess()) {
log.info("其他应收单提交失败!");
return rb.setMsg("其他应收单提交失败!");
}
@ -101,6 +103,7 @@ public class OtherReceivableBillCreditResultService extends FinKingDeeService {
m.put("FCOSTDEPARTMENTID", c.getDearDept());
m.put("FNOTAXAMOUNTFOR", c.getExTaxMoney());
m.put("F_PAEZ_Assistant1", c.getUseTo());
m.put("FCOMMENT",c.getRemarks());
collectionDetailMap.add(m);
}
return rb.success().setData(collectionDetailMap);

2
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/capitalcreditresult/data_FEntity.json
View File

@ -25,7 +25,7 @@
"F_PMZC_Assistant2": {
"FNumber": ""
},
"FCOMMENT": "",
"FCOMMENT": "@KD_FCOMMENT",
"FSourceBillNo": "",
"FCREATEINVOICE": "false",
"FIVAmountFor": "0",

2
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/capitalcreditresult/data_model.json
View File

@ -55,7 +55,7 @@
"FNUMBER": ""
},
"F_PAEZ_Base": {
"FNUMBER": ""
"FNUMBER": "@KD_F_PAEZ_Base"
},
"F_PAEZ_Base1": {
"FNUMBER": ""

2
anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigatefile/LoanHomeVisitInvestigateInitZMWJVo.java
View File

@ -30,4 +30,6 @@ public class LoanHomeVisitInvestigateInitZMWJVo implements Vo {
private List<String> guarantorAccount;
@ApiModelProperty("是否有配偶")
private Boolean spouseState = false;
@ApiModelProperty("是否有担保人")
private Boolean dbrState = false;
}

2
anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancapitalcreditresult/LoanCapitalCreditResultService.java
View File

@ -268,7 +268,7 @@ public class LoanCapitalCreditResultService extends MybatisBaseService<LoanCapit
for (BusSalesOrderVehicle salesOrderVehicle : busSalesOrderVehicles) {
vinNo = vinNo + salesOrderVehicle.getLinkNo().substring(salesOrderVehicle.getLinkNo().length() - 8) + "、";
}
vinNo = vinNo.substring(vinNo.lastIndexOf("、"));
vinNo = vinNo.substring(0, vinNo.lastIndexOf("、"));
//发送通知给销售专员
try {
ThreadFactory namedThreadFactory = new ThreadFactoryBuilder()

34
anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitfileexamine/LoanHomevisitFileexamineService.java
View File

@ -29,11 +29,16 @@ import cn.hutool.core.bean.BeanUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.google.common.util.concurrent.ThreadFactoryBuilder;
import com.yxt.anrui.base.api.basevehiclestate.BaseVehicleStateDto;
import com.yxt.anrui.base.api.basevehiclestate.BaseVehicleStateEnum;
import com.yxt.anrui.base.api.basevehiclestate.BaseVehicleStateFeign;
import com.yxt.anrui.buscenter.api.bussalesorderborrower.BusSalesOrderBorrowerDetailsVo;
import com.yxt.anrui.buscenter.api.bussalesorderborrower.BusSalesOrderBorrowerFeign;
import com.yxt.anrui.buscenter.api.bussalesorderloancontract.BusSalesOrderLoancontract;
import com.yxt.anrui.buscenter.api.bussalesorderloancontract.BusSalesOrderLoancontractDetailsVo;
import com.yxt.anrui.buscenter.api.bussalesorderloancontract.BusSalesOrderLoancontractFeign;
import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicle;
import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicleFeign;
import com.yxt.anrui.portal.api.sysuser.PrivilegeQuery;
import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
import com.yxt.anrui.riskcenter.api.loancapitalcreditresult.LoanCapitalCreditResultDto;
@ -97,6 +102,10 @@ public class LoanHomevisitFileexamineService extends MybatisBaseService<LoanHome
@Autowired
private BusSalesOrderBorrowerFeign busSalesOrderBorrowerFeign;
@Autowired
private BusSalesOrderVehicleFeign busSalesOrderVehicleFeign;
@Autowired
private BaseVehicleStateFeign baseVehicleStateFeign;
@Autowired
private MessageFeign messageFeign;
public PagerVo<LoanHomevisitFileexamineVo> homeInforListPage(PagerQuery<LoanHomevisitFileexamineQuery> pq) {
@ -104,15 +113,15 @@ public class LoanHomevisitFileexamineService extends MybatisBaseService<LoanHome
QueryWrapper<LoanHomevisitFileexamine> qw = new QueryWrapper<>();
qw.eq("li.state", 2);
qw.eq("lf.state", query.getType());
if ("1".equals(query.getType())){
if ("1".equals(query.getType())) {
qw.eq("bb.busNo", 303);
}
if (StringUtils.isNotBlank(query.getMenuUrl())) {
//=======================
PrivilegeQuery privilegeQuery = new PrivilegeQuery();
if (StringUtils.isNotBlank(query.getOrgSidPath())){
if (StringUtils.isNotBlank(query.getOrgSidPath())) {
privilegeQuery.setOrgPath(query.getOrgSidPath());
}else if (StringUtils.isNotBlank(query.getOrgPath())){
} else if (StringUtils.isNotBlank(query.getOrgPath())) {
privilegeQuery.setOrgPath(query.getOrgPath());
}
privilegeQuery.setMenuUrl(query.getMenuUrl());
@ -121,9 +130,9 @@ public class LoanHomevisitFileexamineService extends MybatisBaseService<LoanHome
if (StringUtils.isNotBlank(defaultIdReltBean.getData())) {
//数据权限ID(1集团、2事业部、3分公司、4部门、5个人)
String orgSidPath = "";
if (StringUtils.isNotBlank(query.getOrgSidPath())){
if (StringUtils.isNotBlank(query.getOrgSidPath())) {
orgSidPath = query.getOrgSidPath();
}else if (StringUtils.isNotBlank(query.getOrgPath())){
} else if (StringUtils.isNotBlank(query.getOrgPath())) {
orgSidPath = query.getOrgPath();
}
orgSidPath = orgSidPath + "/";
@ -421,10 +430,10 @@ public class LoanHomevisitFileexamineService extends MybatisBaseService<LoanHome
}
}
this.updateByDto(dto);
if (!"1".equals(dto.getIsSave())){
if (!"1".equals(dto.getIsSave())) {
LoanHomevisitInvestigate loanHomevisitInvestigate = loanHomevisitInvestigateService.fetchBySid(dto.getHomeVisitSid());
List<BusSalesOrderLoancontract> busSalesOrderLoancontracts = busSalesOrderLoancontractFeign.fetchAllByBorrowerSid(loanHomevisitInvestigate.getSaleOrderBorrowerSid()).getData();
if (busSalesOrderLoancontracts != null){
if (busSalesOrderLoancontracts != null) {
for (BusSalesOrderLoancontract busSalesOrderLoancontract : busSalesOrderLoancontracts) {
LoanCapitalCreditResultDto loanCapitalCreditResultDto = new LoanCapitalCreditResultDto();
loanCapitalCreditResultDto.setSaleOrderSid(dto.getSaleOrderSid());
@ -433,6 +442,15 @@ public class LoanHomevisitFileexamineService extends MybatisBaseService<LoanHome
loanCapitalCreditResultService.saveOrUpdateDto(loanCapitalCreditResultDto);
}
}
List<BusSalesOrderVehicle> busSalesOrderVehicles = busSalesOrderVehicleFeign.selectListByOrderSidAndDkrSid(loanHomevisitInvestigate.getSaleOrderSid(), loanHomevisitInvestigate.getSaleOrderBorrowerSid()).getData();
List<BaseVehicleStateDto> dtoList = new ArrayList<>();
for (BusSalesOrderVehicle busSalesOrderVehicle : busSalesOrderVehicles) {
BaseVehicleStateDto baseVehicleStateDto = new BaseVehicleStateDto();
baseVehicleStateDto.setOperateType(BaseVehicleStateEnum.OperateTypeEnum.JFZLSH.getTypeKey());
baseVehicleStateDto.setBusSid(busSalesOrderVehicle.getSid());
dtoList.add(baseVehicleStateDto);
}
baseVehicleStateFeign.saveOrUpdate(dtoList);
}
}
@ -449,7 +467,7 @@ public class LoanHomevisitFileexamineService extends MybatisBaseService<LoanHome
}
LoanHomevisitFileexamine entity = fetchBySid(dtoSid);
BeanUtil.copyProperties(dto, entity, "id", "sid");
if (!"1".equals(dto.getIsSave())){
if (!"1".equals(dto.getIsSave())) {
entity.setState(2);
}
baseMapper.updateById(entity);

40
anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigate/LoanHomevisitInvestigateService.java
View File

@ -1007,24 +1007,32 @@ public class LoanHomevisitInvestigateService extends MybatisBaseService<LoanHome
loanHomeVisitInvestigateInitZMWJVo.setSpouseState(true);
}
}
//担保人身份证
List<LoanHomevisitInvestigateFileDetailsVo> dbrsfzImages = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(sid, LoanAttachTypeEnum.DBRSFZ.getAttachType());
List<String> pohkbImage = new ArrayList<>();
if (dbrsfzImages != null && dbrsfzImages.size() > 0) {
for (LoanHomevisitInvestigateFileDetailsVo dbrsfzImage : dbrsfzImages) {
pohkbImage.add(dbrsfzImage.getFileUrl());
}
}
loanHomeVisitInvestigateInitZMWJVo.setGuarantorIdCard(pohkbImage);
//担保人户口本
List<LoanHomevisitInvestigateFileDetailsVo> dbrhkbImages = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(sid, LoanAttachTypeEnum.DBRHKB.getAttachType());
List<String> guarantorAccount = new ArrayList<>();
if (dbrhkbImages != null && dbrhkbImages.size() > 0) {
for (LoanHomevisitInvestigateFileDetailsVo dbrhkbImage : dbrhkbImages) {
guarantorAccount.add(dbrhkbImage.getFileUrl());
List<LoanHomeVisitInvestigateInitOtherPeoVo> loanHomeVisitInvestigateInitOtherPeoVos = loanHomevisitInvestigateOtherpeoService.selByMainSid(sid);
if (loanHomeVisitInvestigateInitOtherPeoVos != null && loanHomeVisitInvestigateInitOtherPeoVos.size() > 0){
for (LoanHomeVisitInvestigateInitOtherPeoVo loanHomeVisitInvestigateInitOtherPeoVo : loanHomeVisitInvestigateInitOtherPeoVos) {
if ("1".equals(loanHomeVisitInvestigateInitOtherPeoVo.getPersonnelKey())){
//担保人身份证
List<LoanHomevisitInvestigateFileDetailsVo> dbrsfzImages = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(sid, LoanAttachTypeEnum.DBRSFZ.getAttachType());
List<String> pohkbImage = new ArrayList<>();
if (dbrsfzImages != null && dbrsfzImages.size() > 0) {
for (LoanHomevisitInvestigateFileDetailsVo dbrsfzImage : dbrsfzImages) {
pohkbImage.add(dbrsfzImage.getFileUrl());
}
}
loanHomeVisitInvestigateInitZMWJVo.setGuarantorIdCard(pohkbImage);
//担保人户口本
List<LoanHomevisitInvestigateFileDetailsVo> dbrhkbImages = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(sid, LoanAttachTypeEnum.DBRHKB.getAttachType());
List<String> guarantorAccount = new ArrayList<>();
if (dbrhkbImages != null && dbrhkbImages.size() > 0) {
for (LoanHomevisitInvestigateFileDetailsVo dbrhkbImage : dbrhkbImages) {
guarantorAccount.add(dbrhkbImage.getFileUrl());
}
}
loanHomeVisitInvestigateInitZMWJVo.setGuarantorAccount(guarantorAccount);
loanHomeVisitInvestigateInitZMWJVo.setDbrState(true);
}
}
}
loanHomeVisitInvestigateInitZMWJVo.setGuarantorAccount(guarantorAccount);
loanHomeVisitInvestigateInitZMWJVo.setSid(sid);
return rb.success().setData(loanHomeVisitInvestigateInitZMWJVo);
}

22
anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loannoguaranteecreditreview/LoanNoGuaranteeCreditReviewService.java
View File

@ -153,6 +153,13 @@ public class LoanNoGuaranteeCreditReviewService extends MybatisBaseService<LoanN
//推送其他应收单
LoanNoGuaranteeCreditReview creditReview = fetchBySid(sid);
if (null != creditReview) {
//家访考察通过后修改车辆业务状态中的资方终审为1.
if (StringUtils.isNotBlank(creditReview.getHomeVisit())){
List<BusSalesOrderVehicle> busSalesOrderVehicles = busSalesOrderVehicleFeign.selectByBorrowerSid(borrowerSid).getData();
for (BusSalesOrderVehicle busSalesOrderVehicle : busSalesOrderVehicles) {
baseVehicleStateFeign.updateManageState(busSalesOrderVehicle.getSid());
}
}
if (StringUtils.isNotBlank(creditReview.getCreditReview())) {
if ("通过".equals(creditReview.getCreditReview()) && !"通过".equals(result)) {
BusSalesOrderBorrowerDetailsVo borrowerDetailsVo = busSalesOrderBorrowerFeign.fetchDetailsBySid(creditReview.getBorrowerSid()).getData();
@ -176,10 +183,10 @@ public class LoanNoGuaranteeCreditReviewService extends MybatisBaseService<LoanN
ResultBean pushOtherReceivable = busSalesOrderLoancontractFeign.pushOtherReceivable(loanOtherReceivablePush);
}
//资方信审终审通过后修改车辆业务状态中的资方终审为1.
ResultBean<BusSalesOrderVehicle> busSalesOrderVehicle = busSalesOrderVehicleFeign.selectOneByBorrowerSid(borrowerSid);
/*ResultBean<BusSalesOrderVehicle> busSalesOrderVehicle = busSalesOrderVehicleFeign.selectOneByBorrowerSid(borrowerSid);
if (busSalesOrderVehicle.getData() != null) {
ResultBean updateManageState = baseVehicleStateFeign.updateManageState(busSalesOrderVehicle.getData().getSid());
}
}*/
}
}
}
@ -206,6 +213,13 @@ public class LoanNoGuaranteeCreditReviewService extends MybatisBaseService<LoanN
//推送其他应收单
LoanNoGuaranteeCreditReview creditReview = fetchBySid(sid);
if (null != creditReview) {
//家访考察通过后修改车辆业务状态中的资方终审为1.
if (StringUtils.isNotBlank(creditReview.getHomeVisit())){
List<BusSalesOrderVehicle> busSalesOrderVehicles = busSalesOrderVehicleFeign.selectByBorrowerSid(borrowerSid).getData();
for (BusSalesOrderVehicle busSalesOrderVehicle : busSalesOrderVehicles) {
baseVehicleStateFeign.updateManageState(busSalesOrderVehicle.getSid());
}
}
if (StringUtils.isNotBlank(creditReview.getCreditReview())) {
if ("通过".equals(creditReview.getCreditReview())) {
BusSalesOrderBorrowerDetailsVo borrowerDetailsVo = busSalesOrderBorrowerFeign.fetchDetailsBySid(creditReview.getBorrowerSid()).getData();
@ -229,10 +243,10 @@ public class LoanNoGuaranteeCreditReviewService extends MybatisBaseService<LoanN
ResultBean pushOtherReceivable = busSalesOrderLoancontractFeign.pushOtherReceivable(loanOtherReceivablePush);
}
//资方信审终审通过后修改车辆业务状态中的资方终审为1.
ResultBean<BusSalesOrderVehicle> busSalesOrderVehicle = busSalesOrderVehicleFeign.selectOneByBorrowerSid(borrowerSid);
/*ResultBean<BusSalesOrderVehicle> busSalesOrderVehicle = busSalesOrderVehicleFeign.selectOneByBorrowerSid(borrowerSid);
if (busSalesOrderVehicle.getData() != null) {
ResultBean updateManageState = baseVehicleStateFeign.updateManageState(busSalesOrderVehicle.getData().getSid());
}
}*/
}
}
}

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

@ -217,13 +217,14 @@ public class ScmApplyInboundService extends MybatisBaseService<ScmApplyInboundMa
inboundVehicle.setOrgSidPath(orgPath);
inboundVehicle.setNewUpdateDate(DateUtil.formatDate(new Date()));
if (StringUtils.isNotBlank(dto.getLogo())) {
/*if (StringUtils.isNotBlank(dto.getLogo())) {
if (dto.getLogo().equals("1")) {
inboundVehicle.setOrgPriceDate("");
}
} else {
inboundVehicle.setOrgPriceDate(DateUtil.formatDate(new Date()));
}
}*/
inboundVehicle.setOrgPriceDate("");
save(inboundVehicle);
String num = dto.getNum();
if (StringUtils.isNotBlank(num) && StringUtils.isNumeric(num)) {
@ -1026,7 +1027,10 @@ public class ScmApplyInboundService extends MybatisBaseService<ScmApplyInboundMa
return new ResultBean().fail().setMsg("车型与配置贷款或全款销售指导价未维护，不可确认");
}
List<ScmApplyInboundVehicleDto> vehicleList = dto.getVehicleList();
int vinCount = 0;
if (StringUtils.isBlank(dto.getOrgPriceDate())){
return new ResultBean().fail().setMsg("公司入库日期不能为空");
}
/*int vinCount = 0;
if (!vehicleList.isEmpty()) {
for (ScmApplyInboundVehicleDto scmApplyInboundVehicleDto : vehicleList) {
if (StringUtils.isNotBlank(scmApplyInboundVehicleDto.getVinNo()) && StringUtils.isNotBlank(scmApplyInboundVehicleDto.getEngineNo())) {
@ -1037,7 +1041,7 @@ public class ScmApplyInboundService extends MybatisBaseService<ScmApplyInboundMa
if (vinCount < Integer.parseInt(num)) {
dto.setOrgPriceDate("");
dto.setLogo("1");
}
}*/
if (StringUtils.isBlank(busSid)) {
ResultBean<String> resultBean = saveOrUpdateApplyInBound(dto);
if (!resultBean.getSuccess()) {
@ -1051,7 +1055,7 @@ public class ScmApplyInboundService extends MybatisBaseService<ScmApplyInboundMa
String vinNo = scmApplyInboundVehicleDto.getVinNo();
if (StringUtils.isBlank(vinNo)) {
scmApplyInboundVehicleService.deleteBySid(scmApplyInboundVehicleDto.getSid());
BeanUtil.copyProperties(scmApplyInbound, scmApplyInboundDto);
BeanUtil.copyProperties(scmApplyInbound, scmApplyInboundDto, "orgPriceDate");
scmApplyInboundDto.setSid(null);
scmApplyInboundVehicleDtos1.add(scmApplyInboundVehicleDto);
}

Write Preview
Loading…
Cancel
Save