From 52ce1ee256f8c207cd8dce25dc05b672cd50d110 Mon Sep 17 00:00:00 2001 From: YUJT Date: Mon, 20 Jun 2022 09:51:46 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=A1=A8=E5=90=8D=E7=B1=BB?= =?UTF-8?q?=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...CalcDTO.java => PointAdditiveCalcDTO.java} | 2 +- ...rdDTO.java => PointAdditiveRecordDTO.java} | 2 +- ....java => PointAdditiveRecordDailyDTO.java} | 2 +- ...java => PointAdditiveRecordResultDTO.java} | 4 +- .../epmet/controller/ResiPointController.java | 10 +- ...CalcDao.java => PointAdditiveCalcDao.java} | 4 +- ...rdDao.java => PointAdditiveRecordDao.java} | 10 +- ...tity.java => PointAdditiveCalcEntity.java} | 4 +- ...ty.java => PointAdditiveRecordEntity.java} | 4 +- ...ice.java => PointAdditiveCalcService.java} | 22 +-- ...e.java => PointAdditiveRecordService.java} | 28 ++-- .../impl/PointAdditiveCalcServiceImpl.java | 82 ++++++++++ ...va => PointAdditiveRecordServiceImpl.java} | 58 +++---- .../impl/PointAditiveCalcServiceImpl.java | 82 ---------- .../service/impl/PointApplyServiceImpl.java | 32 ++-- .../impl/UserPointTotalServiceImpl.java | 26 ++-- .../db/migration/V0.0.11__pointAdditive.sql | 146 ++++++++++++++++++ .../resources/mapper/PointAdditiveCalcDao.xml | 8 + .../mapper/PointAdditiveRecordDao.xml | 31 ++++ .../resources/mapper/PointAditiveCalcDao.xml | 22 --- .../mapper/PointAditiveRecordDao.xml | 48 ------ 21 files changed, 371 insertions(+), 256 deletions(-) rename epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/{PointAditiveCalcDTO.java => PointAdditiveCalcDTO.java} (94%) rename epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/{PointAditiveRecordDTO.java => PointAdditiveRecordDTO.java} (95%) rename epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/result/{PointAditiveRecordDailyDTO.java => PointAdditiveRecordDailyDTO.java} (92%) rename epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/result/{PointAditiveRecordResultDTO.java => PointAdditiveRecordResultDTO.java} (71%) rename epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/dao/{PointAditiveCalcDao.java => PointAdditiveCalcDao.java} (63%) rename epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/dao/{PointAditiveRecordDao.java => PointAdditiveRecordDao.java} (52%) rename epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/entity/{PointAditiveCalcEntity.java => PointAdditiveCalcEntity.java} (89%) rename epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/entity/{PointAditiveRecordEntity.java => PointAdditiveRecordEntity.java} (92%) rename epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/{PointAditiveCalcService.java => PointAdditiveCalcService.java} (64%) rename epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/{PointAditiveRecordService.java => PointAdditiveRecordService.java} (60%) create mode 100644 epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointAdditiveCalcServiceImpl.java rename epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/{PointAditiveRecordServiceImpl.java => PointAdditiveRecordServiceImpl.java} (61%) delete mode 100644 epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointAditiveCalcServiceImpl.java create mode 100644 epmet-module/epmet-point/epmet-point-server/src/main/resources/db/migration/V0.0.11__pointAdditive.sql create mode 100644 epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/PointAdditiveCalcDao.xml create mode 100644 epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/PointAdditiveRecordDao.xml delete mode 100644 epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/PointAditiveCalcDao.xml delete mode 100644 epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/PointAditiveRecordDao.xml diff --git a/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/PointAditiveCalcDTO.java b/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/PointAdditiveCalcDTO.java similarity index 94% rename from epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/PointAditiveCalcDTO.java rename to epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/PointAdditiveCalcDTO.java index dd61db0db7..5a86dff31b 100644 --- a/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/PointAditiveCalcDTO.java +++ b/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; diff --git a/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/PointAditiveRecordDTO.java b/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/PointAdditiveRecordDTO.java similarity index 95% rename from epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/PointAditiveRecordDTO.java rename to epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/PointAdditiveRecordDTO.java index b72fe77a08..68c899bed8 100644 --- a/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/PointAditiveRecordDTO.java +++ b/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; diff --git a/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/result/PointAditiveRecordDailyDTO.java b/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/result/PointAdditiveRecordDailyDTO.java similarity index 92% rename from epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/result/PointAditiveRecordDailyDTO.java rename to epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/result/PointAdditiveRecordDailyDTO.java index 56b54fd318..1f51bc9928 100644 --- a/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/result/PointAditiveRecordDailyDTO.java +++ b/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 diff --git a/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/result/PointAditiveRecordResultDTO.java b/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/result/PointAdditiveRecordResultDTO.java similarity index 71% rename from epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/result/PointAditiveRecordResultDTO.java rename to epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/result/PointAdditiveRecordResultDTO.java index c56cbeaade..096b585417 100644 --- a/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/result/PointAditiveRecordResultDTO.java +++ b/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 dailyList; + private List dailyList; } diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/controller/ResiPointController.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/controller/ResiPointController.java index 5a393cc871..885910a843 100644 --- a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/controller/ResiPointController.java +++ b/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>} + * @Return {@link Result>} * @Author zhaoqifeng * @Date 2022/6/15 9:55 */ - @PostMapping("aditiverecordlist") - public Result> aditiveRecords(@LoginUser TokenDto dto,@RequestBody CommonPageUserFormDTO pageUserParam){ + @PostMapping("additiverecordlist") + public Result> additiveRecords(@LoginUser TokenDto dto, @RequestBody CommonPageUserFormDTO pageUserParam){ pageUserParam.setCustomerId(dto.getCustomerId()); pageUserParam.setUserId(dto.getUserId()); ValidatorUtils.validateEntity(pageUserParam, CommonPageUserFormDTO.PageUserGroup.class); - return new Result>().ok(pointAditiveRecordService.getRecords(pageUserParam)); + return new Result>().ok(pointAdditiveRecordService.getRecords(pageUserParam)); } } diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/dao/PointAditiveCalcDao.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/dao/PointAdditiveCalcDao.java similarity index 63% rename from epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/dao/PointAditiveCalcDao.java rename to epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/dao/PointAdditiveCalcDao.java index b5410693e5..ca55b3d103 100644 --- a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/dao/PointAditiveCalcDao.java +++ b/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 { +public interface PointAdditiveCalcDao extends BaseDao { } \ No newline at end of file diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/dao/PointAditiveRecordDao.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/dao/PointAdditiveRecordDao.java similarity index 52% rename from epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/dao/PointAditiveRecordDao.java rename to epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/dao/PointAdditiveRecordDao.java index 83c06481b5..e1a5638f48 100644 --- a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/dao/PointAditiveRecordDao.java +++ b/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.entity.PointAditiveRecordEntity; +import com.epmet.dto.result.PointAdditiveRecordDailyDTO; +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 { +public interface PointAdditiveRecordDao extends BaseDao { /** * 积分记录 * * @Param customerId * @Param categoryCode * @Param subjectId - * @Return {@link List< PointAditiveRecordDailyDTO>} + * @Return {@link List< PointAdditiveRecordDailyDTO >} * @Author zhaoqifeng * @Date 2022/6/15 10:12 */ - List selectRecordList(@Param("customerId") String customerId, @Param("categoryCode") String categoryCode, @Param("subjectId") String subjectId); + List selectRecordList(@Param("customerId") String customerId, @Param("categoryCode") String categoryCode, @Param("subjectId") String subjectId); } \ No newline at end of file diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/entity/PointAditiveCalcEntity.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/entity/PointAdditiveCalcEntity.java similarity index 89% rename from epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/entity/PointAditiveCalcEntity.java rename to epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/entity/PointAdditiveCalcEntity.java index 552b9e5dea..53c4939cf8 100644 --- a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/entity/PointAditiveCalcEntity.java +++ b/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") -public class PointAditiveCalcEntity extends BaseEpmetEntity { +@TableName("point_additive_calc") +public class PointAdditiveCalcEntity extends BaseEpmetEntity { private static final long serialVersionUID = 1L; diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/entity/PointAditiveRecordEntity.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/entity/PointAdditiveRecordEntity.java similarity index 92% rename from epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/entity/PointAditiveRecordEntity.java rename to epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/entity/PointAdditiveRecordEntity.java index 1a3ad83056..cc30d1fb85 100644 --- a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/entity/PointAditiveRecordEntity.java +++ b/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") -public class PointAditiveRecordEntity extends BaseEpmetEntity { +@TableName("point_additive_record") +public class PointAdditiveRecordEntity extends BaseEpmetEntity { private static final long serialVersionUID = 1L; diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/PointAditiveCalcService.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/PointAdditiveCalcService.java similarity index 64% rename from epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/PointAditiveCalcService.java rename to epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/PointAdditiveCalcService.java index 6b87e5cefc..74ac718ccb 100644 --- a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/PointAditiveCalcService.java +++ b/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.entity.PointAditiveCalcEntity; +import com.epmet.dto.PointAdditiveCalcDTO; +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 { +public interface PointAdditiveCalcService extends BaseService { /** * 默认分页 * * @param params - * @return PageData + * @return PageData * @author generator * @date 2022-06-14 */ - PageData page(Map params); + PageData page(Map params); /** * 默认查询 * * @param params - * @return java.util.List + * @return java.util.List * @author generator * @date 2022-06-14 */ - List list(Map params); + List list(Map 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 { +public interface PointAdditiveRecordService extends BaseService { /** * 默认分页 * * @param params - * @return PageData + * @return PageData * @author generator * @date 2022-06-14 */ - PageData page(Map params); + PageData page(Map params); /** * 默认查询 * * @param params - * @return java.util.List + * @return java.util.List * @author generator * @date 2022-06-14 */ - List list(Map params); + List list(Map 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} + * @Return {@link List< PointAdditiveRecordResultDTO >} * @Author zhaoqifeng * @Date 2022/6/15 9:55 */ - List getRecords(CommonPageUserFormDTO formDTO); + List getRecords(CommonPageUserFormDTO formDTO); } \ No newline at end of file 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 new file mode 100644 index 0000000000..ca319c7b6f --- /dev/null +++ b/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 implements PointAdditiveCalcService { + + @Override + public PageData page(Map params) { + IPage page = baseDao.selectPage( + getPage(params, FieldConstant.CREATED_TIME, false), + getWrapper(params) + ); + return getPageData(page, PointAdditiveCalcDTO.class); + } + + @Override + public List list(Map params) { + List entityList = baseDao.selectList(getWrapper(params)); + + return ConvertUtils.sourceToTarget(entityList, PointAdditiveCalcDTO.class); + } + + private QueryWrapper getWrapper(Map params){ + String id = (String)params.get(FieldConstant.ID_HUMP); + + QueryWrapper 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)); + } + +} \ No newline at end of file diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointAditiveRecordServiceImpl.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointAdditiveRecordServiceImpl.java similarity index 61% rename from epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointAditiveRecordServiceImpl.java rename to epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointAdditiveRecordServiceImpl.java index fbc96f0faf..4845b1193c 100644 --- a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointAditiveRecordServiceImpl.java +++ b/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.dto.PointAditiveRecordDTO; +import com.epmet.dao.PointAdditiveRecordDao; +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 implements PointAditiveRecordService { +public class PointAdditiveRecordServiceImpl extends BaseServiceImpl implements PointAdditiveRecordService { @Resource private EpmetUserOpenFeignClient epmetUserOpenFeignClient; @Override - public PageData page(Map params) { - IPage page = baseDao.selectPage( + public PageData page(Map params) { + IPage page = baseDao.selectPage( getPage(params, FieldConstant.CREATED_TIME, false), getWrapper(params) ); - return getPageData(page, PointAditiveRecordDTO.class); + return getPageData(page, PointAdditiveRecordDTO.class); } @Override - public List list(Map params) { - List entityList = baseDao.selectList(getWrapper(params)); + public List list(Map params) { + List entityList = baseDao.selectList(getWrapper(params)); - return ConvertUtils.sourceToTarget(entityList, PointAditiveRecordDTO.class); + return ConvertUtils.sourceToTarget(entityList, PointAdditiveRecordDTO.class); } - private QueryWrapper getWrapper(Map params){ + private QueryWrapper getWrapper(Map params){ String id = (String)params.get(FieldConstant.ID_HUMP); - QueryWrapper wrapper = new QueryWrapper<>(); + QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id); return wrapper; } @Override - public PointAditiveRecordDTO get(String id) { - PointAditiveRecordEntity entity = baseDao.selectById(id); - return ConvertUtils.sourceToTarget(entity, PointAditiveRecordDTO.class); + public PointAdditiveRecordDTO get(String id) { + PointAdditiveRecordEntity entity = baseDao.selectById(id); + return ConvertUtils.sourceToTarget(entity, PointAdditiveRecordDTO.class); } @Override @Transactional(rollbackFor = Exception.class) - public void save(PointAditiveRecordDTO dto) { - PointAditiveRecordEntity entity = ConvertUtils.sourceToTarget(dto, PointAditiveRecordEntity.class); + public void save(PointAdditiveRecordDTO dto) { + PointAdditiveRecordEntity entity = ConvertUtils.sourceToTarget(dto, PointAdditiveRecordEntity.class); insert(entity); } @Override @Transactional(rollbackFor = Exception.class) - public void update(PointAditiveRecordDTO dto) { - PointAditiveRecordEntity entity = ConvertUtils.sourceToTarget(dto, PointAditiveRecordEntity.class); + public void update(PointAdditiveRecordDTO dto) { + PointAdditiveRecordEntity entity = ConvertUtils.sourceToTarget(dto, PointAdditiveRecordEntity.class); updateById(entity); } @@ -99,13 +99,13 @@ public class PointAditiveRecordServiceImpl extends BaseServiceImpl} + * @Return {@link List< PointAdditiveRecordResultDTO >} * @Author zhaoqifeng * @Date 2022/6/15 9:55 */ @Override - public List getRecords(CommonPageUserFormDTO formDTO) { - List list = new ArrayList<>(); + public List getRecords(CommonPageUserFormDTO formDTO) { + List list = new ArrayList<>(); String subjectId; //如果申请类型为德育积分，需要获取用户所在房屋 if (CommonConstant.MORAL_EDUCATION.equals(formDTO.getCategoryCode())) { @@ -122,17 +122,17 @@ public class PointAditiveRecordServiceImpl extends BaseServiceImpl recordList = baseDao.selectRecordList(formDTO.getCustomerId(), formDTO.getCategoryCode(), subjectId); + List recordList = baseDao.selectRecordList(formDTO.getCustomerId(), formDTO.getCategoryCode(), subjectId); if(CollectionUtils.isNotEmpty(recordList)){ - Map> map = - recordList.stream().collect(Collectors.groupingBy(PointAditiveRecordDailyDTO::getDate)); + Map> map = + recordList.stream().collect(Collectors.groupingBy(PointAdditiveRecordDailyDTO::getDate)); - Map> sortedMap = Maps.newLinkedHashMap(); - map.entrySet().stream().sorted(Map.Entry.>comparingByKey().reversed()) + Map> sortedMap = Maps.newLinkedHashMap(); + map.entrySet().stream().sorted(Map.Entry.>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); diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointAditiveCalcServiceImpl.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointAditiveCalcServiceImpl.java deleted file mode 100644 index 2b8bc7ed16..0000000000 --- a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointAditiveCalcServiceImpl.java +++ /dev/null @@ -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 implements PointAditiveCalcService { - - @Override - public PageData page(Map params) { - IPage page = baseDao.selectPage( - getPage(params, FieldConstant.CREATED_TIME, false), - getWrapper(params) - ); - return getPageData(page, PointAditiveCalcDTO.class); - } - - @Override - public List list(Map params) { - List entityList = baseDao.selectList(getWrapper(params)); - - return ConvertUtils.sourceToTarget(entityList, PointAditiveCalcDTO.class); - } - - private QueryWrapper getWrapper(Map params){ - String id = (String)params.get(FieldConstant.ID_HUMP); - - QueryWrapper 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)); - } - -} \ No newline at end of file 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 a0cf8c4dda..67e870c8d2 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 @@ -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.PointAditiveRecordDao; +import com.epmet.dao.PointAdditiveCalcDao; +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.PointAditiveRecordEntity; +import com.epmet.entity.PointAdditiveCalcEntity; +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 page(PointApplyPageFormDTO formDTO) { @@ -248,7 +248,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); + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(PointAdditiveCalcEntity::getCustomerId, tokenDto.getCustomerId()); + wrapper.eq(PointAdditiveCalcEntity::getSubjectId, subjectId); + wrapper.eq(PointAdditiveCalcEntity::getCategoryCode, dto.getCategoryCode()); + 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); } } } diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/UserPointTotalServiceImpl.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/UserPointTotalServiceImpl.java index aa400d8f7a..e9ff35e4bc 100644 --- a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/UserPointTotalServiceImpl.java +++ b/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 wrapper = new LambdaQueryWrapper<>(); - wrapper.eq(PointAditiveCalcEntity::getCustomerId, formDTO.getCustomerId()); - wrapper.eq(PointAditiveCalcEntity::getSubjectId, result.getData().getHouseId()); - wrapper.eq(PointAditiveCalcEntity::getCategoryCode, CommonConstant.MORAL_EDUCATION); - PointAditiveCalcEntity entity = pointAditiveCalcDao.selectOne(wrapper); + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(PointAdditiveCalcEntity::getCustomerId, formDTO.getCustomerId()); + wrapper.eq(PointAdditiveCalcEntity::getSubjectId, result.getData().getHouseId()); + wrapper.eq(PointAdditiveCalcEntity::getCategoryCode, CommonConstant.MORAL_EDUCATION); + 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 wrapper = new LambdaQueryWrapper<>(); - wrapper.eq(PointAditiveCalcEntity::getCustomerId, formDTO.getCustomerId()); - wrapper.eq(PointAditiveCalcEntity::getSubjectId, formDTO.getUserId()); - wrapper.eq(PointAditiveCalcEntity::getCategoryCode, CommonConstant.PARTY_BUILDING); - PointAditiveCalcEntity entity = pointAditiveCalcDao.selectOne(wrapper); + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(PointAdditiveCalcEntity::getCustomerId, formDTO.getCustomerId()); + wrapper.eq(PointAdditiveCalcEntity::getSubjectId, formDTO.getUserId()); + wrapper.eq(PointAdditiveCalcEntity::getCategoryCode, CommonConstant.PARTY_BUILDING); + PointAdditiveCalcEntity entity = pointAdditiveCalcDao.selectOne(wrapper); if (null != entity) { resultDTO.setTotal(entity.getTotal()); resultDTO.setSpend(entity.getSpend()); diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/resources/db/migration/V0.0.11__pointAdditive.sql b/epmet-module/epmet-point/epmet-point-server/src/main/resources/db/migration/V0.0.11__pointAdditive.sql new file mode 100644 index 0000000000..db75bc8fcf --- /dev/null +++ b/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 = '积分相关附件表'; diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/PointAdditiveCalcDao.xml b/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/PointAdditiveCalcDao.xml new file mode 100644 index 0000000000..dc41cb4988 --- /dev/null +++ b/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/PointAdditiveCalcDao.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/PointAdditiveRecordDao.xml b/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/PointAdditiveRecordDao.xml new file mode 100644 index 0000000000..b491f35e25 --- /dev/null +++ b/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/PointAdditiveRecordDao.xml @@ -0,0 +1,31 @@ + + + + + + + + + \ No newline at end of file diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/PointAditiveCalcDao.xml b/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/PointAditiveCalcDao.xml deleted file mode 100644 index c015362019..0000000000 --- a/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/PointAditiveCalcDao.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/PointAditiveRecordDao.xml b/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/PointAditiveRecordDao.xml deleted file mode 100644 index d56f192143..0000000000 --- a/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/PointAditiveRecordDao.xml +++ /dev/null @@ -1,48 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file