Merge remote-tracking branch 'remotes/origin/dev_heart' into dev

epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/PointAdjustmentLogDTO.java

@@ -0,0 +1,106 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.dto;
+
+import java.io.Serializable;
+import java.util.Date;
+import lombok.Data;
+
+
+/**
+ * 
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-07-27
+ */
+@Data
+public class PointAdjustmentLogDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 
+     */
+	private String id;
+
+    /**
+     * 关联的积分动作Id
+     */
+	private String actionId;
+
+    /**
+     * 调整人名称【xx机关-xx】
+     */
+	private String operatorName;
+
+    /**
+     * 调整原因
+     */
+	private String adjustReason;
+
+    /**
+     * 调整积分
+     */
+	private Integer point;
+
+    /**
+     * plus/minus
+     */
+	private String adjustmentType;
+
+    /**
+     * 调整人所属机关Id
+     */
+	private String operatorAgencyId;
+
+    /**
+     * 居民Id
+     */
+	private String userId;
+
+    /**
+     * 
+     */
+	private String delFlag;
+
+    /**
+     * 
+     */
+	private Integer revision;
+
+    /**
+     * 
+     */
+	private Date createdTime;
+
+    /**
+     * 
+     */
+	private String createdBy;
+
+    /**
+     * 
+     */
+	private Date updatedTime;
+
+    /**
+     * 
+     */
+	private String updatedBy;
+
+}

epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/PointVerificationLogDTO.java

@@ -48,16 +48,6 @@ public class PointVerificationLogDTO implements Serializable {
      */
 	private String userId;
 
-    /**
-     * 核销对象首次注册网格
-     */
-	private String userRegistedGridId;
-
-    /**
-     * 核销对象首次注册网格所在机关
-     */
-	private String userRegistedAgnecyId;
-
     /**
      * 核销人员ID
      */

epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/form/CommonPageUserFormDTO.java

@@ -0,0 +1,29 @@
+package com.epmet.dto.form;
+
+import com.epmet.commons.tools.validator.group.CustomerClientShowGroup;
+import lombok.Data;
+
+import javax.validation.constraints.Min;
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+/**
+ * @Description 用户Id  分页参数
+ * @ClassName CommonPageUserFormDTO
+ * @Auth wangc
+ * @Date 2020-07-24 13:24
+ */
+@Data
+public class CommonPageUserFormDTO implements Serializable {
+    private static final long serialVersionUID = -6721313124444595189L;
+
+    public interface PageUserGroup extends CustomerClientShowGroup{}
+
+    @NotBlank(message = "获取不到用户Id" , groups = PageUserGroup.class)
+    private String userId;
+
+    @Min(value = 1)
+    private Integer pageNo = 1;
+
+    private Integer pageSize = 10;
+}

epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/form/PointAdjustmentFormDTO.java

@@ -0,0 +1,56 @@
+package com.epmet.dto.form;
+
+import com.epmet.commons.tools.validator.group.CustomerClientShowGroup;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+/**
+ * @Description 积分调整传参积分dto
+ * @ClassName PointAdjustmentFormDTO
+ * @Auth wangc
+ * @Date 2020-07-27 13:36
+ */
+@Data
+public class PointAdjustmentFormDTO implements Serializable {
+    private static final long serialVersionUID = -1879530107301465633L;
+
+    public interface PointAdjustmentGroup extends CustomerClientShowGroup{}
+
+    /**
+     * 用户Id
+     * */
+    @NotBlank(message = "用户Id不能为空", groups =  PointAdjustmentGroup.class)
+    private String userId;
+
+    /**
+     * 积分调整标识 key:add/minus
+     * */
+    @NotBlank(message = "调整类型不能为空", groups =  PointAdjustmentGroup.class)
+    private String adjustmentType;
+
+    /**
+     * 调整的分值
+     * */
+    private Integer point;
+
+    /**
+     * 调整原因
+     * */
+    @NotBlank(message = "调整原因不能为空", groups =  PointAdjustmentGroup.class)
+    private String reason;
+
+    /**
+     * 操作人Id
+     * */
+    @NotBlank(message = "当前工作人员Id不能为空", groups =  PointAdjustmentGroup.class)
+    private String operatorId;
+
+    /**
+     * 客户Id
+     * */
+    @NotBlank(message = "客户Id不能为空", groups =  PointAdjustmentGroup.class)
+    private String customerId;
+
+}

epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/form/PointVerificationFormDTO.java

@@ -0,0 +1,53 @@
+package com.epmet.dto.form;
+
+import com.epmet.commons.tools.validator.group.CustomerClientShowGroup;
+import lombok.Data;
+
+import javax.validation.constraints.Min;
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+/**
+ * @Description 积分核销传参dto
+ *
+ * @ClassName PointVerificationFormDTO
+ * @Auth wangc
+ * @Date 2020-07-27 13:45
+ */
+@Data
+public class PointVerificationFormDTO implements Serializable {
+    private static final long serialVersionUID = -154634518066538184L;
+
+    public interface PointVerificationGroup extends CustomerClientShowGroup{}
+
+    /**
+     * 用户Id
+     * */
+    @NotBlank(message = "用户Id不能为空", groups =  PointVerificationGroup.class)
+    private String userId;
+
+    /**
+     * 核销备注
+     * */
+    @NotBlank(message = "核销备注不能为空", groups =  PointVerificationGroup.class)
+    private String remark;
+
+    /**
+     * 核销积分数
+     * */
+    @Min(0)
+    private Integer point;
+
+    /**
+     * 操作人Id
+     * */
+    @NotBlank(message = "当前工作人员Id不能为空", groups =  PointVerificationGroup.class)
+    private String operatorId;
+
+
+    private String longitude;
+
+    private String dimension;
+
+    private String address;
+}

epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/form/ResiCommonUserIdFormDTO.java

@@ -16,8 +16,8 @@ import java.io.Serializable;
 public class ResiCommonUserIdFormDTO implements Serializable {
     private static final long serialVersionUID = -1961545266124776452L;
 
-    public interface UserId extends CustomerClientShowGroup{}
+    public interface UserIdGroup extends CustomerClientShowGroup{}
 
-    @NotBlank(message = "获取不到用户Id",groups = UserId.class)
+    @NotBlank(message = "获取不到用户Id",groups = UserIdGroup.class)
     private String userId;
 }

epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/form/ResiPointRankFormDTO.java

@@ -1,8 +1,10 @@
 package com.epmet.dto.form;
 
+import com.epmet.commons.tools.validator.group.CustomerClientShowGroup;
 import lombok.Data;
 
 import javax.validation.constraints.Min;
+import javax.validation.constraints.NotBlank;
 import java.io.Serializable;
 
 /**
@@ -15,19 +17,29 @@ import java.io.Serializable;
 public class ResiPointRankFormDTO implements Serializable {
     private static final long serialVersionUID = 1534061512200591149L;
 
+    public interface ResiPointRankGroup extends CustomerClientShowGroup{}
+
     /**
      * 页码
      * */
-    @Min(1)
-    private Integer pageNo;
+    @Min(value = 1,groups = ResiPointRankGroup.class)
+    private Integer pageNo = 1;
 
     /**
      * 每页数据条数
      * */
-    private Integer pageSize;
+    private Integer pageSize = 10;
 
     /**
-     * 时间维度  week month
+     * 时间维度  week month 如果为空则按照week处理
      * */
     private String timeDimension;
+
+    @NotBlank(message = "获取不到用户Id",groups = ResiPointRankGroup.class)
+    private String userId;
+
+    /**
+     * 客户Id，不做校验，如果前端不传则使用userId查询相应的客户Id
+     * */
+    private String customerId;
 }

epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/form/WorkPointVerificationFormDTO.java

@@ -0,0 +1,32 @@
+package com.epmet.dto.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.Max;
+import javax.validation.constraints.Min;
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+/**
+ * @Description 工作端核销记录传参
+ * @ClassName WorkPointVerificationFormDTO
+ * @Auth wangc
+ * @Date 2020-07-24 16:25
+ */
+@Data
+public class WorkPointVerificationFormDTO implements Serializable {
+    private static final long serialVersionUID = -590822390667788693L;
+
+    @NotBlank(message = "获取不到用户Id",groups = ResiCommonUserIdFormDTO.UserIdGroup.class)
+    private String staffId;
+
+    /**
+     * yyyy-MM
+     * */
+    private String timeParam;
+
+    @Min(1)
+    private Integer pageNo;
+
+    private Integer pageSize;
+}

epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/result/PointAdjustmentResultDTO.java

@@ -0,0 +1,36 @@
+package com.epmet.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Description
+ * @ClassName PointAdjustmentResultDTO
+ * @Auth wangc
+ * @Date 2020-07-27 09:45
+ */
+@Data
+public class PointAdjustmentResultDTO implements Serializable {
+    private static final long serialVersionUID = -5339173292750971212L;
+
+    /**
+     * 操作日期
+     * */
+    private String date;
+
+    /**
+     * 调整积分
+     * */
+    private String point;
+
+    /**
+     * 调整原因
+     * */
+    private String reason;
+
+    /**
+     * 调整人昵称
+     * */
+    private String staffNickname;
+}

epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/result/PointDetailResultDTO.java

@@ -19,6 +19,6 @@ public class PointDetailResultDTO implements Serializable {
 	private Integer point;
 	private String pointUnit;
 	private String upLimit;
-	private String enabledFlag;
+	private Boolean enabledFlag;
 	private String upLimitDesc;
 }

epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/result/PointRuleResultDTO.java

@@ -16,6 +16,7 @@ public class PointRuleResultDTO implements Serializable {
 	private String ruleId;
 	private String ruleName;
 	private String ruleDesc;
+	private Boolean enabledFlag;
 	/**
 	 * 拼接好的 积分值/单位
 	 */

epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/result/PointVerificationResultDTO.java

@@ -0,0 +1,36 @@
+package com.epmet.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Description 积分核销返参Dto
+ * @ClassName PointVerificationResultDTO
+ * @Auth wangc
+ * @Date 2020-07-27 13:57
+ */
+@Data
+public class PointVerificationResultDTO implements Serializable {
+    private static final long serialVersionUID = 6990717665110392389L;
+
+    /**
+     * 核销成功标识
+     * */
+    private boolean successFlag;
+
+    /**
+     * 失败原因
+     * */
+    private String failureReason;
+
+    /**
+     * 用户(居民)昵称
+     * */
+    private String userNickname;
+
+    /**
+     * 用户(居民)头像
+     * */
+    private String userHeadPhoto;
+}

epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/result/ResiPointRankListResultDTO.java

@@ -33,5 +33,5 @@ public class ResiPointRankListResultDTO implements Serializable {
     /**
      * 积分排名列表
      * */
-    private List<ResiPointRankingResultDTO> rankList;
+    private ResiPointRankingResultDTO rankList;
 }

epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/result/WorkPointVerficationListResultDTO.java

@@ -0,0 +1,27 @@
+package com.epmet.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @Description 工作端积分核销记录列表
+ * @ClassName WorkPointVerficationListResultDTO
+ * @Auth wangc
+ * @Date 2020-07-24 15:38
+ */
+@Data
+public class WorkPointVerficationListResultDTO implements Serializable {
+    private static final long serialVersionUID = 2737976236826002595L;
+
+    /**
+     * 当月总积分
+     * */
+    private Integer totalPoint;
+
+    /**
+     *  核销列表
+     * */
+    List<WorkPointVerificationDetailResultDTO> checkingList;
+}

epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/result/WorkPointVerificationDetailResultDTO.java

@@ -0,0 +1,33 @@
+package com.epmet.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Description 工作端积分核销显示记录
+ * @ClassName WorkPointVerificationDetailResultDTO
+ * @Auth wangc
+ * @Date 2020-07-24 15:38
+ */
+@Data
+public class WorkPointVerificationDetailResultDTO implements Serializable {
+    private static final long serialVersionUID = -205177259417194562L;
+
+    /**
+     * 被核销用户昵称
+     * */
+    private String userNickname;
+
+    /**
+     * 核销积分 "-100"
+     * */
+    private String point;
+
+    /**
+     * 核销备注
+     * */
+    private String remark;
+
+
+}

epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/result/WorkPointVerificationLogResultDTO.java

@@ -0,0 +1,38 @@
+package com.epmet.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Description 工作端积分核销记录
+ * @ClassName WorkPointVerificationLogResultDTO
+ * @Auth wangc
+ * @Date 2020-07-24 15:38
+ */
+@Data
+public class WorkPointVerificationLogResultDTO implements Serializable {
+    private static final long serialVersionUID = -3570820382554221450L;
+
+    /**
+     * 积分
+     * */
+    private Integer point;
+
+    /**
+     * 用户Id
+     * */
+    private String userId;
+
+    /**
+     * 日期 yyyy-MM-dd HH:mm:ss
+     * */
+    private String date;
+
+    /**
+     * 核销备注
+     * */
+    private String remark;
+
+
+}

epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/feign/EpmetPointOpenFeignClient.java

@@ -1,8 +1,13 @@
 package com.epmet.feign;
 
+import com.epmet.commons.tools.annotation.LoginUser;
 import com.epmet.commons.tools.constant.ServiceConstant;
+import com.epmet.commons.tools.security.dto.TokenDto;
+import com.epmet.commons.tools.utils.Result;
+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;
 
 /**
  * 本服务对外开放的API,其他服务通过引用此client调用该服务
@@ -12,4 +17,14 @@ import org.springframework.cloud.openfeign.FeignClient;
  */
 @FeignClient(name = ServiceConstant.EPMET_HEART_SERVER, fallback = EpmetPointOpenFeignClientFallback.class)
 public interface EpmetPointOpenFeignClient {
+
+    /**
+     * @Description 获取指定居民的积分信息
+     * @param dto
+     * @return
+     * @author wangc
+     * @date 2020.07.22 15:58
+     **/
+    @GetMapping("mypoint")
+    Result<ResiPointDetailResultDTO> myPoint(TokenDto dto);
 }

epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/feign/fallback/EpmetPointOpenFeignClientFallback.java

@@ -1,5 +1,10 @@
 package com.epmet.feign.fallback;
 
+import com.epmet.commons.tools.constant.ServiceConstant;
+import com.epmet.commons.tools.security.dto.TokenDto;
+import com.epmet.commons.tools.utils.ModuleUtils;
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.dto.result.ResiPointDetailResultDTO;
 import com.epmet.feign.EpmetPointOpenFeignClient;
 import org.springframework.stereotype.Component;
 
@@ -11,4 +16,8 @@ import org.springframework.stereotype.Component;
  */
 @Component
 public class EpmetPointOpenFeignClientFallback implements EpmetPointOpenFeignClient {
+    @Override
+    public Result<ResiPointDetailResultDTO> myPoint(TokenDto dto) {
+        return ModuleUtils.feignConError(ServiceConstant.RESI_PARTYMEMBER_SERVER, "myPoint", dto);
+    }
 }

epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/controller/AdjustmentController.java

@@ -1,8 +1,23 @@
 package com.epmet.controller;
 
+
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.commons.tools.validator.ValidatorUtils;
+import com.epmet.dto.form.CustomerUserFormDTO;
+import com.epmet.dto.form.IssueInitiatorFormDTO;
+import com.epmet.dto.result.CustomerUser4PointResultDTO;
+import com.epmet.dto.result.CustomerUserDetailResultDTO;
+import com.epmet.dto.result.PointAdjustmentResultDTO;
+import com.epmet.feign.EpmetUserOpenFeignClient;
+import com.epmet.service.PointAdjustmentLogService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.List;
+
 /**
  * @description: 工作人员积分调整Controller
  * @date: Created in 2020-07-20 16:38
@@ -11,4 +26,48 @@ import org.springframework.web.bind.annotation.RestController;
 @RestController
 @RequestMapping("work/adjustment")
 public class AdjustmentController {
+
+    @Autowired
+    EpmetUserOpenFeignClient epmetUserOpenFeignClient;
+    @Autowired
+    PointAdjustmentLogService pointAdjustmentLogService;
+    /**
+     * @Description 调整积分时获取用户列表
+     * @param param
+     * @return
+     * @author wangc
+     * @date 2020.07.27 10:57
+     **/
+    @PostMapping("userlist")
+    public Result<List<CustomerUser4PointResultDTO>> userList(@RequestBody CustomerUserFormDTO param){
+        ValidatorUtils.validateEntity(param, CustomerUserFormDTO.CustomerIdGroup.class);
+        return epmetUserOpenFeignClient.customerUserList(param);
+    }
+
+    /**
+     * @Description 调整积分时获取用户详情
+     * @param param
+     * @return
+     * @author wangc
+     * @date 2020.07.27 11:15
+    **/
+    @PostMapping("userdetail")
+    public Result<CustomerUserDetailResultDTO> userDetail(@RequestBody IssueInitiatorFormDTO param){
+        ValidatorUtils.validateEntity(param,IssueInitiatorFormDTO.UserIdGroup.class);
+        return new  Result<CustomerUserDetailResultDTO>().ok(pointAdjustmentLogService.userDetail(param));
+    }
+
+    /**
+     * @Description 根据UserId获取积分调整记录
+     * @param param :: getUserId
+     * @return
+     * @author wangc
+     * @date 2020.07.27 10:51
+     **/
+    @PostMapping("adjustrecord")
+    public Result<List<PointAdjustmentResultDTO>> adjustRecord(@RequestBody IssueInitiatorFormDTO param){
+        ValidatorUtils.validateEntity(param, IssueInitiatorFormDTO.UserIdGroup.class);
+        return new Result<List<PointAdjustmentResultDTO>>().ok(pointAdjustmentLogService.adjustRecord(param));
+    }
 }
+

epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/controller/ExchangeController.java

@@ -11,4 +11,6 @@ import org.springframework.web.bind.annotation.RestController;
 @RestController
 @RequestMapping("work/exchange")
 public class ExchangeController {
+
+
 }

epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/controller/ResiPointController.java

@@ -1,7 +1,24 @@
 package com.epmet.controller;
 
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import com.epmet.commons.tools.annotation.LoginUser;
+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.ResiPointRankFormDTO;
+import com.epmet.dto.result.ResiPointDetailResultDTO;
+import com.epmet.dto.result.ResiPointLogListResultDTO;
+import com.epmet.dto.result.ResiPointRankListResultDTO;
+import com.epmet.service.PointVerificationLogService;
+import com.epmet.service.UserPointActionLogService;
+import com.epmet.service.UserPointStatisticalDailyService;
+import com.epmet.service.UserPointTotalService;
+import com.epmet.utils.ModuleConstant;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
 
 /**
  * @description: 居民端积分信息controller
@@ -11,4 +28,105 @@ import org.springframework.web.bind.annotation.RestController;
 @RestController
 @RequestMapping("resi/point")
 public class ResiPointController {
+
+    @Autowired
+    private UserPointTotalService userPointTotalService;
+    @Autowired
+    private UserPointStatisticalDailyService userPointStatisticalDailyService;
+    @Autowired
+    private PointVerificationLogService pointVerificationLogService;
+    @Autowired
+    private UserPointActionLogService pointActionLogService;
+
+    /**
+     * @Description 获取指定居民的积分信息
+     * @param dto
+     * @return
+     * @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));
+    }
+
+    /**
+     * @Description 获取客户下用户积分排名榜
+     * @param dto
+     * @param pointRankFormDTO
+     * @return
+     * @author wangc
+     * @date 2020.07.22 16:13
+     **/
+    @PostMapping("rank")
+    public Result<List<ResiPointRankListResultDTO>> rank(@LoginUser TokenDto dto,@RequestBody ResiPointRankFormDTO pointRankFormDTO){
+        pointRankFormDTO.setUserId(dto.getUserId());
+        ValidatorUtils.validateEntity(pointRankFormDTO, ResiPointRankFormDTO.ResiPointRankGroup.class);
+        return new Result<List<ResiPointRankListResultDTO>>().ok(userPointTotalService.getPointRanking(pointRankFormDTO));
+    }
+
+    /**
+     * @Description 获取居民端周积分排行榜 还有当前用的信息
+     * @param dto
+     * @param pointRankFormDTO
+     * @return
+     * @author wangc
+     * @date 2020.07.21 16:57
+     **/
+    @PostMapping("weeklyrank")
+    public Result<List<ResiPointRankListResultDTO>> weeklyRank(@LoginUser TokenDto dto,@RequestBody ResiPointRankFormDTO pointRankFormDTO){
+        pointRankFormDTO.setUserId(dto.getUserId());
+        pointRankFormDTO.setTimeDimension(ModuleConstant.TIME_DIMENSION_WEEK);
+        ValidatorUtils.validateEntity(pointRankFormDTO, ResiPointRankFormDTO.ResiPointRankGroup.class);
+        return new Result<List<ResiPointRankListResultDTO>>().ok(userPointStatisticalDailyService.getPointRankWithinTimeZone(pointRankFormDTO));
+    }
+
+    /**
+     * @Description 获取居民端月积分排行榜 还有当前用的信息
+     * @param dto
+     * @param pointRankFormDTO
+     * @return
+     * @author wangc
+     * @date 2020.07.21 16:57
+     **/
+    @PostMapping("monthlyrank")
+    public Result<List<ResiPointRankListResultDTO>> monthlyRank(@LoginUser TokenDto dto,@RequestBody ResiPointRankFormDTO pointRankFormDTO){
+        pointRankFormDTO.setUserId(dto.getUserId());
+        pointRankFormDTO.setTimeDimension(ModuleConstant.TIME_DIMENSION_MONTH);
+        ValidatorUtils.validateEntity(pointRankFormDTO,ResiPointRankFormDTO.ResiPointRankGroup.class);
+        return new Result<List<ResiPointRankListResultDTO>>().ok(userPointStatisticalDailyService.getPointRankWithinTimeZone(pointRankFormDTO));
+    }
+
+    /**
+     * @Description 查找指定用户的积分记录
+     * @param dto
+     * @param pageUserParam
+     * @return
+     * @author wangc
+     * @date 2020.07.22 14:05
+     **/
+    @PostMapping("records")
+    public Result<List<ResiPointLogListResultDTO>> records(@LoginUser TokenDto dto,@RequestBody CommonPageUserFormDTO pageUserParam){
+        pageUserParam.setUserId(dto.getUserId());
+        ValidatorUtils.validateEntity(pageUserParam, CommonPageUserFormDTO.PageUserGroup.class);
+        return new Result<List<ResiPointLogListResultDTO>>().ok(pointActionLogService.getMyPointRecord(pageUserParam));
+    }
+
+    /**
+     * @Description 查找指定用户的积分兑换记录
+     * @param dto
+     * @param pageUserParam
+     * @return
+     * @author wangc
+     * @date 2020.07.22 14:05
+     **/
+    @PostMapping("exchangedrecord")
+    public Result<List<ResiPointLogListResultDTO>> exchangeRecord(@LoginUser TokenDto dto,@RequestBody CommonPageUserFormDTO pageUserParam){
+        pageUserParam.setUserId(dto.getUserId());
+        ValidatorUtils.validateEntity(pageUserParam,CommonPageUserFormDTO.PageUserGroup.class);
+        return new Result<List<ResiPointLogListResultDTO>>().ok(pointVerificationLogService.getMyExchangeRecord(pageUserParam));
+    }
 }

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

@@ -0,0 +1,46 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.dao;
+
+import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.dto.result.PointAdjustmentResultDTO;
+import com.epmet.entity.PointAdjustmentLogEntity;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * 
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-07-27
+ */
+@Mapper
+public interface PointAdjustmentLogDao extends BaseDao<PointAdjustmentLogEntity> {
+
+    /**
+     * @Description 查询积分调整列表
+     * @param userId
+     * @return
+     * @author wangc
+     * @date 2020.07.27 10:44
+    **/
+    List<PointAdjustmentResultDTO> selectAdjustmentListByUserId(@Param("userId") String userId);
+
+}

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

@@ -19,10 +19,12 @@ package com.epmet.dao;
 
 import com.epmet.commons.mybatis.dao.BaseDao;
 import com.epmet.dto.result.ResiPointLogPeriodResultDTO;
+import com.epmet.dto.result.WorkPointVerificationLogResultDTO;
 import com.epmet.entity.PointVerificationLogEntity;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -43,4 +45,14 @@ public interface PointVerificationLogDao extends BaseDao<PointVerificationLogEnt
     **/
     List<ResiPointLogPeriodResultDTO> selectVerificationLog(@Param("userId") String userId);
 
+    /**
+     * @Description 获取工作人员月度核销记录
+     * @param staffId
+     * @param startDate
+     * @param endDate
+     * @return
+     * @author wangc
+     * @date 2020.07.25 13:17
+    **/
+    List<WorkPointVerificationLogResultDTO> selectStaffVerificationLog(String staffId, Date startDate, Date endDate);
 }

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

@@ -20,6 +20,7 @@ package com.epmet.dao;
 import com.epmet.commons.mybatis.dao.BaseDao;
 import com.epmet.entity.PointVerificationStatisticalDailyEntity;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * 工作人员核销数据统计
@@ -29,5 +30,13 @@ import org.apache.ibatis.annotations.Mapper;
  */
 @Mapper
 public interface PointVerificationStatisticalDailyDao extends BaseDao<PointVerificationStatisticalDailyEntity> {
-	
+    /**
+     * @Description 查询指定日期的工作人员核销积分是否存在
+     * @param createdBy
+     * @param dateId
+     * @return
+     * @author wangc
+     * @date 2020.07.27 17:37
+    **/
+    PointVerificationStatisticalDailyEntity selectIfExisted(@Param("createdBy") String createdBy, @Param("dateId") String dateId);
 }

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

@@ -45,4 +45,12 @@ public interface UserPointStatisticalDailyDao extends BaseDao<UserPointStatistic
     **/
     List<ResiPointRankResultDTO> selectPointRankWithinTimeZone(@Param("customerId") String customerId,@Param("dimension") String dimension,@Param("dimensionId") String dimensionId);
 
+    /**
+     * @Description 查询有无指定日期的积分日统计
+     * @param userId
+     * @return
+     * @author wangc
+     * @date 2020.07.27 16:20
+    **/
+    UserPointStatisticalDailyEntity selectIfExisted(@Param("userId") String userId,@Param("dateId") String dateId,@Param("actionFlag")String actionFlag);
 }

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

@@ -53,4 +53,13 @@ public interface UserPointTotalDao extends BaseDao<UserPointTotalEntity> {
     **/
     List<ResiPointRankResultDTO> selectUserPointRank(@Param("customerId") String customerId);
 
+    /**
+     * @Description 根据userId查找是否存在数据
+     * @param userId
+     * @return
+     * @author wangc
+     * @date 2020.07.27 16:51
+    **/
+    UserPointTotalEntity selectIfExisted(@Param("userId") String userId);
+
 }

epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/entity/PointAdjustmentLogEntity.java

@@ -0,0 +1,76 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+
+import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.Date;
+
+/**
+ * 
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-07-27
+ */
+@Data
+@EqualsAndHashCode(callSuper=false)
+@TableName("point_adjustment_log")
+public class PointAdjustmentLogEntity extends BaseEpmetEntity {
+
+	private static final long serialVersionUID = 1L;
+
+    /**
+     * 关联的积分动作Id
+     */
+	private String actionId;
+
+    /**
+     * 调整人名称【xx机关-xx】
+     */
+	private String operatorName;
+
+    /**
+     * 调整原因
+     */
+	private String adjustReason;
+
+    /**
+     * 调整积分
+     */
+	private Integer point;
+
+    /**
+     * plus/minus
+     */
+	private String adjustmentType;
+
+    /**
+     * 调整人所属机关Id
+     */
+	private String operatorAgencyId;
+
+    /**
+     * 居民Id
+     */
+	private String userId;
+
+}

epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/entity/PointVerificationLogEntity.java

@@ -48,16 +48,6 @@ public class PointVerificationLogEntity extends BaseEpmetEntity {
      */
 	private String userId;
 
-    /**
-     * 核销对象首次注册网格
-     */
-	private String userRegistedGridId;
-
-    /**
-     * 核销对象首次注册网格所在机关
-     */
-	private String userRegistedAgnecyId;
-
     /**
      * 核销人员ID
      */

epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/redis/PointRedis.java

@@ -0,0 +1,18 @@
+package com.epmet.redis;
+
+import com.epmet.commons.tools.redis.RedisUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+/**
+ * @Description 积分缓存相关
+ * @ClassName PointRedis
+ * @Auth wangc
+ * @Date 2020-07-27 17:25
+ */
+@Component
+public class PointRedis {
+
+    @Autowired
+    private RedisUtils redisUtils;
+}

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

@@ -0,0 +1,126 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+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.IssueInitiatorFormDTO;
+import com.epmet.dto.form.PointAdjustmentFormDTO;
+import com.epmet.dto.result.CustomerUserDetailResultDTO;
+import com.epmet.dto.result.PointAdjustmentResultDTO;
+import com.epmet.entity.PointAdjustmentLogEntity;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-07-27
+ */
+public interface PointAdjustmentLogService extends BaseService<PointAdjustmentLogEntity> {
+
+    /**
+     * 默认分页
+     *
+     * @param params
+     * @return PageData<PointAdjustmentLogDTO>
+     * @author generator
+     * @date 2020-07-27
+     */
+    PageData<PointAdjustmentLogDTO> page(Map<String, Object> params);
+
+    /**
+     * 默认查询
+     *
+     * @param params
+     * @return java.util.List<PointAdjustmentLogDTO>
+     * @author generator
+     * @date 2020-07-27
+     */
+    List<PointAdjustmentLogDTO> list(Map<String, Object> params);
+
+    /**
+     * 单条查询
+     *
+     * @param id
+     * @return PointAdjustmentLogDTO
+     * @author generator
+     * @date 2020-07-27
+     */
+    PointAdjustmentLogDTO get(String id);
+
+    /**
+     * 默认保存
+     *
+     * @param dto
+     * @return void
+     * @author generator
+     * @date 2020-07-27
+     */
+    void save(PointAdjustmentLogDTO dto);
+
+    /**
+     * 默认更新
+     *
+     * @param dto
+     * @return void
+     * @author generator
+     * @date 2020-07-27
+     */
+    void update(PointAdjustmentLogDTO dto);
+
+    /**
+     * 批量删除
+     *
+     * @param ids
+     * @return void
+     * @author generator
+     * @date 2020-07-27
+     */
+    void delete(String[] ids);
+
+    /**
+     * @Description 根据UserId获取积分调整记录
+     * @param param :: getUserId
+     * @return
+     * @author wangc
+     * @date 2020.07.27 10:51
+    **/
+    List<PointAdjustmentResultDTO> adjustRecord(IssueInitiatorFormDTO param);
+
+    /**
+     * @Description 用户详情
+     * @param param
+     * @return
+     * @author wangc
+     * @date 2020.07.27 10:57
+    **/
+    CustomerUserDetailResultDTO userDetail(IssueInitiatorFormDTO param);
+
+    /**
+     * @Description 积分调整
+     * @param param
+     * @return
+     * @author wangc
+     * @date 2020.07.27 13:52
+    **/
+    void adjustPoint(PointAdjustmentFormDTO param);
+}

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

@@ -20,8 +20,12 @@ package com.epmet.service;
 import com.epmet.commons.mybatis.service.BaseService;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.dto.PointVerificationLogDTO;
-import com.epmet.dto.form.ResiCommonUserIdFormDTO;
+import com.epmet.dto.form.CommonPageUserFormDTO;
+import com.epmet.dto.form.PointVerificationFormDTO;
+import com.epmet.dto.form.WorkPointVerificationFormDTO;
+import com.epmet.dto.result.PointVerificationResultDTO;
 import com.epmet.dto.result.ResiPointLogListResultDTO;
+import com.epmet.dto.result.WorkPointVerficationListResultDTO;
 import com.epmet.entity.PointVerificationLogEntity;
 
 import java.util.List;
@@ -97,10 +101,28 @@ public interface PointVerificationLogService extends BaseService<PointVerificati
 
     /**
      * @Description 查找指定用户的积分兑换记录
-     * @param userId
+     * @param pageUser
      * @return
      * @author wangc
      * @date 2020.07.22 14:05
      **/
-    List<ResiPointLogListResultDTO> getMyExchangeRecord(ResiCommonUserIdFormDTO userId);
+    List<ResiPointLogListResultDTO> getMyExchangeRecord(CommonPageUserFormDTO pageUser);
+
+    /**
+     * @Description 获取工作端积分核销记录
+     * @param verificationParam
+     * @return
+     * @author wangc
+     * @date 2020.07.24 16:08
+    **/
+    WorkPointVerficationListResultDTO getStaffVerificationRecordMonthly(WorkPointVerificationFormDTO verificationParam);
+
+    /**
+     * @Description 积分核销
+     * @param verificationParam
+     * @return
+     * @author wangc
+     * @date 2020.07.27 14:03
+    **/
+    PointVerificationResultDTO verifyPoint(PointVerificationFormDTO verificationParam);
 }

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

@@ -92,4 +92,13 @@ public interface PointVerificationStatisticalDailyService extends BaseService<Po
      * @date 2020-07-20
      */
     void delete(String[] ids);
+
+    /**
+     * @Description 新增或修改积分核销数据
+     * @param entity
+     * @return
+     * @author wangc
+     * @date 2020.07.27 17:28
+    **/
+    void insertOrUpdate(PointVerificationStatisticalDailyEntity entity);
 }

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

@@ -20,7 +20,7 @@ package com.epmet.service;
 import com.epmet.commons.mybatis.service.BaseService;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.dto.UserPointActionLogDTO;
-import com.epmet.dto.form.ResiCommonUserIdFormDTO;
+import com.epmet.dto.form.CommonPageUserFormDTO;
 import com.epmet.dto.result.ResiPointLogListResultDTO;
 import com.epmet.entity.UserPointActionLogEntity;
 
@@ -97,11 +97,12 @@ public interface UserPointActionLogService extends BaseService<UserPointActionLo
 
     /**
      * @Description 查找指定用户的积分记录
-     * @param userId
+     * @param pageUser
      * @return
      * @author wangc
      * @date 2020.07.22 14:05
     **/
-    List<ResiPointLogListResultDTO> getMyPointRecord(ResiCommonUserIdFormDTO userId);
+    List<ResiPointLogListResultDTO> getMyPointRecord(CommonPageUserFormDTO pageUser);
+
 
 }

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

@@ -102,5 +102,14 @@ public interface UserPointStatisticalDailyService extends BaseService<UserPointS
      * @author wangc
      * @date 2020.07.21 16:57
     **/
-    ResiPointRankListResultDTO getPointRankWithinTimeZone(ResiPointRankFormDTO pointRankFormDTO);
+    List<ResiPointRankListResultDTO> getPointRankWithinTimeZone(ResiPointRankFormDTO pointRankFormDTO);
+
+    /**
+     * @Description 用户积分日统计新增或修改
+     * @param entity
+     * @return
+     * @author wangc
+     * @date 2020.07.27 16:10
+    **/
+    void insertOrUpdate(UserPointStatisticalDailyEntity entity);
 }

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

@@ -20,6 +20,10 @@ 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.ResiCommonUserIdFormDTO;
+import com.epmet.dto.form.ResiPointRankFormDTO;
+import com.epmet.dto.result.ResiPointDetailResultDTO;
+import com.epmet.dto.result.ResiPointRankListResultDTO;
 import com.epmet.entity.UserPointTotalEntity;
 
 import java.util.List;
@@ -92,4 +96,31 @@ public interface UserPointTotalService extends BaseService<UserPointTotalEntity>
      * @date 2020-07-20
      */
     void delete(String[] ids);
+
+    /**
+     * @Description 获取指定居民的积分信息
+     * @param userId
+     * @return
+     * @author wangc
+     * @date 2020.07.22 15:58
+    **/
+    ResiPointDetailResultDTO getMyPoint(ResiCommonUserIdFormDTO userId);
+
+    /**
+     * @Description 获取客户下用户积分排名榜
+     * @param pointRankFormDTO
+     * @return
+     * @author wangc
+     * @date 2020.07.22 16:13
+    **/
+    List<ResiPointRankListResultDTO> getPointRanking(ResiPointRankFormDTO pointRankFormDTO);
+
+    /**
+     * @Description 新增或修改用户总积分记录
+     * @param entity
+     * @return
+     * @author wangc
+     * @date 2020.07.27 16:45
+    **/
+    void insertOrUpdate(UserPointTotalEntity entity);
 }

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

@@ -0,0 +1,242 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
+import com.epmet.commons.tools.constant.NumConstant;
+import com.epmet.commons.tools.exception.EpmetErrorCode;
+import com.epmet.commons.tools.exception.RenException;
+import com.epmet.commons.tools.page.PageData;
+import com.epmet.commons.tools.utils.ConvertUtils;
+import com.epmet.commons.tools.constant.FieldConstant;
+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.IssueInitiatorFormDTO;
+import com.epmet.dto.form.PointAdjustmentFormDTO;
+import com.epmet.dto.form.ResiCommonUserIdFormDTO;
+import com.epmet.dto.result.CustomerUserDetailResultDTO;
+import com.epmet.dto.result.PointAdjustmentResultDTO;
+import com.epmet.dto.result.ResiPointDetailResultDTO;
+import com.epmet.dto.result.StaffEtAgencyResultDTO;
+import com.epmet.entity.PointAdjustmentLogEntity;
+import com.epmet.entity.UserPointActionLogEntity;
+import com.epmet.entity.UserPointStatisticalDailyEntity;
+import com.epmet.entity.UserPointTotalEntity;
+import com.epmet.feign.EpmetUserOpenFeignClient;
+import com.epmet.service.PointAdjustmentLogService;
+import com.epmet.service.UserPointStatisticalDailyService;
+import com.epmet.service.UserPointTotalService;
+import com.epmet.utils.DimIdGenerator;
+import com.epmet.utils.ModuleConstant;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.Arrays;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-07-27
+ */
+@Service
+public class PointAdjustmentLogServiceImpl extends BaseServiceImpl<PointAdjustmentLogDao, PointAdjustmentLogEntity> implements PointAdjustmentLogService {
+
+    @Autowired
+    EpmetUserOpenFeignClient epmetUserOpenFeignClient;
+    @Autowired
+    UserPointTotalService userPointTotalService;
+    @Autowired
+    UserPointActionLogDao userPointActionLogDao;
+    @Autowired
+    UserPointStatisticalDailyService userPointStatisticalDailyService;
+    @Autowired
+    PointAdjustmentLogDao pointAdjustmentLogDao;
+
+    @Override
+    public PageData<PointAdjustmentLogDTO> page(Map<String, Object> params) {
+        IPage<PointAdjustmentLogEntity> page = baseDao.selectPage(
+                getPage(params, FieldConstant.CREATED_TIME, false),
+                getWrapper(params)
+        );
+        return getPageData(page, PointAdjustmentLogDTO.class);
+    }
+
+    @Override
+    public List<PointAdjustmentLogDTO> list(Map<String, Object> params) {
+        List<PointAdjustmentLogEntity> entityList = baseDao.selectList(getWrapper(params));
+
+        return ConvertUtils.sourceToTarget(entityList, PointAdjustmentLogDTO.class);
+    }
+
+    private QueryWrapper<PointAdjustmentLogEntity> getWrapper(Map<String, Object> params){
+        String id = (String)params.get(FieldConstant.ID_HUMP);
+
+        QueryWrapper<PointAdjustmentLogEntity> wrapper = new QueryWrapper<>();
+        wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id);
+
+        return wrapper;
+    }
+
+    @Override
+    public PointAdjustmentLogDTO get(String id) {
+        PointAdjustmentLogEntity entity = baseDao.selectById(id);
+        return ConvertUtils.sourceToTarget(entity, PointAdjustmentLogDTO.class);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void save(PointAdjustmentLogDTO dto) {
+        PointAdjustmentLogEntity entity = ConvertUtils.sourceToTarget(dto, PointAdjustmentLogEntity.class);
+        insert(entity);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void update(PointAdjustmentLogDTO dto) {
+        PointAdjustmentLogEntity entity = ConvertUtils.sourceToTarget(dto, PointAdjustmentLogEntity.class);
+        updateById(entity);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void delete(String[] ids) {
+        // 逻辑删除（@TableLogic 注解）
+        baseDao.deleteBatchIds(Arrays.asList(ids));
+    }
+
+    /**
+     * @Description 根据UserId获取积分调整记录
+     * @param param :: getUserId
+     * @return
+     * @author wangc
+     * @date 2020.07.27 10:51
+     **/
+    @Override
+    public List<PointAdjustmentResultDTO> adjustRecord(IssueInitiatorFormDTO param) {
+        return baseDao.selectAdjustmentListByUserId(param.getUserId());
+    }
+
+
+    /**
+     * @Description 用户详情
+     * @param param
+     * @return
+     * @author wangc
+     * @date 2020.07.27 10:57
+     **/
+    @Override
+    public CustomerUserDetailResultDTO userDetail(IssueInitiatorFormDTO param) {
+        Result<CustomerUserDetailResultDTO> detailResult =  epmetUserOpenFeignClient.customerUserDetail(param);
+        if(!detailResult.success()){
+            throw new RenException(detailResult.getCode());
+        }
+        ResiCommonUserIdFormDTO userParam = ConvertUtils.sourceToTarget(param,ResiCommonUserIdFormDTO.class);
+        ResiPointDetailResultDTO pointDto = userPointTotalService.getMyPoint(userParam);
+        if(null != detailResult.getData()){
+            CustomerUserDetailResultDTO result = new CustomerUserDetailResultDTO();
+            result.setPoint(null != pointDto ? pointDto.getUsablePoint() : NumConstant.ZERO);
+        }
+        detailResult.getData().setPoint(null != pointDto ? pointDto.getUsablePoint() : NumConstant.ZERO);
+        return detailResult.getData();
+    }
+
+    /**
+     * @Description 积分调整
+     * @param param
+     * @return
+     * @author wangc
+     * @date 2020.07.27 13:52
+     **/
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void adjustPoint(PointAdjustmentFormDTO param) {
+        if(null == param.getPoint()) throw new RenException(EpmetErrorCode.SERVER_ERROR.getCode());
+        Date currentTime = new Date();
+        Integer point = param.getPoint();
+        if(StringUtils.equals(ModuleConstant.OPERATION_TYPE_MINUS,param.getAdjustmentType())){
+            if(point > NumConstant.ZERO){
+                point *= NumConstant.ONE_NEG;
+            }
+        }else{
+            if(point < NumConstant.ZERO){
+                point *= NumConstant.ONE_NEG;
+            }
+        }
+        //0.工作人员基本信息[agencyId 昵称]
+        IssueInitiatorFormDTO staffParam = new IssueInitiatorFormDTO();
+        staffParam.setUserId(param.getOperatorId());
+        Result<StaffEtAgencyResultDTO> staffResult =
+            epmetUserOpenFeignClient.staffMsg(staffParam);
+        String agencyId = ModuleConstant.EMPTY_STR;
+        String operatorName = ModuleConstant.EMPTY_STR;
+        if(staffResult.success() && null != staffResult.getData()){
+            agencyId = staffResult.getData().getAgencyId();
+            operatorName = staffResult.getData().getNickname();
+        }
+        //1.记录用户积分行为记录表
+        UserPointActionLogEntity userPointActionEntity = new UserPointActionLogEntity();
+        userPointActionEntity.setUserId(param.getUserId());
+        userPointActionEntity.setCustomerId(param.getCustomerId());
+        userPointActionEntity.setActionFlag(param.getAdjustmentType());
+        userPointActionEntity.setPoint(point);
+        userPointActionEntity.setEventStatement(param.getReason());
+        userPointActionEntity.setEventName(ModuleConstant.EVENT_NAME_ADJUSTMENT);
+        userPointActionEntity.setOperatorAgencyId(agencyId);
+        userPointActionLogDao.insert(userPointActionEntity);
+        //2.记录积分调整记录表
+        PointAdjustmentLogEntity adjustmentEntity = new PointAdjustmentLogEntity();
+        adjustmentEntity.setActionId(userPointActionEntity.getId());
+        adjustmentEntity.setOperatorName(operatorName);
+        adjustmentEntity.setAdjustReason(param.getReason());
+        adjustmentEntity.setAdjustmentType(param.getAdjustmentType());
+        adjustmentEntity.setPoint(point);
+        adjustmentEntity.setOperatorAgencyId(agencyId);
+        adjustmentEntity.setUserId(param.getUserId());
+        //此处设置无效，会拦截到当前请求token中的userId，实际与这里的operatorId一致
+        adjustmentEntity.setCreatedBy(param.getOperatorId());
+        pointAdjustmentLogDao.insert(adjustmentEntity);
+        //3.新增或更新用户积分日统计表
+        DimIdGenerator.DimIdBean dim = DimIdGenerator.getDimIdBean(currentTime);
+        UserPointStatisticalDailyEntity statistical = ConvertUtils.sourceToTarget(dim,UserPointStatisticalDailyEntity.class);
+        statistical.setUserId(param.getUserId());
+        statistical.setActionFlag(param.getAdjustmentType());
+        statistical.setCustomerId(param.getCustomerId());
+        statistical.setPointChange(point);
+        userPointStatisticalDailyService.insertOrUpdate(statistical);
+        //4.更新用户积分总表
+        UserPointTotalEntity total = new UserPointTotalEntity();
+        total.setUserId(param.getUserId());
+        total.setCustomerId(param.getCustomerId());
+        //增量
+        total.setUsedPoint(NumConstant.ZERO);
+        total.setUsablePoint(point);
+        total.setTotalPoint(point);
+        userPointTotalService.insertOrUpdate(total);
+    }
+
+}

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

@@ -115,6 +115,7 @@ public class PointRuleServiceImpl extends BaseServiceImpl<PointRuleDao, PointRul
 				log.error("list ruleId:{} have not pointUnit or pointNum,pointRule:{}", JSON.toJSONString(pointRuleEntity));
 				return null;
 			}
+			resultDTO.setEnabledFlag(NumConstant.ONE_STR.equals(pointRuleEntity.getEnabledFlag()) ? true : false);
 			resultDTO.setPointValue(pointRuleEntity.getPoint().toString().concat("分").concat(StrConstant.SEPARATOR).concat(pointUnitEnum.getDesc()));
 			return resultDTO;
 		}).filter(fun -> fun != null).collect(Collectors.toList());
@@ -129,7 +130,7 @@ public class PointRuleServiceImpl extends BaseServiceImpl<PointRuleDao, PointRul
 		}
 		PointDetailResultDTO resultDTO = ConvertUtils.sourceToTarget(pointRuleEntity, PointDetailResultDTO.class);
 		resultDTO.setRuleId(pointRuleEntity.getId());
-		resultDTO.setEnabledFlag(NumConstant.ONE_STR.equals(pointRuleEntity.getEnabledFlag()) ? "true" : "false");
+		resultDTO.setEnabledFlag(NumConstant.ONE_STR.equals(pointRuleEntity.getEnabledFlag()) ? true : false);
 		return resultDTO;
 	}
 

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

@@ -20,25 +20,42 @@ package com.epmet.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
+import com.epmet.commons.tools.constant.NumConstant;
+import com.epmet.commons.tools.exception.EpmetErrorCode;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.commons.tools.constant.FieldConstant;
+import com.epmet.commons.tools.utils.DateUtils;
+import com.epmet.commons.tools.utils.Result;
 import com.epmet.dao.PointVerificationLogDao;
+import com.epmet.dao.UserPointActionLogDao;
 import com.epmet.dto.PointVerificationLogDTO;
-import com.epmet.dto.form.ResiCommonUserIdFormDTO;
-import com.epmet.dto.result.ResiPointLogListResultDTO;
-import com.epmet.dto.result.ResiPointLogPeriodResultDTO;
-import com.epmet.entity.PointVerificationLogEntity;
+import com.epmet.dto.form.*;
+import com.epmet.dto.result.*;
+import com.epmet.entity.*;
+import com.epmet.feign.EpmetUserOpenFeignClient;
+import com.epmet.redis.PointRedis;
 import com.epmet.service.PointVerificationLogService;
+import com.epmet.service.PointVerificationStatisticalDailyService;
+import com.epmet.service.UserPointStatisticalDailyService;
+import com.epmet.service.UserPointTotalService;
+import com.epmet.utils.DimIdGenerator;
+import com.epmet.utils.ModuleConstant;
+import com.github.pagehelper.PageHelper;
 import com.google.common.collect.Maps;
 import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.Arrays;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
+import java.text.SimpleDateFormat;
+import java.time.Instant;
+import java.time.LocalDateTime;
+import java.time.LocalTime;
+import java.time.ZoneId;
+import java.util.*;
 import java.util.stream.Collectors;
 
 /**
@@ -50,6 +67,22 @@ import java.util.stream.Collectors;
 @Service
 public class PointVerificationLogServiceImpl extends BaseServiceImpl<PointVerificationLogDao, PointVerificationLogEntity> implements PointVerificationLogService {
 
+    protected final Logger logger = LoggerFactory.getLogger(getClass());
+    @Autowired
+    private EpmetUserOpenFeignClient epmetUserOpenFeignClient;
+    @Autowired
+    private UserPointTotalService userPointTotalService;
+    @Autowired
+    private PointVerificationLogDao pointVerificationLogDao;
+    @Autowired
+    private PointVerificationStatisticalDailyService pointVerificationStatisticalDailyService;
+    @Autowired
+    PointRedis pointRedis;
+    @Autowired
+    private UserPointActionLogDao userPointActionLogDao;
+    @Autowired
+    private UserPointStatisticalDailyService userPointStatisticalDailyService;
+
     @Override
     public PageData<PointVerificationLogDTO> page(Map<String, Object> params) {
         IPage<PointVerificationLogEntity> page = baseDao.selectPage(
@@ -104,14 +137,15 @@ public class PointVerificationLogServiceImpl extends BaseServiceImpl<PointVerifi
 
     /**
      * @Description 查找指定用户的积分兑换记录
-     * @param userId
+     * @param pageUser
      * @return
      * @author wangc
      * @date 2020.07.22 14:05
      **/
     @Override
-    public List<ResiPointLogListResultDTO> getMyExchangeRecord(ResiCommonUserIdFormDTO userId) {
-        List<ResiPointLogPeriodResultDTO> logList = baseDao.selectVerificationLog(userId.getUserId());
+    public List<ResiPointLogListResultDTO> getMyExchangeRecord(CommonPageUserFormDTO pageUser) {
+        PageHelper.startPage(pageUser.getPageNo(),pageUser.getPageSize());
+        List<ResiPointLogPeriodResultDTO> logList = baseDao.selectVerificationLog(pageUser.getUserId());
         List<ResiPointLogListResultDTO> result = new LinkedList<>();
         if(null != logList && !logList.isEmpty()){
             Map<String,List<ResiPointLogPeriodResultDTO>> map =
@@ -130,4 +164,204 @@ public class PointVerificationLogServiceImpl extends BaseServiceImpl<PointVerifi
         return result;
     }
 
+    /**
+     * @Description 获取工作端积分核销记录
+     * @param verificationParam
+     * @return
+     * @author wangc
+     * @date 2020.07.24 16:08
+     **/
+    @Override
+    public WorkPointVerficationListResultDTO getStaffVerificationRecordMonthly(WorkPointVerificationFormDTO verificationParam) {
+        SimpleDateFormat format = new SimpleDateFormat(DateUtils.DATE_PATTERN);
+        if(StringUtils.isNotBlank(verificationParam.getTimeParam()) && verificationParam.getTimeParam().matches(ModuleConstant.MONTH_REG)){
+            verificationParam.setTimeParam(new StringBuilder(verificationParam.getTimeParam()).append(ModuleConstant.DATE_COMPLEMENT).toString());
+        }else{
+            verificationParam.setTimeParam(format.format(new Date()));
+        }
+        WorkPointVerficationListResultDTO result = new WorkPointVerficationListResultDTO();
+        result.setTotalPoint(NumConstant.ZERO);
+        List<WorkPointVerificationDetailResultDTO> resultObj = new LinkedList<>();
+
+        try{
+            Date date = format.parse(verificationParam.getTimeParam());
+            List<WorkPointVerificationLogResultDTO> dataList =
+                baseDao.selectStaffVerificationLog(verificationParam.getStaffId(),getFirstDayDateOfMonth(date),getLastDayOfMonth(date));
+            result.setTotalPoint(
+                    dataList.stream().mapToInt(o -> o.getPoint()).sum()
+            );
+            List<String> userIds = dataList.stream().map(data -> data.getUserId()).collect(Collectors.toList());
+            Result<List<UserBaseInfoResultDTO>> userInfo =
+                epmetUserOpenFeignClient.queryUserBaseInfo(userIds);
+            boolean userRequestCallback = userInfo.success() && null != userInfo.getData() && !userInfo.getData().isEmpty();
+            for(int i = NumConstant.ZERO ; i < dataList.size() ; i++){
+
+                WorkPointVerificationDetailResultDTO o = new WorkPointVerificationDetailResultDTO();
+                o.setPoint(new StringBuilder("-").append(dataList.get(i).getPoint().toString()).toString());
+                o.setRemark(dataList.get(i).getRemark());
+                if(userRequestCallback) {
+                    //如果是陌生人显示微信昵称
+                    o.setUserNickname(userInfo.getData().get(i) == null ? ModuleConstant.EMPTY_STR : (StringUtils.isBlank(userInfo.getData().get(i).getShowName()) ? userInfo.getData().get(i).getNickname() : userInfo.getData().get(i).getShowName()));
+                }
+                resultObj.add(o);
+            }
+
+        }catch (Exception e){
+            logger.error(String.format(ModuleConstant.DATE_TRANSLATION_ERROR,e.getMessage()));
+        }
+        result.setCheckingList(resultObj);
+        return result;
+    }
+
+    /**
+     * @Description 积分核销
+     * @param verificationParam
+     * @return
+     * @author wangc
+     * @date 2020.07.27 14:03
+     **/
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public PointVerificationResultDTO verifyPoint(PointVerificationFormDTO verificationParam) {
+        Date currentTime = new Date();
+        PointVerificationResultDTO result = new PointVerificationResultDTO();
+        ResiCommonUserIdFormDTO userId = new ResiCommonUserIdFormDTO();
+        userId.setUserId(verificationParam.getUserId());
+        ResiPointDetailResultDTO currentPoint = userPointTotalService.getMyPoint(userId);
+        if(null == currentPoint || null == currentPoint.getUsablePoint() || currentPoint.getUsablePoint() < verificationParam.getPoint()){
+            result.setSuccessFlag(false);
+            result.setFailureReason(ModuleConstant.POINT_NOT_ENOUGH);
+            return result;
+        }
+        IssueInitiatorFormDTO staffId = new IssueInitiatorFormDTO();
+        staffId.setUserId(verificationParam.getOperatorId());
+        Result<StaffEtAgencyResultDTO> staffResult =
+            epmetUserOpenFeignClient.staffMsg(staffId);
+        //保证积分为负数，因为是积分核销，只有在积分核销日统计和积分核销日志里存储正数
+        Integer point = verificationParam.getPoint();
+        if(point > NumConstant.ZERO){
+            point *= NumConstant.ONE_NEG;
+        }
+
+        String customerId = ModuleConstant.EMPTY_STR;
+
+        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();
+            operatorName = staffResult.getData().getNickname();
+            agencyId = staffResult.getData().getAgencyId();
+        }
+
+        //1.记录积分行为日志 - 居民端
+        UserPointActionLogEntity action = new UserPointActionLogEntity();
+        action.setCreatedBy(verificationParam.getOperatorId());
+        action.setUserId(verificationParam.getUserId());
+        action.setActionFlag(ModuleConstant.OPERATION_TYPE_MINUS);
+        action.setEventName(ModuleConstant.EVENT_NAME_EXCHANGE);
+        action.setEventStatement(verificationParam.getRemark());
+        action.setPoint(point);
+        userPointActionLogDao.insert(action);
+        //2.记录积分核销日志表
+        PointVerificationLogEntity verificationLog = new PointVerificationLogEntity();
+        verificationLog.setActionId(action.getId());
+        verificationLog.setUserId(verificationParam.getUserId());
+        verificationLog.setOperatorId(verificationParam.getOperatorId());
+        verificationLog.setOperatorName(operatorName);
+        verificationLog.setOperatorAgencyId(agencyId);
+        verificationLog.setExchangedItem(verificationParam.getRemark());
+        verificationLog.setPoint(point * NumConstant.ONE_NEG);
+        verificationLog.setLongitude(verificationParam.getLongitude());
+        verificationLog.setDimension(verificationParam.getDimension());
+        verificationLog.setAddress(verificationParam.getAddress());
+        pointVerificationLogDao.insert(verificationLog);
+        //3.记录积分日统计表
+        DimIdGenerator.DimIdBean dim = DimIdGenerator.getDimIdBean(currentTime);
+        UserPointStatisticalDailyEntity userStatistical = ConvertUtils.sourceToTarget(dim,UserPointStatisticalDailyEntity.class);
+        userStatistical.setUserId(verificationParam.getUserId());
+        userStatistical.setActionFlag(ModuleConstant.OPERATION_TYPE_EXCHANGE);
+        userStatistical.setCustomerId(customerId);
+        userStatistical.setPointChange(point);
+        userPointStatisticalDailyService.insertOrUpdate(userStatistical);
+        //4.记录积分核销日统计 - 政府端
+        statistical.setVerificatedPoint(point * NumConstant.ONE_NEG);
+        pointVerificationStatisticalDailyService.insertOrUpdate(statistical);
+        //5.更新用户总积分表
+        UserPointTotalEntity userPoint = new UserPointTotalEntity();
+        userPoint.setUserId(verificationParam.getUserId());
+        userPoint.setCustomerId(customerId);
+        //负数
+        userPoint.setTotalPoint(point);
+        //负数
+        userPoint.setUsablePoint(point);
+        //正数
+        userPoint.setUsedPoint(point * NumConstant.ONE_NEG);
+        userPointTotalService.insertOrUpdate(userPoint);
+        //6.将核销结果记录redis(List) key -> [epmet:point:verification:userId]      lpush  #新元素插入表头   lindex key 0 #表头
+
+        result.setSuccessFlag(true);
+        List<String> userParam = new LinkedList<>();
+        userParam.add(verificationParam.getUserId());
+        Result<List<UserBaseInfoResultDTO>> userResult =
+        epmetUserOpenFeignClient.queryUserBaseInfo(userParam);
+        String userHeadPhoto = ModuleConstant.EMPTY_STR;
+        String userNickname = ModuleConstant.EMPTY_STR;
+        if(userResult.success() && null != userResult.getData() && !userResult.getData().isEmpty()){
+            userHeadPhoto = userResult.getData().get(NumConstant.ZERO).getHeadImgUrl();
+            userNickname = userResult.getData().get(NumConstant.ZERO).getShowName();
+        }
+        result.setUserHeadPhoto(userHeadPhoto);
+        result.setUserNickname(userNickname);
+        return result;
+    }
+
+    /**
+     * @Description 得到指定日所在月第一天
+     * @param date
+     * @return
+     * @author wangc
+     * @date 2020.07.27 17:21
+    **/
+    private static Date getFirstDayDateOfMonth(final Date date) {
+
+        final Calendar cal = Calendar.getInstance();
+
+        cal.setTime(date);
+
+        final int last = cal.getActualMinimum(Calendar.DAY_OF_MONTH);
+
+        cal.set(Calendar.DAY_OF_MONTH, last);
+
+        LocalDateTime localDateTime = LocalDateTime.ofInstant(Instant.ofEpochMilli(cal.getTimeInMillis()), ZoneId.systemDefault());
+        LocalDateTime startOfDay = localDateTime.with(LocalTime.MIN);
+        return Date.from(startOfDay.atZone(ZoneId.systemDefault()).toInstant());
+
+
+    }
+
+    /**
+     * @Description 得到指定日所在月最后一天
+     * @param date
+     * @return
+     * @author wangc
+     * @date 2020.07.27 17:21
+     **/
+    public static Date getLastDayOfMonth(final Date date) {
+
+        final Calendar cal = Calendar.getInstance();
+
+        cal.setTime(date);
+
+        final int last = cal.getActualMaximum(Calendar.DAY_OF_MONTH);
+
+        cal.set(Calendar.DAY_OF_MONTH, last);
+
+        LocalDateTime localDateTime = LocalDateTime.ofInstant(Instant.ofEpochMilli(cal.getTimeInMillis()), ZoneId.systemDefault());;
+        LocalDateTime endOfDay = localDateTime.with(LocalTime.MAX);
+        return Date.from(endOfDay.atZone(ZoneId.systemDefault()).toInstant());
+
+
+    }
 }

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

@@ -97,4 +97,22 @@ public class PointVerificationStatisticalDailyServiceImpl extends BaseServiceImp
         baseDao.deleteBatchIds(Arrays.asList(ids));
     }
 
+    /**
+     * @Description 新增或修改积分核销数据
+     * @param entity
+     * @return
+     * @author wangc
+     * @date 2020.07.27 17:28
+     **/
+    @Override
+    public void insertOrUpdate(PointVerificationStatisticalDailyEntity entity) {
+        PointVerificationStatisticalDailyEntity existed = baseDao.selectIfExisted(entity.getCreatedBy(),entity.getDateId());
+        if(null != existed && StringUtils.isNotBlank(existed.getId())){
+            existed.setVerificatedPoint(null == existed.getVerificatedPoint() ? entity.getVerificatedPoint() : existed.getVerificatedPoint() + entity.getVerificatedPoint());
+            updateById(existed);
+        }else{
+            insert(entity);
+        }
+    }
+
 }

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

@@ -25,11 +25,12 @@ import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.dao.UserPointActionLogDao;
 import com.epmet.dto.UserPointActionLogDTO;
-import com.epmet.dto.form.ResiCommonUserIdFormDTO;
+import com.epmet.dto.form.CommonPageUserFormDTO;
 import com.epmet.dto.result.ResiPointLogListResultDTO;
 import com.epmet.dto.result.ResiPointLogPeriodResultDTO;
 import com.epmet.entity.UserPointActionLogEntity;
 import com.epmet.service.UserPointActionLogService;
+import com.github.pagehelper.PageHelper;
 import com.google.common.collect.Maps;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
@@ -102,14 +103,15 @@ public class UserPointActionLogServiceImpl extends BaseServiceImpl<UserPointActi
 
     /**
      * @Description 查找指定用户的积分记录
-     * @param userId
+     * @param pageUser
      * @return
      * @author wangc
      * @date 2020.07.22 14:05
      **/
     @Override
-    public List<ResiPointLogListResultDTO> getMyPointRecord(ResiCommonUserIdFormDTO userId) {
-        List<ResiPointLogPeriodResultDTO> logList = baseDao.selectPointActionLogList(userId.getUserId());
+    public List<ResiPointLogListResultDTO> getMyPointRecord(CommonPageUserFormDTO pageUser) {
+        PageHelper.startPage(pageUser.getPageNo(),pageUser.getPageSize());
+        List<ResiPointLogPeriodResultDTO> logList = baseDao.selectPointActionLogList(pageUser.getUserId());
         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

@@ -20,23 +20,31 @@ package com.epmet.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
+import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.commons.tools.constant.FieldConstant;
+import com.epmet.commons.tools.utils.Result;
 import com.epmet.dao.UserPointStatisticalDailyDao;
 import com.epmet.dto.UserPointStatisticalDailyDTO;
 import com.epmet.dto.form.ResiPointRankFormDTO;
 import com.epmet.dto.result.ResiPointRankListResultDTO;
+import com.epmet.dto.result.ResiPointRankResultDTO;
+import com.epmet.dto.result.ResiPointRankingResultDTO;
+import com.epmet.dto.result.UserBaseInfoResultDTO;
 import com.epmet.entity.UserPointStatisticalDailyEntity;
+import com.epmet.feign.EpmetUserOpenFeignClient;
 import com.epmet.service.UserPointStatisticalDailyService;
+import com.epmet.utils.DimIdGenerator;
 import com.epmet.utils.ModuleConstant;
+import com.github.pagehelper.PageHelper;
 import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
+import java.util.stream.Collectors;
 
 /**
  * 用户积分统计情况
@@ -47,6 +55,8 @@ import java.util.Map;
 @Service
 public class UserPointStatisticalDailyServiceImpl extends BaseServiceImpl<UserPointStatisticalDailyDao, UserPointStatisticalDailyEntity> implements UserPointStatisticalDailyService {
 
+    @Autowired
+    private EpmetUserOpenFeignClient epmetUserOpenFeignClient;
 
     @Override
     public PageData<UserPointStatisticalDailyDTO> page(Map<String, Object> params) {
@@ -108,13 +118,100 @@ public class UserPointStatisticalDailyServiceImpl extends BaseServiceImpl<UserPo
      * @date 2020.07.21 16:57
      **/
     @Override
-    public ResiPointRankListResultDTO getPointRankWithinTimeZone(ResiPointRankFormDTO pointRankFormDTO) {
-        //默认查周数据
-        if(StringUtils.isBlank(pointRankFormDTO.getTimeDimension())) {
-            pointRankFormDTO.setTimeDimension(ModuleConstant.TIME_ZONE_WEEK);
+    public List<ResiPointRankListResultDTO> getPointRankWithinTimeZone(ResiPointRankFormDTO pointRankFormDTO) {
+
+        List<ResiPointRankListResultDTO> result = new LinkedList<>();
+        ResiPointRankListResultDTO o = new ResiPointRankListResultDTO();
+        //需要参数 Id 维度值 维度标识
+
+        //1.获取当前用户昵称以及当前用户所属客户Id
+        List<String> userIdParam = new LinkedList<>();
+        userIdParam.add(pointRankFormDTO.getUserId());
+        Result<List<UserBaseInfoResultDTO>> myResiInfoResult =
+              epmetUserOpenFeignClient.queryUserBaseInfo(userIdParam);
+        if(myResiInfoResult.success() && null != myResiInfoResult.getData() && !myResiInfoResult.getData().isEmpty()){
+               if(StringUtils.isBlank(pointRankFormDTO.getCustomerId())) {
+                   //缓存中陌生人游客也有对应的customerId
+                   pointRankFormDTO.setCustomerId(myResiInfoResult.getData().get(NumConstant.ZERO).getCustomerId());
+                }
+                //微信昵称
+                o.setMyNickname(myResiInfoResult.getData().get(NumConstant.ZERO).getNickname());
         }
+        //2.获取维度值
+        DimIdGenerator.DimIdBean dimIdBean = DimIdGenerator.getDimIdBean(new Date());
+        String dimVal = StringUtils.equals(ModuleConstant.TIME_ZONE_WEEK,pointRankFormDTO.getTimeDimension()) ? dimIdBean.getWeekId() : dimIdBean.getMonthId();
+        //3.查询排行榜信息，个人排行(分页)
+        if(NumConstant.ONE < pointRankFormDTO.getPageNo()){
+            PageHelper.startPage(pointRankFormDTO.getPageNo(),pointRankFormDTO.getPageSize());
+        }
+        List<ResiPointRankResultDTO> rankList =
+            baseDao.selectPointRankWithinTimeZone(pointRankFormDTO.getCustomerId(),pointRankFormDTO.getTimeDimension(),dimVal);
+        if(null == rankList || rankList.isEmpty()){
+            o.setMyPoint(NumConstant.ZERO);
+            o.setMyRanking(NumConstant.ZERO);
+
+            return result;
+        }
+        //如果请求的是第一页
+        if(NumConstant.ONE == pointRankFormDTO.getPageNo()) {
+            ResiPointRankResultDTO myself =
+                    rankList.stream().filter(obj -> StringUtils.equals(obj.getUserId(), pointRankFormDTO.getUserId())).findFirst().get();
+            if (null != myself) {
+                o.setMyPoint(myself.getTotalPoint());
+                o.setMyRanking(myself.getRank());
+            } else {
+                o.setMyPoint(NumConstant.ZERO);
+                if (rankList.get(rankList.size() - NumConstant.ONE).getTotalPoint() > NumConstant.ZERO) {
+                    o.setMyRanking(rankList.get(rankList.size() - NumConstant.ONE).getRank() + NumConstant.ONE);
+                } else {
+                    o.setMyRanking(rankList.get(rankList.size() - NumConstant.ONE).getRank());
+                }
+            }
+            int fromIndex = pointRankFormDTO.getPageNo() * pointRankFormDTO.getPageSize();
+            int toIndex = (pointRankFormDTO.getPageNo() + 1) * pointRankFormDTO.getPageSize();
+            if(toIndex > rankList.size()) {
+                toIndex = rankList.size();
+            }
+            rankList = rankList.subList(fromIndex,toIndex);
+
+        }
+        List<String> userIds = rankList.stream().map(ResiPointRankResultDTO::getUserId).collect(Collectors.toList());
+        //查询用户昵称
+        Result<List<UserBaseInfoResultDTO>> userInfo =
+                epmetUserOpenFeignClient.queryUserBaseInfo(userIds);
+        boolean userRequestCallback = userInfo.success() && null != userInfo.getData() && !userInfo.getData().isEmpty();
+
+        for (int i = NumConstant.ZERO; i < rankList.size(); i++) {
+            ResiPointRankListResultDTO resultObj = ConvertUtils.sourceToTarget(o,ResiPointRankListResultDTO.class);
+            ResiPointRankingResultDTO target = new ResiPointRankingResultDTO();
+            target.setRanking(rankList.get(i).getRank());
+            target.setPoint(rankList.get(i).getTotalPoint());
+            if(userRequestCallback) {
+                target.setNickname(null == userInfo.getData().get(i) ? "" : userInfo.getData().get(i).getNickname());
+            }
+            resultObj.setRankList(target);
+            result.add(resultObj);
+        }
+        return result;
+    }
 
-        return null;
+    /**
+     * @Description 用户积分日统计新增或修改
+     * @param entity
+     * @return
+     * @author wangc
+     * @date 2020.07.27 16:10
+     **/
+    @Override
+    public void insertOrUpdate(UserPointStatisticalDailyEntity entity) {
+        UserPointStatisticalDailyEntity existed = baseDao.selectIfExisted(entity.getUserId(),entity.getDateId(),entity.getActionFlag());
+        if(null != existed && StringUtils.isNotBlank(existed.getId())){
+            existed.setPointChange(null == existed.getPointChange() ? entity.getPointChange() : existed.getPointChange() + entity.getPointChange());
+            updateById(existed);
+        }else{
+            insert(entity);
+        }
     }
 
+
 }

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

@@ -20,20 +20,30 @@ package com.epmet.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
+import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.ConvertUtils;
 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.ResiCommonUserIdFormDTO;
+import com.epmet.dto.form.ResiPointRankFormDTO;
+import com.epmet.dto.result.*;
 import com.epmet.entity.UserPointTotalEntity;
+import com.epmet.feign.EpmetUserOpenFeignClient;
 import com.epmet.service.UserPointTotalService;
+import com.epmet.utils.DimIdGenerator;
+import com.epmet.utils.ModuleConstant;
+import com.github.pagehelper.PageHelper;
 import org.apache.commons.lang3.StringUtils;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
+import java.util.stream.Collectors;
 
 /**
  * 用户积分总计
@@ -44,6 +54,8 @@ import java.util.Map;
 @Service
 public class UserPointTotalServiceImpl extends BaseServiceImpl<UserPointTotalDao, UserPointTotalEntity> implements UserPointTotalService {
 
+    @Autowired
+    EpmetUserOpenFeignClient epmetUserOpenFeignClient;
 
     @Override
     public PageData<UserPointTotalDTO> page(Map<String, Object> params) {
@@ -97,4 +109,123 @@ public class UserPointTotalServiceImpl extends BaseServiceImpl<UserPointTotalDao
         baseDao.deleteBatchIds(Arrays.asList(ids));
     }
 
+    /**
+     * @Description 获取指定居民的积分信息
+     * @param userId
+     * @return
+     * @author wangc
+     * @date 2020.07.22 15:58
+     **/
+    @Override
+    public ResiPointDetailResultDTO getMyPoint(ResiCommonUserIdFormDTO userId) {
+        return baseDao.selectPointByUserId(userId.getUserId());
+    }
+
+    /**
+     * @Description 获取客户下用户积分排名榜
+     * @param pointRankFormDTO
+     * @return
+     * @author wangc
+     * @date 2020.07.22 16:13
+     **/
+    @Override
+    public List<ResiPointRankListResultDTO> getPointRanking(ResiPointRankFormDTO pointRankFormDTO) {
+
+        List<ResiPointRankListResultDTO> result = new LinkedList<>();
+        ResiPointRankListResultDTO o = new ResiPointRankListResultDTO();
+
+
+        //1.获取当前用户昵称以及当前用户所属客户Id
+        List<String> userIdParam = new LinkedList<>();
+        userIdParam.add(pointRankFormDTO.getUserId());
+        Result<List<UserBaseInfoResultDTO>> myResiInfoResult =
+                epmetUserOpenFeignClient.queryUserBaseInfo(userIdParam);
+        if(myResiInfoResult.success() && null != myResiInfoResult.getData() && !myResiInfoResult.getData().isEmpty()){
+            if(StringUtils.isBlank(pointRankFormDTO.getCustomerId())) {
+                pointRankFormDTO.setCustomerId(myResiInfoResult.getData().get(NumConstant.ZERO).getCustomerId());
+            }
+            //微信昵称
+            o.setMyNickname(myResiInfoResult.getData().get(NumConstant.ZERO).getNickname());
+        }
+        //2.查询排行榜信息，个人排行(分页)
+        if(NumConstant.ONE < pointRankFormDTO.getPageNo()){
+            PageHelper.startPage(pointRankFormDTO.getPageNo(),pointRankFormDTO.getPageSize());
+        }
+        //排行榜
+        List<ResiPointRankResultDTO> rankList =
+                baseDao.selectUserPointRank(pointRankFormDTO.getCustomerId());
+        //当排行榜没有数据时
+        if(null == rankList || rankList.isEmpty()){
+            o.setMyPoint(NumConstant.ZERO);
+            o.setMyRanking(NumConstant.ZERO);
+
+            result.add(o);
+            return result;
+        }
+        //如果当前请求不是第一页
+        if(NumConstant.ONE == pointRankFormDTO.getPageNo()) {
+            ResiPointRankResultDTO myself =
+                    rankList.stream().filter(obj -> StringUtils.equals(obj.getUserId(), pointRankFormDTO.getUserId())).findFirst().get();
+            if (null != myself) {
+                o.setMyPoint(myself.getTotalPoint());
+                o.setMyRanking(myself.getRank());
+            } else {
+
+                if (rankList.get(rankList.size() - NumConstant.ONE).getTotalPoint() > NumConstant.ZERO) {
+                    o.setMyRanking(rankList.get(rankList.size() - NumConstant.ONE).getRank() + NumConstant.ONE);
+                } else {
+                    o.setMyRanking(rankList.get(rankList.size() - NumConstant.ONE).getRank());
+                }
+            }
+            int fromIndex = pointRankFormDTO.getPageNo() * pointRankFormDTO.getPageSize();
+            int toIndex = (pointRankFormDTO.getPageNo() + 1) * pointRankFormDTO.getPageSize();
+            if(toIndex > rankList.size()) {
+                toIndex = rankList.size();
+            }
+            //将假分页结果替换到rankList
+            rankList = rankList.subList(fromIndex,toIndex);
+
+        }
+
+        List<String> userIds = rankList.stream().map(ResiPointRankResultDTO::getUserId).collect(Collectors.toList());
+        //查询用户昵称
+        Result<List<UserBaseInfoResultDTO>> userInfo =
+                epmetUserOpenFeignClient.queryUserBaseInfo(userIds);
+        boolean userRequestCallback = userInfo.success() && null != userInfo.getData() && !userInfo.getData().isEmpty();
+
+        for (int i = NumConstant.ZERO; i < rankList.size(); i++) {
+            ResiPointRankListResultDTO resultObj = ConvertUtils.sourceToTarget(o,ResiPointRankListResultDTO.class);
+
+            ResiPointRankingResultDTO target = new ResiPointRankingResultDTO();
+            target.setRanking(rankList.get(i).getRank());
+            target.setPoint(rankList.get(i).getTotalPoint());
+            if(userRequestCallback) {
+                target.setNickname(null == userInfo.getData().get(i) ? "" : userInfo.getData().get(i).getNickname());
+            }
+            resultObj.setRankList(target);
+            result.add(resultObj);
+        }
+        return result;
+    }
+
+    /**
+     * @Description 新增或修改用户总积分记录
+     * @param entity
+     * @return
+     * @author wangc
+     * @date 2020.07.27 16:45
+     **/
+    @Override
+    public void insertOrUpdate(UserPointTotalEntity entity) {
+        UserPointTotalEntity existed = baseDao.selectIfExisted(entity.getUserId());
+        if(null != existed && StringUtils.isBlank(existed.getId())){
+            existed.setUsedPoint(null == existed.getUsedPoint() ? entity.getUsedPoint() : entity.getUsedPoint() + existed.getUsedPoint());
+            existed.setUsablePoint(null == existed.getUsablePoint() ? entity.getUsablePoint() : entity.getUsablePoint() + existed.getUsablePoint());
+            existed.setTotalPoint(null == existed.getTotalPoint() ? entity.getTotalPoint() : entity.getTotalPoint() + existed.getTotalPoint());
+            updateById(existed);
+        }else{
+            insert(entity);
+        }
+    }
+
 }

epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/utils/DimIdGenerator.java

@@ -0,0 +1,91 @@
+package com.epmet.utils;
+
+import com.epmet.commons.tools.utils.DateUtils;
+import lombok.Data;
+
+import java.util.Calendar;
+import java.util.Date;
+
+public class DimIdGenerator {
+
+    /**
+     * 生成日期维度ID
+     * @param targetDate
+     * @return
+     */
+    public static String getDateDimId(Date targetDate) {
+        return DateUtils.format(targetDate, DateUtils.DATE_PATTERN_YYYYMMDD);
+    }
+
+    /**
+     * 获取月维度ID
+     * @param date
+     * @return
+     */
+    public static String getMonthDimId(Date date) {
+        return DateUtils.format(date, DateUtils.DATE_PATTERN_YYYYMM);
+    }
+
+    /**
+     * 获取周维度ID ,每周的星期一为 周的开始
+     * @param date
+     * @return
+     */
+    public static String getWeekDimId(Date date) {
+        String yyyy = DateUtils.format(date, DateUtils.DATE_PATTERN_YYYY);
+        Calendar calendar = Calendar.getInstance();
+        calendar.setFirstDayOfWeek(Calendar.MONDAY);
+        calendar.setTime(date);
+        return yyyy.concat("W").concat(calendar.get(Calendar.WEEK_OF_YEAR)+"");
+    }
+
+    /**
+     * 获取季度维度ID
+     * @param date
+     * @return
+     */
+    public static String getQuarterDimId(Date date) {
+        String yyyy = DateUtils.format(date, DateUtils.DATE_PATTERN_YYYY);
+        return yyyy.concat("Q").concat(DateUtils.getQuarterIndex(date) + "");
+    }
+
+    /**
+     * 获取年维度ID
+     * @param date
+     * @return
+     */
+    public static String getYearDimId(Date date) {
+        return DateUtils.format(date, DateUtils.DATE_PATTERN_YYYY);
+    }
+
+    /**
+     * 获取封装了所有ID的对象
+     * @return
+     */
+    public static DimIdBean getDimIdBean(Date date) {
+        DimIdBean dimIdBean = new DimIdBean();
+        dimIdBean.setDateId(getDateDimId(date));
+        dimIdBean.setMonthId(getMonthDimId(date));
+        dimIdBean.setWeekId(getWeekDimId(date));
+        dimIdBean.setQuarterId(getQuarterDimId(date));
+        dimIdBean.setYearId(getYearDimId(date));
+        return dimIdBean;
+    }
+
+    public static void main(String[] args) {
+        DimIdBean dimIdBean = getDimIdBean(DateUtils.stringToDate("2020-06-14",DateUtils.DATE_PATTERN));
+        System.out.println(dimIdBean);
+    }
+
+    @Data
+    public static class DimIdBean {
+        private String dateId;
+        private String monthId;
+        private String quarterId;
+        private String yearId;
+        private String weekId;
+
+        public DimIdBean() {
+        }
+    }
+}

epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/utils/ModuleConstant.java

@@ -20,31 +20,74 @@ public interface ModuleConstant extends Constant {
 
     /**
      * 正则表达式 日期 严格按照【yyyy-MM-dd】格式匹配
-     * */
+     */
     String DATE_REG = "^([1-9]\\d{3}-)([0-1][1-9]-)(([0-3]{0,1}[0-9]))$";
 
     /**
      * 正则表达式 周 严格按照【yyyyWcc】格式匹配
-     * */
+     */
     String WEEK_REG = "^([1-9]\\d{3}W)(([0-4][1-9])|50|51|52)";
 
     /**
      * 正则表达式 月份 严格按照【yyyy-MM】格式匹配
-     * */
+     */
     String MONTH_REG = "^([1-9]\\d{3}-)(([0][1-9])|10|11|12)";
 
     /**
      * 兑换记录标题
-     * */
+     */
     String TITLE_EXCHANGE_POINT = "积分兑换";
 
     /**
      * 按周排行
-     * */
+     */
     String TIME_ZONE_WEEK = "week";
 
     /**
      * 按月排行
-     * */
+     */
     String TIME_ZONE_MONTH = "month";
+
+    /**
+     * 给传参 yyyy-MM形式补全日期
+     */
+    String DATE_COMPLEMENT = "-01";
+
+    /**
+     * 日期转换格式异常
+     */
+    String DATE_TRANSLATION_ERROR = "日期转换格式异常 -> 【%s】";
+
+    /**
+     * 时间维度：周
+     */
+    String TIME_DIMENSION_WEEK = "week";
+
+    /**
+     * 时间维度：月
+     */
+    String TIME_DIMENSION_MONTH = "month";
+
+    /**
+     * 减
+     */
+    String OPERATION_TYPE_MINUS = "minus";
+
+    /**
+     * 加
+     */
+    String OPERATION_TYPE_PLUS = "plus";
+
+    /**
+     * 核销
+     */
+    String OPERATION_TYPE_EXCHANGE = "exchange";
+
+    String EMPTY_STR = "";
+
+    String EVENT_NAME_ADJUSTMENT = "积分调整";
+
+    String EVENT_NAME_EXCHANGE = "积分兑换";
+
+    String POINT_NOT_ENOUGH = "积分余额不足";
 }

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

@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.epmet.dao.PointAdjustmentLogDao">
+
+    <resultMap type="com.epmet.entity.PointAdjustmentLogEntity" id="pointAdjustmentLogMap">
+        <result property="id" column="ID"/>
+        <result property="actionId" column="ACTION_ID"/>
+        <result property="operatorName" column="OPERATOR_NAME"/>
+        <result property="adjustReason" column="ADJUST_REASON"/>
+        <result property="point" column="POINT"/>
+        <result property="adjustmentType" column="ADJUSTMENT_TYPE"/>
+        <result property="operatorAgencyId" column="OPERATOR_AGENCY_ID"/>
+        <result property="userId" column="USER_ID"/>
+        <result property="delFlag" column="DEL_FLAG"/>
+        <result property="revision" column="REVISION"/>
+        <result property="createdTime" column="CREATED_TIME"/>
+        <result property="createdBy" column="CREATED_BY"/>
+        <result property="updatedTime" column="UPDATED_TIME"/>
+        <result property="updatedBy" column="UPDATED_BY"/>
+    </resultMap>
+
+    <!-- 查询积分调整记录 -->
+    <select id="selectAdjustmentListByUserId" resultType="com.epmet.dto.result.PointAdjustmentResultDTO">
+        SELECT
+            operator_name AS staffNickname,
+            adjust_reason AS reason,
+            DATE_FORMAT( created_time, '%Y-%m-%d %H:%i:%s' ) AS date,
+        CASE
+            action_flag
+            WHEN 'plus' THEN
+            CONCAT( '+', POINT ) ELSE CONCAT( '-', POINT )
+            END AS POINT
+        FROM
+            point_adjustment_log
+        WHERE
+            del_flag = '0'
+            AND user_id = #{userId}
+        ORDER BY
+            created_time DESC
+    </select>
+
+</mapper>

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

@@ -7,8 +7,6 @@
         <result property="id" column="ID"/>
         <result property="actionId" column="ACTION_ID"/>
         <result property="userId" column="USER_ID"/>
-        <result property="userRegistedGridId" column="USER_REGISTED_GRID_ID"/>
-        <result property="userRegistedAgnecyId" column="USER_REGISTED_AGNECY_ID"/>
         <result property="operatorId" column="OPERATOR_ID"/>
         <result property="operatorName" column="OPERATOR_NAME"/>
         <result property="operatorAgencyId" column="OPERATOR_AGENCY_ID"/>
@@ -42,4 +40,22 @@
         ORDER BY
             CREATED_TIME DESC
     </select>
+
+    <!-- 获取工作人员月度核销记录 -->
+    <select id="selectStaffVerificationLog" resultType="com.epmet.dto.result.WorkPointVerificationLogResultDTO">
+        SELECT
+            user_id,
+            exchanged_item AS remark,
+            point,
+            DATE_FORMAT(created_time,'%Y-%m-%d %H:%i:%s') AS date
+        FROM
+            point_verification_log
+        WHERE
+            del_flag = '0'
+            AND operator_id = #{staffId}
+            AND created_time &gt; #{startDate}
+            AND created_time &lt; #{endDate}
+        ORDER BY
+            created_time DESC
+    </select>
 </mapper>

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

@@ -23,5 +23,19 @@
         <result property="updatedTime" column="UPDATED_TIME"/>
     </resultMap>
 
+    <!-- 查询指定日期的工作人员核销积分是否存在 -->
+    <select id="selectIfExisted" resultType="com.epmet.entity.PointVerificationStatisticalDailyEntity">
+        SELECT
+            ID,
+            VERIFICATED_POINT
+        FROM
+            point_verification_statistical_daily
+        WHERE
+            del_flag = '0'
+        AND
+            date_id = #{dateId}
+        AND
+            created_by = #{createdBy}
+    </select>
 
 </mapper>

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

@@ -23,12 +23,14 @@
     </resultMap>
 
     <!--  查询客户下周/月度用户积分排行榜 传参：客户Id | 维度 | 维度值 -->
+    <!-- user_point_statistical_daily中的action_flag有三种key值，plus(获取)，exchange(积分兑换)，minus(调整、惩罚)，当action_flag为minus时,point_change为负值，其余均为正数 -->
     <select id="selectPointRankWithinTimeZone" resultType="com.epmet.dto.result.ResiPointRankResultDTO">
         SELECT
         IF
             ( @point > point.TOTAL_POINT, @rank := @rank + 1, @rank := @rank + 0 ) AS rank,
             point.user_id,
             point.TOTAL_POINT,
+            -- CASE WHEN point.TOTAL_POINT <![CDATA[>=]]> 0 THEN point.TOTAL_POINT ELSE 0 END AS totalPoint,
             @point := point.TOTAL_POINT
         FROM
             (
@@ -47,6 +49,8 @@
                 AND MONTH_ID = #{dimensionId}
             </if>
             AND ACTION_FLAG = 'plus'
+            OR   ACTION_FLAG = 'minus'
+
         GROUP BY
             USER_ID
         ORDER BY
@@ -55,5 +59,21 @@
             ( SELECT @point := NULL, @rank := 1 ) a
     </select>
 
+    <!-- 查询有无指定日期的积分日统计 userId dateId actionFlag-->
+    <select id="selectIfExisted" resultType="com.epmet.entity.UserPointStatisticalDailyEntity" >
+        SELECT
+             id,
+             point_change
+        FROM
+            user_point_statistical_daily
+        WHERE
+            del_flag = '0'
+        AND
+             user_id = #{userId}
+        AND
+             date_id = #{dateId}
+        AND
+             action_flag = #{actionFlag}
+    </select>
 
 </mapper>

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

@@ -44,4 +44,19 @@
             ( SELECT @point := NULL, @rank := 1 ) a
     </select>
 
+    <!-- 根据userId查找是否存在数据 -->
+    <select id="selectIfExisted" resultType="com.epmet.entity.UserPointTotalEntity">
+        SELECT
+            ID,
+            USERD_POINT,
+            USABLE_POINT,
+            TOTAL_POINT
+        FROM
+            user_point_total
+        WHERE
+            del_flag = '0'
+        AND
+             user_id = #{userId}
+    </select>
+
 </mapper>

epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/GovOrgOpenFeignClient.java

@@ -5,6 +5,7 @@ import com.epmet.commons.tools.utils.Result;
 import com.epmet.dto.CustomerAgencyDTO;
 import com.epmet.dto.CustomerPartyBranchDTO;
 import com.epmet.dto.form.AddAgencyAndStaffFormDTO;
+import com.epmet.dto.form.BelongGridNameFormDTO;
 import com.epmet.dto.form.ListPartyBranchFormDTO;
 import com.epmet.dto.result.*;
 import com.epmet.feign.fallback.GovOrgOpenFeignClientFallback;
@@ -166,4 +167,13 @@ public interface GovOrgOpenFeignClient {
      **/
     @PostMapping("/gov/org/customeragency/querysponsorlist/{staffId}")
     Result<ActSponsorResultDTO> querySponsorList(@PathVariable("staffId") String staffId);
+
+    /**
+     *
+     * @Description 根据网格id查询网格名称
+     * @Author zxc
+     * @CreatedTime 2020/4/27 9:22
+     */
+    @PostMapping("/gov/org/customergrid/getgridnamebygridid")
+    Result<BelongGridNameResultDTO> getGridNameByGridId(@RequestBody BelongGridNameFormDTO formDTO);
 }

epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/fallback/GovOrgOpenFeignClientFallback.java

@@ -6,6 +6,7 @@ import com.epmet.commons.tools.utils.Result;
 import com.epmet.dto.CustomerAgencyDTO;
 import com.epmet.dto.CustomerPartyBranchDTO;
 import com.epmet.dto.form.AddAgencyAndStaffFormDTO;
+import com.epmet.dto.form.BelongGridNameFormDTO;
 import com.epmet.dto.form.ListPartyBranchFormDTO;
 import com.epmet.dto.result.*;
 import com.epmet.feign.GovOrgOpenFeignClient;
@@ -102,4 +103,9 @@ public class GovOrgOpenFeignClientFallback implements GovOrgOpenFeignClient {
     public Result<ActSponsorResultDTO> querySponsorList(String staffId) {
         return ModuleUtils.feignConError(ServiceConstant.GOV_ORG_SERVER, "querySponsorList", staffId);
     }
+
+    @Override
+    public Result<BelongGridNameResultDTO> getGridNameByGridId(BelongGridNameFormDTO formDTO) {
+        return ModuleUtils.feignConError(ServiceConstant.GOV_ORG_SERVER, "getGridNameByGridId", formDTO);
+    }
 }

epmet-module/resi-mine/resi-mine-client/src/main/java/com/epmet/resi/mine/dto/result/MyResiUserInfoResultDTO.java

@@ -42,5 +42,9 @@ public class MyResiUserInfoResultDTO implements Serializable {
      * 拥有角色名称列表，可为空[]
      * */
     private List<String> roleList;
+    /**
+     * 累计积分
+     * */
+    private Integer point;
 
 }

epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartyMemberConfirmServiceImpl.java

@@ -12,13 +12,11 @@ import com.epmet.constant.PartyMemberConstant;
 import com.epmet.constant.PartyMemberMessageConstant;
 import com.epmet.constant.ReadFlagConstant;
 import com.epmet.constant.SmsTemplateConstant;
-import com.epmet.dto.CustomerGridDTO;
-import com.epmet.dto.CustomerStaffGridDTO;
-import com.epmet.dto.UserResiInfoDTO;
-import com.epmet.dto.UserRoleDTO;
+import com.epmet.dto.*;
 import com.epmet.dto.form.*;
 import com.epmet.dto.result.*;
 import com.epmet.feign.EpmetMessageOpenFeignClient;
+import com.epmet.feign.EpmetUserOpenFeignClient;
 import com.epmet.modules.feign.EpmetUserFeignClient;
 import com.epmet.modules.feign.GovOrgFeignClient;
 import com.epmet.modules.feign.ResiGroupFeignClient;
@@ -91,6 +89,8 @@ public class PartyMemberConfirmServiceImpl implements PartyMemberConfirmService
 	private ResiGroupFeignClient resiGroupFeignClient;
 	@Autowired
 	private PartymemberAuthRecordService partymemberAuthRecordService;
+	@Autowired
+	private EpmetUserOpenFeignClient epmetUserOpenFeignClient;
 
 	@Override
 	@Transactional(rollbackFor = Exception.class)
@@ -266,6 +266,16 @@ public class PartyMemberConfirmServiceImpl implements PartyMemberConfirmService
 		//判断是否已注册居民，如果没有则注册居民
 		isResiRegister(partyMemberInfoDTO);
 
+		//将身份证号更新到用户基础信息表中
+		UserBaseInfoDTO baseInfo = new UserBaseInfoDTO();
+		baseInfo.setUserId(partyMemberInfoDTO.getUserId());
+		baseInfo.setIdNum(partyMemberInfoDTO.getIdCard());
+		baseInfo.setBuildingAddress(partyMemberInfoDTO.getBuilding());
+		baseInfo.setStreet(partyMemberInfoDTO.getStreet());
+		baseInfo.setSurname(partyMemberInfoDTO.getSurname());
+		baseInfo.setName(partyMemberInfoDTO.getName());
+
+		epmetUserOpenFeignClient.saveUserBaseInfo(baseInfo);
 		return result;
 	}
 

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

@@ -0,0 +1,34 @@
+package com.epmet.dto.form;
+
+import com.epmet.commons.tools.validator.group.CustomerClientShowGroup;
+import lombok.Data;
+
+import javax.validation.constraints.Min;
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+/**
+ * @Description 查询一个客户下所有用户包括陌生人
+ * @ClassName CustomerUserFormDTO
+ * @Auth wangc
+ * @Date 2020-07-25 15:38
+ */
+@Data
+public class CustomerUserFormDTO implements Serializable {
+    private static final long serialVersionUID = -8209934663808878617L;
+
+    public interface CustomerIdGroup extends CustomerClientShowGroup{}
+
+    @NotBlank(message = "客户Id不能为空", groups = CustomerIdGroup.class)
+    private String customerId;
+
+    /**
+     * 查询参数：全名
+     * */
+    private String name;
+
+    @Min(1)
+    private Integer pageNo = 1;
+
+    private Integer pageSize = 20;
+}

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

@@ -1,7 +1,9 @@
 package com.epmet.dto.form;
 
+import com.epmet.commons.tools.validator.group.CustomerClientShowGroup;
 import lombok.Data;
 
+import javax.validation.constraints.NotBlank;
 import java.io.Serializable;
 
 /**
@@ -14,9 +16,12 @@ public class IssueInitiatorFormDTO implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
+    public interface UserIdGroup extends CustomerClientShowGroup{}
+
     /**
      * 话题id
      */
+    @NotBlank(message = "用户Id不能为空",groups = UserIdGroup.class)
     private String userId;
 
 

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/CustomerUser4PointResultDTO.java

@@ -0,0 +1,40 @@
+package com.epmet.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Description
+ * @ClassName CustomerUser4PointResultDTO
+ * @Auth wangc
+ * @Date 2020-07-28 09:47
+ */
+@Data
+public class CustomerUser4PointResultDTO implements Serializable {
+
+    /**
+     * 用户头像
+     * */
+    private String userHeadPhoto;
+
+    /**
+     * 用户显示昵称
+     * */
+    private String userName;
+
+    /**
+     * 用户微信昵称
+     * */
+    private String userNickname;
+
+    /**
+     *注册网格名称
+     * */
+    private String registeredGrid;
+
+    /**
+     * 用户Id
+     * */
+    private String userId;
+}

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/CustomerUserDetailResultDTO.java

@@ -0,0 +1,51 @@
+package com.epmet.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Description 积分调整-人员查询-人员详情
+ * @ClassName CustomerUserDetailResultDTO
+ * @Auth wangc
+ * @Date 2020-07-27 01:26
+ */
+@Data
+public class CustomerUserDetailResultDTO implements Serializable {
+    private static final long serialVersionUID = 893146364651215391L;
+
+    /**
+     * 姓名
+     * */
+    private String name;
+
+    /**
+     * 男 女 未知
+     * */
+    private String gender;
+
+    /**
+     * 手机号
+     * */
+    private String mobile;
+
+    /**
+     * 身份证号
+     * */
+    private String idNum;
+
+    /**
+     * 居民地址
+     * */
+    private String address;
+
+    /**
+     * 所属(注册)网格
+     * */
+    private String associatedGrid;
+
+    /**
+     * 积分(可用)
+     * */
+    private Integer point;
+}

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/MyResiUserInfoResultDTO.java

@@ -43,4 +43,9 @@ public class MyResiUserInfoResultDTO implements Serializable {
      * */
     private List<String> roleList;
 
+    /**
+     * 累计积分
+     * */
+    private Integer point;
+
 }

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/StaffEtAgencyResultDTO.java

@@ -0,0 +1,42 @@
+package com.epmet.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Description 工作人员的信息：显示昵称、所属机关Id
+ * @ClassName StaffEtAgencyResultDTO
+ * @Auth wangc
+ * @Date 2020-07-27 15:11
+ */
+@Data
+public class StaffEtAgencyResultDTO implements Serializable {
+
+    private static final long serialVersionUID = -7048248108253396688L;
+
+    /**
+     * 所属机关Id
+     * */
+    private String agencyId;
+
+    /**
+     * 工作人员昵称  xx机关-xx
+     * */
+    private String nickname;
+
+    /**
+     * 上级机关Id
+     * */
+    private String pid;
+
+    /**
+     * 上级机关Id集合
+     * */
+    private String pids;
+
+    /**
+     * 客户Id
+     * */
+    private String customerId;
+}

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/UserBaseInfoResultDTO.java

@@ -16,6 +16,12 @@ public class UserBaseInfoResultDTO implements Serializable {
     private static final long serialVersionUID = 3124057264557384333L;
     @JsonIgnore
     private String id;
+
+    /**
+     * 客户Id
+     * */
+    private String customerId;
+
     /**
      * 用户id
      */
@@ -76,6 +82,21 @@ public class UserBaseInfoResultDTO implements Serializable {
      */
     private String headImgUrl;
 
+    /**
+     * 网格Id
+     * */
+    private String registeredGridId;
+
+    /**
+     * xx机关-yy网格
+     * */
+    private String registeredGridName;
+
+    /**
+     * 显示昵称 xx网格-y先生/女士
+     * */
+    private String showName;
+
     /**
      * 微信基本信息
      */

epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java

@@ -4,6 +4,7 @@ import com.epmet.commons.tools.constant.ServiceConstant;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.dto.CustomerStaffDTO;
 import com.epmet.dto.GovStaffRoleDTO;
+import com.epmet.dto.UserBaseInfoDTO;
 import com.epmet.dto.UserDTO;
 import com.epmet.dto.form.*;
 import com.epmet.dto.result.*;
@@ -179,4 +180,44 @@ public interface EpmetUserOpenFeignClient {
      **/
     @PostMapping("epmetuser/user/updateUserBaseAndWxUserInfo")
     Result updateUserBaseAndWxUserInfo(@RequestBody WxUserInfoFormDTO formDTO);
+
+    /**
+     * @Description 新增或保存用户基本信息
+     * @param baseInfo
+     * @return
+     * @author wangc
+     * @date 2020.07.23 13:31
+     **/
+    @PostMapping("/epmetuser/userbaseinfo/saveuserbaseinfo")
+    Result saveUserBaseInfo(@RequestBody UserBaseInfoDTO baseInfo);
+
+    /**
+     * @Description 查询客户下所有用户包括陌生人
+     * @param param
+     * @return
+     * @author wangc
+     * @date 2020.07.25 16:15
+     **/
+    @PostMapping("/epmetuser/gridlatest/customeruserlist")
+    Result<List<CustomerUser4PointResultDTO>> customerUserList(@RequestBody CustomerUserFormDTO param);
+
+    /**
+     * @Description 查询用户详情信息
+     * @param param
+     * @return
+     * @author wangc
+     * @date 2020.07.27 01:34
+     **/
+    @PostMapping("/epmetuser/userbaseinfo/customeruserdetail")
+    Result<CustomerUserDetailResultDTO> customerUserDetail(@RequestBody IssueInitiatorFormDTO param);
+
+    /**
+     * @Description 得到工组人员的头像、名称、所属机关名称
+     * @param userId
+     * @return
+     * @author wangc
+     * @date 2020.07.27 14:45
+     **/
+    @PostMapping("/epmetuser/customerstaff/staffmsg")
+    Result<StaffEtAgencyResultDTO> staffMsg(@RequestBody IssueInitiatorFormDTO userId);
 }

epmet-user/epmet-user-client/src/main/java/com/epmet/feign/fallback/EpmetUserOpenFeignClientFallback.java

@@ -5,6 +5,7 @@ import com.epmet.commons.tools.utils.ModuleUtils;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.dto.CustomerStaffDTO;
 import com.epmet.dto.GovStaffRoleDTO;
+import com.epmet.dto.UserBaseInfoDTO;
 import com.epmet.dto.UserDTO;
 import com.epmet.dto.form.*;
 import com.epmet.dto.result.*;
@@ -113,4 +114,52 @@ public class EpmetUserOpenFeignClientFallback implements EpmetUserOpenFeignClien
     public Result updateUserBaseAndWxUserInfo(WxUserInfoFormDTO formDTO) {
         return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "updateUserBaseAndWxUserInfo", formDTO);
     }
+
+    /**
+     * @Description 新增或保存用户基本信息
+     * @param baseInfo
+     * @return
+     * @author wangc
+     * @date 2020.07.23 13:31
+     **/
+    @Override
+    public Result saveUserBaseInfo(UserBaseInfoDTO baseInfo) {
+        return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "saveUserBaseInfo", baseInfo);
+    }
+
+    /**
+     * @Description 查询客户下所有用户包括陌生人
+     * @param param
+     * @return
+     * @author wangc
+     * @date 2020.07.25 16:15
+     **/
+    @Override
+    public Result<List<CustomerUser4PointResultDTO>> customerUserList(CustomerUserFormDTO param) {
+        return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "customerUserList", param);
+    }
+
+    /**
+     * @Description 查询用户详情信息
+     * @param param
+     * @return
+     * @author wangc
+     * @date 2020.07.27 01:34
+     **/
+    @Override
+    public Result<CustomerUserDetailResultDTO> customerUserDetail(IssueInitiatorFormDTO param) {
+        return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "customerUserDetail", param);
+    }
+
+    /**
+     * @Description 得到工组人员的头像、名称、所属机关名称
+     * @param userId
+     * @return
+     * @author wangc
+     * @date 2020.07.27 14:45
+     **/
+    @Override
+    public Result<StaffEtAgencyResultDTO> staffMsg(IssueInitiatorFormDTO userId) {
+        return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "staffMsg", userId);
+    }
 }

epmet-user/epmet-user-server/pom.xml

@@ -88,6 +88,12 @@
             <version>2.0.0</version>
             <scope>compile</scope>
         </dependency>
+        <dependency>
+            <groupId>com.epmet</groupId>
+            <artifactId>epmet-point-client</artifactId>
+            <version>2.0.0</version>
+            <scope>compile</scope>
+        </dependency>
     </dependencies>
 
     <build>

epmet-user/epmet-user-server/src/main/java/com/epmet/constant/UserRedisKeys.java

@@ -0,0 +1,26 @@
+package com.epmet.constant;
+
+/**
+ * @Description
+ * @ClassName UserRedisKeys
+ * @Auth wangc
+ * @Date 2020-07-22 17:16
+ */
+public class UserRedisKeys {
+
+    /**
+     * 党群e事通redis前缀
+     */
+    private static String rootPrefix = "epmet:";
+
+    /**
+     * @Description 用户缓存Key
+     * @Param 用户Id
+     * @return epmet:resi:user:userId
+     * @Author wangc
+     * @Date 2020.04.13 11:27
+     **/
+    public static String getResiUserKey(String userId){
+        return rootPrefix.concat("resi:user:").concat(userId);
+    }
+}

epmet-user/epmet-user-server/src/main/java/com/epmet/controller/CustomerStaffController.java

@@ -297,4 +297,17 @@ public class CustomerStaffController {
         customerStaffService.resetStaffPassword(staffResetPwFormDTO);
         return new Result();
     }
-}
+
+    /**
+     * @Description 得到工组人员的头像、名称、所属机关名称
+     * @param userId
+     * @return
+     * @author wangc
+     * @date 2020.07.27 14:45
+     **/
+    @PostMapping("staffmsg")
+    public Result<StaffEtAgencyResultDTO> staffMsg(@RequestBody IssueInitiatorFormDTO userId){
+        ValidatorUtils.validateEntity(userId, IssueInitiatorFormDTO.UserIdGroup.class);
+        return new Result<StaffEtAgencyResultDTO>().ok(customerStaffService.getStaffMsg(userId));
+    }
+}

epmet-user/epmet-user-server/src/main/java/com/epmet/controller/GridLatestController.java

@@ -26,6 +26,8 @@ import com.epmet.commons.tools.validator.group.AddGroup;
 import com.epmet.commons.tools.validator.group.UpdateGroup;
 import com.epmet.commons.tools.validator.group.DefaultGroup;
 import com.epmet.dto.GridLatestDTO;
+import com.epmet.dto.form.CustomerUserFormDTO;
+import com.epmet.dto.result.CustomerUser4PointResultDTO;
 import com.epmet.dto.result.LatestGridInfoResultDTO;
 import com.epmet.excel.GridLatestExcel;
 import com.epmet.service.GridLatestService;
@@ -115,4 +117,17 @@ public class GridLatestController {
         return gridLatestService.getGridsByUserId(userId);
     }
 
+
+    /**
+     * @Description 查询客户下所有用户包括陌生人
+     * @param param
+     * @return
+     * @author wangc
+     * @date 2020.07.25 16:15
+     **/
+    @PostMapping("customeruserlist")
+    public Result<List<CustomerUser4PointResultDTO>> customerUserList(@RequestBody CustomerUserFormDTO param){
+        return new  Result<List<CustomerUser4PointResultDTO>>().ok(gridLatestService.getCustomerUsers(param));
+    }
+
 }

epmet-user/epmet-user-server/src/main/java/com/epmet/controller/UserBaseInfoController.java

@@ -26,9 +26,13 @@ import com.epmet.commons.tools.validator.group.AddGroup;
 import com.epmet.commons.tools.validator.group.DefaultGroup;
 import com.epmet.commons.tools.validator.group.UpdateGroup;
 import com.epmet.dto.UserBaseInfoDTO;
+import com.epmet.dto.form.IssueInitiatorFormDTO;
+import com.epmet.dto.result.CustomerUserDetailResultDTO;
 import com.epmet.dto.result.UserBaseInfoResultDTO;
+import com.epmet.entity.UserBaseInfoEntity;
 import com.epmet.excel.UserBaseInfoExcel;
 import com.epmet.service.UserBaseInfoService;
+import oracle.jdbc.proxy.annotation.Post;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -117,4 +121,29 @@ public class UserBaseInfoController {
         userBaseInfoService.initBaseInfo();
         return new Result();
     }
-}
+
+    /**
+     * @Description 新增或保存用户基本信息
+     * @param baseInfo
+     * @return
+     * @author wangc
+     * @date 2020.07.23 13:31
+    **/
+    @PostMapping("saveuserbaseinfo")
+    public Result insertOrUpdate(@RequestBody UserBaseInfoEntity baseInfo){
+        userBaseInfoService.insertOrUpdate(baseInfo);
+        return new Result();
+    }
+
+    /**
+     * @Description 查询用户详情信息
+     * @param param
+     * @return
+     * @author wangc
+     * @date 2020.07.27 01:34
+     **/
+    @PostMapping("customeruserdetail")
+    public Result<CustomerUserDetailResultDTO> customerUserDetail(@RequestBody IssueInitiatorFormDTO param){
+       return new Result<CustomerUserDetailResultDTO>().ok(userBaseInfoService.customerUserDetail(param.getUserId()));
+    }
+}

epmet-user/epmet-user-server/src/main/java/com/epmet/controller/UserController.java

@@ -9,10 +9,7 @@ import com.epmet.commons.tools.validator.group.DefaultGroup;
 import com.epmet.dto.UserDTO;
 import com.epmet.dto.UserWechatDTO;
 import com.epmet.dto.form.*;
-import com.epmet.dto.result.CreatedTimeByUserIdResultDTO;
-import com.epmet.dto.result.LoginUserDetailsResultDTO;
-import com.epmet.dto.result.MyResiUserInfoResultDTO;
-import com.epmet.dto.result.PasswordLoginUserInfoResultDTO;
+import com.epmet.dto.result.*;
 import com.epmet.service.UserService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;

epmet-user/epmet-user-server/src/main/java/com/epmet/dao/GridLatestDao.java

@@ -55,4 +55,13 @@ public interface GridLatestDao extends BaseDao<GridLatestEntity> {
      * @Author sun
      **/
     List<String> selectAllGridsByUserId(@Param("userId") String userId);
+
+    /**
+     * @Description 查询一个客户下的所有用户：注册居民、陌生人
+     * @param customerId
+     * @return
+     * @author wangc
+     * @date 2020.07.25 15:26
+    **/
+    List<String> selectAllUserByCustomerId(@Param("customerId")String customerId);
 }

epmet-user/epmet-user-server/src/main/java/com/epmet/dao/RegisterRelationDao.java

@@ -36,4 +36,12 @@ public interface RegisterRelationDao extends BaseDao<RegisterRelationEntity> {
 
     List<RegisterRelationEntity> getListByUserId(@Param("userId") String userId);
 
+    /**
+     * @Description 查询用户的首次注册网格Id
+     * @param userId
+     * @return
+     * @author wangc
+     * @date 2020.07.23 15:31
+    **/
+    RegisterRelationEntity selectRegisteredGridIdByUserId(@Param("userId") String userId);
 }

epmet-user/epmet-user-server/src/main/java/com/epmet/dao/UserWechatDao.java

@@ -6,6 +6,7 @@ import com.epmet.dto.UserHeadPhotoDTO;
 import com.epmet.dto.UserWechatDTO;
 import com.epmet.dto.form.WxLoginUserInfoFormDTO;
 import com.epmet.dto.result.CertifiedResultDTO;
+import com.epmet.dto.result.CustomerUser4PointResultDTO;
 import com.epmet.entity.UserWechatEntity;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -64,4 +65,14 @@ public interface UserWechatDao extends BaseDao<UserWechatEntity>{
      * @Date 2020/7/22 10:46
      **/
     List<UserWechatDTO> selectAll();
+
+    /**
+     * @Description 查询人员信息，排序，包括陌生人与注册居民，没有注册居民则只有微信昵称
+     * @param userIds
+     * @return
+     * @author wangc
+     * @date 2020.07.27 00:58
+    **/
+    List<CustomerUser4PointResultDTO> selectResiAndStrangerInfo(@Param("userIds") List<String> userIds, @Param("realName")String realName);
+
 }

epmet-user/epmet-user-server/src/main/java/com/epmet/feign/fallback/OperRoleUserFeignClientFallBack.java

@@ -5,7 +5,7 @@ import com.epmet.commons.tools.utils.ModuleUtils;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.feign.OperRoleUserFeignClient;
 import org.springframework.stereotype.Component;
-import sun.misc.Contended;
+
 
 import java.util.List;
 

epmet-user/epmet-user-server/src/main/java/com/epmet/redis/UserBaseInfoRedis.java

@@ -17,10 +17,29 @@
 
 package com.epmet.redis;
 
+import cn.hutool.core.bean.BeanUtil;
+import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.redis.RedisUtils;
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.constant.UserRedisKeys;
+import com.epmet.dao.GridLatestDao;
+import com.epmet.dao.RegisterRelationDao;
+import com.epmet.dao.UserBaseInfoDao;
+import com.epmet.dto.form.BelongGridNameFormDTO;
+import com.epmet.dto.result.BelongGridNameResultDTO;
+import com.epmet.dto.result.LatestGridInfoResultDTO;
+import com.epmet.dto.result.UserBaseInfoResultDTO;
+import com.epmet.entity.RegisterRelationEntity;
+import com.epmet.feign.GovOrgOpenFeignClient;
+import com.epmet.util.ModuleConstant;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
+import java.util.Map;
+
+import static com.epmet.commons.tools.redis.RedisUtils.NOT_EXPIRE;
+
 /**
  * 用户基础信息
  *
@@ -31,17 +50,93 @@ import org.springframework.stereotype.Component;
 public class UserBaseInfoRedis {
     @Autowired
     private RedisUtils redisUtils;
+    @Autowired
+    private UserBaseInfoDao userBaseInfoDao;
+    @Autowired
+    private RegisterRelationDao registerRelationDao;
+    @Autowired
+    private GovOrgOpenFeignClient govOrgOpenFeignClient;
+    @Autowired
+    private GridLatestDao gridLatestDao;
 
     public void delete(Object[] ids) {
 
     }
 
-    public void set(){
-
+    /**
+     * @Description 将用户基本信息放入缓存
+     * @param baseInfo
+     * @return
+     * @author wangc
+     * @date 2020.07.23 14:43
+    **/
+    public void set(UserBaseInfoResultDTO baseInfo){
+        if(StringUtils.isBlank(baseInfo.getUserId())) return;
+        String key = UserRedisKeys.getResiUserKey(baseInfo.getUserId());
+        //bean to map
+        Map<String, Object> map = BeanUtil.beanToMap(baseInfo, false, true);
+        redisUtils.hMSet(key, map,NOT_EXPIRE);
     }
 
     public String get(String id){
         return null;
     }
 
+    /**
+     * @Description 缓存中获取用户基本信息
+     * @param userId
+     * @return
+     * @author wangc
+     * @date 2020.07.23 14:58
+    **/
+    public UserBaseInfoResultDTO getUserInfo(String userId){
+        if(StringUtils.isNotBlank(userId)){
+            //获取居民缓存key
+            Map<String,Object> map = redisUtils.hGetAll(UserRedisKeys.getResiUserKey(userId));
+            if(null != map && !map.isEmpty()) {
+                //缓存中有数据，直接返回
+                return BeanUtil.mapToBean(map, UserBaseInfoResultDTO.class, true);
+            }
+            //缓存中没有数据，先查数据库，放入缓存后再返回
+            UserBaseInfoResultDTO baseInfo = userBaseInfoDao.selectListByUserIdList(userId);
+            if(null != baseInfo && StringUtils.isNotBlank(baseInfo.getId())){
+                RegisterRelationEntity relation = registerRelationDao.selectRegisteredGridIdByUserId(userId);
+                //如果没有首次注册网格，则没有网格名称(xx机关-xx网格)、显示昵称(xx网格-x先生/女士)
+                if(null != relation && StringUtils.isNotBlank(relation.getGridId())){
+                    baseInfo.setCustomerId(relation.getCustomerId());
+                    BelongGridNameFormDTO gridParam = new BelongGridNameFormDTO();
+                    gridParam.setGridId(relation.getGridId());
+                    Result<BelongGridNameResultDTO> gridResult =
+                        govOrgOpenFeignClient.getGridNameByGridId(gridParam);
+                    if(gridResult.success() && null != gridResult.getData()
+                            && StringUtils.isNotBlank(gridResult.getData().getBelongsGridName())){
+                        String gridFullName = gridResult.getData().getBelongsGridName();
+                        baseInfo.setRegisteredGridName(gridFullName);
+                        StringBuffer buffer = new StringBuffer(gridFullName.split(ModuleConstant.DASH)[NumConstant.ONE]).append(ModuleConstant.DASH).append(baseInfo.getSurname());
+                        switch(baseInfo.getGender()){
+                            case NumConstant.ONE_STR :
+                                buffer.append(ModuleConstant.RESI_USER_NICKNAME_SUFFIX_MALE);
+                                break;
+                            case  NumConstant.TWO_STR :
+                                buffer.append(ModuleConstant.RESI_USER_NICKNAME_SUFFIX_FEMALE);
+                                break;
+                            default:
+                                buffer.append(ModuleConstant.RESI_USER_NICKNAME_SUFFIX_GENDER_UNKNOWN);
+                        }
+                        baseInfo.setShowName(buffer.toString());
+                    }
+                }else{
+                    //如果没有居民注册记录，说明当前用户是陌生人，需要从陌生人网格访问列表中查询所属的客户Id
+                    LatestGridInfoResultDTO gridLatest =
+                        gridLatestDao.selectLatestGridInfoByUserId(userId);
+                    if(null != gridLatest){
+                        baseInfo.setCustomerId(gridLatest.getCustomerId());
+                    }
+                }
+                set(baseInfo);
+                return baseInfo;
+            }
+        }
+        return null;
+    }
 }

epmet-user/epmet-user-server/src/main/java/com/epmet/service/CustomerStaffService.java

@@ -241,4 +241,13 @@ public interface CustomerStaffService extends BaseService<CustomerStaffEntity> {
      * @Date 2020/7/1 10:41
      **/
     void resetStaffPassword(StaffResetPwFormDTO staffResetPwFormDTO);
+
+    /**
+     * @Description 得到工组人员的头像、名称、所属机关名称
+     * @param userId
+     * @return
+     * @author wangc
+     * @date 2020.07.27 14:45
+    **/
+	StaffEtAgencyResultDTO getStaffMsg(IssueInitiatorFormDTO userId);
 }

epmet-user/epmet-user-server/src/main/java/com/epmet/service/GridLatestService.java

@@ -22,7 +22,9 @@ import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.dto.CustomerGridDTO;
 import com.epmet.dto.GridLatestDTO;
+import com.epmet.dto.form.CustomerUserFormDTO;
 import com.epmet.dto.form.VisitedFormDTO;
+import com.epmet.dto.result.CustomerUser4PointResultDTO;
 import com.epmet.dto.result.LatestGridInfoResultDTO;
 import com.epmet.entity.GridLatestEntity;
 
@@ -120,4 +122,13 @@ public interface GridLatestService extends BaseService<GridLatestEntity> {
      **/
     Result<List<String>> getGridsByUserId(String userId);
 
+    /**
+     * @Description 查询客户下所有用户包括陌生人
+     * @param customerUserFormDTO
+     * @return
+     * @author wangc
+     * @date 2020.07.25 16:15
+    **/
+    List<CustomerUser4PointResultDTO> getCustomerUsers(CustomerUserFormDTO customerUserFormDTO);
+
 }

epmet-user/epmet-user-server/src/main/java/com/epmet/service/UserBaseInfoService.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.UserBaseInfoDTO;
+import com.epmet.dto.result.CustomerUserDetailResultDTO;
 import com.epmet.dto.result.UserBaseInfoResultDTO;
 import com.epmet.entity.UserBaseInfoEntity;
 
@@ -111,4 +112,22 @@ public interface UserBaseInfoService extends BaseService<UserBaseInfoEntity> {
      * @Date 2020/7/22 10:42
      **/
     void initBaseInfo();
+
+    /**
+     * @Description 检查有无居民基础信息表，如果有更新，无插入
+     * @param baseInfo
+     * @return
+     * @author wangc
+     * @date 2020.07.23 10:35
+    **/
+    void insertOrUpdate(UserBaseInfoEntity baseInfo);
+
+    /**
+     * @Description 查询用户详情信息
+     * @param userId
+     * @return
+     * @author wangc
+     * @date 2020.07.27 01:34
+    **/
+    CustomerUserDetailResultDTO customerUserDetail(String userId);
 }

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

@@ -44,11 +44,13 @@ import com.epmet.entity.GovStaffRoleEntity;
 import com.epmet.entity.StaffRoleEntity;
 import com.epmet.entity.UserEntity;
 import com.epmet.feign.AuthFeignClient;
+import com.epmet.feign.GovOrgOpenFeignClient;
 import com.epmet.redis.CustomerStaffRedis;
 import com.epmet.service.CustomerStaffService;
 import com.epmet.service.GovStaffRoleService;
 import com.epmet.service.StaffRoleService;
 import com.epmet.service.UserService;
+import com.epmet.util.ModuleConstant;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.logging.log4j.LogManager;
@@ -88,6 +90,8 @@ public class CustomerStaffServiceImpl extends BaseServiceImpl<CustomerStaffDao,
 	private CpUserDetailRedis cpUserDetailRedis;
 	@Autowired
 	private AuthFeignClient authFeignClient;
+	@Autowired
+	private GovOrgOpenFeignClient govOrgOpenFeignClient;
 
 	@Override
 	public PageData<CustomerStaffDTO> page(Map<String, Object> params) {
@@ -492,4 +496,26 @@ public class CustomerStaffServiceImpl extends BaseServiceImpl<CustomerStaffDao,
 		this.update(customerStaffDTO);
 	}
 
+	/**
+	 * @Description 得到工组人员的头像、名称、所属机关名称
+	 * @param userId
+	 * @return
+	 * @author wangc
+	 * @date 2020.07.27 14:45
+	 **/
+	@Override
+	public StaffEtAgencyResultDTO getStaffMsg(IssueInitiatorFormDTO userId) {
+		StaffEtAgencyResultDTO result = new StaffEtAgencyResultDTO();
+		CustomerStaffDTO staff = baseDao.selectByStaffId(userId.getUserId());
+		if(null != staff){
+			Result<CustomerAgencyDTO> agencyResult = govOrgOpenFeignClient.getAgencyByStaff(userId.getUserId());
+			if(agencyResult.success() && null != agencyResult.getData()){
+				result = ConvertUtils.sourceToTarget(agencyResult.getData(),StaffEtAgencyResultDTO.class);
+				result.setAgencyId(agencyResult.getData().getId());
+				result.setNickname(new StringBuilder(agencyResult.getData().getOrganizationName()).append(ModuleConstant.DASH).append(staff.getRealName()).toString());
+			}
+		}
+		return result;
+	}
+
 }

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

@@ -26,13 +26,20 @@ import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.dao.GridLatestDao;
+import com.epmet.dao.UserWechatDao;
 import com.epmet.dto.CustomerGridDTO;
 import com.epmet.dto.GridLatestDTO;
+import com.epmet.dto.form.CustomerUserFormDTO;
 import com.epmet.dto.form.VisitedFormDTO;
+import com.epmet.dto.result.CustomerUser4PointResultDTO;
 import com.epmet.dto.result.LatestGridInfoResultDTO;
+import com.epmet.dto.result.UserBaseInfoResultDTO;
 import com.epmet.entity.GridLatestEntity;
 import com.epmet.redis.GridLatestRedis;
+import com.epmet.redis.UserBaseInfoRedis;
 import com.epmet.service.GridLatestService;
+import com.epmet.util.ModuleConstant;
+import com.github.pagehelper.PageHelper;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -40,10 +47,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.Arrays;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 /**
  * 最近访问网格表 记录用户访问网格的最近一次记录，对同一网格只记录一条记录，同一网格每次只更新最近一次访问的时间
@@ -58,6 +62,10 @@ public class GridLatestServiceImpl extends BaseServiceImpl<GridLatestDao, GridLa
     private GridLatestRedis gridLatestRedis;
     @Autowired
     private GridLatestDao gridLatestDao;
+    @Autowired
+    private UserBaseInfoRedis userBaseInfoRedis;
+    @Autowired
+    private UserWechatDao userWechatDao;
 
     @Override
     public PageData<GridLatestDTO> page(Map<String, Object> params) {
@@ -166,4 +174,35 @@ public class GridLatestServiceImpl extends BaseServiceImpl<GridLatestDao, GridLa
         return new Result<List<String>>().ok(gridList);
     }
 
+    /**
+     * @Description 查询客户下所有用户包括陌生人
+     * @param customerUserFormDTO
+     * @return
+     * @author wangc
+     * @date 2020.07.25 16:15
+     **/
+    @Override
+    public List<CustomerUser4PointResultDTO> getCustomerUsers(CustomerUserFormDTO customerUserFormDTO) {
+        List<String> userIds = baseDao.selectAllUserByCustomerId(customerUserFormDTO.getCustomerId());
+        List<CustomerUser4PointResultDTO> allData = new LinkedList<>();
+        if(null == userIds || userIds.isEmpty()){
+            return allData;
+        }
+        PageHelper.startPage(customerUserFormDTO.getPageNo(),customerUserFormDTO.getPageSize());
+        allData = userWechatDao.selectResiAndStrangerInfo(userIds,customerUserFormDTO.getName());
+        if(null == allData || allData.isEmpty()){
+            return allData;
+        }
+        allData.forEach(info -> {
+            if(StringUtils.isBlank(info.getUserName())){
+                info.setUserName(ModuleConstant.EMPTY_STR);
+                UserBaseInfoResultDTO cache = userBaseInfoRedis.getUserInfo(info.getUserId());
+                if(null != cache) {
+                    info.setRegisteredGrid(cache.getRegisteredGridName());
+                }
+            }
+        });
+        return allData;
+    }
+
 }

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

@@ -296,6 +296,7 @@ public class RegisterRelationServiceImpl extends BaseServiceImpl<RegisterRelatio
         visitedFormDTO.setUserId(enterGridFormDTO.getUserId());
         UserResiInfoFormDTO userResiParam = new UserResiInfoFormDTO();
         userResiParam.setUserId(enterGridFormDTO.getUserId());
+        userResiParam.setCustomerId(enterGridFormDTO.getCustomerId());
         UserResiInfoResultDTO resiResult =
         userResiInfoDao.selectUserResiInfoDTO(userResiParam);
         if(null == resiResult){

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

@@ -31,6 +31,7 @@ import com.epmet.dao.UserWechatDao;
 import com.epmet.dto.UserBaseInfoDTO;
 import com.epmet.dto.UserResiInfoDTO;
 import com.epmet.dto.UserWechatDTO;
+import com.epmet.dto.result.CustomerUserDetailResultDTO;
 import com.epmet.dto.result.UserBaseInfoResultDTO;
 import com.epmet.dto.result.UserWechatResultDTO;
 import com.epmet.entity.UserBaseInfoEntity;
@@ -38,6 +39,7 @@ import com.epmet.redis.UserBaseInfoRedis;
 import com.epmet.resi.partymember.dto.partymember.PartymemberInfoDTO;
 import com.epmet.resi.partymember.feign.ResiPartyMemberOpenFeignClient;
 import com.epmet.service.UserBaseInfoService;
+import com.epmet.util.ModuleConstant;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -139,6 +141,13 @@ public class UserBaseInfoServiceImpl extends BaseServiceImpl<UserBaseInfoDao, Us
                 userBaseInfoList.add(userBaseInfoResultDTO);
             }
         }
+        userIdList.forEach(id -> {
+            UserBaseInfoResultDTO baseInfo = userBaseInfoRedis.getUserInfo(id);
+            //为了保证传过来的user数量与返回的一致，就算查出的用户信息为空也要添加进集合里
+            //if(null != baseInfo && StringUtils.isNotBlank(baseInfo.getId())){
+                userBaseInfoList.add(baseInfo);
+            //}
+        });
         return userBaseInfoList;
     }
 
@@ -197,5 +206,52 @@ public class UserBaseInfoServiceImpl extends BaseServiceImpl<UserBaseInfoDao, Us
         return;
     }
 
+    /**
+     * @Description 检查有无居民基础信息表，有更新，无插入
+     * @param baseInfo
+     * @return
+     * @author wangc
+     * @date 2020.07.23 10:35
+     **/
+    @Override
+    public void insertOrUpdate(UserBaseInfoEntity baseInfo) {
+        if(StringUtils.isBlank(baseInfo.getUserId())){
+            return ;
+        }
+        UserBaseInfoResultDTO userBaseInfoResultDTO = baseDao.selectListByUserIdList(baseInfo.getUserId());
+        baseInfo.setRealName(new StringBuilder(baseInfo.getSurname()).append(baseInfo.getName()).toString());
+        if(null == userBaseInfoResultDTO || StringUtils.isBlank(userBaseInfoResultDTO.getId())){
+            //更新
+            baseInfo.setId(userBaseInfoResultDTO.getId());
+            updateById(baseInfo);
+        }else{
+            //新增
+            insert(baseInfo);
+        }
+    }
+
+    /**
+     * @Description 查询用户详情信息
+     * @param userId
+     * @return
+     * @author wangc
+     * @date 2020.07.27 01:34
+     **/
+    @Override
+    public CustomerUserDetailResultDTO customerUserDetail(String userId) {
+        UserBaseInfoResultDTO userInfo =
+            userBaseInfoRedis.getUserInfo(userId);
+        if(null != userInfo){
+        CustomerUserDetailResultDTO result = ConvertUtils.sourceToTarget(userInfo,CustomerUserDetailResultDTO.class);
+        result.setName(userInfo.getRealName());
+        result.setGender(StringUtils.equals(NumConstant.ZERO_STR,userInfo.getGender()) || StringUtils.isBlank(userInfo.getGender()) ?
+        ModuleConstant.GENDER_UNKNOWN : (StringUtils.equals(NumConstant.ONE_STR,userInfo.getGender()) ? ModuleConstant.GENDER_MALE : ModuleConstant.GENDER_FEMALE));
+        result.setAddress(new StringBuilder(userInfo.getDistrict()).append(userInfo.getStreet()).append(userInfo.getBuildingAddress()).toString());
+        result.setAssociatedGrid(userInfo.getRegisteredGridName());
+        return result;
+        }
+        return null;
+    }
+
 
 }

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

@@ -22,6 +22,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
 import com.epmet.commons.tools.constant.EpmetRoleKeyConstant;
 import com.epmet.commons.tools.constant.FieldConstant;
+import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.exception.EpmetErrorCode;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.ConvertUtils;
@@ -30,19 +31,19 @@ import com.epmet.constant.SmsTemplateConstant;
 import com.epmet.constant.UserConstant;
 import com.epmet.constant.UserRoleConstant;
 import com.epmet.dao.UserResiInfoDao;
+import com.epmet.dao.UserWechatDao;
 import com.epmet.dto.UserResiInfoDTO;
 import com.epmet.dto.UserRoleDTO;
 import com.epmet.dto.form.*;
 import com.epmet.dto.result.IssueInitiatorResultDTO;
 import com.epmet.dto.result.SendVerificationCodeResultDTO;
 import com.epmet.dto.result.UserResiInfoResultDTO;
+import com.epmet.entity.UserBaseInfoEntity;
 import com.epmet.entity.UserResiInfoEntity;
+import com.epmet.entity.UserWechatEntity;
 import com.epmet.feign.EpmetMessageOpenFeignClient;
 import com.epmet.redis.UserResiInfoRedis;
-import com.epmet.service.RegisterRelationService;
-import com.epmet.service.UserResiInfoService;
-import com.epmet.service.UserResiRegisterVisitService;
-import com.epmet.service.UserRoleService;
+import com.epmet.service.*;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -77,6 +78,10 @@ public class UserResiInfoServiceImpl extends BaseServiceImpl<UserResiInfoDao, Us
 	private UserRoleService userRoleService;
 	@Autowired
 	private EpmetMessageOpenFeignClient epmetMessageOpenFeignClient;
+	@Autowired
+	private UserBaseInfoService userBaseInfoService;
+	@Autowired
+	private UserWechatDao userWechatService;
 
 	@Override
 	public PageData<UserResiInfoDTO> page(Map<String, Object> params) {
@@ -192,6 +197,18 @@ public class UserResiInfoServiceImpl extends BaseServiceImpl<UserResiInfoDao, Us
         //居民角色对应的网格Id存默认值-all
 		userRoleDTO.setGridId(UserRoleConstant.DEFAULT_GRID_ID);
         userRoleService.saveUserRole(userRoleDTO);
+        //4:保存baseInfo
+		UserBaseInfoEntity baseInfo = ConvertUtils.sourceToTarget(userResiInfoDTO, UserBaseInfoEntity.class);
+		baseInfo.setMobile(userResiInfoDTO.getRegMobile());
+		baseInfo.setRealName(new StringBuilder(userResiInfoDTO.getSurname()).append(userResiInfoDTO.getName()).toString());
+		//微信昵称:nickname 头像:headImgUrl 性别:gender
+		List<UserWechatEntity> wechat = userWechatService.selectByUserId(userResiInfoDTO.getUserId());
+		if(null != wechat && !wechat.isEmpty()){
+			baseInfo.setHeadImgUrl(wechat.get(NumConstant.ZERO).getHeadImgUrl());
+			baseInfo.setGender(wechat.get(NumConstant.ZERO).getSex().toString());
+			baseInfo.setNickname(wechat.get(NumConstant.ZERO).getNickname());
+		}
+		userBaseInfoService.insertOrUpdate(baseInfo);
 	}
 
 	/**

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

@@ -3,6 +3,7 @@ package com.epmet.service.impl;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
 import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.exception.RenException;
+import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.commons.tools.utils.CpUserDetailRedis;
 import com.epmet.commons.tools.utils.Result;
@@ -15,9 +16,12 @@ import com.epmet.dto.UserDTO;
 import com.epmet.dto.UserWechatDTO;
 import com.epmet.dto.form.*;
 import com.epmet.dto.result.*;
+import com.epmet.entity.UserBaseInfoEntity;
 import com.epmet.entity.UserEntity;
 import com.epmet.entity.UserWechatEntity;
+import com.epmet.feign.EpmetPointOpenFeignClient;
 import com.epmet.feign.GovOrgFeignClient;
+import com.epmet.service.UserBaseInfoService;
 import com.epmet.service.UserService;
 import com.epmet.util.ModuleConstant;
 import org.apache.commons.lang3.StringUtils;
@@ -45,6 +49,10 @@ public class UserServiceImpl extends BaseServiceImpl<UserDao, UserEntity> implem
     private UserRoleDao userRoleDao;
     @Autowired
     private CpUserDetailRedis cpUserDetailRedis;
+    @Autowired
+    private UserBaseInfoService userBaseInfoService;
+    @Autowired
+    private EpmetPointOpenFeignClient epmetPointOpenFeignClient;
 
     private static final Logger log = LoggerFactory.getLogger(UserServiceImpl.class);
 
@@ -122,6 +130,12 @@ public class UserServiceImpl extends BaseServiceImpl<UserDao, UserEntity> implem
         userWechatDTO.setUpdatedTime(new Date());
         userWechatDTO.setUpdatedBy(wxUserInfoFormDTO.getUserId());
         userWechatDao.updateByUserId(userWechatDTO);
+        UserBaseInfoEntity baseInfo = new UserBaseInfoEntity();
+        baseInfo.setUserId(wxUserInfoFormDTO.getUserId());
+        baseInfo.setNickname(wxUserInfoFormDTO.getNickName());
+        baseInfo.setHeadImgUrl(wxUserInfoFormDTO.getAvatarUrl());
+        baseInfo.setGender(wxUserInfoFormDTO.getGender());
+        userBaseInfoService.insertOrUpdate(baseInfo);
         return new Result();
     }
 
@@ -172,6 +186,14 @@ public class UserServiceImpl extends BaseServiceImpl<UserDao, UserEntity> implem
             userRoleFormDTO.setCustomerId(myResiUserInfoFormDTO.getCustomerId());
             userRoleFormDTO.setGridId(myResiUserInfoFormDTO.getGridId());
             result.setRoleList(userRoleDao.getUserRoleList(userRoleFormDTO));
+
+            TokenDto dto = new TokenDto();
+            dto.setUserId(myResiUserInfoFormDTO.getUserId());
+            Result<ResiPointDetailResultDTO> pointResult = epmetPointOpenFeignClient.myPoint(dto);
+            if(pointResult.success() && null != pointResult.getData()){
+                //累计积分
+                result.setPoint(pointResult.getData().getAccumulatedPoint());
+            }
             return result;
         }
 

epmet-user/epmet-user-server/src/main/java/com/epmet/util/ModuleConstant.java

@@ -19,4 +19,19 @@ public interface ModuleConstant {
       * 未检索到客户信息
       * */
      String CUSTOMER_INFO_NOT_FOUND = "未检索到客户信息";
+
+     String RESI_USER_NICKNAME_SUFFIX_MALE = "先生";
+
+     String RESI_USER_NICKNAME_SUFFIX_FEMALE = "女士";
+
+     String RESI_USER_NICKNAME_SUFFIX_GENDER_UNKNOWN = "先生/女士";
+
+     String DASH = "-";
+
+     String GENDER_MALE = "男";
+
+     String GENDER_FEMALE = "女";
+
+     String GENDER_UNKNOWN = "未知";
+
 }

epmet-user/epmet-user-server/src/main/resources/mapper/GridLatestDao.xml

@@ -82,4 +82,15 @@
         AND customer_user_id = #{userId}
         ORDER BY latest_time DESC
     </select>
+
+    <!-- 查询一个客户下的居民和陌生人 传参 : 客户Id -->
+    <select id="selectAllUserByCustomerId" resultType="string">
+        SELECT DISTINCT
+            customer_user_id
+        FROM
+            grid_latest
+        WHERE
+            del_flag = '0'
+        AND customer_id = #{customerId}
+    </select>
 </mapper>

epmet-user/epmet-user-server/src/main/resources/mapper/RegisterRelationDao.xml

@@ -30,5 +30,19 @@
               user_id = #{userId}
     </select>
 
+    <!-- 查询用户的首次注册网格Id -->
+    <select id="selectRegisteredGridIdByUserId" resultType="com.epmet.entity.RegisterRelationEntity">
+        SELECT
+            GRID_ID,
+            CUSTOMER_ID
+        FROM
+            register_relation
+        WHERE
+            del_flag = '0'
+        AND
+            user_id = #{userId}
+        AND
+            first_register = '1'
+    </select>
 
 </mapper>

epmet-user/epmet-user-server/src/main/resources/mapper/UserWechatDao.xml

@@ -89,4 +89,27 @@
             uw.DEL_FLAG = '0'
             AND uw.NICKNAME IS NOT NULL
     </select>
+
+    <!-- 查询人员信息，排序，包括陌生人与注册居民，没有注册居民则只有微信昵称 -->
+    <select id="selectResiAndStrangerInfo" resultType="com.epmet.dto.result.CustomerUser4PointResultDTO">
+        SELECT
+            wechat.USER_ID,
+            wechat.NICKNAME AS userNickname,
+            wechat.HEAD_IMG_URL AS userHeadPhoto,
+            base.REAL_NAME AS userName
+        FROM
+            user_wechat wechat
+        LEFT JOIN
+            user_base_info base on wechat.USER_ID = base.USER_ID
+        WHERE
+            wechat.DEL_FLAG = '0'
+            <foreach collection="userIds" item="item" open="AND (" separator=" OR " close=" )">
+                wechat.USER_ID = #{item}
+            </foreach>
+            <if test='null != realName and "" != reamName'>
+                AND base.REAL_NAME = #{realName}
+            </if>
+        ORDER BY
+           base.REAL_NAME , wechat.NICKNAME
+    </select>
 </mapper>