From f62ed7c7ae04a71c6829ee1e5d969c7e7b557504 Mon Sep 17 00:00:00 2001 From: wangchao Date: Thu, 30 Jul 2020 10:18:09 +0800 Subject: [PATCH] =?UTF-8?q?POINT=20=20=20USER=20=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../result/WorkPointVerificationDetailResultDTO.java | 4 +++- .../com/epmet/feign/EpmetPointOpenFeignClient.java | 2 +- .../fallback/EpmetPointOpenFeignClientFallback.java | 2 +- .../service/impl/PointVerificationLogServiceImpl.java | 2 +- .../epmet/dto/result/CustomerUser4PointResultDTO.java | 10 +++++----- 5 files changed, 11 insertions(+), 9 deletions(-) diff --git a/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/result/WorkPointVerificationDetailResultDTO.java b/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/result/WorkPointVerificationDetailResultDTO.java index 694c80a1cd..f93cace94e 100644 --- a/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/result/WorkPointVerificationDetailResultDTO.java +++ b/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/result/WorkPointVerificationDetailResultDTO.java @@ -17,7 +17,7 @@ public class WorkPointVerificationDetailResultDTO implements Serializable { /** * 被核销用户昵称 * */ - private String userNickname; + private String userNickname = ""; /** * 核销积分 "-100" @@ -29,5 +29,7 @@ public class WorkPointVerificationDetailResultDTO implements Serializable { * */ private String remark; + private String date; + } 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 09dfbd3e3d..deaa7bb6d5 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 @@ -15,7 +15,7 @@ import org.springframework.web.bind.annotation.GetMapping; * @author wangc * @date 2020/7/9 13:25 */ -@FeignClient(name = ServiceConstant.EPMET_HEART_SERVER, fallback = EpmetPointOpenFeignClientFallback.class) +@FeignClient(name = ServiceConstant.EPMET_POINT_SERVER, fallback = EpmetPointOpenFeignClientFallback.class) public interface EpmetPointOpenFeignClient { /** 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 188881efd8..8901a0724b 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 @@ -18,6 +18,6 @@ import org.springframework.stereotype.Component; public class EpmetPointOpenFeignClientFallback implements EpmetPointOpenFeignClient { @Override public Result myPoint(TokenDto dto) { - return ModuleUtils.feignConError(ServiceConstant.RESI_PARTYMEMBER_SERVER, "myPoint", dto); + return ModuleUtils.feignConError(ServiceConstant.EPMET_POINT_SERVER, "myPoint", dto); } } 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 32d86c57a5..d60444edb1 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 @@ -190,7 +190,7 @@ public class PointVerificationLogServiceImpl extends BaseServiceImpl dataList = baseDao.selectStaffVerificationLog(verificationParam.getStaffId(),getFirstDayDateOfMonth(date),getLastDayOfMonth(date)); - if(NumConstant.ONE < verificationParam.getPageNo()){ + if(NumConstant.ONE == verificationParam.getPageNo()){ result.setTotalPoint( dataList.stream().mapToInt(o -> o.getPoint()).sum() ); diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/CustomerUser4PointResultDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/CustomerUser4PointResultDTO.java index 95cba037ef..a8049ae3fc 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/CustomerUser4PointResultDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/CustomerUser4PointResultDTO.java @@ -16,25 +16,25 @@ public class CustomerUser4PointResultDTO implements Serializable { /** * 用户头像 * */ - private String userHeadPhoto; + private String userHeadPhoto = ""; /** * 用户显示昵称 * */ - private String userName; + private String userName = ""; /** * 用户微信昵称 * */ - private String userNickname; + private String userNickname = ""; /** *注册网格名称 * */ - private String registeredGrid; + private String registeredGrid = ""; /** * 用户Id * */ - private String userId; + private String userId = ""; }