提交奖扣记录-补充业务

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;

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<PointAdditiveCalcE
      * @date 2022-06-14
      */
     void delete(String[] ids);
+
+    /**
+    * @describe: 根据房屋ID和积分类别 插入/修改德育积分
+    * @author wangtong
+    * @date 2022/6/21 14:51
+    * @params [insertEntity]
+    * @return com.epmet.commons.tools.utils.Result
+    */
+    Result insertMoralEducation(PointRewardEntity insertEntity);
 }

epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/PointAdditiveRecordService.java

@@ -2,10 +2,12 @@ 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.PointAdditiveRecordDTO;
 import com.epmet.dto.form.CommonPageUserFormDTO;
 import com.epmet.dto.result.PointAdditiveRecordResultDTO;
 import com.epmet.entity.PointAdditiveRecordEntity;
+import com.epmet.entity.PointRewardEntity;
 
 import java.util.List;
 import java.util.Map;
@@ -87,4 +89,13 @@ public interface PointAdditiveRecordService extends BaseService<PointAdditiveRec
      * @Date 2022/6/15 9:55
      */
     List<PointAdditiveRecordResultDTO> getRecords(CommonPageUserFormDTO formDTO);
+
+    /**
+    * @describe: 插入德育积分记录
+    * @author wangtong
+    * @date 2022/6/21 14:29
+    * @params [insertEntity]
+    * @return com.epmet.commons.tools.utils.Result
+    */
+    Result insertMoralEducation(PointRewardEntity insertEntity);
 }

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<PointAdditiveC
         baseDao.deleteBatchIds(Arrays.asList(ids));
     }
 
+    @Override
+    public Result insertMoralEducation(PointRewardEntity rewardEntity) {
+        PointAdditiveCalcEntity queryData = new PointAdditiveCalcEntity();
+        queryData.setSubjectId(rewardEntity.getHouseId());
+        queryData.setCategoryCode(PointAddRuleEnum.MORAL_EDUCATION.getCode());
+        QueryWrapper<PointAdditiveCalcEntity> 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();
+    }
+
 }

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<PointAdditiv
         return list;
     }
 
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public Result insertMoralEducation(PointRewardEntity rewardEntity) {
+        PointAdditiveRecordEntity entity = new PointAdditiveRecordEntity();
+        entity.setCustomerId(rewardEntity.getCustomerId());
+        if(PointAddRuleEnum.POINT_REWARD.getCode().equals(rewardEntity.getBusinessCode())){
+            entity.setTitle("德育积分奖励");
+        }else if(PointAddRuleEnum.POINT_FINE.getCode().equals(rewardEntity.getBusinessCode())){
+            entity.setTitle("德育积分扣罚");
+        }
+        entity.setStatement(rewardEntity.getStatement());
+        entity.setPointValue(rewardEntity.getPointValue());
+        entity.setCategoryCode(PointAddRuleEnum.MORAL_EDUCATION.getCode());
+        entity.setSubjectId(rewardEntity.getHouseId());
+        entity.setBusinessId(rewardEntity.getId());
+        entity.setBusinessCode(rewardEntity.getBusinessCode());
+        insert(entity);
+        return new Result();
+    }
+
 }

epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointRewardServiceImpl.java

@@ -5,6 +5,8 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
 import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult;
+import com.epmet.commons.tools.exception.EpmetErrorCode;
+import com.epmet.commons.tools.exception.EpmetException;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.redis.common.CustomerIcHouseRedis;
 import com.epmet.commons.tools.redis.common.CustomerStaffRedis;
@@ -18,9 +20,7 @@ import com.epmet.dto.form.RecordRewardFormDTO;
 import com.epmet.dto.form.SubmitRewardFormDTO;
 import com.epmet.entity.PointRewardEntity;
 import com.epmet.redis.PointRewardRedis;
-import com.epmet.service.PointAnnexService;
+import com.epmet.service.*;
-import com.epmet.service.PointRewardRuleService;
-import com.epmet.service.PointRewardService;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import org.apache.commons.lang3.StringUtils;
@@ -53,6 +53,12 @@ public class PointRewardServiceImpl extends BaseServiceImpl<PointRewardDao, Poin
     @Autowired
     private PointAdditiveRuleDao pointAdditiveRuleDao;
 
+    @Autowired
+    private PointAdditiveRecordService pointAdditiveRecordService;
+
+    @Autowired
+    private PointAdditiveCalcService pointAdditiveCalcService;
+
     @Override
     public PageData<PointRewardDTO> page(Map<String, Object> params) {
         IPage<PointRewardEntity> page = baseDao.selectPage(
@@ -122,12 +128,19 @@ public class PointRewardServiceImpl extends BaseServiceImpl<PointRewardDao, Poin
         insertEntity.setStatement(dto.getStatement());
         //根据积分规则去获取分值
         Integer pointSum = pointAdditiveRuleDao.selectPointTotalByIds(dto);
+        if(null == pointSum){
+            throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "积分不可为空","积分不可为空");
+        }
         insertEntity.setPointValue(pointSum);
         insert(insertEntity);
         //插入积分奖扣明细
         pointRewardRuleService.insertBatchPointRule(insertEntity.getId(),dto);
         //插入积分附件
         pointAnnexService.insertBatchPoint(insertEntity.getId(),dto);
+        //插入附加积分记录
+        pointAdditiveRecordService.insertMoralEducation(insertEntity);
+        //插入附加积分计算
+        pointAdditiveCalcService.insertMoralEducation(insertEntity);
         return new Result().ok("提交成功！");
     }