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

优化

master
dimengzhe 2 years ago
parent
d66ab2dbc3
commit
8e041fce46
2 changed files with 16 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-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/AppBusSalesOrderVo.java
  2. 64
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java

2
anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/AppBusSalesOrderVo.java
View File

@ -209,4 +209,6 @@ public class AppBusSalesOrderVo implements Vo {
private String contractFilePath;
@ApiModelProperty("是否显示生成合同按钮")
private boolean showContractBtn2;
private String nowCarUnknownVinNum;
}

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

@ -1265,6 +1265,10 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
if (confirmation.getFirst() == 1) {
return rb.setMsg("不是首次，不允许驳回");
}
confirmation.setAuditState(2);
//更新驳回原因
confirmation.setReason(reason);
baseMapper.updateById(confirmation);
List<FinSelectedReceivablesDetailedVo> finSelectedReceivablesDetailedVos = finSelectedReceivablesDetailedService.fetchByAuditState(sid, 1);
finSelectedReceivablesDetailedVos.stream().forEach(v -> {
String selectSid = v.getSid();
@ -1281,9 +1285,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
}
});
confirmation.setAuditState(2);
//更新驳回原因
confirmation.setReason(reason);
confirmation = fetchBySid(sid);
ResultBean<SysUserVo> userVoResultBean = sysUserFeign.fetchBySid(userSid);
if (userVoResultBean.getData() != null) {
confirmation.setConfirmName(userVoResultBean.getData().getName());
@ -1674,6 +1676,8 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
if("4".equals(confirmation.getAuditState())){
return rb.setMsg("该申请已撤回，不允许确认");
}
confirmation.setAuditState(3);
baseMapper.updateById(confirmation);
finSelectedReceivablesDetailedService.updateAuditStateBySid(1, sid);
//推送收款单
ARReceivebill arReceivebill = new ARReceivebill();
@ -1964,51 +1968,11 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
baseVehicleStateDto.setBusSid(finUncollectedReceivablesDetailed.getBusVinSid());
dtoList.add(baseVehicleStateDto);
}
//根据busVinSid查询待出库中是否存在该数据
/* ResultBean<BusDelivered> busDeliveredResultBean = busDeliveredFeign.selectByBusVinSid(finUncollectedReceivablesDetailed.getBusVinSid());
if (busDeliveredResultBean.getData() == null) {
if (leftAll.compareTo(rightAll) <= 0) {//推送待出库
BusDeliveredDto busDeliveredDto = new BusDeliveredDto();
busDeliveredDto.setSubscriptionKey(VehicleStateTempOrLast.PaymentEnum.PAY_MODELS.getCode());
busDeliveredDto.setSubscription(VehicleStateTempOrLast.PaymentEnum.PAY_MODELS.getRemarks());
busDeliveredDto.setPaymentMethodKey(vo.getPayTypeKey());
busDeliveredDto.setPaymentMethod(vo.getPayType());
busDeliveredDto.setContractNo(v.getContractNo());
busDeliveredDto.setName(v.getCustomerName());
busDeliveredDto.setVinNo(v.getVIN());
busDeliveredDto.setMobile(v.getCustomerPhone());
busDeliveredDto.setPrice(priceInfoVo.getSingleFinalPrice());
busDeliveredDto.setCreateBySid(confirmation.getStaffUserSid());
SubmitVo intermediary1 = vo.getIntermediary1();
if (intermediary1 != null) {
busDeliveredDto.setDistributorName(intermediary1.getIntermediaryName());
busDeliveredDto.setDistributorPrice(intermediary1.getAgencyFee());
}
SubmitVo intermediary2 = vo.getIntermediary2();
if (intermediary2 != null) {
busDeliveredDto.setDistributorNameTwo(intermediary2.getIntermediaryName());
busDeliveredDto.setDistributorPriceTwo(intermediary2.getAgencyFee());
}
busDeliveredDto.setSingleCarDiscountPrice(priceInfoVo.getSingleCarDiscountPrice());
//根据客户sid查询客户的身份证号
AppOrderModelInfoVo appOrderModelInfoVo = vo.getModelInfo();
busDeliveredDto.setModelName(appOrderModelInfoVo.getModelName());
busDeliveredDto.setUseOrgSid(confirmation.getUseOrgSid());
ResultBean<SysOrganizationVo> sysOrganizationVoResultBean = sysOrganizationFeign.fetchBySid(confirmation.getUseOrgSid());
if (sysOrganizationVoResultBean.getData() != null) {
busDeliveredDto.setUseOrgName(sysOrganizationVoResultBean.getData().getName());
}
busDeliveredDto.setBusVinSid(finUncollectedReceivablesDetailed.getBusVinSid());
ResultBean resultBean1 = busDeliveredFeign.save(busDeliveredDto);
}
}*/
}
}
}
});
}
//查询该申请已认款金额总数
subscriptionMoneyAll = finSelectedReceivablesDetailedVos.stream().map(FinSelectedReceivablesDetailedVo::getSubscriptionMoney).map(BigDecimal::new).reduce(BigDecimal.ZERO, BigDecimal::add);
}
@ -2029,12 +1993,12 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
}
//查询该申请所有的款项明细
finSelectedReceivablesDetailedVos = finSelectedReceivablesDetailedService.fetchByAuditState(sid, 3);
confirmation = fetchBySid(sid);
//与收款金额作比较：更新认款状态 1未认款/2部分认款/3已认款
confirmation.setPaymentState(confirmation.getCollectionMoney().compareTo(subscriptionMoneyAll) <= 0 ? 3 : subscriptionMoneyAll.compareTo(BigDecimal.ZERO) == 0 ? 1 : 2);
//更新收款申请的余额以及审核状态
BigDecimal balanceBigDecimal = confirmation.getCollectionMoney().subtract(subscriptionMoneyAll);
confirmation.setBalance(balanceBigDecimal);
confirmation.setAuditState(3);
//查询当前登录人信息并更新审核人和审核时间
ResultBean<SysUserVo> userVoResultBean = sysUserFeign.fetchBySid(userSid);
if (userVoResultBean.getData() != null) {
@ -2806,6 +2770,12 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
if (!userSid.equals(confirmation.getCreateBySid())) {
return rb.setMsg("当前登录人员与发起人员不是同一人，不允许撤回");
}
confirmation.setAuditState(4);
confirmation.setReason("申请人已撤回");
confirmation.setConfirmDate("");
confirmation.setConfirmName("");
confirmation.setConfirmNameSid("");
baseMapper.updateById(confirmation);
List<FinSelectedReceivablesDetailedVo> finSelectedReceivablesDetailedVos = finSelectedReceivablesDetailedService.fetchByAuditState(sid, 1);
finSelectedReceivablesDetailedVos.stream().forEach(v -> {
String selectSid = v.getSid();
@ -2821,12 +2791,6 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
finUncollectedReceivablesDetailedService.updateById(finUncollectedReceivablesDetailed);
}
});
confirmation.setAuditState(4);
confirmation.setReason("申请人已撤回");
confirmation.setConfirmDate("");
confirmation.setConfirmName("");
confirmation.setConfirmNameSid("");
baseMapper.updateById(confirmation);
return rb.success().setMsg("撤回成功");
}

Write Preview
Loading…
Cancel
Save