POINT USER 修改

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

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 {
 
     /**

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<ResiPointDetailResultDTO> myPoint(TokenDto dto) {
-        return ModuleUtils.feignConError(ServiceConstant.RESI_PARTYMEMBER_SERVER, "myPoint", dto);
+        return ModuleUtils.feignConError(ServiceConstant.EPMET_POINT_SERVER, "myPoint", dto);
     }
 }

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<PointVerifi
             }
             List<WorkPointVerificationLogResultDTO> 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()
                 );

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