diff --git a/epmet-module/epmet-point/epmet-point-client/pom.xml b/epmet-module/epmet-point/epmet-point-client/pom.xml index c43496fa40..479b51156e 100644 --- a/epmet-module/epmet-point/epmet-point-client/pom.xml +++ b/epmet-module/epmet-point/epmet-point-client/pom.xml @@ -27,6 +27,12 @@ io.springfox springfox-swagger-ui + + com.epmet + epmet-user-client + 2.0.0 + compile + diff --git a/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/form/CommonPageUserFormDTO.java b/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/form/CommonPageUserFormDTO.java index 3dd0e34ac9..c37afa2921 100644 --- a/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/form/CommonPageUserFormDTO.java +++ b/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/form/CommonPageUserFormDTO.java @@ -26,4 +26,7 @@ public class CommonPageUserFormDTO implements Serializable { private Integer pageNo = 1; private Integer pageSize = 10; + + @NotBlank(message = "获取不到用户Id" , groups = PageUserGroup.class) + private String customerId; } diff --git a/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/form/PointVerificationFormDTO.java b/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/form/PointVerificationFormDTO.java index 7920d68c66..8726a2659b 100644 --- a/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/form/PointVerificationFormDTO.java +++ b/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/form/PointVerificationFormDTO.java @@ -52,4 +52,6 @@ public class PointVerificationFormDTO implements Serializable { @NotBlank(message = "缺失地址信息" , groups = PointVerificationGroup.class) private String address; + + private String customerId; } diff --git a/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/feign/EpmetPointOpenFeignClient.java b/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/feign/EpmetPointOpenFeignClient.java index 749b9eefe0..d5b9edd6c6 100644 --- a/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/feign/EpmetPointOpenFeignClient.java +++ b/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/feign/EpmetPointOpenFeignClient.java @@ -2,10 +2,11 @@ package com.epmet.feign; import com.epmet.commons.tools.constant.ServiceConstant; import com.epmet.commons.tools.utils.Result; +import com.epmet.dto.form.CommonUserFormDTO; import com.epmet.dto.result.ResiPointDetailResultDTO; import com.epmet.feign.fallback.EpmetPointOpenFeignClientFallback; import org.springframework.cloud.openfeign.FeignClient; -import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; /** * 本服务对外开放的API,其他服务通过引用此client调用该服务 @@ -23,6 +24,6 @@ public interface EpmetPointOpenFeignClient { * @author wangc * @date 2020.07.22 15:58 **/ - @GetMapping("/point/resi/point/mypoint") - Result myPoint(); + @PostMapping("/point/resi/point/mypoint") + Result myPoint(CommonUserFormDTO param); } diff --git a/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/feign/fallback/EpmetPointOpenFeignClientFallback.java b/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/feign/fallback/EpmetPointOpenFeignClientFallback.java index 845c105b50..7d5cda718f 100644 --- a/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/feign/fallback/EpmetPointOpenFeignClientFallback.java +++ b/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/feign/fallback/EpmetPointOpenFeignClientFallback.java @@ -3,6 +3,7 @@ package com.epmet.feign.fallback; import com.epmet.commons.tools.constant.ServiceConstant; import com.epmet.commons.tools.utils.ModuleUtils; import com.epmet.commons.tools.utils.Result; +import com.epmet.dto.form.CommonUserFormDTO; import com.epmet.dto.result.ResiPointDetailResultDTO; import com.epmet.feign.EpmetPointOpenFeignClient; import org.springframework.stereotype.Component; @@ -16,7 +17,7 @@ import org.springframework.stereotype.Component; @Component public class EpmetPointOpenFeignClientFallback implements EpmetPointOpenFeignClient { @Override - public Result myPoint() { - return ModuleUtils.feignConError(ServiceConstant.EPMET_POINT_SERVER, "myPoint"); + public Result myPoint(CommonUserFormDTO param) { + return ModuleUtils.feignConError(ServiceConstant.EPMET_POINT_SERVER, "myPoint",param); } } diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/controller/AdjustmentController.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/controller/AdjustmentController.java index 21336dccb2..535b717e0c 100644 --- a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/controller/AdjustmentController.java +++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/controller/AdjustmentController.java @@ -7,6 +7,7 @@ import com.epmet.commons.tools.enums.RequirePermissionEnum; import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.commons.tools.utils.Result; import com.epmet.commons.tools.validator.ValidatorUtils; +import com.epmet.dto.form.CommonUserFormDTO; import com.epmet.dto.form.CustomerUserFormDTO; import com.epmet.dto.form.IssueInitiatorFormDTO; import com.epmet.dto.form.PointAdjustmentFormDTO; @@ -59,7 +60,8 @@ public class AdjustmentController { **/ @PostMapping("userdetail") @RequirePermission(requirePermission = RequirePermissionEnum.MORE_POINT_USER_MANAGE_DETAIL_VIEW) - public Result userDetail(@RequestBody IssueInitiatorFormDTO param){ + public Result userDetail(@LoginUser TokenDto staffToken,@RequestBody CommonUserFormDTO param){ + param.setCustomerId(staffToken.getCustomerId()); ValidatorUtils.validateEntity(param,IssueInitiatorFormDTO.UserIdGroup.class); return new Result().ok(pointAdjustmentLogService.userDetail(param)); } diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/controller/ExchangeController.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/controller/ExchangeController.java index ff4bdd2285..8bb1d31cc5 100644 --- a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/controller/ExchangeController.java +++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/controller/ExchangeController.java @@ -39,6 +39,7 @@ public class ExchangeController { @PostMapping("execute") public Result execute(@LoginUser TokenDto token, @RequestBody PointVerificationFormDTO verificationParam){ verificationParam.setOperatorId(token.getUserId()); + verificationParam.setCustomerId(token.getCustomerId()); ValidatorUtils.validateEntity(verificationParam, PointVerificationFormDTO.PointVerificationGroup.class); return new Result().ok(pointVerificationLogService.verifyPoint(verificationParam)); } 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 bca69b050a..f4e5ce6bb4 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 @@ -5,7 +5,7 @@ import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.commons.tools.utils.Result; import com.epmet.commons.tools.validator.ValidatorUtils; import com.epmet.dto.form.CommonPageUserFormDTO; -import com.epmet.dto.form.ResiCommonUserIdFormDTO; +import com.epmet.dto.form.CommonUserFormDTO; import com.epmet.dto.form.ResiPointRankFormDTO; import com.epmet.dto.result.PointExchangeResponseResultDTO; import com.epmet.dto.result.ResiPointDetailResultDTO; @@ -46,12 +46,11 @@ public class ResiPointController { * @author wangc * @date 2020.07.22 15:58 **/ - @GetMapping("mypoint") - public Result myPoint(@LoginUser TokenDto dto){ - ResiCommonUserIdFormDTO param = new ResiCommonUserIdFormDTO(); - param.setUserId(dto.getUserId()); - ValidatorUtils.validateEntity(param,ResiCommonUserIdFormDTO.UserIdGroup.class); - return new Result().ok(userPointTotalService.getMyPoint(param)); + @PostMapping("mypoint") + public Result myPoint(@LoginUser TokenDto dto, @RequestBody CommonUserFormDTO userParam){ + userParam.setUserId(dto.getUserId()); + ValidatorUtils.validateEntity(userParam, CommonUserFormDTO.CustomerId_UserIdGroup.class); + return new Result().ok(userPointTotalService.getMyPoint(userParam)); } /** diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/dao/PointVerificationLogDao.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/dao/PointVerificationLogDao.java index 5b90380b88..52c76a7c4c 100644 --- a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/dao/PointVerificationLogDao.java +++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/dao/PointVerificationLogDao.java @@ -43,7 +43,7 @@ public interface PointVerificationLogDao extends BaseDao selectVerificationLog(@Param("userId") String userId); + List selectVerificationLog(@Param("userId") String userId,@Param("customerId")String customerId); /** * @Description 获取工作人员月度核销记录 diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/dao/UserPointActionLogDao.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/dao/UserPointActionLogDao.java index a16ce26c67..42d7cb404b 100644 --- a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/dao/UserPointActionLogDao.java +++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/dao/UserPointActionLogDao.java @@ -42,7 +42,8 @@ public interface UserPointActionLogDao extends BaseDao * @author wangc * @date 2020.07.22 13:56 **/ - List selectPointActionLogList(@Param("userId") String userId); + List selectPointActionLogList(@Param("userId") String userId,@Param("customerId")String customerId); + /** * @Description 查询指定用户在某条规则下所得的积分总和 diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/dao/UserPointTotalDao.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/dao/UserPointTotalDao.java index 36b2540ac1..c78d265734 100644 --- a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/dao/UserPointTotalDao.java +++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/dao/UserPointTotalDao.java @@ -44,6 +44,15 @@ public interface UserPointTotalDao extends BaseDao { **/ ResiPointDetailResultDTO selectPointByUserId(@Param("userId")String userId); + /** + * @Description 根据用户Id和客户Id查询他的累计积分以及可用积分 + * @param userId + * @return + * @author wangc + * @date 2020.07.21 13:38 + **/ + ResiPointDetailResultDTO selectPointByCustomerUserId(@Param("userId")String userId,@Param("customerId")String customerId); + /** * @Description 查询客户下的用户累计积分排名榜 * @param customerId diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/PointAdjustmentLogService.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/PointAdjustmentLogService.java index 02df12d652..6e77b0f7c8 100644 --- a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/PointAdjustmentLogService.java +++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/PointAdjustmentLogService.java @@ -20,6 +20,7 @@ package com.epmet.service; import com.epmet.commons.mybatis.service.BaseService; import com.epmet.commons.tools.page.PageData; import com.epmet.dto.PointAdjustmentLogDTO; +import com.epmet.dto.form.CommonUserFormDTO; import com.epmet.dto.form.IssueInitiatorFormDTO; import com.epmet.dto.form.PointAdjustmentFormDTO; import com.epmet.dto.result.CustomerUserDetailResultDTO; @@ -113,7 +114,7 @@ public interface PointAdjustmentLogService extends BaseService /** * @Description 获取指定居民的积分信息 - * @param userId + * @param param * @return * @author wangc * @date 2020.07.22 15:58 **/ - ResiPointDetailResultDTO getMyPoint(ResiCommonUserIdFormDTO userId); + ResiPointDetailResultDTO getMyPoint(CommonUserFormDTO param); /** * @Description 获取客户下用户积分排名榜 @@ -125,4 +126,13 @@ public interface UserPointTotalService extends BaseService void insertOrUpdate(UserPointTotalEntity entity); void testInsertOrUpdate(UserPointTotalEntity entity); + + /** + * @Description 获取指定居民的积分信息 - 使用客户Id匹配，兼容多客户情况 + * @param customerUserParam + * @return + * @author wangc + * @date 2020.07.22 15:58 + **/ + ResiPointDetailResultDTO getMyPointGroupByCustomer(CommonUserFormDTO customerUserParam); } \ No newline at end of file diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointAdjustmentLogServiceImpl.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointAdjustmentLogServiceImpl.java index a78e6f70bf..cdbf4e882b 100644 --- a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointAdjustmentLogServiceImpl.java +++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointAdjustmentLogServiceImpl.java @@ -30,6 +30,7 @@ import com.epmet.commons.tools.utils.Result; import com.epmet.dao.PointAdjustmentLogDao; import com.epmet.dao.UserPointActionLogDao; import com.epmet.dto.PointAdjustmentLogDTO; +import com.epmet.dto.form.CommonUserFormDTO; import com.epmet.dto.form.IssueInitiatorFormDTO; import com.epmet.dto.form.PointAdjustmentFormDTO; import com.epmet.dto.form.ResiCommonUserIdFormDTO; @@ -150,13 +151,14 @@ public class PointAdjustmentLogServiceImpl extends BaseServiceImpl detailResult = epmetUserOpenFeignClient.customerUserDetail(param); + public CustomerUserDetailResultDTO userDetail(CommonUserFormDTO param) { + IssueInitiatorFormDTO userParam = new IssueInitiatorFormDTO(); + userParam.setUserId(param.getUserId()); + Result detailResult = epmetUserOpenFeignClient.customerUserDetail(userParam); if(!detailResult.success()){ throw new RenException(detailResult.getCode()); } - ResiCommonUserIdFormDTO userParam = ConvertUtils.sourceToTarget(param,ResiCommonUserIdFormDTO.class); - ResiPointDetailResultDTO pointDto = userPointTotalService.getMyPoint(userParam); + ResiPointDetailResultDTO pointDto = userPointTotalService.getMyPointGroupByCustomer(param); if(null != detailResult.getData()){ CustomerUserDetailResultDTO result = new CustomerUserDetailResultDTO(); result.setPoint(null != pointDto ? pointDto.getUsablePoint() : NumConstant.ZERO); diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointVerificationLogServiceImpl.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointVerificationLogServiceImpl.java index f8f3974e80..8dec019109 100644 --- a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointVerificationLogServiceImpl.java +++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointVerificationLogServiceImpl.java @@ -147,7 +147,7 @@ public class PointVerificationLogServiceImpl extends BaseServiceImpl getMyExchangeRecord(CommonPageUserFormDTO pageUser) { PageHelper.startPage(pageUser.getPageNo(),pageUser.getPageSize()); - List logList = baseDao.selectVerificationLog(pageUser.getUserId()); + List logList = baseDao.selectVerificationLog(pageUser.getUserId(),pageUser.getCustomerId()); List result = new LinkedList<>(); if(null != logList && !logList.isEmpty()){ Map> map = @@ -256,9 +256,10 @@ public class PointVerificationLogServiceImpl extends BaseServiceImpl getMyPointRecord(CommonPageUserFormDTO pageUser) { PageHelper.startPage(pageUser.getPageNo(),pageUser.getPageSize()); - List logList = baseDao.selectPointActionLogList(pageUser.getUserId()); + List logList = baseDao.selectPointActionLogList(pageUser.getUserId(),pageUser.getCustomerId()); List result = new LinkedList<>(); if(null != logList && !logList.isEmpty()){ Map> map = 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 36ca84e901..2560755667 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 @@ -27,6 +27,7 @@ import com.epmet.commons.tools.constant.FieldConstant; import com.epmet.commons.tools.utils.Result; import com.epmet.dao.UserPointTotalDao; import com.epmet.dto.UserPointTotalDTO; +import com.epmet.dto.form.CommonUserFormDTO; import com.epmet.dto.form.ResiCommonUserIdFormDTO; import com.epmet.dto.form.ResiPointRankFormDTO; import com.epmet.dto.result.*; @@ -114,14 +115,14 @@ public class UserPointTotalServiceImpl extends BaseServiceImpl diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/UserPointActionLogDao.xml b/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/UserPointActionLogDao.xml index 9777f506d3..994bca4ad4 100644 --- a/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/UserPointActionLogDao.xml +++ b/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/UserPointActionLogDao.xml @@ -36,6 +36,8 @@ DEL_FLAG = '0' AND USER_ID = #{userId} + AND + CUSTOMER_ID = #{customerId} ORDER BY CREATED_TIME DESC diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/UserPointTotalDao.xml b/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/UserPointTotalDao.xml index d84b1b02ed..e64d984a00 100644 --- a/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/UserPointTotalDao.xml +++ b/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/UserPointTotalDao.xml @@ -31,6 +31,21 @@ USER_ID = #{userId} + + +