From 7a8c770c955b8aeb79e19ff6bf8324f7d471e00c Mon Sep 17 00:00:00 2001
From: songyunpeng <syp2850@163.com>
Date: Sun, 1 Aug 2021 00:46:55 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A7=AF=E5=88=86=E6=B8=85=E9=9B=B6=20feign?=
 =?UTF-8?q?=E8=B6=85=E6=97=B6bug=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../elink/esua/epdc/feign/UsersFeignClient.java    | 10 ++++++++++
 .../feign/fallback/UsersFeignClientFallback.java   |  5 +++++
 .../epdc/service/impl/PointsLogsServiceImpl.java   |  3 ++-
 .../elink/esua/epdc/controller/UserController.java | 11 +++++++++++
 .../com/elink/esua/epdc/service/UserService.java   |  8 ++++++++
 .../esua/epdc/service/impl/UserServiceImpl.java    | 14 ++++++++------
 6 files changed, 44 insertions(+), 7 deletions(-)

diff --git a/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/feign/UsersFeignClient.java b/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/feign/UsersFeignClient.java
index eee0e501..b9d88e93 100644
--- a/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/feign/UsersFeignClient.java
+++ b/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/feign/UsersFeignClient.java
@@ -91,5 +91,15 @@ public interface UsersFeignClient {
      **/
     @GetMapping(value = "app-user/usergrid/getUserFirstScanGird/{userId}", consumes = MediaType.APPLICATION_JSON_VALUE)
     Result<UserGridRelationDTO> getUserFirstScanGird(@PathVariable("userId") String userId);
+
+    /**
+     * @Description   季度重置用户可兑换积分  - 数据库操作 - points调用
+     * @Author songyunpeng
+     * @Date  2021/8/1
+     * @Param []
+     * @return com.elink.esua.epdc.commons.tools.utils.Result
+     **/
+    @PostMapping(value = "app-user/user/resetUserPoints", consumes = MediaType.APPLICATION_JSON_VALUE)
+    Result resetUserPoints();
 }
 
diff --git a/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/feign/fallback/UsersFeignClientFallback.java b/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/feign/fallback/UsersFeignClientFallback.java
index 190bd604..19638573 100644
--- a/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/feign/fallback/UsersFeignClientFallback.java
+++ b/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/feign/fallback/UsersFeignClientFallback.java
@@ -53,4 +53,9 @@ public class UsersFeignClientFallback implements UsersFeignClient {
         return ModuleUtils.feignConError(ServiceConstant.EPDC_USER_SERVER, "getUserFirstScanGird", userId);
     }
 
+    @Override
+    public Result resetUserPoints() {
+        return ModuleUtils.feignConError(ServiceConstant.EPDC_USER_SERVER, "resetUserPoints");
+    }
+
 }
diff --git a/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/service/impl/PointsLogsServiceImpl.java b/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/service/impl/PointsLogsServiceImpl.java
index 78602094..1af92cdc 100755
--- a/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/service/impl/PointsLogsServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/service/impl/PointsLogsServiceImpl.java
@@ -604,7 +604,7 @@ public class PointsLogsServiceImpl extends BaseServiceImpl<PointsLogsDao, Points
             pointsLogsEntity.setOperationTime(new Date());
             pointsLogsEntity.setOperationMode(PointsOperationModeEnum.OPERATION_MODE_ADMIN.getOperationMode());
             pointsLogsEntity.setRuleCode(PointsConstant.behaviorCodeCode);
-            pointsLogsEntity.setBehaviorCode(BehaviorEnum.TOPIC_VIOLATIONS.getValue());
+            pointsLogsEntity.setBehaviorCode(BehaviorEnum.POINTS_RESET.getValue());
             pointsLogsEntity.setOperationDesc(behaviorCodeInfoByBehaviorCode.getData().getBehaviorDesc());
             pointsLogsEntity.setPoints(formDto.getPoints());
             pointsLogsEntity.setOperationType("0");
@@ -622,6 +622,7 @@ public class PointsLogsServiceImpl extends BaseServiceImpl<PointsLogsDao, Points
             list.add(pointsLogsEntity);
         }
         baseDao.insertBatchPointsResetLogs(list);
+        usersFeignClient.resetUserPoints();
         return new Result();
     }
 
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/UserController.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/UserController.java
index 6f3d7439..e62739df 100644
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/UserController.java
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/UserController.java
@@ -386,5 +386,16 @@ public class UserController {
         return userService.resetPoints();
     }
 
+    /**
+     * @Description  季度重置用户可兑换积分  - 数据库操作 - points调用
+     * @Author songyunpeng
+     * @Date  2021/4/19
+     * @Param []
+     * @return com.elink.esua.epdc.commons.tools.utils.Result
+     **/
+    @PostMapping("resetUserPoints")
+    public Result resetUserPoints(){
+        return userService.resetUserPoints();
+    }
 
 }
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/UserService.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/UserService.java
index 96de755a..e49f9fc5 100644
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/UserService.java
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/UserService.java
@@ -459,4 +459,12 @@ public interface UserService extends BaseService<UserEntity> {
      * @since 2021/7/5 10:11
      */
     List<EpdcUserMobilePartyFlagResultDTO> listOfUserPartyFlagByMobiles(List<String> formDto);
+    /**
+     * @Description   季度重置用户可兑换积分  - 数据库操作 - points调用
+     * @Author songyunpeng
+     * @Date  2021/8/1
+     * @Param []
+     * @return com.elink.esua.epdc.commons.tools.utils.Result
+     **/
+    Result resetUserPoints();
 }
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserServiceImpl.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserServiceImpl.java
index adfaa248..d9e4486c 100644
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserServiceImpl.java
@@ -1564,12 +1564,8 @@ public class UserServiceImpl extends BaseServiceImpl<UserDao, UserEntity> implem
         if(userEntities.size()==0){
             return new Result();
         }
-        //插入到积分日志表 -  新增积分清零记录
-        Result result = pointsFeignClient.insertPointsResetLogs(ConvertUtils.sourceToTarget(userEntities, UserDTO.class));
-        if(result.success()){
-            //重置积分
-            baseDao.resetPoints();
-        }
+        //插入到积分日志表 -  新增积分清零记录 - 并且重置积分
+        pointsFeignClient.insertPointsResetLogs(ConvertUtils.sourceToTarget(userEntities, UserDTO.class));
         return new Result();
     }
 
@@ -1580,4 +1576,10 @@ public class UserServiceImpl extends BaseServiceImpl<UserDao, UserEntity> implem
         }
         return baseDao.selectListOfUserPartyFlagByMobiles(formDto);
     }
+
+    @Override
+    public Result resetUserPoints() {
+        baseDao.resetPoints();
+        return new Result();
+    }
 }