diff --git a/src/main/java/com/qs/serve/modules/bir/entity/BirActivityCenterGoods.java b/src/main/java/com/qs/serve/modules/bir/entity/BirActivityCenterGoods.java index e619d865..19d86dc9 100644 --- a/src/main/java/com/qs/serve/modules/bir/entity/BirActivityCenterGoods.java +++ b/src/main/java/com/qs/serve/modules/bir/entity/BirActivityCenterGoods.java @@ -80,6 +80,8 @@ public class BirActivityCenterGoods implements Serializable { @NotNull(message = "分配的释放金额不能为空") private BigDecimal splitReleaseAmount; + private BigDecimal splitPayAmount; + /** 成本明细编码 */ @ExcelProperty("成本明细编码") @Length(max = 30,message = "成本明细编码长度不能超过30字") @@ -118,6 +120,8 @@ public class BirActivityCenterGoods implements Serializable { @ExcelProperty("活动释放金额") private BigDecimal activityTotalReleaseAmount; + private BigDecimal activityTotalPayAmount; + /** 科目id */ @NotNull(message = "科目id不能为空") private Long subjectId; diff --git a/src/main/java/com/qs/serve/modules/bir/entity/dto/BirCenterGoodSplitDTO.java b/src/main/java/com/qs/serve/modules/bir/entity/dto/BirCenterGoodSplitDTO.java index f81c22a7..b3f63291 100644 --- a/src/main/java/com/qs/serve/modules/bir/entity/dto/BirCenterGoodSplitDTO.java +++ b/src/main/java/com/qs/serve/modules/bir/entity/dto/BirCenterGoodSplitDTO.java @@ -20,4 +20,7 @@ public class BirCenterGoodSplitDTO { //当前CenterGoods分割项核销金额(粗略计算) BigDecimal currentSplitReleaseAmount; + //当前CenterGoods分割项支付金额(粗略计算) + BigDecimal currentSplitPayAmount; + } diff --git a/src/main/java/com/qs/serve/modules/bir/service/impl/BirActivityCenterGoodsServiceImpl.java b/src/main/java/com/qs/serve/modules/bir/service/impl/BirActivityCenterGoodsServiceImpl.java index e340919b..90d1ada0 100644 --- a/src/main/java/com/qs/serve/modules/bir/service/impl/BirActivityCenterGoodsServiceImpl.java +++ b/src/main/java/com/qs/serve/modules/bir/service/impl/BirActivityCenterGoodsServiceImpl.java @@ -90,7 +90,6 @@ public class BirActivityCenterGoodsServiceImpl extends ServiceImpl activityIds = activityCenterGoodsAllList.stream().filter(a->a.getId()!=null) .map(TbsActivityCenterGoods::getActivityId).collect(Collectors.toList()); @@ -243,6 +242,7 @@ public class BirActivityCenterGoodsServiceImpl extends ServiceImpl