aike/emis-service
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request 'demand: 修改现金客户额度触发定时任务' (#13) from develop into master

Browse Source 
Reviewed-on: http://git.xdadan.loc/tanex/emis-service/pulls/13
This commit is contained in:
smshen 2025-05-06 14:34:44 +08:00
commit bcc893ce15
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java
View File

@ -1624,7 +1624,7 @@ public class EmisBaseService {
} }
} }
private BigDecimal getInTermMoney(List<EmisWaybill> emisWaybillList) { protected BigDecimal getInTermMoney(List<EmisWaybill> emisWaybillList) {
List<EmisWaybill> inTermList = filterInTermEmisWaybillList(emisWaybillList); List<EmisWaybill> inTermList = filterInTermEmisWaybillList(emisWaybillList);
List<String> billCodeList = inTermList.stream().map(EmisWaybill::getBillCode).collect(Collectors.toList()); List<String> billCodeList = inTermList.stream().map(EmisWaybill::getBillCode).collect(Collectors.toList());
log.info("cd getInTermMoney , billCodeList,{}", billCodeList); log.info("cd getInTermMoney , billCodeList,{}", billCodeList);
@ -1674,7 +1674,7 @@ public class EmisBaseService {
return inTermList; return inTermList;
} }
private List<EmisWaybill> getEmisWaybills(EmisCreditSalesmen item) { protected List<EmisWaybill> getEmisWaybills(EmisCreditSalesmen item) {
EmisWaybill emisWaybill = new EmisWaybill(); EmisWaybill emisWaybill = new EmisWaybill();
emisWaybill.setPaymentType("1,3"); emisWaybill.setPaymentType("1,3");
emisWaybill.setPayee(item.getSalesmen()); emisWaybill.setPayee(item.getSalesmen());

10
emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisCreditSalesmenServiceImpl.java
View File

@ -18,6 +18,7 @@ import java.util.Map;
import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.collection.CollectionUtil;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSON;
import com.xdadan.erp.emis.domain.EmisTempCreditSalesmen; 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.enumtype.EmisBizErrorType;
import com.xdadan.erp.emis.domain.exception.EmisBizError; import com.xdadan.erp.emis.domain.exception.EmisBizError;
import com.xdadan.erp.emis.mapper.EmisTempCreditSalesmenMapper; import com.xdadan.erp.emis.mapper.EmisTempCreditSalesmenMapper;
@ -142,6 +143,15 @@ public class EmisCreditSalesmenServiceImpl extends EmisBaseService implements IE
BigDecimal useMoney = (BigDecimal)useMoneyMap.get("useMoney"); BigDecimal useMoney = (BigDecimal)useMoneyMap.get("useMoney");
emisCreditSalesmen.setUseMoney(useMoney); emisCreditSalesmen.setUseMoney(useMoney);
List<EmisWaybill> 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("=====>useMoneyMap=1111====>{}", JSON.toJSONString(useMoneyMap));
log.error("=====>useMoney=1111====>{}",useMoney.toString()); log.error("=====>useMoney=1111====>{}",useMoney.toString());