Merge remote-tracking branch 'origin/dev_bugfix' into dev_temp

epmet-module/epmet-point/epmet-point-client/pom.xml

@@ -27,6 +27,12 @@
             <groupId>io.springfox</groupId>
             <artifactId>springfox-swagger-ui</artifactId>
         </dependency>
+        <dependency>
+            <groupId>com.epmet</groupId>
+            <artifactId>epmet-user-client</artifactId>
+            <version>2.0.0</version>
+            <scope>compile</scope>
+        </dependency>
     </dependencies>
 
     <build>

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;
 }

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;
 }

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<ResiPointDetailResultDTO> myPoint();
+    @PostMapping("/point/resi/point/mypoint")
+    Result<ResiPointDetailResultDTO> myPoint(CommonUserFormDTO param);
 }

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<ResiPointDetailResultDTO> myPoint() {
-        return ModuleUtils.feignConError(ServiceConstant.EPMET_POINT_SERVER, "myPoint");
+    public Result<ResiPointDetailResultDTO> myPoint(CommonUserFormDTO param) {
+        return ModuleUtils.feignConError(ServiceConstant.EPMET_POINT_SERVER, "myPoint",param);
     }
 }

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<CustomerUserDetailResultDTO> userDetail(@RequestBody IssueInitiatorFormDTO param){
+    public Result<CustomerUserDetailResultDTO> userDetail(@LoginUser TokenDto staffToken,@RequestBody CommonUserFormDTO param){
+        param.setCustomerId(staffToken.getCustomerId());
         ValidatorUtils.validateEntity(param,IssueInitiatorFormDTO.UserIdGroup.class);
         return new  Result<CustomerUserDetailResultDTO>().ok(pointAdjustmentLogService.userDetail(param));
     }

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<PointVerificationResultDTO> execute(@LoginUser TokenDto token, @RequestBody PointVerificationFormDTO verificationParam){
         verificationParam.setOperatorId(token.getUserId());
+        verificationParam.setCustomerId(token.getCustomerId());
         ValidatorUtils.validateEntity(verificationParam, PointVerificationFormDTO.PointVerificationGroup.class);
         return new Result<PointVerificationResultDTO>().ok(pointVerificationLogService.verifyPoint(verificationParam));
     }

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<ResiPointDetailResultDTO> myPoint(@LoginUser TokenDto dto){
-        ResiCommonUserIdFormDTO param = new ResiCommonUserIdFormDTO();
-        param.setUserId(dto.getUserId());
-        ValidatorUtils.validateEntity(param,ResiCommonUserIdFormDTO.UserIdGroup.class);
-        return new Result<ResiPointDetailResultDTO>().ok(userPointTotalService.getMyPoint(param));
+    @PostMapping("mypoint")
+    public Result<ResiPointDetailResultDTO> myPoint(@LoginUser TokenDto dto, @RequestBody CommonUserFormDTO userParam){
+        userParam.setUserId(dto.getUserId());
+        ValidatorUtils.validateEntity(userParam, CommonUserFormDTO.CustomerId_UserIdGroup.class);
+        return new Result<ResiPointDetailResultDTO>().ok(userPointTotalService.getMyPoint(userParam));
     }
 
     /**

epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/dao/PointVerificationLogDao.java

@@ -43,7 +43,7 @@ public interface PointVerificationLogDao extends BaseDao<PointVerificationLogEnt
      * @author wangc
      * @date 2020.07.22 15:38
     **/
-    List<ResiPointLogPeriodResultDTO> selectVerificationLog(@Param("userId") String userId);
+    List<ResiPointLogPeriodResultDTO> selectVerificationLog(@Param("userId") String userId,@Param("customerId")String customerId);
 
     /**
      * @Description 获取工作人员月度核销记录

epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/dao/UserPointActionLogDao.java

@@ -42,7 +42,8 @@ public interface UserPointActionLogDao extends BaseDao<UserPointActionLogEntity>
      * @author wangc
      * @date 2020.07.22 13:56
     **/
-    List<ResiPointLogPeriodResultDTO> selectPointActionLogList(@Param("userId") String userId);
+    List<ResiPointLogPeriodResultDTO> selectPointActionLogList(@Param("userId") String userId,@Param("customerId")String customerId);
+
 
     /**
      * @Description 查询指定用户在某条规则下所得的积分总和

epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/dao/UserPointTotalDao.java

@@ -44,6 +44,15 @@ public interface UserPointTotalDao extends BaseDao<UserPointTotalEntity> {
     **/
     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

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<PointAdjustmentLo
      * @author wangc
      * @date 2020.07.27 10:57
     **/
-    CustomerUserDetailResultDTO userDetail(IssueInitiatorFormDTO param);
+    CustomerUserDetailResultDTO userDetail(CommonUserFormDTO param);
 
     /**
      * @Description 积分调整

epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/UserPointTotalService.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.UserPointTotalDTO;
+import com.epmet.dto.form.CommonUserFormDTO;
 import com.epmet.dto.form.ResiCommonUserIdFormDTO;
 import com.epmet.dto.form.ResiPointRankFormDTO;
 import com.epmet.dto.result.ResiPointDetailResultDTO;
@@ -99,12 +100,12 @@ public interface UserPointTotalService extends BaseService<UserPointTotalEntity>
 
     /**
      * @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<UserPointTotalEntity>
     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);
 }

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<PointAdjustme
      * @date 2020.07.27 10:57
      **/
     @Override
-    public CustomerUserDetailResultDTO userDetail(IssueInitiatorFormDTO param) {
-        Result<CustomerUserDetailResultDTO> detailResult =  epmetUserOpenFeignClient.customerUserDetail(param);
+    public CustomerUserDetailResultDTO userDetail(CommonUserFormDTO param) {
+        IssueInitiatorFormDTO userParam = new IssueInitiatorFormDTO();
+        userParam.setUserId(param.getUserId());
+        Result<CustomerUserDetailResultDTO> 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);

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<PointVerifi
     @Override
     public List<ResiPointLogListResultDTO> getMyExchangeRecord(CommonPageUserFormDTO pageUser) {
         PageHelper.startPage(pageUser.getPageNo(),pageUser.getPageSize());
-        List<ResiPointLogPeriodResultDTO> logList = baseDao.selectVerificationLog(pageUser.getUserId());
+        List<ResiPointLogPeriodResultDTO> logList = baseDao.selectVerificationLog(pageUser.getUserId(),pageUser.getCustomerId());
         List<ResiPointLogListResultDTO> result = new LinkedList<>();
         if(null != logList && !logList.isEmpty()){
             Map<String,List<ResiPointLogPeriodResultDTO>> map =
@@ -256,9 +256,10 @@ public class PointVerificationLogServiceImpl extends BaseServiceImpl<PointVerifi
 
         DimIdGenerator.DimIdBean dim = DimIdGenerator.getDimIdBean(new Date());
 
-        ResiCommonUserIdFormDTO userId = new ResiCommonUserIdFormDTO();
-        userId.setUserId(verificationParam.getUserId());
-        ResiPointDetailResultDTO currentPoint = userPointTotalService.getMyPoint(userId);
+        CommonUserFormDTO customerUserParam = new CommonUserFormDTO();
+        customerUserParam.setUserId(verificationParam.getUserId());
+        customerUserParam.setCustomerId(verificationParam.getCustomerId());
+        ResiPointDetailResultDTO currentPoint = userPointTotalService.getMyPointGroupByCustomer(customerUserParam);
         if(null == currentPoint || null == currentPoint.getUsablePoint() || currentPoint.getUsablePoint() < verificationParam.getPoint()){
             result.setSuccessFlag(false);
             result.setFailureReason(ModuleConstant.POINT_NOT_ENOUGH);
@@ -280,14 +281,14 @@ public class PointVerificationLogServiceImpl extends BaseServiceImpl<PointVerifi
             point *= NumConstant.ONE_NEG;
         }
 
-        String customerId = ModuleConstant.EMPTY_STR;
+        String customerId = verificationParam.getCustomerId();
 
         String agencyId = ModuleConstant.EMPTY_STR;
         String operatorName = ModuleConstant.EMPTY_STR;
         PointVerificationStatisticalDailyEntity statistical = new PointVerificationStatisticalDailyEntity();
         if(staffResult.success() && null != staffResult.getData()){
             statistical = ConvertUtils.sourceToTarget(staffResult.getData(),PointVerificationStatisticalDailyEntity.class);
-            customerId = staffResult.getData().getCustomerId();
+            customerId = StringUtils.isBlank(customerId) ? staffResult.getData().getCustomerId() : customerId;
             operatorName = staffResult.getData().getNickname();
             agencyId = staffResult.getData().getAgencyId();
         }

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

@@ -139,7 +139,7 @@ public class UserPointActionLogServiceImpl extends BaseServiceImpl<UserPointActi
     @Override
     public List<ResiPointLogListResultDTO> getMyPointRecord(CommonPageUserFormDTO pageUser) {
         PageHelper.startPage(pageUser.getPageNo(),pageUser.getPageSize());
-        List<ResiPointLogPeriodResultDTO> logList = baseDao.selectPointActionLogList(pageUser.getUserId());
+        List<ResiPointLogPeriodResultDTO> logList = baseDao.selectPointActionLogList(pageUser.getUserId(),pageUser.getCustomerId());
         List<ResiPointLogListResultDTO> result = new LinkedList<>();
         if(null != logList && !logList.isEmpty()){
             Map<String,List<ResiPointLogPeriodResultDTO>> map =

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

@@ -38,6 +38,7 @@ import com.epmet.service.UserPointStatisticalDailyService;
 import com.epmet.utils.DimIdGenerator;
 import com.epmet.utils.ModuleConstant;
 import com.github.pagehelper.PageHelper;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -53,6 +54,7 @@ import java.util.stream.Collectors;
  * @since v1.0.0 2020-07-20
  */
 @Service
+@Slf4j
 public class UserPointStatisticalDailyServiceImpl extends BaseServiceImpl<UserPointStatisticalDailyDao, UserPointStatisticalDailyEntity> implements UserPointStatisticalDailyService {
 
     @Autowired
@@ -131,6 +133,8 @@ public class UserPointStatisticalDailyServiceImpl extends BaseServiceImpl<UserPo
               epmetUserOpenFeignClient.queryUserBaseInfo(userIdParam);
         if(myResiInfoResult.success() && null != myResiInfoResult.getData() && !myResiInfoResult.getData().isEmpty()){
                if(StringUtils.isBlank(pointRankFormDTO.getCustomerId())) {
+                   //缓存中的customerId是不准确的，前端一定会传customerId，所以不会执行此代码
+                   log.warn("com.epmet.service.impl.UserPointTotalServiceImpl.getPointRanking，传参缺失客户Id，参数：{}",pointRankFormDTO);
                    //缓存中陌生人游客也有对应的customerId
                    pointRankFormDTO.setCustomerId(myResiInfoResult.getData().get(NumConstant.ZERO).getCustomerId());
                 }

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.*;
@@ -36,6 +37,7 @@ import com.epmet.service.UserPointTotalService;
 import com.epmet.utils.DimIdGenerator;
 import com.epmet.utils.ModuleConstant;
 import com.github.pagehelper.PageHelper;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -52,8 +54,10 @@ import java.util.stream.Collectors;
  * @since v1.0.0 2020-07-20
  */
 @Service
+@Slf4j
 public class UserPointTotalServiceImpl extends BaseServiceImpl<UserPointTotalDao, UserPointTotalEntity> implements UserPointTotalService {
 
+
     @Autowired
     EpmetUserOpenFeignClient epmetUserOpenFeignClient;
 
@@ -111,14 +115,14 @@ public class UserPointTotalServiceImpl extends BaseServiceImpl<UserPointTotalDao
 
     /**
      * @Description 获取指定居民的积分信息
-     * @param userId
+     * @param param
      * @return
      * @author wangc
      * @date 2020.07.22 15:58
      **/
     @Override
-    public ResiPointDetailResultDTO getMyPoint(ResiCommonUserIdFormDTO userId) {
-        ResiPointDetailResultDTO result = baseDao.selectPointByUserId(userId.getUserId());
+    public ResiPointDetailResultDTO getMyPoint(CommonUserFormDTO param) {
+        ResiPointDetailResultDTO result = baseDao.selectPointByCustomerUserId(param.getUserId(),param.getCustomerId());
         if(null == result) return new ResiPointDetailResultDTO();
         if(null == result.getUsablePoint() || null == result.getAccumulatedPoint()) return new ResiPointDetailResultDTO();
         return result;
@@ -145,6 +149,8 @@ public class UserPointTotalServiceImpl extends BaseServiceImpl<UserPointTotalDao
                 epmetUserOpenFeignClient.queryUserBaseInfo(userIdParam);
         if(myResiInfoResult.success() && null != myResiInfoResult.getData() && !myResiInfoResult.getData().isEmpty()){
             if(StringUtils.isBlank(pointRankFormDTO.getCustomerId())) {
+                //缓存中的customerId是不准确的，前端一定会传customerId，所以不会执行此代码
+                log.warn("com.epmet.service.impl.UserPointTotalServiceImpl.getPointRanking，传参缺失客户Id，参数：{}",pointRankFormDTO);
                 pointRankFormDTO.setCustomerId(myResiInfoResult.getData().get(NumConstant.ZERO).getCustomerId());
             }
             //微信昵称
@@ -169,7 +175,7 @@ public class UserPointTotalServiceImpl extends BaseServiceImpl<UserPointTotalDao
                 return result;
             }
         }
-        //如果当前请求不是第一页
+        //如果当前请求是第一页
         if(NumConstant.ONE == pointRankFormDTO.getPageNo()) {
             ResiPointRankResultDTO myself = null;
             Optional<ResiPointRankResultDTO> opt = rankList.stream().filter(obj -> StringUtils.equals(obj.getUserId(), pointRankFormDTO.getUserId())).findFirst();
@@ -244,4 +250,20 @@ public class UserPointTotalServiceImpl extends BaseServiceImpl<UserPointTotalDao
         baseDao.insertOrUpdate(entity);
     }
 
+
+    /**
+     * @Description 获取指定居民的积分信息 - 使用客户Id匹配，兼容多客户情况
+     * @param customerUserParam
+     * @return
+     * @author wangc
+     * @date 2020.07.22 15:58
+     **/
+    @Override
+    public ResiPointDetailResultDTO getMyPointGroupByCustomer(CommonUserFormDTO customerUserParam) {
+        ResiPointDetailResultDTO result = baseDao.selectPointByUserId(customerUserParam.getUserId());
+        if(null == result) return new ResiPointDetailResultDTO();
+        if(null == result.getUsablePoint() || null == result.getAccumulatedPoint()) return new ResiPointDetailResultDTO();
+        return result;
+    }
+
 }

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

@@ -25,20 +25,24 @@
 
     <!-- 查询指定用户兑换记录 传参:用户Id -->
     <select id="selectVerificationLog" resultType="com.epmet.dto.result.ResiPointLogPeriodResultDTO">
-        SELECT
-            USER_ID,
+         SELECT
+            verify.USER_ID,
             '积分兑换' AS TITLE,
-            concat( '兑换', EXCHANGED_ITEM ) AS REMARK,
-            concat( '-', POINT ) AS point,
-            DATE_FORMAT( CREATED_TIME, '%Y-%m-%d' ) AS DATE,
-            DATE_FORMAT( CREATED_TIME, '%H:%i' ) AS TIME
+            concat( '兑换', verify.EXCHANGED_ITEM ) AS REMARK,
+            concat( '-', verify.POINT ) AS point,
+            DATE_FORMAT( verify.CREATED_TIME, '%Y-%m-%d' ) AS DATE,
+            DATE_FORMAT( verify.CREATED_TIME, '%H:%i' ) AS TIME
         FROM
-            POINT_VERIFICATION_LOG
+            POINT_VERIFICATION_LOG verify
+				LEFT JOIN
+						USER_POINT_ACTION_LOG action
+				ON  verify.ACTION_ID = action.ID AND action.DEL_FLAG = '0'
         WHERE
-            DEL_FLAG = '0'
-            AND USER_ID = #{userId}
+            verify.DEL_FLAG = '0'
+            AND verify.USER_ID = #{userId}
+            AND action.CUSTOMER_ID = #{customerId}
         ORDER BY
-            CREATED_TIME DESC
+            verify.CREATED_TIME DESC
     </select>
 
     <!-- 获取工作人员月度核销记录 -->

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
     </select>

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

@@ -31,6 +31,21 @@
             USER_ID = #{userId}
     </select>
 
+    <!-- 根据用户Id和客户Id查询他的累计积分以及可用积分 -->
+    <select id="selectPointByCustomerUserId" resultType="com.epmet.dto.result.ResiPointDetailResultDTO">
+        SELECT
+            USABLE_POINT AS usablePoint,
+            TOTAL_POINT AS accumulatedPoint
+        FROM
+            USER_POINT_TOTAL
+        WHERE
+            DEL_FLAG = '0'
+        AND
+            CUSTOMER_ID = #{customerId}
+        AND
+            USER_ID = #{userId}
+    </select>
+
     <!-- 查询客户下的用户积分排行，分页  传参:customerId -->
     <select id="selectUserPointRank" resultType="com.epmet.dto.result.ResiPointRankResultDTO">
         SELECT

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/CommonUserFormDTO.java

@@ -1,5 +1,6 @@
 package com.epmet.dto.form;
 
+import com.epmet.commons.tools.validator.group.CustomerClientShowGroup;
 import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
@@ -15,15 +16,17 @@ import java.io.Serializable;
 public class CommonUserFormDTO implements Serializable{
     private static final long serialVersionUID = -7994579456530273809L;
 
+    public interface CustomerId_UserIdGroup extends CustomerClientShowGroup{}
+
     /**
      * 用户Id
      * */
-    @NotBlank(message = "用户Id不能为空")
+    @NotBlank(message = "用户Id不能为空" , groups = CustomerId_UserIdGroup.class)
     private String userId;
 
     /**
      * 客户Id
      * */
-    @NotBlank(message = "客户Id不能为空")
+    @NotBlank(message = "客户Id不能为空" , groups = CustomerId_UserIdGroup.class)
     private String customerId;
 }

epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserServiceImpl.java

@@ -202,7 +202,9 @@ public class UserServiceImpl extends BaseServiceImpl<UserDao, UserEntity> implem
             userRoleFormDTO.setGridId(myResiUserInfoFormDTO.getGridId());
             result.setRoleList(userRoleDao.getUserRoleList(userRoleFormDTO));
 
-            Result<ResiPointDetailResultDTO> pointResult = epmetPointOpenFeignClient.myPoint();
+            CommonUserFormDTO pointParam = new CommonUserFormDTO();
+            pointParam.setCustomerId(myResiUserInfoFormDTO.getCustomerId());
+            Result<ResiPointDetailResultDTO> pointResult = epmetPointOpenFeignClient.myPoint(pointParam);
             if(pointResult.success() && null != pointResult.getData()){
                 //累计积分
                 result.setPoint(pointResult.getData().getUsablePoint());