积分过期脚本

liquidnet-bus-do/liquidnet-service-stone-do/src/main/java/com/liquidnet/service/stone/mapper/StoneScoreLogsMapper.java

@@ -3,7 +3,9 @@ package com.liquidnet.service.stone.mapper;
 import com.liquidnet.service.stone.dto.StoneInvalidDto;
 import com.liquidnet.service.stone.entity.StoneScoreLogs;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
 
+import java.time.LocalDate;
 import java.util.List;
 
 /**
@@ -16,6 +18,6 @@ import java.util.List;
  */
 public interface StoneScoreLogsMapper extends BaseMapper<StoneScoreLogs> {
 
-    List<StoneInvalidDto> getInvalidScore(String time);
+    List<StoneInvalidDto> getInvalidScore(@Param("st") LocalDate st, @Param("et") LocalDate et);
 
 }

liquidnet-bus-do/liquidnet-service-stone-do/src/main/resources/com/liquidnet/service/stone/mapper/StoneScoreLogsMapper.xml

@@ -8,7 +8,7 @@
     </resultMap>
 
     <select id="getInvalidScore" resultMap="StoneScoreListDtoResult">
-        select uid,sum(score) as 'invalid_score' from stone_score_logs where created_at <![CDATA[<]]> #{time} group by uid
+        select uid,sum(score) as 'invalid_score' from stone_score_logs where created_at <![CDATA[>=]]> #{st} and created_at <![CDATA[<]]> #{et} group by uid
         ORDER BY uid
     </select>
 

liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/controller/stone/InnerController.java

@@ -31,7 +31,7 @@ public class InnerController {
     @PostMapping("refreshScore")
     @ApiOperation("积分过期")
     @ApiImplicitParams({
-            @ApiImplicitParam(type = "form", required = true, dataType = "String", name = "time", value = "格式[2022-12-01]", example = "1"),
+            @ApiImplicitParam(type = "form", required = true, dataType = "String", name = "time", value = "格式[2022-12-01]", example = "2022-12-01"),
     })
     public void refreshScore(@RequestParam("time") String time) {
         data.refreshScore(time);

liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/service/impl/stone/StoneServerImpl.java

 package com.liquidnet.service.platform.service.impl.stone;
 
-import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.liquidnet.common.cache.redis.util.RedisDataSourceUtil;
-import com.liquidnet.commons.lang.util.CollectionUtil;
-import com.liquidnet.commons.lang.util.HttpUtil;
 import com.liquidnet.commons.lang.util.IDGenerator;
-import com.liquidnet.service.adam.constant.AdamRedisConst;
-import com.liquidnet.service.adam.dto.vo.AdamUserInfoVo;
-import com.liquidnet.service.adam.entity.AdamUser;
-import com.liquidnet.service.adam.mapper.AdamUserMapper;
 import com.liquidnet.service.feign.stone.api.FeignStoneIntegralClient;
-import com.liquidnet.service.kylin.mapper.KylinOrderTicketsMapper;
-import com.liquidnet.service.stone.constant.StoneConstant;
 import com.liquidnet.service.stone.dto.StoneInvalidDto;
 import com.liquidnet.service.stone.entity.StoneScoreLogs;
 import com.liquidnet.service.stone.entity.StoneScoreUser;
 import com.liquidnet.service.stone.entity.TempScore;
-import com.liquidnet.service.stone.mapper.StoneScoreItemsMapper;
 import com.liquidnet.service.stone.mapper.StoneScoreLogsMapper;
 import com.liquidnet.service.stone.mapper.StoneScoreUserMapper;
 import com.liquidnet.service.stone.mapper.TempScoreMapper;
 import com.liquidnet.service.stone.vo.StoneUserVo;
-import com.liquidnet.service.sweet.constant.SweetConstant;
-import com.liquidnet.service.sweet.vo.SweetAppletUsersVo;
-import com.mysql.cj.jdbc.result.ResultSetImpl;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.data.domain.PageRequest;
-import org.springframework.data.domain.Pageable;
-import org.springframework.data.domain.Sort;
 import org.springframework.data.mongodb.core.MongoTemplate;
-import org.springframework.data.mongodb.core.query.Criteria;
-import org.springframework.data.mongodb.core.query.Query;
 import org.springframework.stereotype.Service;
 
-import java.sql.Connection;
-import java.sql.DriverManager;
-import java.sql.PreparedStatement;
+import java.math.BigDecimal;
+import java.time.LocalDate;
 import java.time.LocalDateTime;
-import java.util.Arrays;
-import java.util.HashMap;
+import java.time.format.DateTimeFormatter;
 import java.util.List;
 
+
 @Service
 @Slf4j
 public class StoneServerImpl {
@@ -63,17 +41,13 @@ public class StoneServerImpl {
 
     public boolean refreshScore(String time) {
         //获取需要跑积分的用户
-        List<StoneInvalidDto> logsList = stoneScoreLogsMapper.getInvalidScore();
-        log.debug("DATA SIZE = "+logsList.size());
+        LocalDate et = LocalDate.parse(time);
+        LocalDate st = et.minusYears(1);
+        List<StoneInvalidDto> logsList = stoneScoreLogsMapper.getInvalidScore(st,et);
         for (StoneInvalidDto logs : logsList) {
-//            int restScore = getUserScoreRest(logs.getUid());
-//            if(logs.getScore().compareTo(new BigDecimal(restScore))<0){
-//                log.debug("积分过期 全量");
-//                stoneIntegralClient.de2111(logs.getUid(), new BigDecimal(logs.getScore() + "").intValue(), "积分到期");
-//            }else if(restScore>0){
-//                log.debug("积分过期 部分");
-//                stoneIntegralClient.de2111(logs.getUid(), new BigDecimal(restScore + "").intValue(), "积分到期");
-//            }
+            if(logs.getInvalidScore()>0){
+                stoneIntegralClient.de2111(logs.getUid(), new BigDecimal(logs.getInvalidScore() + "").intValue(), "积分到期");
+            }
         }
         return true;
     }