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

更改

master
ligaode 3 weeks ago
parent
0cc7265a2a
commit
376180f8cf
3 changed files with 94 additions and 65 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. 129
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordService.java
  2. 19
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatewithapply/ScmSpecialRebateWithApplyService.java
  3. 9
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatewithapply/ScmVehRebateWithApplyService.java

129
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordService.java
View File

@ -70,8 +70,12 @@ import com.yxt.anrui.fin.biz.finuncollectedreceivablesdetailedjr.FinUncollectedR
import com.yxt.anrui.fin.biz.kingdee.appaybill.ApPayBillService;
import com.yxt.anrui.fin.biz.kingdee.voucher.VoucherService;
import com.yxt.anrui.portal.api.dictcommon.DictCommonFeign;
import com.yxt.anrui.portal.api.dictcommon.DictCommonVo;
import com.yxt.anrui.portal.api.flow.FlowableFeign;
import com.yxt.anrui.portal.api.flow.PCHistTaskListAndCommentList;
import com.yxt.anrui.portal.api.sysmapping.SysMappingFeign;
import com.yxt.anrui.portal.api.sysmapping.SysMappingInfoVo;
import com.yxt.anrui.portal.api.sysmapping.SysMappingListInfoQuery;
import com.yxt.anrui.portal.api.sysorganization.SysOrganization;
import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign;
import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo;
@ -186,8 +190,8 @@ public class FinPaymentrecordService extends MybatisBaseService<FinPaymentrecord
private LoanSettleApplyFeign loanSettleApplyFeign;
@Autowired
private VoucherService voucherService;
@Resource
private FinKingDeeFeign finKingDeeFeign;
@Autowired
private SysMappingFeign sysMappingFeign;
@Autowired
private DictCommonFeign dictCommonFeign;
@Autowired
@ -1646,47 +1650,53 @@ public class FinPaymentrecordService extends MybatisBaseService<FinPaymentrecord
voucher.setVoucherNo(organizationVo.getOrgCode());
}
List<Voucher.VoucherResultDetailDto> voucherResultDetailDtos = new ArrayList<>();
Voucher.VoucherResultDetailDto voucherResultDetailDto = new Voucher.VoucherResultDetailDto();
Voucher.VoucherResultDetailDto voucherResultDetailDtoJF = new Voucher.VoucherResultDetailDto();
Voucher.VoucherResultDetailDto voucherResultDetailDtoDf = new Voucher.VoucherResultDetailDto();
FinManufacturerBank manufacturerBank = finManufacturerBankService.selOneByBankNo(finPaymentrecord.getPayBankAccount(), finPaymentrecord.getUseOrgSid()).getData();
if (null != manufacturerBank) {
if (manufacturerBank.getDueBankKey().equals("02")) {
voucherResultDetailDtoDf.setSubjectNo("1002.01.00");
} else if (manufacturerBank.getDueBankKey().equals("01")) {
voucherResultDetailDtoDf.setSubjectNo("1002.02.01");
}
}
if ("015".equals(finPaymentrecord.getCostTitleKey())) {//银行保证金
//借方
voucherResultDetailDto.setSummary("付" + finPaymentrecord.getCostTitleValue() + finPaymentrecord.getCost());
voucherResultDetailDto.setSubjectNo("1009.03");
voucherResultDetailDtoJF.setSummary("付" + finPaymentrecord.getCostTitleValue() + finPaymentrecord.getCost());
voucherResultDetailDtoJF.setSubjectNo("1009.03");
SysOrganizationVo deptVo = sysOrganizationFeign.fetchBySid(finPaymentrecord.getPurchaseSystemSid()).getData();
voucherResultDetailDto.setDimensionDept(deptVo.getOrgCode());
voucherResultDetailDtoJF.setDimensionDept(deptVo.getOrgCode());
String key = dictCommonFeign.selectByValue(finPaymentrecord.getReceiveBank()).getData();
voucherResultDetailDto.setBank(key);
voucherResultDetailDto.setDebit(finPaymentrecord.getCost().toString());
voucherResultDetailDtos.add(voucherResultDetailDto);
voucherResultDetailDtoJF.setBank(key);
voucherResultDetailDtoJF.setDebit(finPaymentrecord.getCost().toString());
voucherResultDetailDtos.add(voucherResultDetailDtoJF);
//贷方
voucherResultDetailDto.setSummary("付" + finPaymentrecord.getCostTitleValue() + finPaymentrecord.getCost());
voucherResultDetailDto.setSubjectNo("1002.01.00");
voucherResultDetailDto.setBankAccount(finPaymentrecord.getPayBankAccount());
voucherResultDetailDto.setCredit(finPaymentrecord.getCost().toString());
voucherResultDetailDtos.add(voucherResultDetailDto);
voucherResultDetailDtoDf.setSummary("付" + finPaymentrecord.getCostTitleValue() + finPaymentrecord.getCost());
voucherResultDetailDtoDf.setBankAccount(finPaymentrecord.getPayBankAccount());
voucherResultDetailDtoDf.setCredit(finPaymentrecord.getCost().toString());
voucherResultDetailDtos.add(voucherResultDetailDtoDf);
} else if ("016".equals(finPaymentrecord.getCostTitleKey())) {//银行手续费
//借方
voucherResultDetailDto.setSummary("付" + finPaymentrecord.getCostTitleValue() + finPaymentrecord.getCost());
voucherResultDetailDto.setSubjectNo("6603.03.00");
voucherResultDetailDto.setDebit(finPaymentrecord.getCost().toString());
voucherResultDetailDtos.add(voucherResultDetailDto);
voucherResultDetailDtoJF.setSummary("付" + finPaymentrecord.getCostTitleValue() + finPaymentrecord.getCost());
voucherResultDetailDtoJF.setSubjectNo("6603.03.00");
voucherResultDetailDtoJF.setDebit(finPaymentrecord.getCost().toString());
voucherResultDetailDtos.add(voucherResultDetailDtoJF);
//贷方
voucherResultDetailDto.setSummary("付" + finPaymentrecord.getCostTitleValue());
voucherResultDetailDto.setSubjectNo("1002.01.00");
voucherResultDetailDto.setBankAccount(finPaymentrecord.getPayBankAccount());
voucherResultDetailDto.setCredit(finPaymentrecord.getCost().toString());
voucherResultDetailDtos.add(voucherResultDetailDto);
voucherResultDetailDtoDf.setSummary("付" + finPaymentrecord.getCostTitleValue());
voucherResultDetailDtoDf.setBankAccount(finPaymentrecord.getPayBankAccount());
voucherResultDetailDtoDf.setCredit(finPaymentrecord.getCost().toString());
voucherResultDetailDtos.add(voucherResultDetailDtoDf);
} else if ("017".equals(finPaymentrecord.getCostTitleKey())) {//金融服务费
//借方
voucherResultDetailDto.setSummary("付" + finPaymentrecord.getCostTitleValue() + finPaymentrecord.getCost());
voucherResultDetailDto.setSubjectNo("6603.03.00");
voucherResultDetailDto.setDebit(finPaymentrecord.getCost().toString());
voucherResultDetailDtos.add(voucherResultDetailDto);
voucherResultDetailDtoJF.setSummary("付" + finPaymentrecord.getCostTitleValue() + finPaymentrecord.getCost());
voucherResultDetailDtoJF.setSubjectNo("6603.03.00");
voucherResultDetailDtoJF.setDebit(finPaymentrecord.getCost().toString());
voucherResultDetailDtos.add(voucherResultDetailDtoJF);
//贷方
voucherResultDetailDto.setSummary("付" + finPaymentrecord.getCostTitleValue());
voucherResultDetailDto.setSubjectNo("1002.01.00");
voucherResultDetailDto.setBankAccount(finPaymentrecord.getPayBankAccount());
voucherResultDetailDto.setCredit(finPaymentrecord.getCost().toString());
voucherResultDetailDtos.add(voucherResultDetailDto);
voucherResultDetailDtoDf.setSummary("付" + finPaymentrecord.getCostTitleValue());
voucherResultDetailDtoDf.setBankAccount(finPaymentrecord.getPayBankAccount());
voucherResultDetailDtoDf.setCredit(finPaymentrecord.getCost().toString());
voucherResultDetailDtos.add(voucherResultDetailDtoDf);
} else if (StringUtils.isBlank(finPaymentrecord.getCostTitleKey())) {//平仓款
//查询平仓总付款金额
FinPaymentapplyDetailsBelowEve finPaymentapplyDetailsBelowEve = finPaymentapplyDetailsBelowEveService.fetchBySid(finPaymentrecord.getBusSid());
@ -1698,43 +1708,42 @@ public class FinPaymentrecordService extends MybatisBaseService<FinPaymentrecord
BigDecimal payPriceTotal = baseMapper.selPayPrice(finPaymentrecord.getApplySid());
if (payPriceTotal.add(finPaymentrecord.getCost()).compareTo(exePayPriceTotal) == -1) {
//借方
voucherResultDetailDto.setSummary("还" + finPaymentrecord.getCostTitleValue() + finPaymentapplyDetailsBelowEve.getExePayDate());
voucherResultDetailDto.setSubjectNo("1009.03");
voucherResultDetailDtoJF.setSummary("还" + finPaymentrecord.getCostTitleValue() + finPaymentapplyDetailsBelowEve.getExePayDate());
voucherResultDetailDtoJF.setSubjectNo("1009.03");
SysOrganizationVo deptVo = sysOrganizationFeign.fetchBySid(finPaymentrecord.getPurchaseSystemSid()).getData();
voucherResultDetailDto.setDimensionDept(deptVo.getOrgCode());
voucherResultDetailDtoJF.setDimensionDept(deptVo.getOrgCode());
String key = dictCommonFeign.selectByValue(finPaymentrecord.getReceiveBank()).getData();
voucherResultDetailDto.setBank(key);
voucherResultDetailDto.setDebit(finPaymentrecord.getCost().toString());
voucherResultDetailDtos.add(voucherResultDetailDto);
voucherResultDetailDtoJF.setBank(key);
voucherResultDetailDtoJF.setDebit(finPaymentrecord.getCost().toString());
voucherResultDetailDtos.add(voucherResultDetailDtoJF);
//贷方
voucherResultDetailDto.setSummary("还" + finPaymentrecord.getCostTitleValue() + finPaymentapplyDetailsBelowEve.getExePayDate());
voucherResultDetailDto.setSubjectNo("1002.01.00");
voucherResultDetailDto.setBankAccount(finPaymentrecord.getPayBankAccount());
voucherResultDetailDto.setCredit(finPaymentrecord.getCost().toString());
voucherResultDetailDtos.add(voucherResultDetailDto);
voucherResultDetailDtoDf.setSummary("还" + finPaymentrecord.getCostTitleValue() + finPaymentapplyDetailsBelowEve.getExePayDate());
voucherResultDetailDtoDf.setBankAccount(finPaymentrecord.getPayBankAccount());
voucherResultDetailDtoDf.setCredit(finPaymentrecord.getCost().toString());
voucherResultDetailDtos.add(voucherResultDetailDtoDf);
} else {
//借方
voucherResultDetailDto.setSummary("还" + finPaymentrecord.getCostTitleValue() + finPaymentapplyDetailsBelowEve.getExePayDate());
voucherResultDetailDto.setSubjectNo("2111");
voucherResultDetailDtoJF.setSummary("还" + finPaymentrecord.getCostTitleValue() + finPaymentapplyDetailsBelowEve.getExePayDate());
voucherResultDetailDtoJF.setSubjectNo("2111");
SysOrganizationVo deptVo = sysOrganizationFeign.fetchBySid(finPaymentrecord.getPurchaseSystemSid()).getData();
voucherResultDetailDto.setDimensionDept(deptVo.getOrgCode());
voucherResultDetailDtoJF.setDimensionDept(deptVo.getOrgCode());
String key = dictCommonFeign.selectByValue(finPaymentrecord.getReceiveBank()).getData();
voucherResultDetailDto.setBank(key);
voucherResultDetailDto.setDebit(exePayPriceTotal.add(payAccount).toString());
voucherResultDetailDtos.add(voucherResultDetailDto);
voucherResultDetailDtoJF.setBank(key);
voucherResultDetailDtoJF.setDebit(exePayPriceTotal.add(payAccount).toString());
voucherResultDetailDtos.add(voucherResultDetailDtoJF);
//贷方1
voucherResultDetailDto.setSummary("还" + finPaymentrecord.getCostTitleValue() + finPaymentapplyDetailsBelowEve.getExePayDate());
voucherResultDetailDto.setSubjectNo("1009.03");
voucherResultDetailDto.setDimensionDept(deptVo.getOrgCode());
voucherResultDetailDto.setBank(key);
voucherResultDetailDto.setCredit(payPriceTotal.add(payAccount).subtract(finPaymentrecord.getCost()).toString());
voucherResultDetailDtos.add(voucherResultDetailDto);
voucherResultDetailDtoDf.setSummary("还" + finPaymentrecord.getCostTitleValue() + finPaymentapplyDetailsBelowEve.getExePayDate());
voucherResultDetailDtoDf.setSubjectNo("1009.03");
voucherResultDetailDtoDf.setDimensionDept(deptVo.getOrgCode());
voucherResultDetailDtoDf.setBank(key);
voucherResultDetailDtoDf.setCredit(payPriceTotal.add(payAccount).subtract(finPaymentrecord.getCost()).toString());
voucherResultDetailDtos.add(voucherResultDetailDtoDf);
//贷方2
voucherResultDetailDto.setSummary("还" + finPaymentrecord.getCostTitleValue() + finPaymentapplyDetailsBelowEve.getExePayDate());
voucherResultDetailDto.setSubjectNo("1002.01.00");
voucherResultDetailDto.setBankAccount(finPaymentrecord.getPayBankAccount());
voucherResultDetailDto.setCredit(finPaymentrecord.getCost().toString());
voucherResultDetailDtos.add(voucherResultDetailDto);
Voucher.VoucherResultDetailDto voucherResultDetailDtoDf2 = new Voucher.VoucherResultDetailDto();
voucherResultDetailDtoDf2.setSummary("还" + finPaymentrecord.getCostTitleValue() + finPaymentapplyDetailsBelowEve.getExePayDate());
voucherResultDetailDtoDf2.setBankAccount(finPaymentrecord.getPayBankAccount());
voucherResultDetailDtoDf2.setCredit(finPaymentrecord.getCost().toString());
voucherResultDetailDtos.add(voucherResultDetailDtoDf2);
}
}
voucher.setResultDetails(voucherResultDetailDtos);

19
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatewithapply/ScmSpecialRebateWithApplyService.java
View File

@ -63,6 +63,7 @@ import com.yxt.anrui.scm.api.scmspecialrebatewithapply.flow.GetNodeQuery;
import com.yxt.anrui.scm.api.scmspecialrebatewithapply.flow.GetNodeVo;
import com.yxt.anrui.scm.api.scmspecialrebatewithapply.flow.ScmSpecialRebateWithApplyDelegateQuery;
import com.yxt.anrui.scm.api.scmspecialrebatewithapply.flow.SubmitScmSpecialRebateWithApplyDto;
import com.yxt.anrui.scm.api.scmvehrebatewith.ScmVehRebateWithDetailsVo;
import com.yxt.anrui.scm.biz.scmspecialrebate.ScmSpecialRebateService;
import com.yxt.anrui.scm.biz.scmspecialrebatewith.ScmSpecialRebateWithService;
import com.yxt.anrui.scm.biz.scmvehrebatewithapply.ScmVehRebateWithApplyService;
@ -256,6 +257,12 @@ public class ScmSpecialRebateWithApplyService extends MybatisBaseService<ScmSpec
if (scmSpecialRebateWithApply == null) {
rb.setMsg("该专项返利预提申请单不存在");
}
if (!"待提交".equals(scmSpecialRebateWithApply.getNodeState())) {
List<String> specialRebateSids = scmSpecialRebateWithService.fetchSpecialReBateSidByMainSid(dtoSid);
for (String specialRebateSid : specialRebateSids) {
scmSpecialRebateService.updateState(specialRebateSid, 0);
}
}
this.updateByDto(dto);
scmSpecialRebateWithService.delByMainSid(dtoSid);
for (ScmSpecialRebateWithDto scmSpecialRebateWithDto : scmSpecialRebateWiths) {
@ -265,6 +272,9 @@ public class ScmSpecialRebateWithApplyService extends MybatisBaseService<ScmSpec
scmSpecialRebateWith.setSpecialRebateSid(specialRebateSid);
scmSpecialRebateWith.setMainSid(dtoSid);
scmSpecialRebateWithService.save(scmSpecialRebateWith);
if (!"待提交".equals(scmSpecialRebateWithApply.getNodeState())) {
scmSpecialRebateService.updateState(specialRebateSid, 1);
}
}
}
return rb.success().setMsg("修改成功").setData(dtoSid);
@ -429,6 +439,7 @@ public class ScmSpecialRebateWithApplyService extends MybatisBaseService<ScmSpec
/**
* 推送专项返利预提凭证
*
* @param sid
*/
public void pushSpecialRebateWithVoucher(String sid) {
@ -585,7 +596,7 @@ public class ScmSpecialRebateWithApplyService extends MybatisBaseService<ScmSpec
if ("Event_end".equals(resultBean.getData().getTaskDefKey())) {
for (String specialRebateSid : specialRebateSids) {
scmSpecialRebateService.updateState(specialRebateSid, 2);
scmSpecialRebateService.updateWithholdingDateBySid(specialRebateSid,scmSpecialRebateWithApply.getWithApply());
scmSpecialRebateService.updateWithholdingDateBySid(specialRebateSid, scmSpecialRebateWithApply.getWithApply());
}
try {
ThreadFactory namedThreadFactory = new ThreadFactoryBuilder()
@ -700,7 +711,7 @@ public class ScmSpecialRebateWithApplyService extends MybatisBaseService<ScmSpec
Map<String, Object> map = BeanUtil.beanToMap(resultBean.getData());
updateFlowFiled(map);
for (String specialRebateSid : specialRebateSids) {
scmSpecialRebateService.updateState(specialRebateSid,0);
scmSpecialRebateService.updateState(specialRebateSid, 0);
}
return rb.success().setData(resultBean.getData());
} else {
@ -714,7 +725,7 @@ public class ScmSpecialRebateWithApplyService extends MybatisBaseService<ScmSpec
Map<String, Object> map = BeanUtil.beanToMap(resultBean.getData());
updateFlowFiled(map);
for (String specialRebateSid : specialRebateSids) {
scmSpecialRebateService.updateState(specialRebateSid,0);
scmSpecialRebateService.updateState(specialRebateSid, 0);
}
return rb.success().setData(resultBean.getData());
}
@ -793,7 +804,7 @@ public class ScmSpecialRebateWithApplyService extends MybatisBaseService<ScmSpec
List<ScmSpecialRebateWithDetailsVo> scmSpecialRebateWiths = scmSpecialRebateWithApplyDetailsVo.getScmSpecialRebateWiths();
Map<String, Object> dataMap = new HashMap<String, Object>();
//标题
dataMap.put("title",scmSpecialRebateWithApplyDetailsVo.getWithApply() + "专项返利预提审批");
dataMap.put("title", scmSpecialRebateWithApplyDetailsVo.getWithApply() + "专项返利预提审批");
//分公司
dataMap.put("useOrgName", scmSpecialRebateWithApplyDetailsVo.getCreateOrgName());
//创建部门

9
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatewithapply/ScmVehRebateWithApplyService.java
View File

@ -277,6 +277,12 @@ public class ScmVehRebateWithApplyService extends MybatisBaseService<ScmVehRebat
rb.setMsg("该单车返利预提申请单不存在");
}
this.updateByDto(dto);
if (!"待提交".equals(scmVehRebateWithApply.getNodeState())){
List<ScmVehRebateWithDetailsVo> scmVehRebateWithDetailsVos = scmVehRebateWithService.selByMainSid(dtoSid);
for (ScmVehRebateWithDetailsVo scmVehRebateWithDetailsVo : scmVehRebateWithDetailsVos) {
scmVehRebateService.updateState(scmVehRebateWithDetailsVo.getVehRebateSid(), 0);
}
}
scmVehRebateWithService.delByMainSid(dtoSid);
for (ScmVehRebateWithDto scmVehRebateWith : scmVehRebateWiths) {
List<String> vehRebateSids = scmVehRebateWith.getVehRebateSids();
@ -285,6 +291,9 @@ public class ScmVehRebateWithApplyService extends MybatisBaseService<ScmVehRebat
scmVehRebateWith1.setVehRebateSid(vehRebateSid);
scmVehRebateWith1.setMainSid(dtoSid);
scmVehRebateWithService.save(scmVehRebateWith1);
if (!"待提交".equals(scmVehRebateWithApply.getNodeState())){
scmVehRebateService.updateState(vehRebateSid, 1);
}
}
}
return rb.success().setMsg("修改成功").setData(dtoSid);

Write Preview
Loading…
Cancel
Save