diff --git a/epdc-cloud-commons-yushan b/epdc-cloud-commons-yushan index 8e13368..c012345 160000 --- a/epdc-cloud-commons-yushan +++ b/epdc-cloud-commons-yushan @@ -1 +1 @@ -Subproject commit 8e13368aad9310e107299b137fedd118c76bb57d +Subproject commit c0123458bdfa8e808852e984723b61f95c80554f diff --git a/epdc-cloud-parent-yushan b/epdc-cloud-parent-yushan index db92131..6c53fd9 160000 --- a/epdc-cloud-parent-yushan +++ b/epdc-cloud-parent-yushan @@ -1 +1 @@ -Subproject commit db9213163f8005cba05ad21334bebb72484174b7 +Subproject commit 6c53fd985cbaae46046a44a2d84f1eb9bff86a9d diff --git a/epdc-cloud-points/src/main/java/com/elink/esua/epdc/controller/EpdcAppPointsController.java b/epdc-cloud-points/src/main/java/com/elink/esua/epdc/controller/EpdcAppPointsController.java index c83694d..c556c57 100644 --- a/epdc-cloud-points/src/main/java/com/elink/esua/epdc/controller/EpdcAppPointsController.java +++ b/epdc-cloud-points/src/main/java/com/elink/esua/epdc/controller/EpdcAppPointsController.java @@ -2,11 +2,9 @@ package com.elink.esua.epdc.controller; import com.elink.esua.epdc.commons.tools.constant.Constant; import com.elink.esua.epdc.commons.tools.utils.Result; -import com.elink.esua.epdc.dto.form.EpdcAppPointsRankingFormDTO; -import com.elink.esua.epdc.dto.form.EpdcAppPointsRecordFormDTO; -import com.elink.esua.epdc.dto.result.EpdcAppPointsRankingResultDTO; -import com.elink.esua.epdc.dto.result.EpdcAppPointsRecordResultDTO; -import com.elink.esua.epdc.dto.result.PointsRuleResultDTO; +import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils; +import com.elink.esua.epdc.dto.form.*; +import com.elink.esua.epdc.dto.result.*; import com.elink.esua.epdc.service.PointsLogsService; import com.elink.esua.epdc.service.PointsRuleService; import org.springframework.beans.factory.annotation.Autowired; @@ -67,4 +65,50 @@ public class EpdcAppPointsController { PointsRuleResultDTO pointsRuleByBehaviorCode = pointsRuleService.getPointsRuleByBehaviorCode(behaviorCode); return new Result().ok(pointsRuleByBehaviorCode); } + + /** + * 获取用户积分记录 + * + * @param formDto 表单 + * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @author Liuchuang + * @since 2021/1/19 14:27 + */ + @GetMapping("getpointslogs/list") + public Result> getPointsLogs(@RequestBody PointsExchangeLogsFormDTO formDto) { + List data = pointsLogsService.listOfPointsLogs(formDto); + + return new Result>().ok(data); + } + + /** + * 积分核销 + * + * @param formDto 表单 + * @return com.elink.esua.epdc.commons.tools.utils.Result + * @author Liuchuang + * @since 2021/1/19 15:57 + */ + @PostMapping("pointsVerification") + public Result pointsVerification(@RequestBody EpdcWorkPointsVerificationFormDTO formDto) { + ValidatorUtils.validateEntity(formDto); + + return pointsLogsService.pointsVerification(formDto); + } + + /** + * 工作端-核销记录 + * + * @param formDto 表单 + * @return com.elink.esua.epdc.commons.tools.utils.Result + * @author Liuchuang + * @since 2021/1/19 17:45 + */ + @GetMapping("verificationLogs/list") + public Result verificationLogs(@RequestBody EpdcWorkVerificationLogsFormDTO formDto) { + ValidatorUtils.validateEntity(formDto); + EpdcVerificationLogsResultDTO data = pointsLogsService.listOfVerificationLogs(formDto); + + return new Result().ok(data); + } } diff --git a/epdc-cloud-points/src/main/java/com/elink/esua/epdc/dao/PointsLogsDao.java b/epdc-cloud-points/src/main/java/com/elink/esua/epdc/dao/PointsLogsDao.java index 1d8928b..9714220 100644 --- a/epdc-cloud-points/src/main/java/com/elink/esua/epdc/dao/PointsLogsDao.java +++ b/epdc-cloud-points/src/main/java/com/elink/esua/epdc/dao/PointsLogsDao.java @@ -19,10 +19,8 @@ package com.elink.esua.epdc.dao; import com.elink.esua.epdc.commons.mybatis.dao.BaseDao; import com.elink.esua.epdc.dto.PointsLogsDTO; -import com.elink.esua.epdc.dto.form.PointsLogsFormDTO; +import com.elink.esua.epdc.dto.form.*; import com.elink.esua.epdc.dto.result.*; -import com.elink.esua.epdc.dto.form.EpdcAppPointsRankingFormDTO; -import com.elink.esua.epdc.dto.form.EpdcAppPointsRecordFormDTO; import com.elink.esua.epdc.entity.PointsLogsEntity; import org.apache.ibatis.annotations.Mapper; @@ -153,4 +151,34 @@ public interface PointsLogsDao extends BaseDao { * @Date 17:02 2022-02-12 **/ void insertBatchPointsResetLogs(List list); + + /** + * 获取用户积分记录 + * + * @param formDto 表单 + * @return java.util.List + * @author Liuchuang + * @since 2021/1/19 14:32 + */ + List selectListOfPointsLogs(PointsExchangeLogsFormDTO formDto); + + /** + * 核销记录 + * + * @param formDto 表单 + * @return java.util.List + * @author Liuchuang + * @since 2021/1/20 9:49 + */ + List selectListOfVerificationLogs(EpdcWorkVerificationLogsFormDTO formDto); + + /** + * 核销总积分 + * + * @param formDto 表单 + * @return java.lang.Integer + * @author Liuchuang + * @since 2021/1/20 9:49 + */ + Integer selectCountOfVerificationLogs(EpdcWorkVerificationLogsFormDTO formDto); } diff --git a/epdc-cloud-points/src/main/java/com/elink/esua/epdc/dao/PointsRuleDao.java b/epdc-cloud-points/src/main/java/com/elink/esua/epdc/dao/PointsRuleDao.java index 73afce3..373f6df 100644 --- a/epdc-cloud-points/src/main/java/com/elink/esua/epdc/dao/PointsRuleDao.java +++ b/epdc-cloud-points/src/main/java/com/elink/esua/epdc/dao/PointsRuleDao.java @@ -19,6 +19,8 @@ package com.elink.esua.epdc.dao; import com.elink.esua.epdc.commons.mybatis.dao.BaseDao; import com.elink.esua.epdc.dto.PointsRuleDTO; +import com.elink.esua.epdc.dto.form.PointsExchangeLogsFormDTO; +import com.elink.esua.epdc.dto.result.PointsLogsResultDTO; import com.elink.esua.epdc.dto.result.PointsRuleResultDTO; import com.elink.esua.epdc.entity.PointsRuleEntity; import org.apache.ibatis.annotations.Mapper; @@ -69,4 +71,6 @@ public interface PointsRuleDao extends BaseDao { * @Date 10:22 2020-05-11 **/ List selectListBehaviorCode(String pointsRuldId); + + } diff --git a/epdc-cloud-points/src/main/java/com/elink/esua/epdc/entity/PointsLogsEntity.java b/epdc-cloud-points/src/main/java/com/elink/esua/epdc/entity/PointsLogsEntity.java index fc10571..8769298 100644 --- a/epdc-cloud-points/src/main/java/com/elink/esua/epdc/entity/PointsLogsEntity.java +++ b/epdc-cloud-points/src/main/java/com/elink/esua/epdc/entity/PointsLogsEntity.java @@ -143,4 +143,17 @@ public class PointsLogsEntity extends BaseEpdcEntity { * 用户真实姓名 */ private String realName; + + /** + * 操作人所属部门名称 + */ + private String createdDept; + /** + * 操作人所属部门ID + */ + private Long createdDeptId; + /** + * 操作人所属部门所有部门ID + */ + private String createdDeptAllDeptIds; } diff --git a/epdc-cloud-points/src/main/java/com/elink/esua/epdc/feign/UsersFeignClient.java b/epdc-cloud-points/src/main/java/com/elink/esua/epdc/feign/UsersFeignClient.java index 0a91526..6d8e714 100644 --- a/epdc-cloud-points/src/main/java/com/elink/esua/epdc/feign/UsersFeignClient.java +++ b/epdc-cloud-points/src/main/java/com/elink/esua/epdc/feign/UsersFeignClient.java @@ -77,5 +77,15 @@ public interface UsersFeignClient { **/ @PostMapping(value = "app-user/user/resetUserPoints", consumes = MediaType.APPLICATION_JSON_VALUE) Result resetUserPoints(); + + /** + * @Description 获取用户认证的网格接口 + * @Author songyunpeng + * @Date 2020/12/14 + * @Param [userId] + * @return com.elink.esua.epdc.commons.tools.utils.Result + **/ + @GetMapping(value = "app-user/epdc-app/user/getUserGridIdByUserId/{userId}", consumes = MediaType.APPLICATION_JSON_VALUE) + Result getUserGridIdByUserId(@PathVariable String userId); } diff --git a/epdc-cloud-points/src/main/java/com/elink/esua/epdc/feign/fallback/UsersFeignClientFallback.java b/epdc-cloud-points/src/main/java/com/elink/esua/epdc/feign/fallback/UsersFeignClientFallback.java index 01279ca..4f9003e 100644 --- a/epdc-cloud-points/src/main/java/com/elink/esua/epdc/feign/fallback/UsersFeignClientFallback.java +++ b/epdc-cloud-points/src/main/java/com/elink/esua/epdc/feign/fallback/UsersFeignClientFallback.java @@ -45,4 +45,9 @@ public class UsersFeignClientFallback implements UsersFeignClient { public Result resetUserPoints() { return ModuleUtils.feignConError(ServiceConstant.EPDC_USER_SERVER, "resetUserPoints"); } + + @Override + public Result getUserGridIdByUserId(String userId) { + return ModuleUtils.feignConError(ServiceConstant.EPDC_USER_SERVER, "getUserGridIdByUserId", userId); + } } diff --git a/epdc-cloud-points/src/main/java/com/elink/esua/epdc/service/PointsLogsService.java b/epdc-cloud-points/src/main/java/com/elink/esua/epdc/service/PointsLogsService.java index 47fa07b..257dfa2 100644 --- a/epdc-cloud-points/src/main/java/com/elink/esua/epdc/service/PointsLogsService.java +++ b/epdc-cloud-points/src/main/java/com/elink/esua/epdc/service/PointsLogsService.java @@ -24,13 +24,8 @@ import com.elink.esua.epdc.dto.EpdcAdjustUserPointsDTO; import com.elink.esua.epdc.dto.PointsLogsDTO; import com.elink.esua.epdc.dto.UserDTO; import com.elink.esua.epdc.dto.epdc.result.EpdcAdjustVolunteerPointsDTO; -import com.elink.esua.epdc.dto.form.EpdcAppPointsRankingFormDTO; -import com.elink.esua.epdc.dto.form.EpdcAppPointsRecordFormDTO; -import com.elink.esua.epdc.dto.form.PointsLogsFormDTO; -import com.elink.esua.epdc.dto.result.EpdcAppPointsRankingResultDTO; -import com.elink.esua.epdc.dto.result.EpdcAppPointsRecordResultDTO; -import com.elink.esua.epdc.dto.result.PointsLogsResultDTO; -import com.elink.esua.epdc.dto.result.PointsStatisticsListResultDTO; +import com.elink.esua.epdc.dto.form.*; +import com.elink.esua.epdc.dto.result.*; import com.elink.esua.epdc.entity.PointsLogsEntity; import java.util.List; @@ -200,4 +195,35 @@ public interface PointsLogsService extends BaseService { * @return com.elink.esua.epdc.commons.tools.utils.Result **/ Result insertPointsResetLogs(List formDTO); + + /** + * 获取用户积分记录 + * + * @param formDto 表单 + * @return java.util.List + * @author Liuchuang + * @since 2021/1/19 14:29 + */ + List listOfPointsLogs(PointsExchangeLogsFormDTO formDto); + + /** + * 积分核销 + * + * @param formDto 表单 + * @return com.elink.esua.epdc.commons.tools.utils.Result + * @author Liuchuang + * @since 2021/1/19 15:53 + */ + Result pointsVerification(EpdcWorkPointsVerificationFormDTO formDto); + + /** + * 工作端-核销记录 + * + * @param formDto 表单 + * @return com.elink.esua.epdc.commons.tools.utils.Result + * @author Liuchuang + * @since 2021/1/19 17:45 + */ + EpdcVerificationLogsResultDTO listOfVerificationLogs(EpdcWorkVerificationLogsFormDTO formDto); + } diff --git a/epdc-cloud-points/src/main/java/com/elink/esua/epdc/service/PointsRuleService.java b/epdc-cloud-points/src/main/java/com/elink/esua/epdc/service/PointsRuleService.java index 5eb043e..353a3a2 100644 --- a/epdc-cloud-points/src/main/java/com/elink/esua/epdc/service/PointsRuleService.java +++ b/epdc-cloud-points/src/main/java/com/elink/esua/epdc/service/PointsRuleService.java @@ -21,6 +21,7 @@ import com.elink.esua.epdc.commons.mybatis.service.BaseService; import com.elink.esua.epdc.commons.tools.page.PageData; import com.elink.esua.epdc.commons.tools.utils.Result; import com.elink.esua.epdc.dto.PointsRuleDTO; +import com.elink.esua.epdc.dto.form.PointsExchangeLogsFormDTO; import com.elink.esua.epdc.dto.form.PointsLogsFormDTO; import com.elink.esua.epdc.dto.result.BehaviorResultDto; import com.elink.esua.epdc.dto.result.PointsLogsResultDTO; @@ -124,4 +125,6 @@ public interface PointsRuleService extends BaseService { * @Date 2019/12/12 16:27 **/ Result initPointsRuleRedis(); -} \ No newline at end of file + + +} diff --git a/epdc-cloud-points/src/main/java/com/elink/esua/epdc/service/impl/PointsLogsServiceImpl.java b/epdc-cloud-points/src/main/java/com/elink/esua/epdc/service/impl/PointsLogsServiceImpl.java index f4a85ee..7931391 100644 --- a/epdc-cloud-points/src/main/java/com/elink/esua/epdc/service/impl/PointsLogsServiceImpl.java +++ b/epdc-cloud-points/src/main/java/com/elink/esua/epdc/service/impl/PointsLogsServiceImpl.java @@ -29,25 +29,28 @@ import com.elink.esua.epdc.commons.tools.enums.pointsenum.PointsOperationEnum; import com.elink.esua.epdc.commons.tools.enums.pointsenum.PointsOperationModeEnum; import com.elink.esua.epdc.commons.tools.exception.RenException; import com.elink.esua.epdc.commons.tools.page.PageData; +import com.elink.esua.epdc.commons.tools.security.user.SecurityUser; +import com.elink.esua.epdc.commons.tools.security.user.UserDetail; import com.elink.esua.epdc.commons.tools.utils.ConvertUtils; import com.elink.esua.epdc.commons.tools.utils.Result; import com.elink.esua.epdc.dao.PointsLogsDao; import com.elink.esua.epdc.dto.EpdcAdjustUserPointsDTO; +import com.elink.esua.epdc.dto.ParentAndAllDeptDTO; import com.elink.esua.epdc.dto.PointsLogsDTO; import com.elink.esua.epdc.dto.UserDTO; import com.elink.esua.epdc.dto.constant.PointsNoticeConstant; import com.elink.esua.epdc.dto.epdc.form.EpdcInformationFormDTO; import com.elink.esua.epdc.dto.epdc.form.EpdcUserPointsFormDTO; import com.elink.esua.epdc.dto.epdc.result.EpdcAdjustVolunteerPointsDTO; -import com.elink.esua.epdc.dto.form.EpdcAppPointsRankingFormDTO; -import com.elink.esua.epdc.dto.form.EpdcAppPointsRecordFormDTO; -import com.elink.esua.epdc.dto.form.PointsLogsFormDTO; +import com.elink.esua.epdc.dto.form.*; import com.elink.esua.epdc.dto.result.*; import com.elink.esua.epdc.entity.PointsLogsEntity; +import com.elink.esua.epdc.feign.AdminFeignClient; import com.elink.esua.epdc.feign.UsersFeignClient; import com.elink.esua.epdc.redis.PointsLogsRedis; import com.elink.esua.epdc.service.PointsBehaviorService; import com.elink.esua.epdc.service.PointsLogsService; +import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -63,6 +66,7 @@ import java.util.stream.Collectors; * @since v1.0.0 2020-04-29 */ @Service +@Slf4j public class PointsLogsServiceImpl extends BaseServiceImpl implements PointsLogsService { @Autowired @@ -71,6 +75,9 @@ public class PointsLogsServiceImpl extends BaseServiceImpl listOfPointsLogs(PointsExchangeLogsFormDTO formDto) { + int pageIndex = (formDto.getPageIndex() - NumConstant.ONE) * formDto.getPageSize(); + formDto.setPageIndex(pageIndex); + return baseDao.selectListOfPointsLogs(formDto); + } + + @Override + public Result pointsVerification(EpdcWorkPointsVerificationFormDTO formDto) { + if (null == SecurityUser.getUser() || null == SecurityUser.getDeptId()) { + throw new RenException("登陆信息超时，请重新登陆"); + } + // 获取用户信息 + EpdcUserPointsFormDTO userPointsFormDTO = new EpdcUserPointsFormDTO(); + userPointsFormDTO.setUserId(formDto.getUserId()); + userPointsFormDTO.setPoints(formDto.getPoints()); + userPointsFormDTO.setOperationType(formDto.getOperationType()); + Result userById = usersFeignClient.getUserById(formDto.getUserId()); + if (!userById.success()) { + return new Result().error("获取用户信息失败"); + } + + Result result = usersFeignClient.handleUserPoints(userPointsFormDTO); + if (!result.success()) { + return new Result().error(result.getMsg()); + } + + // 保存积分日志 + PointsLogsEntity pointsLogsEntity = packagePointsLogs(userById.getData(), formDto); + this.insert(pointsLogsEntity); + + return new Result(); + } + + /** + * 组装积分日志信息 + * + * @param userDto 用户信息 + * @param formDto 表单信息 + * @return com.elink.esua.epdc.entity.PointsLogsEntity + * @author Liuchuang + * @since 2021/1/19 16:14 + */ + private PointsLogsEntity packagePointsLogs(UserDTO userDto, EpdcWorkPointsVerificationFormDTO formDto) { + //根据动作编码获取动作信息 + Result behaviorCodeInfoByBehaviorCode = pointsBehaviorService.getBehaviorCodeInfoByBehaviorCode(PointsConstant.behaviorWorkScanCodePointsVerification); + PointsLogsEntity pointsLogsEntity = new PointsLogsEntity(); + pointsLogsEntity.setUserId(formDto.getUserId()); + pointsLogsEntity.setNickname(userDto.getNickname()); + pointsLogsEntity.setFaceImg(userDto.getFaceImg()); + pointsLogsEntity.setOperationTime(new Date()); + pointsLogsEntity.setOperationMode(PointsOperationModeEnum.OPERATION_MODE_WORK_JFHX.getOperationMode()); + pointsLogsEntity.setRuleCode(PointsConstant.ruleWorkScanCodePointsVerification); + pointsLogsEntity.setBehaviorCode(PointsConstant.behaviorWorkScanCodePointsVerification); + pointsLogsEntity.setOperationDesc(behaviorCodeInfoByBehaviorCode.getData().getBehaviorDesc()); + pointsLogsEntity.setPoints(formDto.getPoints()); + pointsLogsEntity.setOperationType(formDto.getOperationType()); + pointsLogsEntity.setReferenceId(formDto.getUserId()); + if("0".equals(formDto.getOperationType())){ + pointsLogsEntity.setLavePoints(userDto.getPoints() - formDto.getPoints()); + }else { + pointsLogsEntity.setLavePoints(userDto.getPoints() + formDto.getPoints()); + } + pointsLogsEntity.setRemark(formDto.getRemark()); + pointsLogsEntity.setRealName(userDto.getRealName()); + + // 赋值积分所属部门 + Result userGridIdByUserId = usersFeignClient.getUserGridIdByUserId(formDto.getUserId()); + Result parentAndAllDept = adminFeignClient.getParentAndAllDept(userGridIdByUserId.getData()); + ParentAndAllDeptDTO parentAndAllDeptDTO = parentAndAllDept.getData(); + pointsLogsEntity.setGrid(parentAndAllDeptDTO.getGrid()); + pointsLogsEntity.setGridId(parentAndAllDeptDTO.getGridId()); + pointsLogsEntity.setAllDeptIds(parentAndAllDeptDTO.getAllDeptIds()); + pointsLogsEntity.setAllDeptNames(parentAndAllDeptDTO.getAllDeptNames()); + pointsLogsEntity.setParentDeptIds(parentAndAllDeptDTO.getParentDeptIds()); + pointsLogsEntity.setParentDeptNames(parentAndAllDeptDTO.getParentDeptNames()); + + // 组装操作人信息 + UserDetail user = SecurityUser.getUser(); + Result currentUserDept = adminFeignClient.getParentDeptIds(user.getDeptId()); + pointsLogsEntity.setCreatedDeptAllDeptIds(currentUserDept.getData()); + pointsLogsEntity.setCreatedDept(user.getDeptName()); + pointsLogsEntity.setCreatedDeptId(user.getDeptId()); + + return pointsLogsEntity; + } + + @Override + public EpdcVerificationLogsResultDTO listOfVerificationLogs(EpdcWorkVerificationLogsFormDTO formDto) { + log.info("+++++++++++++++++++++++++++++++++++=SecurityUserDeptId():" + SecurityUser.getDeptId()); + if (null == SecurityUser.getUser() || null == SecurityUser.getDeptId()) { + throw new RenException("登陆信息超时，请重新登陆"); + } + int pageIndex = (formDto.getPageIndex() - NumConstant.ONE) * formDto.getPageSize(); + formDto.setPageIndex(pageIndex); + formDto.setCurrentUserDeptId(SecurityUser.getDeptId()); + formDto.setOperationMode(PointsOperationModeEnum.OPERATION_MODE_WORK_JFHX.getOperationMode()); + + // 核销记录 + List verificationLogs = baseDao.selectListOfVerificationLogs(formDto); + // 核销总积分 + Integer pointsTotal = baseDao.selectCountOfVerificationLogs(formDto); + + EpdcVerificationLogsResultDTO data = new EpdcVerificationLogsResultDTO(); + data.setPointsTotal(pointsTotal); + data.setVerificationLogs(verificationLogs); + + return data; + } } diff --git a/epdc-cloud-points/src/main/java/com/elink/esua/epdc/service/impl/PointsRuleServiceImpl.java b/epdc-cloud-points/src/main/java/com/elink/esua/epdc/service/impl/PointsRuleServiceImpl.java index d7b035f..b83f231 100644 --- a/epdc-cloud-points/src/main/java/com/elink/esua/epdc/service/impl/PointsRuleServiceImpl.java +++ b/epdc-cloud-points/src/main/java/com/elink/esua/epdc/service/impl/PointsRuleServiceImpl.java @@ -22,6 +22,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl; import com.elink.esua.epdc.commons.tools.constant.FieldConstant; +import com.elink.esua.epdc.commons.tools.constant.NumConstant; import com.elink.esua.epdc.commons.tools.enums.pointsenum.PointsRuleAvailableEnum; import com.elink.esua.epdc.commons.tools.exception.ErrorCode; import com.elink.esua.epdc.commons.tools.page.PageData; @@ -35,7 +36,9 @@ import com.elink.esua.epdc.dao.PointsRuleDao; import com.elink.esua.epdc.dto.PointsBehaviorDTO; import com.elink.esua.epdc.dto.PointsBehaviorRuleDTO; import com.elink.esua.epdc.dto.PointsRuleDTO; +import com.elink.esua.epdc.dto.form.PointsExchangeLogsFormDTO; import com.elink.esua.epdc.dto.result.BehaviorResultDto; +import com.elink.esua.epdc.dto.result.PointsLogsResultDTO; import com.elink.esua.epdc.dto.result.PointsRuleResultDTO; import com.elink.esua.epdc.entity.PointsBehaviorRuleEntity; import com.elink.esua.epdc.entity.PointsRuleEntity; @@ -247,4 +250,6 @@ public class PointsRuleServiceImpl extends BaseServiceImpl + + + + + + diff --git a/epdc-cloud-points/src/main/resources/mapper/PointsRuleDao.xml b/epdc-cloud-points/src/main/resources/mapper/PointsRuleDao.xml index 8e90b5d..1f57937 100644 --- a/epdc-cloud-points/src/main/resources/mapper/PointsRuleDao.xml +++ b/epdc-cloud-points/src/main/resources/mapper/PointsRuleDao.xml @@ -95,4 +95,6 @@ LEFT JOIN epdc_points_behavior b ON br.BEHAVIOR_ID = b.ID AND b.DEL_FLAG = 0 WHERE r.DEL_FLAG = 0 AND r.id = #{pointsRuldId} + +