积分清零 feign超时bug修改

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

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

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

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

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

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