From 04b781e9ea2e0cfef8ad4ddb764c01cffc95590a Mon Sep 17 00:00:00 2001 From: Jackwang Date: Tue, 21 Jun 2022 15:29:13 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E5=A5=96=E6=89=A3=E8=AE=B0?= =?UTF-8?q?=E5=BD=95-=E8=A1=A5=E5=85=85=E4=B8=9A=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/common/enu/PointAddRuleEnum.java | 3 ++ .../service/PointAdditiveCalcService.java | 13 +++++++- .../service/PointAdditiveRecordService.java | 13 +++++++- .../impl/PointAdditiveCalcServiceImpl.java | 32 ++++++++++++++++++- .../impl/PointAdditiveRecordServiceImpl.java | 28 ++++++++++++++-- .../service/impl/PointRewardServiceImpl.java | 19 +++++++++-- 6 files changed, 100 insertions(+), 8 deletions(-) diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/common/enu/PointAddRuleEnum.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/common/enu/PointAddRuleEnum.java index 91ced60017..8763af0681 100644 --- a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/common/enu/PointAddRuleEnum.java +++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/common/enu/PointAddRuleEnum.java @@ -10,6 +10,9 @@ public enum PointAddRuleEnum { RULE_TYPE("rule", "规则"), APPLY_ALLOW("0", "允许"), APPLY_BAN("1", "禁止"), + MORAL_EDUCATION("moral_education", "德育积分"), + POINT_FINE("point_fine", "积分扣罚"), + POINT_REWARD("point_reward", "积分奖励"), ; private String code; diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/PointAdditiveCalcService.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/PointAdditiveCalcService.java index 74ac718ccb..50d477b844 100644 --- a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/PointAdditiveCalcService.java +++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/PointAdditiveCalcService.java @@ -2,8 +2,10 @@ package com.epmet.service; import com.epmet.commons.mybatis.service.BaseService; import com.epmet.commons.tools.page.PageData; +import com.epmet.commons.tools.utils.Result; import com.epmet.dto.PointAdditiveCalcDTO; import com.epmet.entity.PointAdditiveCalcEntity; +import com.epmet.entity.PointRewardEntity; import java.util.List; import java.util.Map; @@ -75,4 +77,13 @@ public interface PointAdditiveCalcService extends BaseService getRecords(CommonPageUserFormDTO formDTO); -} \ No newline at end of file + + /** + * @describe: 插入德育积分记录 + * @author wangtong + * @date 2022/6/21 14:29 + * @params [insertEntity] + * @return com.epmet.commons.tools.utils.Result + */ + Result insertMoralEducation(PointRewardEntity insertEntity); +} diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointAdditiveCalcServiceImpl.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointAdditiveCalcServiceImpl.java index ca319c7b6f..368c1b5ad7 100644 --- a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointAdditiveCalcServiceImpl.java +++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointAdditiveCalcServiceImpl.java @@ -2,13 +2,16 @@ package com.epmet.service.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.epmet.common.enu.PointAddRuleEnum; import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; import com.epmet.commons.tools.constant.FieldConstant; import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.utils.ConvertUtils; +import com.epmet.commons.tools.utils.Result; import com.epmet.dao.PointAdditiveCalcDao; import com.epmet.dto.PointAdditiveCalcDTO; import com.epmet.entity.PointAdditiveCalcEntity; +import com.epmet.entity.PointRewardEntity; import com.epmet.service.PointAdditiveCalcService; import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; @@ -79,4 +82,31 @@ public class PointAdditiveCalcServiceImpl extends BaseServiceImpl wrapper = new QueryWrapper<>(queryData); + PointAdditiveCalcEntity isExist = baseDao.selectOne(wrapper); + //有则更新，无则插入 + if(null == isExist){ + PointAdditiveCalcEntity entity = new PointAdditiveCalcEntity(); + entity.setCustomerId(rewardEntity.getCustomerId()); + entity.setSubjectId(rewardEntity.getHouseId()); + entity.setCategoryCode(PointAddRuleEnum.MORAL_EDUCATION.getCode()); + entity.setSpend(0); + entity.setTotal(rewardEntity.getPointValue()); + insert(entity); + }else{ + if(null == isExist.getTotal()){ + isExist.setTotal(rewardEntity.getPointValue()); + }else{ + isExist.setTotal(isExist.getTotal()+rewardEntity.getPointValue()); + } + updateById(isExist); + } + return new Result(); + } + +} diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointAdditiveRecordServiceImpl.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointAdditiveRecordServiceImpl.java index 4845b1193c..1b0bec197c 100644 --- a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointAdditiveRecordServiceImpl.java +++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointAdditiveRecordServiceImpl.java @@ -3,6 +3,7 @@ package com.epmet.service.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.epmet.common.CommonConstant; +import com.epmet.common.enu.PointAddRuleEnum; import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; import com.epmet.commons.tools.constant.FieldConstant; import com.epmet.commons.tools.exception.EpmetErrorCode; @@ -13,8 +14,11 @@ import com.epmet.commons.tools.utils.Result; import com.epmet.dao.PointAdditiveRecordDao; import com.epmet.dto.PointAdditiveRecordDTO; import com.epmet.dto.form.CommonPageUserFormDTO; -import com.epmet.dto.result.*; +import com.epmet.dto.result.HomeInfoResultDTO; +import com.epmet.dto.result.PointAdditiveRecordDailyDTO; +import com.epmet.dto.result.PointAdditiveRecordResultDTO; import com.epmet.entity.PointAdditiveRecordEntity; +import com.epmet.entity.PointRewardEntity; import com.epmet.feign.EpmetUserOpenFeignClient; import com.epmet.service.PointAdditiveRecordService; import com.github.pagehelper.PageHelper; @@ -142,4 +146,24 @@ public class PointAdditiveRecordServiceImpl extends BaseServiceImpl page(Map params) { IPage page = baseDao.selectPage( @@ -122,12 +128,19 @@ public class PointRewardServiceImpl extends BaseServiceImpl