积分代码迁移

epdc-cloud-api/src/main/java/com/elink/esua/epdc/controller/ApiUserPointsVerificationController.java

@@ -0,0 +1,66 @@
+package com.elink.esua.epdc.controller;
+
+import com.elink.esua.epdc.common.token.dto.TokenDto;
+import com.elink.esua.epdc.commons.tools.annotation.LoginUser;
+import com.elink.esua.epdc.commons.tools.utils.Result;
+import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils;
+import com.elink.esua.epdc.dto.epdc.result.UserPointsVerificationResultDTO;
+import com.elink.esua.epdc.dto.form.PointsExchangeLogsFormDTO;
+import com.elink.esua.epdc.pointcommons.tools.dto.PointsLogsResultDTO;
+import com.elink.esua.epdc.service.UserPointsVerificationService;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+/**
+ * 用户积分核销模块
+ *
+ * @author wgf
+ * @since 2022/3/8 10:47
+ */
+@RestController
+@RequestMapping("userpointsverification")
+public class ApiUserPointsVerificationController {
+
+    @Autowired
+    private UserPointsVerificationService userPointsVerificationService;
+
+    /**
+     * 获取积分核销兑换码
+     *
+     * @param userDetail 用户信息
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.epdc.result.UserPointsVerificationResultDTO>
+     * @author Liuchuang
+     * @since 2021/1/19 10:54
+     */
+    @GetMapping("getqrcode")
+    public Result<UserPointsVerificationResultDTO> getQRCode(@LoginUser TokenDto userDetail) {
+        if (null == userDetail || StringUtils.isEmpty(userDetail.getUserId())) {
+            return new Result<UserPointsVerificationResultDTO>().error("获取用户信息失败，请稍后重试");
+        }
+
+        return userPointsVerificationService.getQRCode(userDetail.getUserId());
+    }
+
+    /**
+     * 获取用户积分记录
+     *
+     * @param userDetail 用户信息
+     * @param formDto 表单
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<com.elink.esua.epdc.pointcommons.tools.dto.PointsLogsResultDTO>>
+     * @author Liuchuang
+     * @since 2021/1/19 14:16
+     */
+    @GetMapping("getpointslogs")
+    public Result<List<PointsLogsResultDTO>> getPointsLogs(@LoginUser TokenDto userDetail, PointsExchangeLogsFormDTO formDto) {
+        ValidatorUtils.validateEntity(formDto);
+        formDto.setUserId(userDetail.getUserId());
+
+        return userPointsVerificationService.listOfPointsLogs(formDto);
+    }
+
+}

epdc-cloud-api/src/main/java/com/elink/esua/epdc/controller/ApiWorkPointsVerificationController.java

@@ -0,0 +1,86 @@
+package com.elink.esua.epdc.controller;
+
+import com.elink.esua.epdc.commons.tools.utils.Result;
+import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils;
+import com.elink.esua.epdc.dto.SysDeptDTO;
+import com.elink.esua.epdc.dto.epdc.form.EpdcUserPointsVerificationCheckFormDTO;
+import com.elink.esua.epdc.dto.epdc.result.EpdcUserPointsVerificationResultDTO;
+import com.elink.esua.epdc.dto.form.EpdcWorkPointsVerificationFormDTO;
+import com.elink.esua.epdc.dto.form.EpdcWorkVerificationLogsFormDTO;
+import com.elink.esua.epdc.dto.result.EpdcVerificationLogsResultDTO;
+import com.elink.esua.epdc.service.UserPointsVerificationService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * 工作端用户积分核销模块
+ *
+ * @author Liuchuang
+ * @since 2021/1/19 10:47
+ */
+@RestController
+@RequestMapping("work/pointsverification")
+public class ApiWorkPointsVerificationController {
+
+    @Autowired
+    private UserPointsVerificationService userPointsVerificationService;
+
+    /**
+     * 扫描兑换码获取用户信息接口
+     *
+     * @param formDto 码ID
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.epdc.result.EpdcUserPointsVerificationResultDTO>
+     * @author Liuchuang
+     * @since 2021/1/19 15:03
+     */
+    @PostMapping("getuserinfobycode")
+    public Result<EpdcUserPointsVerificationResultDTO> getUserInfoByCode(@RequestBody EpdcUserPointsVerificationCheckFormDTO formDto) {
+        ValidatorUtils.validateEntity(formDto);
+        return userPointsVerificationService.getUserInfoByCode(formDto);
+    }
+
+    /**
+     * 积分核销
+     *
+     * @param formDto 表单
+     * @return com.elink.esua.epdc.commons.tools.utils.Result
+     * @author Liuchuang
+     * @since 2021/1/19 15:52
+     */
+    @PostMapping("pointsverification")
+    public Result pointsVerification(@RequestBody EpdcWorkPointsVerificationFormDTO formDto) {
+        ValidatorUtils.validateEntity(formDto);
+
+        return userPointsVerificationService.pointsVerification(formDto);
+    }
+
+    /**
+     * 工作端-核销记录
+     *
+     * @param formDto 表单
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<com.elink.esua.epdc.pointcommons.tools.dto.PointsLogsResultDTO>>
+     * @author Liuchuang
+     * @since 2021/1/19 17:00
+     */
+    @GetMapping("verificationlogs")
+    public Result<EpdcVerificationLogsResultDTO> verificationLogs(EpdcWorkVerificationLogsFormDTO formDto) {
+        ValidatorUtils.validateEntity(formDto);
+
+        return userPointsVerificationService.listOfVerificationLogs(formDto);
+    }
+
+    /**
+     * 根据机构类型获取机构数据
+     *
+     * @param typeKey 机构类型
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<com.elink.esua.epdc.dto.SysDeptDTO>>
+     * @author Liuchuang
+     * @since 2021/1/20 9:58
+     */
+    @GetMapping("getdeptinfo/{typeKey}")
+    public Result<List<SysDeptDTO>> getDeptInfoByTypeKey(@PathVariable String typeKey) {
+        return userPointsVerificationService.listOfDeptInfoByTypeKey(typeKey);
+    }
+}

epdc-cloud-api/src/main/java/com/elink/esua/epdc/controller/ApiWorkUserController.java

@@ -11,7 +11,9 @@ import com.elink.esua.epdc.controller.v2.ApiWorkUserV2Controller;
 import com.elink.esua.epdc.dto.epdc.form.*;
 import com.elink.esua.epdc.dto.epdc.result.*;
 import com.elink.esua.epdc.dto.form.EpdcWorkAppUserMaTokenFormDTO;
+import com.elink.esua.epdc.dto.form.EpdcWorkVerificationLogsFormDTO;
 import com.elink.esua.epdc.dto.form.WorkAppMenuStatisticsFormDTO;
+import com.elink.esua.epdc.dto.result.EpdcVerificationLogsResultDTO;
 import com.elink.esua.epdc.dto.result.WorkAppMenuStatisticsResultDTO;
 import com.elink.esua.epdc.pointcommons.tools.annotation.RecordUserBehavior;
 import com.elink.esua.epdc.service.WorkUserService;
@@ -33,6 +35,21 @@ public class ApiWorkUserController {
     @Autowired
     private WorkUserService workUserService;
 
+    /**
+     * 工作端-核销记录
+     *
+     * @param formDto 表单
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<com.elink.esua.epdc.pointcommons.tools.dto.PointsLogsResultDTO>>
+     * @author Liuchuang
+     * @since 2021/1/19 17:00
+     */
+    @GetMapping("verificationlogs")
+    public Result<EpdcVerificationLogsResultDTO> verificationLogs(EpdcWorkVerificationLogsFormDTO formDto) {
+        ValidatorUtils.validateEntity(formDto);
+
+        return workUserService.listOfVerificationLogs(formDto);
+    }
+
     /**
      * 工作端-获取token
      *

epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/AdminFeignClient.java

@@ -228,4 +228,15 @@ public interface AdminFeignClient {
      */
     @GetMapping("sys/gridmembercategory/getCommunityDeptList")
     Result getCommunityDeptList();
+
+    /**
+     * 根据机构类型获取机构数据
+     *
+     * @param typeKey 机构类型
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<com.elink.esua.epdc.dto.SysDeptDTO>>
+     * @author Liuchuang
+     * @since 2021/1/20 9:58
+     */
+    @GetMapping("sys/dept/getdeptinfo/{typeKey}")
+    Result<List<SysDeptDTO>> getDeptInfoByTypeKey(@PathVariable("typeKey") String typeKey);
 }

epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/UserFeignClient.java

@@ -542,5 +542,27 @@ public interface UserFeignClient {
      */
     @PostMapping(value = "app-user/user/updateBehavior4Points", consumes = MediaType.APPLICATION_JSON_VALUE)
     Result updateBehavior4Points(PointsUpdateFormDTO formDto);
+
+    /**
+     * 获取积分核销兑换码
+     *
+     * @param userId 用户ID
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.epdc.result.UserPointsVerificationResultDTO>
+     * @author Liuchuang
+     * @since 2021/1/19 15:08
+     */
+    @GetMapping(value = "app-user/epdc-app/verificationqrcode/getqrcode/{userId}", consumes = MediaType.APPLICATION_JSON_VALUE)
+    Result<UserPointsVerificationResultDTO> getQRCode(@PathVariable("userId") String userId);
+
+    /**
+     * 扫描兑换码获取用户信息接口
+     *
+     * @param formDto 码ID
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.epdc.result.EpdcUserPointsVerificationResultDTO>
+     * @author Liuchuang
+     * @since 2021/1/19 15:08
+     */
+    @PostMapping(value = "app-user/epdc-app/verificationqrcode/getuserinfobycode", consumes = MediaType.APPLICATION_JSON_VALUE)
+    Result<EpdcUserPointsVerificationResultDTO> getUserInfoByCode(EpdcUserPointsVerificationCheckFormDTO formDto);
 }
 

epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/fallback/AdminFeignClientFallback.java

@@ -117,4 +117,9 @@ public class AdminFeignClientFallback implements AdminFeignClient {
     public Result getCommunityDeptList() {
         return ModuleUtils.feignConError(ServiceConstant.EPDC_ADMIN_SERVER, "getCommunityDeptList");
     }
+
+    @Override
+    public Result<List<SysDeptDTO>> getDeptInfoByTypeKey(String typeKey) {
+        return ModuleUtils.feignConError(ServiceConstant.EPDC_ADMIN_SERVER, "getDeptInfoByTypeKey", typeKey);
+    }
 }

epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/fallback/UserFeignClientFallback.java

@@ -263,4 +263,14 @@ public class UserFeignClientFallback implements UserFeignClient {
     public Result<UserDTO> updateBehavior4Points(PointsUpdateFormDTO formDto) {
         return ModuleUtils.feignConError(ServiceConstant.EPDC_USER_SERVER, "updateBehavior4Points", formDto);
     }
+
+    @Override
+    public Result<UserPointsVerificationResultDTO> getQRCode(String userId) {
+        return ModuleUtils.feignConError(ServiceConstant.EPDC_USER_SERVER, "getQRCode", userId);
+    }
+
+    @Override
+    public Result<EpdcUserPointsVerificationResultDTO> getUserInfoByCode(EpdcUserPointsVerificationCheckFormDTO formDto) {
+        return ModuleUtils.feignConError(ServiceConstant.EPDC_USER_SERVER, "getUserInfoByCode", formDto);
+    }
 }

epdc-cloud-api/src/main/java/com/elink/esua/epdc/modules/points/feign/PointsFeignClient.java

@@ -2,16 +2,18 @@ package com.elink.esua.epdc.modules.points.feign;
 
 import com.elink.esua.epdc.commons.tools.constant.ServiceConstant;
 import com.elink.esua.epdc.commons.tools.utils.Result;
-import com.elink.esua.epdc.dto.form.EpdcAppPointsRankingFormDTO;
+import com.elink.esua.epdc.dto.form.*;
-import com.elink.esua.epdc.dto.form.EpdcAppPointsRecordFormDTO;
 import com.elink.esua.epdc.dto.result.EpdcAppPointsRankingResultDTO;
 import com.elink.esua.epdc.dto.result.EpdcAppPointsRecordResultDTO;
+import com.elink.esua.epdc.dto.result.EpdcVerificationLogsResultDTO;
 import com.elink.esua.epdc.modules.points.feign.fallback.PointsFeignClientFallback;
+import com.elink.esua.epdc.pointcommons.tools.dto.PointsLogsResultDTO;
 import com.elink.esua.epdc.pointcommons.tools.dto.PointsRuleResultDTO;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.http.MediaType;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
 
 import java.util.List;
 
@@ -60,4 +62,37 @@ public interface PointsFeignClient {
      **/
     @GetMapping(value = "points/epdc-app/points/getPointsRuleByBehaviorCode/{behaviorCode}", consumes = MediaType.APPLICATION_JSON_VALUE)
     Result<PointsRuleResultDTO> getPointsRuleByBehaviorCode(@PathVariable("behaviorCode") String behaviorCode);
+
+    /**
+     * 获取用户积分记录
+     *
+     * @param formDto 表单
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<com.elink.esua.epdc.pointcommons.tools.dto.PointsLogsResultDTO>>
+     * @author Liuchuang
+     * @since 2021/1/19 14:22
+     */
+    @GetMapping(value = "points/epdc-app/points/getpointslogs/list", consumes = MediaType.APPLICATION_JSON_VALUE)
+    Result<List<PointsLogsResultDTO>> getPointsLogs(PointsExchangeLogsFormDTO formDto);
+
+//    /**
+//     * 积分核销
+//     *
+//     * @param formDto 表单
+//     * @return com.elink.esua.epdc.commons.tools.utils.Result
+//     * @author Liuchuang
+//     * @since 2021/1/19 15:56
+//     */
+//    @PostMapping(value = "points/epdc-app/points/pointsVerification", consumes = MediaType.APPLICATION_JSON_VALUE)
+//    Result pointsVerification(EpdcWorkPointsVerificationFormDTO formDto);
+
+//    /**
+//     * 工作端-核销记录
+//     *
+//     * @param formDto 表单
+//     * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.epdc.result.EpdcUserPointsVerificationResultDTO>
+//     * @author Liuchuang
+//     * @since 2021/1/19 17:43
+//     */
+//    @GetMapping(value = "points/epdc-app/points/verificationLogs/list", consumes = MediaType.APPLICATION_JSON_VALUE)
+//    Result<EpdcVerificationLogsResultDTO> verificationLogs(EpdcWorkVerificationLogsFormDTO formDto);
 }

epdc-cloud-api/src/main/java/com/elink/esua/epdc/modules/points/feign/WorkPointsFeignClient.java

@@ -0,0 +1,51 @@
+package com.elink.esua.epdc.modules.points.feign;
+
+import com.elink.esua.epdc.commons.tools.constant.ServiceConstant;
+import com.elink.esua.epdc.commons.tools.utils.Result;
+import com.elink.esua.epdc.config.FeignRequestInterceptor;
+import com.elink.esua.epdc.dto.form.*;
+import com.elink.esua.epdc.dto.result.EpdcAppPointsRankingResultDTO;
+import com.elink.esua.epdc.dto.result.EpdcAppPointsRecordResultDTO;
+import com.elink.esua.epdc.dto.result.EpdcVerificationLogsResultDTO;
+import com.elink.esua.epdc.modules.points.feign.fallback.PointsFeignClientFallback;
+import com.elink.esua.epdc.modules.points.feign.fallback.WorkPointsFeignClientFallback;
+import com.elink.esua.epdc.pointcommons.tools.dto.PointsLogsResultDTO;
+import com.elink.esua.epdc.pointcommons.tools.dto.PointsRuleResultDTO;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.http.MediaType;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+
+import java.util.List;
+
+/**
+ * 积分管理模块
+ * @Author zhangyong
+ * @Date 2020-04-29
+ */
+@FeignClient(name = ServiceConstant.EPDC_POINTS_SERVER, fallback = WorkPointsFeignClientFallback.class, configuration = FeignRequestInterceptor.class)
+public interface WorkPointsFeignClient {
+
+    /**
+     * 积分核销
+     *
+     * @param formDto 表单
+     * @return com.elink.esua.epdc.commons.tools.utils.Result
+     * @author Liuchuang
+     * @since 2021/1/19 15:56
+     */
+    @PostMapping(value = "points/epdc-app/points/pointsVerification", consumes = MediaType.APPLICATION_JSON_VALUE)
+    Result pointsVerification(EpdcWorkPointsVerificationFormDTO formDto);
+
+    /**
+     * 工作端-核销记录
+     *
+     * @param formDto 表单
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.epdc.result.EpdcUserPointsVerificationResultDTO>
+     * @author Liuchuang
+     * @since 2021/1/19 17:43
+     */
+    @GetMapping(value = "points/epdc-app/points/verificationLogs/list", consumes = MediaType.APPLICATION_JSON_VALUE)
+    Result<EpdcVerificationLogsResultDTO> verificationLogs(EpdcWorkVerificationLogsFormDTO formDto);
+}

epdc-cloud-api/src/main/java/com/elink/esua/epdc/modules/points/feign/fallback/PointsFeignClientFallback.java

@@ -3,11 +3,12 @@ package com.elink.esua.epdc.modules.points.feign.fallback;
 import com.elink.esua.epdc.commons.tools.constant.ServiceConstant;
 import com.elink.esua.epdc.commons.tools.utils.ModuleUtils;
 import com.elink.esua.epdc.commons.tools.utils.Result;
-import com.elink.esua.epdc.dto.form.EpdcAppPointsRankingFormDTO;
+import com.elink.esua.epdc.dto.form.*;
-import com.elink.esua.epdc.dto.form.EpdcAppPointsRecordFormDTO;
 import com.elink.esua.epdc.dto.result.EpdcAppPointsRankingResultDTO;
 import com.elink.esua.epdc.dto.result.EpdcAppPointsRecordResultDTO;
+import com.elink.esua.epdc.dto.result.EpdcVerificationLogsResultDTO;
 import com.elink.esua.epdc.modules.points.feign.PointsFeignClient;
+import com.elink.esua.epdc.pointcommons.tools.dto.PointsLogsResultDTO;
 import com.elink.esua.epdc.pointcommons.tools.dto.PointsRuleResultDTO;
 import org.springframework.stereotype.Component;
 
@@ -35,4 +36,19 @@ public class PointsFeignClientFallback implements PointsFeignClient {
     public Result<PointsRuleResultDTO> getPointsRuleByBehaviorCode(String behaviorCode) {
         return ModuleUtils.feignConError(ServiceConstant.EPDC_POINTS_SERVER, "getPointsRuleByBehaviorCode", behaviorCode);
     }
+
+    @Override
+    public Result<List<PointsLogsResultDTO>> getPointsLogs(PointsExchangeLogsFormDTO formDto) {
+        return ModuleUtils.feignConError(ServiceConstant.EPDC_POINTS_SERVER, "getPointsLogs", formDto);
+    }
+
+//    @Override
+//    public Result pointsVerification(EpdcWorkPointsVerificationFormDTO formDto) {
+//        return ModuleUtils.feignConError(ServiceConstant.EPDC_POINTS_SERVER, "pointsVerification", formDto);
+//    }
+//
+//    @Override
+//    public Result<EpdcVerificationLogsResultDTO> verificationLogs(EpdcWorkVerificationLogsFormDTO formDto) {
+//        return ModuleUtils.feignConError(ServiceConstant.EPDC_POINTS_SERVER, "verificationLogs", formDto);
+//    }
 }

epdc-cloud-api/src/main/java/com/elink/esua/epdc/modules/points/feign/fallback/WorkPointsFeignClientFallback.java

@@ -0,0 +1,35 @@
+package com.elink.esua.epdc.modules.points.feign.fallback;
+
+import com.elink.esua.epdc.commons.tools.constant.ServiceConstant;
+import com.elink.esua.epdc.commons.tools.utils.ModuleUtils;
+import com.elink.esua.epdc.commons.tools.utils.Result;
+import com.elink.esua.epdc.dto.form.*;
+import com.elink.esua.epdc.dto.result.EpdcAppPointsRankingResultDTO;
+import com.elink.esua.epdc.dto.result.EpdcAppPointsRecordResultDTO;
+import com.elink.esua.epdc.dto.result.EpdcVerificationLogsResultDTO;
+import com.elink.esua.epdc.modules.points.feign.PointsFeignClient;
+import com.elink.esua.epdc.modules.points.feign.WorkPointsFeignClient;
+import com.elink.esua.epdc.pointcommons.tools.dto.PointsLogsResultDTO;
+import com.elink.esua.epdc.pointcommons.tools.dto.PointsRuleResultDTO;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+/**
+ * 积分管理模块
+ * @Author zhangyong
+ * @Date 2020-04-29
+ */
+@Component
+public class WorkPointsFeignClientFallback implements WorkPointsFeignClient {
+
+    @Override
+    public Result pointsVerification(EpdcWorkPointsVerificationFormDTO formDto) {
+        return ModuleUtils.feignConError(ServiceConstant.EPDC_POINTS_SERVER, "pointsVerification", formDto);
+    }
+
+    @Override
+    public Result<EpdcVerificationLogsResultDTO> verificationLogs(EpdcWorkVerificationLogsFormDTO formDto) {
+        return ModuleUtils.feignConError(ServiceConstant.EPDC_POINTS_SERVER, "verificationLogs", formDto);
+    }
+}

epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/UserPointsVerificationService.java

@@ -0,0 +1,83 @@
+package com.elink.esua.epdc.service;
+
+import com.elink.esua.epdc.commons.tools.utils.Result;
+import com.elink.esua.epdc.dto.SysDeptDTO;
+import com.elink.esua.epdc.dto.epdc.form.EpdcUserPointsVerificationCheckFormDTO;
+import com.elink.esua.epdc.dto.epdc.result.EpdcUserPointsVerificationResultDTO;
+import com.elink.esua.epdc.dto.epdc.result.UserPointsVerificationResultDTO;
+import com.elink.esua.epdc.dto.form.EpdcWorkPointsVerificationFormDTO;
+import com.elink.esua.epdc.dto.form.EpdcWorkVerificationLogsFormDTO;
+import com.elink.esua.epdc.dto.form.PointsExchangeLogsFormDTO;
+import com.elink.esua.epdc.dto.result.EpdcVerificationLogsResultDTO;
+import com.elink.esua.epdc.pointcommons.tools.dto.PointsLogsResultDTO;
+
+import java.util.List;
+
+/**
+ * 用户积分核销
+ *
+ * @author Liuchuang
+ * @since 2021/1/19 10:48
+ */
+public interface UserPointsVerificationService {
+
+    /**
+     * 获取积分核销兑换码
+     *
+     * @param userId 用户ID
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.epdc.result.UserPointsVerificationResultDTO>
+     * @author Liuchuang
+     * @since 2021/1/19 10:57
+     */
+    Result<UserPointsVerificationResultDTO> getQRCode(String userId);
+
+    /**
+     * 获取用户积分记录
+     *
+     * @param formDto 表单
+     * @return java.util.List<com.elink.esua.epdc.pointcommons.tools.dto.PointsLogsResultDTO>
+     * @author Liuchuang
+     * @since 2021/1/19 14:17
+     */
+    Result<List<PointsLogsResultDTO>> listOfPointsLogs(PointsExchangeLogsFormDTO formDto);
+
+    /**
+     * 扫描兑换码获取用户信息接口
+     *
+     * @param formDto 码ID
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.epdc.result.EpdcUserPointsVerificationResultDTO>
+     * @author Liuchuang
+     * @since 2021/1/19 15:04
+     */
+    Result<EpdcUserPointsVerificationResultDTO> getUserInfoByCode(EpdcUserPointsVerificationCheckFormDTO formDto);
+
+    /**
+     * 积分核销
+     *
+     * @param formDto 表单
+     * @return com.elink.esua.epdc.commons.tools.utils.Result
+     * @author Liuchuang
+     * @since 2021/1/19 15:53
+     */
+    Result pointsVerification(EpdcWorkPointsVerificationFormDTO formDto);
+
+    /**
+     * 工作端-核销记录
+     *
+     * @param formDto 表单
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.epdc.result.EpdcUserPointsVerificationResultDTO>
+     * @author Liuchuang
+     * @since 2021/1/19 17:41
+     */
+    Result<EpdcVerificationLogsResultDTO> listOfVerificationLogs(EpdcWorkVerificationLogsFormDTO formDto);
+
+    /**
+     * 根据机构类型获取机构数据
+     *
+     * @param typeKey 机构类型
+     * @return java.util.List<com.elink.esua.epdc.dto.SysDeptDTO>
+     * @author Liuchuang
+     * @since 2021/1/20 9:59
+     */
+    Result<List<SysDeptDTO>> listOfDeptInfoByTypeKey(String typeKey);
+}

epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/WorkUserService.java

@@ -6,7 +6,9 @@ import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.dto.epdc.form.*;
 import com.elink.esua.epdc.dto.epdc.result.*;
 import com.elink.esua.epdc.dto.form.EpdcWorkAppUserMaTokenFormDTO;
+import com.elink.esua.epdc.dto.form.EpdcWorkVerificationLogsFormDTO;
 import com.elink.esua.epdc.dto.form.WorkAppMenuStatisticsFormDTO;
+import com.elink.esua.epdc.dto.result.EpdcVerificationLogsResultDTO;
 import com.elink.esua.epdc.dto.result.WorkAppMenuStatisticsResultDTO;
 
 import java.util.List;
@@ -19,6 +21,16 @@ import java.util.List;
  */
 public interface WorkUserService {
 
+    /**
+     * 工作端-核销记录
+     *
+     * @param formDto 表单
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.epdc.result.EpdcUserPointsVerificationResultDTO>
+     * @author Liuchuang
+     * @since 2021/1/19 17:41
+     */
+    Result<EpdcVerificationLogsResultDTO> listOfVerificationLogs(EpdcWorkVerificationLogsFormDTO formDto);
+
     /**
      * 工作端-获取token
      *

epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/impl/UserPointsVerificationServiceImpl.java

@@ -0,0 +1,75 @@
+package com.elink.esua.epdc.service.impl;
+
+import com.elink.esua.epdc.commons.tools.utils.Result;
+import com.elink.esua.epdc.dto.SysDeptDTO;
+import com.elink.esua.epdc.dto.epdc.form.EpdcUserPointsVerificationCheckFormDTO;
+import com.elink.esua.epdc.dto.epdc.result.EpdcUserPointsVerificationResultDTO;
+import com.elink.esua.epdc.dto.epdc.result.UserPointsVerificationResultDTO;
+import com.elink.esua.epdc.dto.form.EpdcWorkPointsVerificationFormDTO;
+import com.elink.esua.epdc.dto.form.EpdcWorkVerificationLogsFormDTO;
+import com.elink.esua.epdc.dto.form.PointsExchangeLogsFormDTO;
+import com.elink.esua.epdc.dto.result.EpdcVerificationLogsResultDTO;
+import com.elink.esua.epdc.feign.AdminFeignClient;
+import com.elink.esua.epdc.feign.UserFeignClient;
+import com.elink.esua.epdc.modules.points.feign.PointsFeignClient;
+import com.elink.esua.epdc.modules.points.feign.WorkPointsFeignClient;
+import com.elink.esua.epdc.pointcommons.tools.dto.PointsLogsResultDTO;
+import com.elink.esua.epdc.service.UserPointsVerificationService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * 用户积分核销
+ *
+ * @author Liuchuang
+ * @since 2021/1/19 10:49
+ */
+@Service
+public class UserPointsVerificationServiceImpl implements UserPointsVerificationService {
+
+    @Autowired
+    private UserFeignClient userFeignClient;
+
+    @Autowired
+    private PointsFeignClient pointsFeignClient;
+
+    @Autowired
+    private AdminFeignClient adminFeignClient;
+
+    @Autowired
+    private WorkPointsFeignClient workPointsFeignClient;
+
+    @Override
+    public Result<UserPointsVerificationResultDTO> getQRCode(String userId) {
+        return userFeignClient.getQRCode(userId);
+    }
+
+    @Override
+    public Result<List<PointsLogsResultDTO>> listOfPointsLogs(PointsExchangeLogsFormDTO formDto) {
+        return pointsFeignClient.getPointsLogs(formDto);
+    }
+
+    @Override
+    public Result<EpdcUserPointsVerificationResultDTO> getUserInfoByCode(EpdcUserPointsVerificationCheckFormDTO formDto) {
+        return userFeignClient.getUserInfoByCode(formDto);
+    }
+
+    @Override
+    public Result pointsVerification(EpdcWorkPointsVerificationFormDTO formDto) {
+        return workPointsFeignClient.pointsVerification(formDto);
+    }
+
+    @Override
+    public Result<EpdcVerificationLogsResultDTO> listOfVerificationLogs(EpdcWorkVerificationLogsFormDTO formDto) {
+        return workPointsFeignClient.verificationLogs(formDto);
+    }
+
+    @Override
+    public Result<List<SysDeptDTO>> listOfDeptInfoByTypeKey(String typeKey) {
+        return adminFeignClient.getDeptInfoByTypeKey(typeKey);
+    }
+
+
+}

epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/impl/WorkUserServiceImpl.java

@@ -16,20 +16,25 @@ import com.elink.esua.epdc.dto.SysUserDTO;
 import com.elink.esua.epdc.dto.epdc.form.*;
 import com.elink.esua.epdc.dto.epdc.result.*;
 import com.elink.esua.epdc.dto.form.EpdcWorkAppUserMaTokenFormDTO;
+import com.elink.esua.epdc.dto.form.EpdcWorkVerificationLogsFormDTO;
 import com.elink.esua.epdc.dto.form.WorkAppMenuStatisticsFormDTO;
 import com.elink.esua.epdc.dto.issue.form.IssueStateStatisticsFormDTO;
 import com.elink.esua.epdc.dto.issue.result.IssueStateStatisticsResultDTO;
 import com.elink.esua.epdc.dto.item.form.ItemStatisticsFormDTO;
 import com.elink.esua.epdc.dto.item.result.ItemStatisticsResultDTO;
+import com.elink.esua.epdc.dto.result.EpdcVerificationLogsResultDTO;
 import com.elink.esua.epdc.dto.result.WorkAppMenuStatisticsResultDTO;
 import com.elink.esua.epdc.enums.AppMenuCategoryEnum;
 import com.elink.esua.epdc.feign.AdminFeignClient;
 import com.elink.esua.epdc.feign.ResourceFeignClient;
 import com.elink.esua.epdc.feign.UserFeignClient;
+import com.elink.esua.epdc.modules.points.feign.PointsFeignClient;
+import com.elink.esua.epdc.modules.points.feign.WorkPointsFeignClient;
 import com.elink.esua.epdc.service.WorkIssueService;
 import com.elink.esua.epdc.service.WorkItemService;
 import com.elink.esua.epdc.service.WorkUserService;
 import com.elink.esua.epdc.utils.WxMaServiceUtils;
+import lombok.extern.slf4j.Slf4j;
 import me.chanjar.weixin.common.error.WxErrorException;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -45,6 +50,7 @@ import java.util.List;
  * @date 2019/11/18 10:49
  */
 @Service
+@Slf4j
 public class WorkUserServiceImpl implements WorkUserService {
     @Autowired
     private UserFeignClient userFeignClient;
@@ -64,6 +70,14 @@ public class WorkUserServiceImpl implements WorkUserService {
     @Autowired
     private WorkItemService workItemService;
 
+    @Autowired
+    private WorkPointsFeignClient workPointsFeignClient;
+    @Override
+    public Result<EpdcVerificationLogsResultDTO> listOfVerificationLogs(EpdcWorkVerificationLogsFormDTO formDto) {
+        log.info("+++++++++++++++++++++SecurityUser.getDeptId():"+ SecurityUser.getDeptId());
+        return workPointsFeignClient.verificationLogs(formDto);
+    }
+
     @Override
     public Result<WorkUserAuthorizationDTO> getMaToken(EpdcWorkAppUserMaTokenFormDTO formDto) {
         // 获取openId