diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java index 140e2eb50..bbd77dc14 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java @@ -1624,7 +1624,7 @@ public class EmisBaseService { } } - private BigDecimal getInTermMoney(List emisWaybillList) { + protected BigDecimal getInTermMoney(List emisWaybillList) { List inTermList = filterInTermEmisWaybillList(emisWaybillList); List billCodeList = inTermList.stream().map(EmisWaybill::getBillCode).collect(Collectors.toList()); log.info("cd getInTermMoney , billCodeList,{}", billCodeList); @@ -1674,7 +1674,7 @@ public class EmisBaseService { return inTermList; } - private List getEmisWaybills(EmisCreditSalesmen item) { + protected List getEmisWaybills(EmisCreditSalesmen item) { EmisWaybill emisWaybill = new EmisWaybill(); emisWaybill.setPaymentType("1,3"); emisWaybill.setPayee(item.getSalesmen()); diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisCreditSalesmenServiceImpl.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisCreditSalesmenServiceImpl.java index 405c25850..24e99e65f 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisCreditSalesmenServiceImpl.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisCreditSalesmenServiceImpl.java @@ -18,6 +18,7 @@ import java.util.Map; import cn.hutool.core.collection.CollectionUtil; import com.alibaba.fastjson.JSON; import com.xdadan.erp.emis.domain.EmisTempCreditSalesmen; +import com.xdadan.erp.emis.domain.EmisWaybill; import com.xdadan.erp.emis.domain.enumtype.EmisBizErrorType; import com.xdadan.erp.emis.domain.exception.EmisBizError; import com.xdadan.erp.emis.mapper.EmisTempCreditSalesmenMapper; @@ -142,6 +143,15 @@ public class EmisCreditSalesmenServiceImpl extends EmisBaseService implements IE BigDecimal useMoney = (BigDecimal)useMoneyMap.get("useMoney"); emisCreditSalesmen.setUseMoney(useMoney); + List emisWaybillList = getEmisWaybills(emisCreditSalesmen); + // 账期内金额 + BigDecimal inTermMoney = getInTermMoney(emisWaybillList); + // 超期金额 + BigDecimal overTermMoney = BigDecimal + .valueOf(useMoney.subtract(inTermMoney).stripTrailingZeros().longValue()); + emisCreditSalesmen.setOverTermMoney(overTermMoney); + emisCreditSalesmen.setInTermMoney(inTermMoney); + log.error("=====>useMoneyMap=1111====>{}", JSON.toJSONString(useMoneyMap)); log.error("=====>useMoney=1111====>{}",useMoney.toString());