diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointApplyServiceImpl.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointApplyServiceImpl.java index 33065999d5..692b626c02 100644 --- a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointApplyServiceImpl.java +++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointApplyServiceImpl.java @@ -154,6 +154,7 @@ public class PointApplyServiceImpl extends BaseServiceImpl wrapper = new LambdaQueryWrapper<>(); - wrapper.eq(PointAditiveCalcEntity::getCustomerId, tokenDto.getCustomerId()); - wrapper.eq(PointAditiveCalcEntity::getSubjectId, subjectId); - wrapper.eq(PointAditiveCalcEntity::getCategoryCode, dto.getCategoryCode()); - PointAditiveCalcEntity calc = pointAditiveCalcDao.selectOne(wrapper); - if (null != calc) { - calc.setUpdatedBy(null); - calc.setUpdatedTime(null); - calc.setTotal(calc.getTotal() + dto.getPointValue()); - pointAditiveCalcDao.updateById(calc); - } else { - calc = new PointAditiveCalcEntity(); - calc.setCustomerId(tokenDto.getCustomerId()); - calc.setCategoryCode(dto.getCategoryCode()); - calc.setSubjectId(subjectId); - calc.setSpend(NumConstant.ZERO); - calc.setTotal(dto.getPointValue()); - pointAditiveCalcDao.insert(calc); + if (NumConstant.TWO_STR.equals(formDTO.getStatus())) { + //重新计算总分 + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(PointAditiveCalcEntity::getCustomerId, tokenDto.getCustomerId()); + wrapper.eq(PointAditiveCalcEntity::getSubjectId, subjectId); + wrapper.eq(PointAditiveCalcEntity::getCategoryCode, dto.getCategoryCode()); + PointAditiveCalcEntity calc = pointAditiveCalcDao.selectOne(wrapper); + if (null != calc) { + calc.setUpdatedBy(null); + calc.setUpdatedTime(null); + calc.setTotal(calc.getTotal() + dto.getPointValue()); + pointAditiveCalcDao.updateById(calc); + } else { + calc = new PointAditiveCalcEntity(); + calc.setCustomerId(tokenDto.getCustomerId()); + calc.setCategoryCode(dto.getCategoryCode()); + calc.setSubjectId(subjectId); + calc.setSpend(NumConstant.ZERO); + calc.setTotal(dto.getPointValue()); + pointAditiveCalcDao.insert(calc); + } } } }); diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/PointApplyDao.xml b/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/PointApplyDao.xml index 8aa8e7989a..08ca82bcf0 100644 --- a/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/PointApplyDao.xml +++ b/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/PointApplyDao.xml @@ -51,7 +51,7 @@ - +