From 5e368852b611bd9d02afda7563340375a2751009 Mon Sep 17 00:00:00 2001 From: Jackwang Date: Thu, 16 Jun 2022 15:45:22 +0800 Subject: [PATCH] =?UTF-8?q?=E9=99=84=E5=8A=A0=E7=A7=AF=E5=88=86=E5=A5=96?= =?UTF-8?q?=E6=89=A3=E7=9B=B8=E5=85=B3=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/dto/form/RecordRewardFormDTO.java | 37 ++++++++++++ .../epmet/dto/form/SubmitRewardFormDTO.java | 51 ++++++++++++++++ .../controller/PointRewardController.java | 35 ++++++++++- .../com/epmet/dao/PointAdditiveRuleDao.java | 10 ++++ .../java/com/epmet/dao/PointRewardDao.java | 16 ++++- .../com/epmet/service/PointAnnexService.java | 12 +++- .../epmet/service/PointRewardRuleService.java | 12 +++- .../com/epmet/service/PointRewardService.java | 23 +++++++- .../service/impl/PointAnnexServiceImpl.java | 23 +++++++- .../impl/PointRewardRuleServiceImpl.java | 15 ++++- .../service/impl/PointRewardServiceImpl.java | 59 ++++++++++++++++++- .../resources/mapper/PointAdditiveRuleDao.xml | 12 ++++ .../main/resources/mapper/PointRewardDao.xml | 18 +++++- 13 files changed, 309 insertions(+), 14 deletions(-) create mode 100644 epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/form/RecordRewardFormDTO.java create mode 100644 epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/form/SubmitRewardFormDTO.java diff --git a/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/form/RecordRewardFormDTO.java b/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/form/RecordRewardFormDTO.java new file mode 100644 index 0000000000..f01fe59676 --- /dev/null +++ b/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/form/RecordRewardFormDTO.java @@ -0,0 +1,37 @@ +package com.epmet.dto.form; + +import com.epmet.commons.tools.dto.form.PageFormDTO; +import lombok.Data; + +import javax.validation.constraints.NotNull; +import java.io.Serializable; + +/** + * @program: epmet-cloud + * @description: + * @author: wangtong + * @create: 2022-06-15 17:21 + **/ +@Data +public class RecordRewardFormDTO extends PageFormDTO implements Serializable { + + /** + * 客户ID + */ + private String customerId; + + /** + *积分申请房屋ID + */ + private String houseId; + + /** + *业务编码：积分奖励point_reward；积分扣罚point_fine + */ + @NotNull(message = "业务编码不可为空") + private String businessCode; + + + + +} diff --git a/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/form/SubmitRewardFormDTO.java b/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/form/SubmitRewardFormDTO.java new file mode 100644 index 0000000000..27b112f0f7 --- /dev/null +++ b/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/form/SubmitRewardFormDTO.java @@ -0,0 +1,51 @@ +package com.epmet.dto.form; + +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +/** + * @program: epmet-cloud + * @description: + * @author: wangtong + * @create: 2022-06-15 17:21 + **/ +@Data +public class SubmitRewardFormDTO implements Serializable { + + /** + * 客户ID + */ + private String customerId; + + /** + * 工作人员ID + */ + private String staffId; + + /** + *积分申请房屋ID + */ + private String houseId; + + /** + *业务编码：积分奖励point_reward；积分扣罚point_fine + */ + private String businessCode; + /** + *规则ID集合 + */ + private List ruleIdList; + + /** + *附件url集合 + */ + private List annexList; + /** + *备注说明 + */ + private String statement; + + +} diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/controller/PointRewardController.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/controller/PointRewardController.java index f5c802c4eb..4ee6c98f37 100644 --- a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/controller/PointRewardController.java +++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/controller/PointRewardController.java @@ -1,15 +1,19 @@ package com.epmet.controller; +import com.epmet.commons.tools.annotation.LoginUser; import com.epmet.commons.tools.aop.NoRepeatSubmit; import com.epmet.commons.tools.page.PageData; +import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.commons.tools.utils.ExcelUtils; import com.epmet.commons.tools.utils.Result; import com.epmet.commons.tools.validator.AssertUtils; import com.epmet.commons.tools.validator.ValidatorUtils; import com.epmet.commons.tools.validator.group.AddGroup; -import com.epmet.commons.tools.validator.group.UpdateGroup; import com.epmet.commons.tools.validator.group.DefaultGroup; +import com.epmet.commons.tools.validator.group.UpdateGroup; import com.epmet.dto.PointRewardDTO; +import com.epmet.dto.form.RecordRewardFormDTO; +import com.epmet.dto.form.SubmitRewardFormDTO; import com.epmet.excel.PointRewardExcel; import com.epmet.service.PointRewardService; import org.springframework.beans.factory.annotation.Autowired; @@ -27,7 +31,7 @@ import java.util.Map; * @since v1.0.0 2022-06-15 */ @RestController -@RequestMapping("pointReward") +@RequestMapping("reward") public class PointRewardController { @Autowired @@ -77,6 +81,33 @@ public class PointRewardController { ExcelUtils.exportExcelToTarget(response, null, list, PointRewardExcel.class); } + /** + * @describe: 提交积分奖扣 + * @author wangtong + * @date 2022/6/15 17:30 + * @params [tokenDto, dto] + * @return com.epmet.commons.tools.utils.Result + */ + @PostMapping("submit") + public Result submit(@LoginUser TokenDto tokenDto, @RequestBody SubmitRewardFormDTO dto){ + ValidatorUtils.validateEntity(dto); + dto.setCustomerId(tokenDto.getCustomerId()); + dto.setStaffId(tokenDto.getUserId()); + return pointRewardService.submit(dto); + } + /** + * @describe: 查询积分奖扣记录 + * @author wangtong + * @date 2022/6/16 14:21 + * @params [tokenDto, dto] + * @return com.epmet.commons.tools.utils.Result>> + */ + @PostMapping("record") + public Result> record(@LoginUser TokenDto tokenDto, @RequestBody RecordRewardFormDTO dto){ + ValidatorUtils.validateEntity(dto); + dto.setCustomerId(tokenDto.getCustomerId()); + return new Result>().ok(pointRewardService.record(dto)); + } } diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/dao/PointAdditiveRuleDao.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/dao/PointAdditiveRuleDao.java index 9d4da90278..7ac3325052 100644 --- a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/dao/PointAdditiveRuleDao.java +++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/dao/PointAdditiveRuleDao.java @@ -5,6 +5,7 @@ import com.epmet.dto.CategorydetailResultDTO; import com.epmet.dto.PointAdditiveRuleDTO; import com.epmet.dto.form.List4applyFormDTO; import com.epmet.dto.form.List4treeFormDTO; +import com.epmet.dto.form.SubmitRewardFormDTO; import com.epmet.entity.PointAdditiveRuleEntity; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -55,4 +56,13 @@ public interface PointAdditiveRuleDao extends BaseDao { * @return java.util.List */ List selectList4tree(List4treeFormDTO dto); + + /** + * @describe: 根据规则查询积分总值 + * @author wangtong + * @date 2022/6/16 10:43 + * @params [dto] + * @return java.lang.Integer + */ + Integer selectPointTotalByIds(SubmitRewardFormDTO dto); } diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/dao/PointRewardDao.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/dao/PointRewardDao.java index ce5566f4fe..6ff72ba2a4 100644 --- a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/dao/PointRewardDao.java +++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/dao/PointRewardDao.java @@ -1,9 +1,13 @@ package com.epmet.dao; import com.epmet.commons.mybatis.dao.BaseDao; +import com.epmet.dto.PointRewardDTO; +import com.epmet.dto.form.RecordRewardFormDTO; import com.epmet.entity.PointRewardEntity; import org.apache.ibatis.annotations.Mapper; +import java.util.List; + /** * 积分奖扣 * @@ -12,5 +16,13 @@ import org.apache.ibatis.annotations.Mapper; */ @Mapper public interface PointRewardDao extends BaseDao { - -} \ No newline at end of file + + /** + * @describe: 查询积分奖扣记录 + * @author wangtong + * @date 2022/6/16 14:29 + * @params [dto] + * @return java.util.List + */ + List selectRewardRecord(RecordRewardFormDTO dto); +} diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/PointAnnexService.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/PointAnnexService.java index f2c7cdb49e..c9aea552f1 100644 --- a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/PointAnnexService.java +++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/PointAnnexService.java @@ -3,6 +3,7 @@ package com.epmet.service; import com.epmet.commons.mybatis.service.BaseService; import com.epmet.commons.tools.page.PageData; import com.epmet.dto.PointAnnexDTO; +import com.epmet.dto.form.SubmitRewardFormDTO; import com.epmet.entity.PointAnnexEntity; import java.util.List; @@ -75,4 +76,13 @@ public interface PointAnnexService extends BaseService { * @date 2022-06-14 */ void delete(String[] ids); -} \ No newline at end of file + + /** + * @describe: 提交积分奖扣 + * @author wangtong + * @date 2022/6/16 9:27 + * @params [id, dto] + * @return void + */ + void insertBatchPoint(String rewardId, SubmitRewardFormDTO dto); +} diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/PointRewardRuleService.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/PointRewardRuleService.java index 182ac69e74..4dac4bfd97 100644 --- a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/PointRewardRuleService.java +++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/PointRewardRuleService.java @@ -3,6 +3,7 @@ package com.epmet.service; import com.epmet.commons.mybatis.service.BaseService; import com.epmet.commons.tools.page.PageData; import com.epmet.dto.PointRewardRuleDTO; +import com.epmet.dto.form.SubmitRewardFormDTO; import com.epmet.entity.PointRewardRuleEntity; import java.util.List; @@ -75,4 +76,13 @@ public interface PointRewardRuleService extends BaseService { * @date 2022-06-15 */ void delete(String[] ids); -} \ No newline at end of file + + /** + * @describe: 提交积分奖扣 + * @author wangtong + * @date 2022/6/15 17:30 + * @params [tokenDto, dto] + * @return com.epmet.commons.tools.utils.Result + */ + Result submit(SubmitRewardFormDTO dto); + + /** + * @describe: 查询积分奖扣记录 + * @author wangtong + * @date 2022/6/16 14:21 + * @params [tokenDto, dto] + * @return com.epmet.commons.tools.utils.Result>> + */ + PageData record(RecordRewardFormDTO dto); +} diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointAnnexServiceImpl.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointAnnexServiceImpl.java index fdfd83e9fd..d7f0ff9ea7 100644 --- a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointAnnexServiceImpl.java +++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointAnnexServiceImpl.java @@ -3,15 +3,15 @@ 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.commons.tools.constant.FieldConstant; import com.epmet.dao.PointAnnexDao; import com.epmet.dto.PointAnnexDTO; +import com.epmet.dto.form.SubmitRewardFormDTO; import com.epmet.entity.PointAnnexEntity; import com.epmet.service.PointAnnexService; import org.apache.commons.lang3.StringUtils; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -80,4 +80,21 @@ public class PointAnnexServiceImpl extends BaseServiceImpl{ + PointRewardRuleEntity entity = new PointRewardRuleEntity(); + entity.setCustomerId(dto.getCustomerId()); + entity.setRewardId(rewardId); + entity.setRuleId(ruleId); + insert(entity); + }); + } + +} diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointRewardServiceImpl.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointRewardServiceImpl.java index 45c4fbcbf8..3e33eed966 100644 --- a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointRewardServiceImpl.java +++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointRewardServiceImpl.java @@ -3,14 +3,26 @@ 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.dto.result.CustomerStaffInfoCacheResult; import com.epmet.commons.tools.page.PageData; +import com.epmet.commons.tools.redis.common.CustomerIcHouseRedis; +import com.epmet.commons.tools.redis.common.CustomerStaffRedis; +import com.epmet.commons.tools.redis.common.bean.HouseInfoCache; import com.epmet.commons.tools.utils.ConvertUtils; -import com.epmet.commons.tools.constant.FieldConstant; +import com.epmet.commons.tools.utils.Result; +import com.epmet.dao.PointAdditiveRuleDao; import com.epmet.dao.PointRewardDao; import com.epmet.dto.PointRewardDTO; +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.PointRewardRuleService; import com.epmet.service.PointRewardService; +import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -32,6 +44,15 @@ public class PointRewardServiceImpl extends BaseServiceImpl page(Map params) { IPage page = baseDao.selectPage( @@ -84,4 +105,38 @@ public class PointRewardServiceImpl extends BaseServiceImpl record(RecordRewardFormDTO dto) { + PageHelper.startPage(dto.getPageNo(), dto.getPageSize()); + List list = baseDao.selectRewardRecord(dto); + PageInfo pageInfo = new PageInfo<>(list); + return new PageData<>(list, pageInfo.getTotal()); + } + +} diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/PointAdditiveRuleDao.xml b/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/PointAdditiveRuleDao.xml index 78d24c5da2..e07cd82e5f 100644 --- a/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/PointAdditiveRuleDao.xml +++ b/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/PointAdditiveRuleDao.xml @@ -75,6 +75,18 @@ and CUSTOMER_ID=#{customerId} order by UPDATED_TIME desc + diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/PointRewardDao.xml b/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/PointRewardDao.xml index ed5a138721..98f794dcea 100644 --- a/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/PointRewardDao.xml +++ b/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/PointRewardDao.xml @@ -22,6 +22,22 @@ + - \ No newline at end of file +