修改表名类名

epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/PointAditiveCalcDTO.java → epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/PointAdditiveCalcDTO.java

@@ -12,7 +12,7 @@ import lombok.Data;
  * @since v1.0.0 2022-06-14
  */
 @Data
-public class PointAditiveCalcDTO implements Serializable {
+public class PointAdditiveCalcDTO implements Serializable {
 
     private static final long serialVersionUID = 1L;
 

epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/PointAditiveRecordDTO.java → epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/PointAdditiveRecordDTO.java

@@ -13,7 +13,7 @@ import java.util.Date;
  * @since v1.0.0 2022-06-14
  */
 @Data
-public class PointAditiveRecordDTO implements Serializable {
+public class PointAdditiveRecordDTO implements Serializable {
 
     private static final long serialVersionUID = 1L;
 

epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/result/PointAditiveRecordDailyDTO.java → epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/result/PointAdditiveRecordDailyDTO.java

@@ -10,7 +10,7 @@ import java.io.Serializable;
  * @Date 2022/6/15 9:47
  */
 @Data
-public class PointAditiveRecordDailyDTO implements Serializable {
+public class PointAdditiveRecordDailyDTO implements Serializable {
     private static final long serialVersionUID = -239326201168528901L;
     /**
      * 日期yyyy-MM-dd

epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/result/PointAditiveRecordResultDTO.java → epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/result/PointAdditiveRecordResultDTO.java

@@ -11,11 +11,11 @@ import java.util.List;
  * @Date 2022/6/15 9:46
  */
 @Data
-public class PointAditiveRecordResultDTO implements Serializable {
+public class PointAdditiveRecordResultDTO implements Serializable {
     private static final long serialVersionUID = -1498111500078847600L;
     /**
      * 日期yyyy-MM-dd
      */
     private String date;
-    private List<PointAditiveRecordDailyDTO> dailyList;
+    private List<PointAdditiveRecordDailyDTO> dailyList;
 }

epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/controller/ResiPointController.java

@@ -38,7 +38,7 @@ public class ResiPointController {
     @Autowired
     private UserPointActionLogService pointActionLogService;
     @Resource
-    private PointAditiveRecordService pointAditiveRecordService;
+    private PointAdditiveRecordService pointAdditiveRecordService;
 
     /**
      * @Description 获取指定居民的积分信息
@@ -244,15 +244,15 @@ public class ResiPointController {
      *
      * @Param dto
      * @Param pageUserParam
-     * @Return {@link Result<List<PointAditiveRecordResultDTO>>}
+     * @Return {@link Result<List< PointAdditiveRecordResultDTO >>}
      * @Author zhaoqifeng
      * @Date 2022/6/15 9:55
      */
-    @PostMapping("aditiverecordlist")
+    @PostMapping("additiverecordlist")
-    public Result<List<PointAditiveRecordResultDTO>> aditiveRecords(@LoginUser TokenDto dto,@RequestBody CommonPageUserFormDTO pageUserParam){
+    public Result<List<PointAdditiveRecordResultDTO>> additiveRecords(@LoginUser TokenDto dto, @RequestBody CommonPageUserFormDTO pageUserParam){
         pageUserParam.setCustomerId(dto.getCustomerId());
         pageUserParam.setUserId(dto.getUserId());
         ValidatorUtils.validateEntity(pageUserParam, CommonPageUserFormDTO.PageUserGroup.class);
-        return new Result<List<PointAditiveRecordResultDTO>>().ok(pointAditiveRecordService.getRecords(pageUserParam));
+        return new Result<List<PointAdditiveRecordResultDTO>>().ok(pointAdditiveRecordService.getRecords(pageUserParam));
     }
 }

epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/dao/PointAditiveCalcDao.java → epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/dao/PointAdditiveCalcDao.java

@@ -1,7 +1,7 @@
 package com.epmet.dao;
 
 import com.epmet.commons.mybatis.dao.BaseDao;
-import com.epmet.entity.PointAditiveCalcEntity;
+import com.epmet.entity.PointAdditiveCalcEntity;
 import org.apache.ibatis.annotations.Mapper;
 
 /**
@@ -11,6 +11,6 @@ import org.apache.ibatis.annotations.Mapper;
  * @since v1.0.0 2022-06-14
  */
 @Mapper
-public interface PointAditiveCalcDao extends BaseDao<PointAditiveCalcEntity> {
+public interface PointAdditiveCalcDao extends BaseDao<PointAdditiveCalcEntity> {
 	
 }

epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/dao/PointAditiveRecordDao.java → epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/dao/PointAdditiveRecordDao.java

@@ -1,8 +1,8 @@
 package com.epmet.dao;
 
 import com.epmet.commons.mybatis.dao.BaseDao;
-import com.epmet.dto.result.PointAditiveRecordDailyDTO;
+import com.epmet.dto.result.PointAdditiveRecordDailyDTO;
-import com.epmet.entity.PointAditiveRecordEntity;
+import com.epmet.entity.PointAdditiveRecordEntity;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
@@ -15,16 +15,16 @@ import java.util.List;
  * @since v1.0.0 2022-06-14
  */
 @Mapper
-public interface PointAditiveRecordDao extends BaseDao<PointAditiveRecordEntity> {
+public interface PointAdditiveRecordDao extends BaseDao<PointAdditiveRecordEntity> {
     /**
      * 积分记录
      *
      * @Param customerId
      * @Param categoryCode
      * @Param subjectId
-     * @Return {@link List< PointAditiveRecordDailyDTO>}
+     * @Return {@link List<  PointAdditiveRecordDailyDTO >}
      * @Author zhaoqifeng
      * @Date 2022/6/15 10:12
      */
-    List<PointAditiveRecordDailyDTO> selectRecordList(@Param("customerId") String customerId, @Param("categoryCode") String categoryCode, @Param("subjectId") String subjectId);
+    List<PointAdditiveRecordDailyDTO> selectRecordList(@Param("customerId") String customerId, @Param("categoryCode") String categoryCode, @Param("subjectId") String subjectId);
 }

epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/entity/PointAditiveCalcEntity.java → epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/entity/PointAdditiveCalcEntity.java

@@ -13,8 +13,8 @@ import lombok.EqualsAndHashCode;
  */
 @Data
 @EqualsAndHashCode(callSuper=false)
-@TableName("point_aditive_calc")
+@TableName("point_additive_calc")
-public class PointAditiveCalcEntity extends BaseEpmetEntity {
+public class PointAdditiveCalcEntity extends BaseEpmetEntity {
 
 	private static final long serialVersionUID = 1L;
 

epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/entity/PointAditiveRecordEntity.java → epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/entity/PointAdditiveRecordEntity.java

@@ -13,8 +13,8 @@ import lombok.EqualsAndHashCode;
  */
 @Data
 @EqualsAndHashCode(callSuper=false)
-@TableName("point_aditive_record")
+@TableName("point_additive_record")
-public class PointAditiveRecordEntity extends BaseEpmetEntity {
+public class PointAdditiveRecordEntity extends BaseEpmetEntity {
 
 	private static final long serialVersionUID = 1L;
 

epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/PointAditiveCalcService.java → epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/PointAdditiveCalcService.java

@@ -2,8 +2,8 @@ package com.epmet.service;
 
 import com.epmet.commons.mybatis.service.BaseService;
 import com.epmet.commons.tools.page.PageData;
-import com.epmet.dto.PointAditiveCalcDTO;
+import com.epmet.dto.PointAdditiveCalcDTO;
-import com.epmet.entity.PointAditiveCalcEntity;
+import com.epmet.entity.PointAdditiveCalcEntity;
 
 import java.util.List;
 import java.util.Map;
@@ -14,37 +14,37 @@ import java.util.Map;
  * @author generator generator@elink-cn.com
  * @since v1.0.0 2022-06-14
  */
-public interface PointAditiveCalcService extends BaseService<PointAditiveCalcEntity> {
+public interface PointAdditiveCalcService extends BaseService<PointAdditiveCalcEntity> {
 
     /**
      * 默认分页
      *
      * @param params
-     * @return PageData<PointAditiveCalcDTO>
+     * @return PageData<PointAdditiveCalcDTO>
      * @author generator
      * @date 2022-06-14
      */
-    PageData<PointAditiveCalcDTO> page(Map<String, Object> params);
+    PageData<PointAdditiveCalcDTO> page(Map<String, Object> params);
 
     /**
      * 默认查询
      *
      * @param params
-     * @return java.util.List<PointAditiveCalcDTO>
+     * @return java.util.List<PointAdditiveCalcDTO>
      * @author generator
      * @date 2022-06-14
      */
-    List<PointAditiveCalcDTO> list(Map<String, Object> params);
+    List<PointAdditiveCalcDTO> list(Map<String, Object> params);
 
     /**
      * 单条查询
      *
      * @param id
-     * @return PointAditiveCalcDTO
+     * @return PointAdditiveCalcDTO
      * @author generator
      * @date 2022-06-14
      */
-    PointAditiveCalcDTO get(String id);
+    PointAdditiveCalcDTO get(String id);
 
     /**
      * 默认保存
@@ -54,7 +54,7 @@ public interface PointAditiveCalcService extends BaseService<PointAditiveCalcEnt
      * @author generator
      * @date 2022-06-14
      */
-    void save(PointAditiveCalcDTO dto);
+    void save(PointAdditiveCalcDTO dto);
 
     /**
      * 默认更新
@@ -64,7 +64,7 @@ public interface PointAditiveCalcService extends BaseService<PointAditiveCalcEnt
      * @author generator
      * @date 2022-06-14
      */
-    void update(PointAditiveCalcDTO dto);
+    void update(PointAdditiveCalcDTO dto);
 
     /**
      * 批量删除

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

@@ -2,10 +2,10 @@ package com.epmet.service;
 
 import com.epmet.commons.mybatis.service.BaseService;
 import com.epmet.commons.tools.page.PageData;
-import com.epmet.dto.PointAditiveRecordDTO;
+import com.epmet.dto.PointAdditiveRecordDTO;
 import com.epmet.dto.form.CommonPageUserFormDTO;
-import com.epmet.dto.result.PointAditiveRecordResultDTO;
+import com.epmet.dto.result.PointAdditiveRecordResultDTO;
-import com.epmet.entity.PointAditiveRecordEntity;
+import com.epmet.entity.PointAdditiveRecordEntity;
 
 import java.util.List;
 import java.util.Map;
@@ -16,37 +16,37 @@ import java.util.Map;
  * @author generator generator@elink-cn.com
  * @since v1.0.0 2022-06-14
  */
-public interface PointAditiveRecordService extends BaseService<PointAditiveRecordEntity> {
+public interface PointAdditiveRecordService extends BaseService<PointAdditiveRecordEntity> {
 
     /**
      * 默认分页
      *
      * @param params
-     * @return PageData<PointAditiveRecordDTO>
+     * @return PageData<PointAdditiveRecordDTO>
      * @author generator
      * @date 2022-06-14
      */
-    PageData<PointAditiveRecordDTO> page(Map<String, Object> params);
+    PageData<PointAdditiveRecordDTO> page(Map<String, Object> params);
 
     /**
      * 默认查询
      *
      * @param params
-     * @return java.util.List<PointAditiveRecordDTO>
+     * @return java.util.List<PointAdditiveRecordDTO>
      * @author generator
      * @date 2022-06-14
      */
-    List<PointAditiveRecordDTO> list(Map<String, Object> params);
+    List<PointAdditiveRecordDTO> list(Map<String, Object> params);
 
     /**
      * 单条查询
      *
      * @param id
-     * @return PointAditiveRecordDTO
+     * @return PointAdditiveRecordDTO
      * @author generator
      * @date 2022-06-14
      */
-    PointAditiveRecordDTO get(String id);
+    PointAdditiveRecordDTO get(String id);
 
     /**
      * 默认保存
@@ -56,7 +56,7 @@ public interface PointAditiveRecordService extends BaseService<PointAditiveRecor
      * @author generator
      * @date 2022-06-14
      */
-    void save(PointAditiveRecordDTO dto);
+    void save(PointAdditiveRecordDTO dto);
 
     /**
      * 默认更新
@@ -66,7 +66,7 @@ public interface PointAditiveRecordService extends BaseService<PointAditiveRecor
      * @author generator
      * @date 2022-06-14
      */
-    void update(PointAditiveRecordDTO dto);
+    void update(PointAdditiveRecordDTO dto);
 
     /**
      * 批量删除
@@ -82,9 +82,9 @@ public interface PointAditiveRecordService extends BaseService<PointAditiveRecor
      * 获取积分记录
      *
      * @Param formDTO
-     * @Return {@link List<PointAditiveRecordResultDTO>}
+     * @Return {@link List< PointAdditiveRecordResultDTO >}
      * @Author zhaoqifeng
      * @Date 2022/6/15 9:55
      */
-    List<PointAditiveRecordResultDTO> getRecords(CommonPageUserFormDTO formDTO);
+    List<PointAdditiveRecordResultDTO> getRecords(CommonPageUserFormDTO formDTO);
 }

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

@@ -0,0 +1,82 @@
+package com.epmet.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+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.page.PageData;
+import com.epmet.commons.tools.utils.ConvertUtils;
+import com.epmet.dao.PointAdditiveCalcDao;
+import com.epmet.dto.PointAdditiveCalcDTO;
+import com.epmet.entity.PointAdditiveCalcEntity;
+import com.epmet.service.PointAdditiveCalcService;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 附加积分计算
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2022-06-14
+ */
+@Service
+public class PointAdditiveCalcServiceImpl extends BaseServiceImpl<PointAdditiveCalcDao, PointAdditiveCalcEntity> implements PointAdditiveCalcService {
+
+    @Override
+    public PageData<PointAdditiveCalcDTO> page(Map<String, Object> params) {
+        IPage<PointAdditiveCalcEntity> page = baseDao.selectPage(
+                getPage(params, FieldConstant.CREATED_TIME, false),
+                getWrapper(params)
+        );
+        return getPageData(page, PointAdditiveCalcDTO.class);
+    }
+
+    @Override
+    public List<PointAdditiveCalcDTO> list(Map<String, Object> params) {
+        List<PointAdditiveCalcEntity> entityList = baseDao.selectList(getWrapper(params));
+
+        return ConvertUtils.sourceToTarget(entityList, PointAdditiveCalcDTO.class);
+    }
+
+    private QueryWrapper<PointAdditiveCalcEntity> getWrapper(Map<String, Object> params){
+        String id = (String)params.get(FieldConstant.ID_HUMP);
+
+        QueryWrapper<PointAdditiveCalcEntity> wrapper = new QueryWrapper<>();
+        wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id);
+
+        return wrapper;
+    }
+
+    @Override
+    public PointAdditiveCalcDTO get(String id) {
+        PointAdditiveCalcEntity entity = baseDao.selectById(id);
+        return ConvertUtils.sourceToTarget(entity, PointAdditiveCalcDTO.class);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void save(PointAdditiveCalcDTO dto) {
+        PointAdditiveCalcEntity entity = ConvertUtils.sourceToTarget(dto, PointAdditiveCalcEntity.class);
+        insert(entity);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void update(PointAdditiveCalcDTO dto) {
+        PointAdditiveCalcEntity entity = ConvertUtils.sourceToTarget(dto, PointAdditiveCalcEntity.class);
+        updateById(entity);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void delete(String[] ids) {
+        // 逻辑删除（@TableLogic 注解）
+        baseDao.deleteBatchIds(Arrays.asList(ids));
+    }
+
+}

epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointAditiveRecordServiceImpl.java → epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointAdditiveRecordServiceImpl.java

@@ -10,13 +10,13 @@ import com.epmet.commons.tools.exception.EpmetException;
 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.PointAditiveRecordDao;
+import com.epmet.dao.PointAdditiveRecordDao;
-import com.epmet.dto.PointAditiveRecordDTO;
+import com.epmet.dto.PointAdditiveRecordDTO;
 import com.epmet.dto.form.CommonPageUserFormDTO;
 import com.epmet.dto.result.*;
-import com.epmet.entity.PointAditiveRecordEntity;
+import com.epmet.entity.PointAdditiveRecordEntity;
 import com.epmet.feign.EpmetUserOpenFeignClient;
-import com.epmet.service.PointAditiveRecordService;
+import com.epmet.service.PointAdditiveRecordService;
 import com.github.pagehelper.PageHelper;
 import com.google.common.collect.Maps;
 import org.apache.commons.collections4.CollectionUtils;
@@ -38,53 +38,53 @@ import java.util.stream.Collectors;
  * @since v1.0.0 2022-06-14
  */
 @Service
-public class PointAditiveRecordServiceImpl extends BaseServiceImpl<PointAditiveRecordDao, PointAditiveRecordEntity> implements PointAditiveRecordService {
+public class PointAdditiveRecordServiceImpl extends BaseServiceImpl<PointAdditiveRecordDao, PointAdditiveRecordEntity> implements PointAdditiveRecordService {
 
     @Resource
     private EpmetUserOpenFeignClient epmetUserOpenFeignClient;
 
     @Override
-    public PageData<PointAditiveRecordDTO> page(Map<String, Object> params) {
+    public PageData<PointAdditiveRecordDTO> page(Map<String, Object> params) {
-        IPage<PointAditiveRecordEntity> page = baseDao.selectPage(
+        IPage<PointAdditiveRecordEntity> page = baseDao.selectPage(
                 getPage(params, FieldConstant.CREATED_TIME, false),
                 getWrapper(params)
         );
-        return getPageData(page, PointAditiveRecordDTO.class);
+        return getPageData(page, PointAdditiveRecordDTO.class);
     }
 
     @Override
-    public List<PointAditiveRecordDTO> list(Map<String, Object> params) {
+    public List<PointAdditiveRecordDTO> list(Map<String, Object> params) {
-        List<PointAditiveRecordEntity> entityList = baseDao.selectList(getWrapper(params));
+        List<PointAdditiveRecordEntity> entityList = baseDao.selectList(getWrapper(params));
 
-        return ConvertUtils.sourceToTarget(entityList, PointAditiveRecordDTO.class);
+        return ConvertUtils.sourceToTarget(entityList, PointAdditiveRecordDTO.class);
     }
 
-    private QueryWrapper<PointAditiveRecordEntity> getWrapper(Map<String, Object> params){
+    private QueryWrapper<PointAdditiveRecordEntity> getWrapper(Map<String, Object> params){
         String id = (String)params.get(FieldConstant.ID_HUMP);
 
-        QueryWrapper<PointAditiveRecordEntity> wrapper = new QueryWrapper<>();
+        QueryWrapper<PointAdditiveRecordEntity> wrapper = new QueryWrapper<>();
         wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id);
 
         return wrapper;
     }
 
     @Override
-    public PointAditiveRecordDTO get(String id) {
+    public PointAdditiveRecordDTO get(String id) {
-        PointAditiveRecordEntity entity = baseDao.selectById(id);
+        PointAdditiveRecordEntity entity = baseDao.selectById(id);
-        return ConvertUtils.sourceToTarget(entity, PointAditiveRecordDTO.class);
+        return ConvertUtils.sourceToTarget(entity, PointAdditiveRecordDTO.class);
     }
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void save(PointAditiveRecordDTO dto) {
+    public void save(PointAdditiveRecordDTO dto) {
-        PointAditiveRecordEntity entity = ConvertUtils.sourceToTarget(dto, PointAditiveRecordEntity.class);
+        PointAdditiveRecordEntity entity = ConvertUtils.sourceToTarget(dto, PointAdditiveRecordEntity.class);
         insert(entity);
     }
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void update(PointAditiveRecordDTO dto) {
+    public void update(PointAdditiveRecordDTO dto) {
-        PointAditiveRecordEntity entity = ConvertUtils.sourceToTarget(dto, PointAditiveRecordEntity.class);
+        PointAdditiveRecordEntity entity = ConvertUtils.sourceToTarget(dto, PointAdditiveRecordEntity.class);
         updateById(entity);
     }
 
@@ -99,13 +99,13 @@ public class PointAditiveRecordServiceImpl extends BaseServiceImpl<PointAditiveR
      * 获取积分记录
      *
      * @param formDTO 入参
-     * @Return {@link List<PointAditiveRecordResultDTO>}
+     * @Return {@link List< PointAdditiveRecordResultDTO >}
      * @Author zhaoqifeng
      * @Date 2022/6/15 9:55
      */
     @Override
-    public List<PointAditiveRecordResultDTO> getRecords(CommonPageUserFormDTO formDTO) {
+    public List<PointAdditiveRecordResultDTO> getRecords(CommonPageUserFormDTO formDTO) {
-        List<PointAditiveRecordResultDTO> list = new ArrayList<>();
+        List<PointAdditiveRecordResultDTO> list = new ArrayList<>();
         String subjectId;
         //如果申请类型为德育积分，需要获取用户所在房屋
         if (CommonConstant.MORAL_EDUCATION.equals(formDTO.getCategoryCode())) {
@@ -122,17 +122,17 @@ public class PointAditiveRecordServiceImpl extends BaseServiceImpl<PointAditiveR
         }
 
         PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize());
-        List<PointAditiveRecordDailyDTO> recordList = baseDao.selectRecordList(formDTO.getCustomerId(), formDTO.getCategoryCode(), subjectId);
+        List<PointAdditiveRecordDailyDTO> recordList = baseDao.selectRecordList(formDTO.getCustomerId(), formDTO.getCategoryCode(), subjectId);
 
         if(CollectionUtils.isNotEmpty(recordList)){
-            Map<String,List<PointAditiveRecordDailyDTO>> map =
+            Map<String,List<PointAdditiveRecordDailyDTO>> map =
-                    recordList.stream().collect(Collectors.groupingBy(PointAditiveRecordDailyDTO::getDate));
+                    recordList.stream().collect(Collectors.groupingBy(PointAdditiveRecordDailyDTO::getDate));
 
-            Map<String, List<PointAditiveRecordDailyDTO>> sortedMap = Maps.newLinkedHashMap();
+            Map<String, List<PointAdditiveRecordDailyDTO>> sortedMap = Maps.newLinkedHashMap();
-            map.entrySet().stream().sorted(Map.Entry.<String, List<PointAditiveRecordDailyDTO>>comparingByKey().reversed())
+            map.entrySet().stream().sorted(Map.Entry.<String, List<PointAdditiveRecordDailyDTO>>comparingByKey().reversed())
                     .forEachOrdered(e -> sortedMap.put(e.getKey(), e.getValue()));
             sortedMap.forEach((key, value) -> {
-                PointAditiveRecordResultDTO o = new PointAditiveRecordResultDTO();
+                PointAdditiveRecordResultDTO o = new PointAdditiveRecordResultDTO();
                 o.setDate(key);
                 o.setDailyList(value);
                 list.add(o);

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

@@ -1,82 +0,0 @@
-package com.epmet.service.impl;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-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.page.PageData;
-import com.epmet.commons.tools.utils.ConvertUtils;
-import com.epmet.dao.PointAditiveCalcDao;
-import com.epmet.dto.PointAditiveCalcDTO;
-import com.epmet.entity.PointAditiveCalcEntity;
-import com.epmet.service.PointAditiveCalcService;
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
-
-/**
- * 附加积分计算
- *
- * @author generator generator@elink-cn.com
- * @since v1.0.0 2022-06-14
- */
-@Service
-public class PointAditiveCalcServiceImpl extends BaseServiceImpl<PointAditiveCalcDao, PointAditiveCalcEntity> implements PointAditiveCalcService {
-
-    @Override
-    public PageData<PointAditiveCalcDTO> page(Map<String, Object> params) {
-        IPage<PointAditiveCalcEntity> page = baseDao.selectPage(
-                getPage(params, FieldConstant.CREATED_TIME, false),
-                getWrapper(params)
-        );
-        return getPageData(page, PointAditiveCalcDTO.class);
-    }
-
-    @Override
-    public List<PointAditiveCalcDTO> list(Map<String, Object> params) {
-        List<PointAditiveCalcEntity> entityList = baseDao.selectList(getWrapper(params));
-
-        return ConvertUtils.sourceToTarget(entityList, PointAditiveCalcDTO.class);
-    }
-
-    private QueryWrapper<PointAditiveCalcEntity> getWrapper(Map<String, Object> params){
-        String id = (String)params.get(FieldConstant.ID_HUMP);
-
-        QueryWrapper<PointAditiveCalcEntity> wrapper = new QueryWrapper<>();
-        wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id);
-
-        return wrapper;
-    }
-
-    @Override
-    public PointAditiveCalcDTO get(String id) {
-        PointAditiveCalcEntity entity = baseDao.selectById(id);
-        return ConvertUtils.sourceToTarget(entity, PointAditiveCalcDTO.class);
-    }
-
-    @Override
-    @Transactional(rollbackFor = Exception.class)
-    public void save(PointAditiveCalcDTO dto) {
-        PointAditiveCalcEntity entity = ConvertUtils.sourceToTarget(dto, PointAditiveCalcEntity.class);
-        insert(entity);
-    }
-
-    @Override
-    @Transactional(rollbackFor = Exception.class)
-    public void update(PointAditiveCalcDTO dto) {
-        PointAditiveCalcEntity entity = ConvertUtils.sourceToTarget(dto, PointAditiveCalcEntity.class);
-        updateById(entity);
-    }
-
-    @Override
-    @Transactional(rollbackFor = Exception.class)
-    public void delete(String[] ids) {
-        // 逻辑删除（@TableLogic 注解）
-        baseDao.deleteBatchIds(Arrays.asList(ids));
-    }
-
-}

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

@@ -18,8 +18,8 @@ import com.epmet.commons.tools.redis.common.bean.ResiUserInfoCache;
 import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.commons.tools.utils.Result;
-import com.epmet.dao.PointAditiveCalcDao;
+import com.epmet.dao.PointAdditiveCalcDao;
-import com.epmet.dao.PointAditiveRecordDao;
+import com.epmet.dao.PointAdditiveRecordDao;
 import com.epmet.dao.PointAnnexDao;
 import com.epmet.dao.PointApplyDao;
 import com.epmet.dto.PointApplyDTO;
@@ -27,8 +27,8 @@ import com.epmet.dto.form.PointApplyFormDTO;
 import com.epmet.dto.form.PointApplyPageFormDTO;
 import com.epmet.dto.form.PointAuditFormDTO;
 import com.epmet.dto.result.HomeInfoResultDTO;
-import com.epmet.entity.PointAditiveCalcEntity;
+import com.epmet.entity.PointAdditiveCalcEntity;
-import com.epmet.entity.PointAditiveRecordEntity;
+import com.epmet.entity.PointAdditiveRecordEntity;
 import com.epmet.entity.PointAnnexEntity;
 import com.epmet.entity.PointApplyEntity;
 import com.epmet.feign.EpmetUserOpenFeignClient;
@@ -61,9 +61,9 @@ public class PointApplyServiceImpl extends BaseServiceImpl<PointApplyDao, PointA
     @Resource
     private PointAnnexDao pointAnnexDao;
     @Resource
-    private PointAditiveRecordDao pointAditiveRecordDao;
+    private PointAdditiveRecordDao pointAdditiveRecordDao;
     @Resource
-    private PointAditiveCalcDao pointAditiveCalcDao;
+    private PointAdditiveCalcDao pointAdditiveCalcDao;
 
     @Override
     public PageData<PointApplyDTO> page(PointApplyPageFormDTO formDTO) {
@@ -248,7 +248,7 @@ public class PointApplyServiceImpl extends BaseServiceImpl<PointApplyDao, PointA
                     subjectId = dto.getUserId();
                 }
                 //生成积分记录
-                PointAditiveRecordEntity record = new PointAditiveRecordEntity();
+                PointAdditiveRecordEntity record = new PointAdditiveRecordEntity();
                 record.setCustomerId(tokenDto.getCustomerId());
                 record.setTitle(dto.getTitle());
                 record.setStatement(dto.getStatement());
@@ -263,27 +263,27 @@ public class PointApplyServiceImpl extends BaseServiceImpl<PointApplyDao, PointA
                 record.setSubjectId(subjectId);
                 record.setBusinessId(dto.getId());
                 
-                pointAditiveRecordDao.insert(record);
+                pointAdditiveRecordDao.insert(record);
                 if (NumConstant.TWO_STR.equals(formDTO.getStatus())) {
                     //重新计算总分
-                    LambdaQueryWrapper<PointAditiveCalcEntity> wrapper = new LambdaQueryWrapper<>();
+                    LambdaQueryWrapper<PointAdditiveCalcEntity> wrapper = new LambdaQueryWrapper<>();
-                    wrapper.eq(PointAditiveCalcEntity::getCustomerId, tokenDto.getCustomerId());
+                    wrapper.eq(PointAdditiveCalcEntity::getCustomerId, tokenDto.getCustomerId());
-                    wrapper.eq(PointAditiveCalcEntity::getSubjectId, subjectId);
+                    wrapper.eq(PointAdditiveCalcEntity::getSubjectId, subjectId);
-                    wrapper.eq(PointAditiveCalcEntity::getCategoryCode, dto.getCategoryCode());
+                    wrapper.eq(PointAdditiveCalcEntity::getCategoryCode, dto.getCategoryCode());
-                    PointAditiveCalcEntity calc = pointAditiveCalcDao.selectOne(wrapper);
+                    PointAdditiveCalcEntity calc = pointAdditiveCalcDao.selectOne(wrapper);
                     if (null != calc) {
                         calc.setUpdatedBy(null);
                         calc.setUpdatedTime(null);
                         calc.setTotal(calc.getTotal() + dto.getPointValue());
-                        pointAditiveCalcDao.updateById(calc);
+                        pointAdditiveCalcDao.updateById(calc);
                     } else {
-                        calc = new PointAditiveCalcEntity();
+                        calc = new PointAdditiveCalcEntity();
                         calc.setCustomerId(tokenDto.getCustomerId());
                         calc.setCategoryCode(dto.getCategoryCode());
                         calc.setSubjectId(subjectId);
                         calc.setSpend(NumConstant.ZERO);
                         calc.setTotal(dto.getPointValue());
-                        pointAditiveCalcDao.insert(calc);
+                        pointAdditiveCalcDao.insert(calc);
                     }
                 }
             }

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

@@ -26,13 +26,13 @@ import com.epmet.commons.tools.exception.EpmetErrorCode;
 import com.epmet.commons.tools.exception.EpmetException;
 import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.commons.tools.utils.Result;
-import com.epmet.dao.PointAditiveCalcDao;
+import com.epmet.dao.PointAdditiveCalcDao;
 import com.epmet.dao.UserPointTotalDao;
 import com.epmet.dto.form.CommonPageUserFormDTO;
 import com.epmet.dto.form.CommonUserFormDTO;
 import com.epmet.dto.form.ResiPointRankFormDTO;
 import com.epmet.dto.result.*;
-import com.epmet.entity.PointAditiveCalcEntity;
+import com.epmet.entity.PointAdditiveCalcEntity;
 import com.epmet.entity.UserPointTotalEntity;
 import com.epmet.feign.EpmetUserOpenFeignClient;
 import com.epmet.service.UserPointTotalService;
@@ -60,7 +60,7 @@ public class UserPointTotalServiceImpl extends BaseServiceImpl<UserPointTotalDao
     @Resource
     private EpmetUserOpenFeignClient epmetUserOpenFeignClient;
     @Resource
-    private PointAditiveCalcDao pointAditiveCalcDao;
+    private PointAdditiveCalcDao pointAdditiveCalcDao;
 
     /**
      * @Description 获取指定居民的积分信息
@@ -274,11 +274,11 @@ public class UserPointTotalServiceImpl extends BaseServiceImpl<UserPointTotalDao
             throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "获取居民绑定家庭信息失败", "获取居民绑定家庭信息失败");
         }
         if (StringUtils.isNotBlank(result.getData().getHouseId())) {
-            LambdaQueryWrapper<PointAditiveCalcEntity> wrapper = new LambdaQueryWrapper<>();
+            LambdaQueryWrapper<PointAdditiveCalcEntity> wrapper = new LambdaQueryWrapper<>();
-            wrapper.eq(PointAditiveCalcEntity::getCustomerId, formDTO.getCustomerId());
+            wrapper.eq(PointAdditiveCalcEntity::getCustomerId, formDTO.getCustomerId());
-            wrapper.eq(PointAditiveCalcEntity::getSubjectId, result.getData().getHouseId());
+            wrapper.eq(PointAdditiveCalcEntity::getSubjectId, result.getData().getHouseId());
-            wrapper.eq(PointAditiveCalcEntity::getCategoryCode, CommonConstant.MORAL_EDUCATION);
+            wrapper.eq(PointAdditiveCalcEntity::getCategoryCode, CommonConstant.MORAL_EDUCATION);
-            PointAditiveCalcEntity entity = pointAditiveCalcDao.selectOne(wrapper);
+            PointAdditiveCalcEntity entity = pointAdditiveCalcDao.selectOne(wrapper);
             if (null != entity) {
                 resultDTO.setTotal(entity.getTotal());
                 resultDTO.setSpend(entity.getSpend());
@@ -297,11 +297,11 @@ public class UserPointTotalServiceImpl extends BaseServiceImpl<UserPointTotalDao
      */
     private MyTotalPointResultDTO getPartyTotal(CommonPageUserFormDTO formDTO) {
         MyTotalPointResultDTO resultDTO = new MyTotalPointResultDTO();
-        LambdaQueryWrapper<PointAditiveCalcEntity> wrapper = new LambdaQueryWrapper<>();
+        LambdaQueryWrapper<PointAdditiveCalcEntity> wrapper = new LambdaQueryWrapper<>();
-        wrapper.eq(PointAditiveCalcEntity::getCustomerId, formDTO.getCustomerId());
+        wrapper.eq(PointAdditiveCalcEntity::getCustomerId, formDTO.getCustomerId());
-        wrapper.eq(PointAditiveCalcEntity::getSubjectId, formDTO.getUserId());
+        wrapper.eq(PointAdditiveCalcEntity::getSubjectId, formDTO.getUserId());
-        wrapper.eq(PointAditiveCalcEntity::getCategoryCode, CommonConstant.PARTY_BUILDING);
+        wrapper.eq(PointAdditiveCalcEntity::getCategoryCode, CommonConstant.PARTY_BUILDING);
-        PointAditiveCalcEntity entity = pointAditiveCalcDao.selectOne(wrapper);
+        PointAdditiveCalcEntity entity = pointAdditiveCalcDao.selectOne(wrapper);
         if (null != entity) {
             resultDTO.setTotal(entity.getTotal());
             resultDTO.setSpend(entity.getSpend());

epmet-module/epmet-point/epmet-point-server/src/main/resources/db/migration/V0.0.11__pointAdditive.sql

@@ -0,0 +1,146 @@
+DROP TABLE IF EXISTS point_additive_rule;
+CREATE TABLE point_additive_rule(
+    ID VARCHAR(64) NOT NULL   COMMENT '主键' ,
+    CUSTOMER_ID VARCHAR(64) NOT NULL   COMMENT '客户ID' ,
+    TYPE VARCHAR(32) NOT NULL   COMMENT '记录类型;分类:category；规则:rule' ,
+    APPLY_FLAG VARCHAR(1)    COMMENT '允许申请标记;允许0（type = category时，强制赋值为0），禁止1。' ,
+    CATEGORY_CODE VARCHAR(32)    COMMENT '积分类别编码;德育积分moral_education；党建积分party_building' ,
+    CATEGORY_NAME VARCHAR(128)    COMMENT '积分类别名称;type=category时必填' ,
+    RULE_NAME VARCHAR(512)    COMMENT '积分规则名称;type=rule时必填' ,
+    PID VARCHAR(64)    COMMENT '上级节点ID;上级分类ID，顶级分类的PID为0' ,
+    PIDS VARCHAR(512)    COMMENT '上级节点ID路径;所有上级节点以英文冒号(:)拼接；不必拼接0' ,
+    POINT_VALUE INT(10)    COMMENT '分值;正数加分，负数减分；type=rule时必填' ,
+    DEL_FLAG VARCHAR(1)   DEFAULT '0' COMMENT '删除标识;0.未删除 1.已删除' ,
+    REVISION INT(10)    COMMENT '乐观锁' ,
+    CREATED_BY VARCHAR(64)    COMMENT '创建人' ,
+    CREATED_TIME DATETIME    COMMENT '创建时间' ,
+    UPDATED_BY VARCHAR(64)    COMMENT '更新人' ,
+    UPDATED_TIME DATETIME    COMMENT '更新时间' ,
+    PRIMARY KEY (ID)
+)  COMMENT = '附加积分规则';
+
+DROP TABLE IF EXISTS point_additive_record;
+CREATE TABLE point_additive_record(
+    ID VARCHAR(64) NOT NULL   COMMENT '主键' ,
+    CUSTOMER_ID VARCHAR(64) NOT NULL   COMMENT '客户ID' ,
+    TITLE VARCHAR(512)    COMMENT '标题;积分变动标题或业务场景标题' ,
+    STATEMENT VARCHAR(3072)    COMMENT '说明;积分变动的说明' ,
+    POINT_VALUE INT(10)    COMMENT '分值' ,
+    CATEGORY_CODE VARCHAR(32)    COMMENT '积分类别;德育积分moral_education；党建积分party_building' ,
+    SUBJECT_ID VARCHAR(64)    COMMENT '积分主体ID;居民端用户ID或房屋ID' ,
+    BUSINESS_ID VARCHAR(64)    COMMENT '业务主键' ,
+    BUSINESS_CODE VARCHAR(32)    COMMENT '业务编码;积分申请point_apply；积分奖励point_reward；积分扣罚point_fine；积分花费point_cost；驳回积分申请point_reject' ,
+    DEL_FLAG VARCHAR(1)   DEFAULT '0' COMMENT '删除标识;0.未删除 1.已删除' ,
+    REVISION INT(10)    COMMENT '乐观锁' ,
+    CREATED_BY VARCHAR(64)    COMMENT '创建人' ,
+    CREATED_TIME DATETIME    COMMENT '创建时间' ,
+    UPDATED_BY VARCHAR(64)    COMMENT '更新人' ,
+    UPDATED_TIME DATETIME    COMMENT '更新时间' ,
+    PRIMARY KEY (ID)
+)  COMMENT = '附加积分记录';
+
+DROP TABLE IF EXISTS point_additive_calc;
+CREATE TABLE point_additive_calc(
+    ID VARCHAR(64) NOT NULL   COMMENT '主键' ,
+    CUSTOMER_ID VARCHAR(64) NOT NULL   COMMENT '客户ID' ,
+    CATEGORY_CODE VARCHAR(32)    COMMENT '积分类别;德育积分moral_education；党建积分party_building' ,
+    SUBJECT_ID VARCHAR(64)    COMMENT '积分主体ID;居民端用户ID或房屋ID' ,
+    SPEND INT(10)   DEFAULT 0 COMMENT '已用积分;累计已花费' ,
+    TOTAL INT(10)   DEFAULT 0 COMMENT '总分;累计积分' ,
+    DEL_FLAG VARCHAR(1)   DEFAULT '0' COMMENT '删除标识;0.未删除 1.已删除' ,
+    REVISION INT(10)    COMMENT '乐观锁' ,
+    CREATED_BY VARCHAR(64)    COMMENT '创建人' ,
+    CREATED_TIME DATETIME    COMMENT '创建时间' ,
+    UPDATED_BY VARCHAR(64)    COMMENT '更新人' ,
+    UPDATED_TIME DATETIME    COMMENT '更新时间' ,
+    PRIMARY KEY (ID)
+)  COMMENT = '附加积分计算';
+
+DROP TABLE IF EXISTS point_apply;
+CREATE TABLE point_apply(
+    ID VARCHAR(64) NOT NULL   COMMENT '主键' ,
+    CUSTOMER_ID VARCHAR(64) NOT NULL   COMMENT '客户ID' ,
+    CATEGORY_ID VARCHAR(64)    COMMENT '类别ID' ,
+    CATEGORY_NAME VARCHAR(90)    COMMENT '类别名称' ,
+    CATEGORY_CODE VARCHAR(32)    COMMENT '类别编码;德育积分moral_education；党建积分party_building' ,
+    RULE_ID VARCHAR(64) NOT NULL   COMMENT '积分规则ID' ,
+    RULE_NAME VARCHAR(512)    COMMENT '积分规则名称' ,
+    TITLE VARCHAR(128)    COMMENT '申请标题;30字内' ,
+    STATEMENT VARCHAR(3072)    COMMENT '申请内容说明;1000字内' ,
+    STATUS VARCHAR(1) NOT NULL  DEFAULT '0' COMMENT '申请状态;0已提交；1已驳回；2已通过' ,
+    GRID_NAME VARCHAR(32)    COMMENT '申请人所属网格名称' ,
+    GRID_ID VARCHAR(64) NOT NULL   COMMENT '申请人所属网格ID' ,
+    AGENCY_ID VARCHAR(64) NOT NULL   COMMENT '申请人所属组织ID' ,
+    AGENCY_PIDS VARCHAR(512)    COMMENT '上级组织ID路径' ,
+    USER_ID VARCHAR(64)    COMMENT '用户ID;申请人ID（居民端用户ID）' ,
+    IC_RESI_USER VARCHAR(64)    COMMENT '居民ID;申请人居民ID（IC_RESI_USER表主键）' ,
+    HOUSE_ID VARCHAR(64)    COMMENT '房屋ID;房屋或家庭ID' ,
+    HOUSE_ALL_NAME VARCHAR(512)    COMMENT '房屋名称;完整拼接的名称' ,
+    HEAD_IMG_URL VARCHAR(512)    COMMENT '头像' ,
+    NICKNAME VARCHAR(90)    COMMENT '昵称' ,
+    GENDER VARCHAR(1)    COMMENT '性别;未知0；男1；女2' ,
+    NAME VARCHAR(90)    COMMENT '姓名' ,
+    ID_CARD VARCHAR(32)    COMMENT '身份证号' ,
+    MOBILE VARCHAR(32)    COMMENT '手机号' ,
+    REMARK VARCHAR(512)    COMMENT '审核备注' ,
+    DEL_FLAG VARCHAR(1)   DEFAULT '0' COMMENT '删除标识;0.未删除 1.已删除' ,
+    REVISION INT(10)    COMMENT '乐观锁' ,
+    CREATED_BY VARCHAR(64)    COMMENT '创建人' ,
+    CREATED_TIME DATETIME    COMMENT '创建时间' ,
+    UPDATED_BY VARCHAR(64)    COMMENT '更新人' ,
+    UPDATED_TIME DATETIME    COMMENT '更新时间' ,
+    PRIMARY KEY (ID)
+)  COMMENT = '积分申请';
+
+DROP TABLE IF EXISTS point_reward;
+CREATE TABLE point_reward(
+    ID VARCHAR(64) NOT NULL   COMMENT '主键' ,
+    CUSTOMER_ID VARCHAR(64) NOT NULL   COMMENT '客户ID' ,
+    AGENCY_ID VARCHAR(32) NOT NULL   COMMENT '组织ID' ,
+    AGENCY_PIDS VARCHAR(512)    COMMENT '组织ID路径' ,
+    HOUSE_ID VARCHAR(64)    COMMENT '房屋ID' ,
+    HOUSE_ALL_NAME VARCHAR(512)    COMMENT '房屋名称;完整拼接的名称' ,
+    STAFF_ID VARCHAR(64)    COMMENT '工作人员ID' ,
+    STAFF_NAME VARCHAR(90)    COMMENT '工作人员姓名' ,
+    BUSINESS_CODE VARCHAR(32)    COMMENT '操作类型;积分奖励point_reward；积分扣罚point_fine' ,
+    STATEMENT VARCHAR(3072)    COMMENT '备注说明;200字内' ,
+    POINT_VALUE INT(10)    COMMENT '奖扣总分值' ,
+    DEL_FLAG VARCHAR(1)   DEFAULT '0' COMMENT '删除标识;0.未删除 1.已删除' ,
+    REVISION INT(10)    COMMENT '乐观锁' ,
+    CREATED_BY VARCHAR(64)    COMMENT '创建人' ,
+    CREATED_TIME DATETIME    COMMENT '创建时间' ,
+    UPDATED_BY VARCHAR(64)    COMMENT '更新人' ,
+    UPDATED_TIME DATETIME    COMMENT '更新时间' ,
+    PRIMARY KEY (ID)
+)  COMMENT = '积分奖扣';
+
+DROP TABLE IF EXISTS point_reward_rule;
+CREATE TABLE point_reward_rule(
+    ID VARCHAR(64) NOT NULL   COMMENT '主键' ,
+    CUSTOMER_ID VARCHAR(64) NOT NULL   COMMENT '客户ID' ,
+    REWARD_ID VARCHAR(64)    COMMENT '奖扣ID' ,
+    RULE_ID VARCHAR(64)    COMMENT '规则ID' ,
+    DEL_FLAG VARCHAR(1)   DEFAULT '0' COMMENT '删除标识;0.未删除 1.已删除' ,
+    REVISION INT(10)    COMMENT '乐观锁' ,
+    CREATED_BY VARCHAR(64)    COMMENT '创建人' ,
+    CREATED_TIME DATETIME    COMMENT '创建时间' ,
+    UPDATED_BY VARCHAR(64)    COMMENT '更新人' ,
+    UPDATED_TIME DATETIME    COMMENT '更新时间' ,
+    PRIMARY KEY (ID)
+)  COMMENT = '积分奖扣明细';
+
+DROP TABLE IF EXISTS point_annex;
+CREATE TABLE point_annex(
+    ID VARCHAR(64) NOT NULL   COMMENT '主键' ,
+    CUSTOMER_ID VARCHAR(64) NOT NULL   COMMENT '客户ID' ,
+    BUSINESS_ID VARCHAR(64)    COMMENT '业务ID;业务主键，包括积分申请、奖扣等业务' ,
+    BUSINESS_CODE VARCHAR(32)    COMMENT '业务编码;积分申请point_apply，积分奖励point_reward，积分扣罚point_fine，积分花费point_cost' ,
+    URL VARCHAR(512)    COMMENT '附件访问地址' ,
+    DEL_FLAG VARCHAR(1)   DEFAULT '0' COMMENT '删除标识;0.未删除 1.已删除' ,
+    REVISION INT(10)    COMMENT '乐观锁' ,
+    CREATED_BY VARCHAR(64)    COMMENT '创建人' ,
+    CREATED_TIME DATETIME    COMMENT '创建时间' ,
+    UPDATED_BY VARCHAR(64)    COMMENT '更新人' ,
+    UPDATED_TIME DATETIME    COMMENT '更新时间' ,
+    PRIMARY KEY (ID)
+)  COMMENT = '积分相关附件表';

epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/PointAdditiveCalcDao.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.epmet.dao.PointAdditiveCalcDao">
+
+
+
+</mapper>

epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/PointAdditiveRecordDao.xml

@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.epmet.dao.PointAdditiveRecordDao">
+
+    <select id="selectRecordList" resultType="com.epmet.dto.result.PointAdditiveRecordDailyDTO">
+        SELECT
+            TITLE,
+            STATEMENT AS remark,
+            CASE
+                POINT_VALUE
+                WHEN POINT_VALUE > 0 THEN
+                concat( '+', POINT_VALUE ) ELSE POINT_VALUE
+            END AS point,
+            BUSINESS_ID,
+            BUSINESS_CODE,
+            DATE_FORMAT( CREATED_TIME, '%Y-%m-%d' ) AS date,
+            DATE_FORMAT( CREATED_TIME, '%H:%i' ) AS time
+        FROM
+            point_additive_record
+        WHERE
+            DEL_FLAG = '0'
+            AND SUBJECT_ID = #{subjectId}
+            AND CUSTOMER_ID = #{customerId}
+            AND CATEGORY_CODE = #{categoryCode}
+        ORDER BY
+            CREATED_TIME DESC
+    </select>
+
+
+</mapper>

epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/PointAditiveCalcDao.xml

@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-
-<mapper namespace="com.epmet.dao.PointAditiveCalcDao">
-
-    <resultMap type="com.epmet.entity.PointAditiveCalcEntity" id="pointAditiveCalcMap">
-        <result property="id" column="ID"/>
-        <result property="customerId" column="CUSTOMER_ID"/>
-        <result property="categoryCode" column="CATEGORY_CODE"/>
-        <result property="subjectId" column="SUBJECT_ID"/>
-        <result property="spend" column="SPEND"/>
-        <result property="total" column="TOTAL"/>
-        <result property="delFlag" column="DEL_FLAG"/>
-        <result property="revision" column="REVISION"/>
-        <result property="createdBy" column="CREATED_BY"/>
-        <result property="createdTime" column="CREATED_TIME"/>
-        <result property="updatedBy" column="UPDATED_BY"/>
-        <result property="updatedTime" column="UPDATED_TIME"/>
-    </resultMap>
-
-
-</mapper>

epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/PointAditiveRecordDao.xml

@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-
-<mapper namespace="com.epmet.dao.PointAditiveRecordDao">
-
-    <resultMap type="com.epmet.entity.PointAditiveRecordEntity" id="pointAditiveRecordMap">
-        <result property="id" column="ID"/>
-        <result property="customerId" column="CUSTOMER_ID"/>
-        <result property="title" column="TITLE"/>
-        <result property="statement" column="STATEMENT"/>
-        <result property="pointValue" column="POINT_VALUE"/>
-        <result property="categoryCode" column="CATEGORY_CODE"/>
-        <result property="subjectId" column="SUBJECT_ID"/>
-        <result property="businessId" column="BUSINESS_ID"/>
-        <result property="businessCode" column="BUSINESS_CODE"/>
-        <result property="delFlag" column="DEL_FLAG"/>
-        <result property="revision" column="REVISION"/>
-        <result property="createdBy" column="CREATED_BY"/>
-        <result property="createdTime" column="CREATED_TIME"/>
-        <result property="updatedBy" column="UPDATED_BY"/>
-        <result property="updatedTime" column="UPDATED_TIME"/>
-    </resultMap>
-    <select id="selectRecordList" resultType="com.epmet.dto.result.PointAditiveRecordDailyDTO">
-        SELECT
-            TITLE,
-            STATEMENT AS remark,
-            CASE
-                POINT_VALUE
-                WHEN POINT_VALUE > 0 THEN
-                concat( '+', POINT_VALUE ) ELSE POINT_VALUE
-            END AS point,
-            BUSINESS_ID,
-            BUSINESS_CODE,
-            DATE_FORMAT( CREATED_TIME, '%Y-%m-%d' ) AS date,
-            DATE_FORMAT( CREATED_TIME, '%H:%i' ) AS time
-        FROM
-            point_aditive_record
-        WHERE
-            DEL_FLAG = '0'
-            AND SUBJECT_ID = #{subjectId}
-            AND CUSTOMER_ID = #{customerId}
-            AND CATEGORY_CODE = #{categoryCode}
-        ORDER BY
-            CREATED_TIME DESC
-    </select>
-
-
-</mapper>