Merge branch 'pre' into 'master'

Pre

See merge request !165

liquidnet-bus-do/liquidnet-service-stone-do/src/main/java/com/liquidnet/service/stone/dto/StoneInvalidDto.java

+package com.liquidnet.service.stone.dto;
+
+import lombok.Data;
+
+
+@Data
+public class StoneInvalidDto implements Cloneable {
+    /**
+     * 昵称
+     */
+    private String uid;
+    /**
+     * 头像
+     */
+    private Integer invalidScore;
+
+
+    private static final StoneInvalidDto obj = new StoneInvalidDto();
+    public static StoneInvalidDto getNew() {
+        try {
+            return (StoneInvalidDto) obj.clone();
+        } catch (CloneNotSupportedException e) {
+            e.printStackTrace();
+        }
+        return new StoneInvalidDto();
+    }
+}

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

 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;
 
 /**
  * <p>
@@ -13,4 +18,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  */
 public interface StoneScoreLogsMapper extends BaseMapper<StoneScoreLogs> {
 
+    List<StoneInvalidDto> getInvalidScore(@Param("st") LocalDate st, @Param("et") LocalDate et,@Param("strTime") String strTime);
+
 }

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

@@ -2,4 +2,20 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.liquidnet.service.stone.mapper.StoneScoreLogsMapper">
 
+    <resultMap id="StoneScoreListDtoResult" type="com.liquidnet.service.stone.dto.StoneInvalidDto">
+        <result column="uid" property="uid"/>
+        <result column="invalid_score" property="invalidScore"/>
+    </resultMap>
+
+    <select id="getInvalidScore" resultMap="StoneScoreListDtoResult">
+        SELECT uid,sum(score) as 'invalid_score' from stone_score_logs
+        WHERE
+        (created_at <![CDATA[>=]]> #{st} and created_at <![CDATA[<]]> #{et})
+        OR
+        content = #{strTime}
+        GROUP BY uid
+        HAVING invalid_score <![CDATA[>]]> 0
+        ORDER BY uid
+    </select>
+
 </mapper>

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

 package com.liquidnet.service.platform.controller.stone;
 
-import com.liquidnet.service.base.ResponseDto;
 import com.liquidnet.service.platform.service.impl.stone.StoneServerImpl;
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -26,4 +27,14 @@ public class InnerController {
 //        return ResponseDto.success(result);
     }
 
+
+    @PostMapping("refreshScore")
+    @ApiOperation("积分过期")
+    @ApiImplicitParams({
+            @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 {
@@ -60,6 +39,19 @@ public class StoneServerImpl {
     @Autowired
     TempScoreMapper tempScoreMapper;
 
+    public boolean refreshScore(String time) {
+        //获取需要跑积分的用户
+        LocalDate et = LocalDate.parse(time);
+        LocalDate st = et.minusYears(1);
+        int year = et.getYear();
+        String strTime = year + "年积分过期";
+        List<StoneInvalidDto> logsList = stoneScoreLogsMapper.getInvalidScore(st, et, strTime);
+        for (StoneInvalidDto logs : logsList) {
+            stoneIntegralClient.de2111(logs.getUid(), new BigDecimal(logs.getInvalidScore() + "").intValue(), strTime);
+        }
+        return true;
+    }
+
     public boolean initScore(String uid) {
         try {
             TempScore dataBean = tempScoreMapper.selectOne(Wrappers.lambdaQuery(TempScore.class).eq(TempScore::getUid, uid));