diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java index deb9b7552..f6d36d4aa 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java @@ -557,6 +557,10 @@ public class OrderBasicInfoServiceImpl implements OrderBasicInfoService { resultVO.setDateDescription("结算时间 " + startSettleTime + " - " + endSettleTime); resultList.add(resultVO); } + // 前端总结算金额取sumActualReceivedAmount字段 + resultList.forEach(resultVO -> { + resultVO.setSumActualReceivedAmount(YKCUtils.getMinBigDecimal(resultVO.getSumSettleAmount(), resultVO.getSumActualReceivedAmount())); + }); return resultList; }