积分埋点 redis bug修复

esua-epdc/epdc-module/epdc-points/epdc-points-client/src/main/java/com/elink/esua/epdc/dto/result/PointsRuleResultDTO.java

@@ -20,7 +20,6 @@ package com.elink.esua.epdc.dto.result;
 import lombok.Data;
 
 import java.io.Serializable;
-import java.util.Date;
 
 
 /**
@@ -34,10 +33,6 @@ public class PointsRuleResultDTO implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
-    /**
-     * ID
-     */
-	private String id;
 
     /**
      * 积分规则编码
@@ -49,6 +44,10 @@ public class PointsRuleResultDTO implements Serializable {
      */
 	private String behaviorCode;
 
+    /**
+     * 动作描述
+     */
+    private String behaviorDesc;
     /**
      * 积分规则描述
      */
@@ -84,41 +83,6 @@ public class PointsRuleResultDTO implements Serializable {
      */
 	private String addedVal;
 
-    /**
-     * 备注
-     */
-	private String remark;
-
-    /**
-     * 乐观锁
-     */
-	private Integer revision;
-
-    /**
-     * 删除标识 0-否，1-是
-     */
-	private String delFlag;
-
-    /**
-     * 创建人
-     */
-	private String createdBy;
-
-    /**
-     * 创建时间
-     */
-	private Date createdTime;
-
-    /**
-     * 更新人
-     */
-	private String updatedBy;
-
-    /**
-     * 更新时间
-     */
-	private Date updatedTime;
-
     /**
      * 动作上限次数0-不限 1-一次 ....
      */

esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/dao/PointsRuleDao.java

@@ -19,8 +19,6 @@ package com.elink.esua.epdc.dao;
 
 import com.elink.esua.epdc.commons.mybatis.dao.BaseDao;
 import com.elink.esua.epdc.dto.PointsRuleDTO;
-import com.elink.esua.epdc.dto.result.BehaviorResultDto;
-import com.elink.esua.epdc.dto.result.PointsLogsResultDTO;
 import com.elink.esua.epdc.dto.result.PointsRuleResultDTO;
 import com.elink.esua.epdc.entity.PointsRuleEntity;
 import org.apache.ibatis.annotations.Mapper;
@@ -44,7 +42,7 @@ public interface PointsRuleDao extends BaseDao<PointsRuleEntity> {
      * @Date 2020/4/29
      * @Param [behaviorCode]
      **/
-    PointsRuleEntity selecOnePointsRuleByBehaviorCode(String behaviorCode);
+    PointsRuleResultDTO selecOnePointsRuleByBehaviorCode(String behaviorCode);
 
     /**
      * 积分规则配置 列表查询

esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/mq/PointsModifyConsumer.java

@@ -3,29 +3,20 @@ package com.elink.esua.epdc.mq;
 import com.alibaba.fastjson.JSONObject;
 import com.elink.esua.epdc.common.token.dto.TokenDto;
 import com.elink.esua.epdc.common.token.util.CpUserDetailRedis;
-import com.elink.esua.epdc.commons.tools.constant.Constant;
 import com.elink.esua.epdc.commons.tools.constant.RocketMqConstant;
-import com.elink.esua.epdc.commons.tools.exception.ErrorCode;
-import com.elink.esua.epdc.commons.tools.exception.RenException;
 import com.elink.esua.epdc.commons.tools.utils.ConvertUtils;
-import com.elink.esua.epdc.commons.tools.utils.DateUtils;
 import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.dto.UserDTO;
 import com.elink.esua.epdc.dto.form.PointsLogsAddFormDTO;
 import com.elink.esua.epdc.dto.form.PointsLogsFormDTO;
 import com.elink.esua.epdc.dto.result.PointsLogsResultDTO;
-import com.elink.esua.epdc.dto.result.PointsLogsSumResultDTO;
 import com.elink.esua.epdc.dto.result.PointsRuleResultDTO;
 import com.elink.esua.epdc.entity.PointsLogsEntity;
 import com.elink.esua.epdc.feign.UsersFeignClient;
 import com.elink.esua.epdc.jwt.JwtTokenProperties;
-import com.elink.esua.epdc.jwt.JwtTokenUtils;
 import com.elink.esua.epdc.mq.dto.BehaviorDto;
-import com.elink.esua.epdc.service.PointsBehaviorService;
 import com.elink.esua.epdc.service.PointsLogsService;
 import com.elink.esua.epdc.service.PointsRuleService;
-import io.jsonwebtoken.Claims;
-import io.netty.util.internal.StringUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.rocketmq.common.message.MessageExt;
@@ -165,6 +156,7 @@ public class PointsModifyConsumer implements RocketMQListener<MessageExt> {
         //4.更新redis用户积分情况
         TokenDto tokenDto = ConvertUtils.sourceToTarget(userDTO, TokenDto.class);
         tokenDto.setUserId(userDTO.getId());
+        tokenDto.setGridId(userDTO.getDeptId());
         int expire = jwtTokenProperties.getExpire();
         cpUserDetailRedis.set(tokenDto, expire);
         //更新用户的积分 -- 结束

esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/service/impl/PointsRuleServiceImpl.java

@@ -30,13 +30,8 @@ import com.elink.esua.epdc.commons.tools.redis.RedisKeys;
 import com.elink.esua.epdc.commons.tools.redis.RedisUtils;
 import com.elink.esua.epdc.commons.tools.utils.ConvertUtils;
 import com.elink.esua.epdc.commons.tools.utils.Result;
-import com.elink.esua.epdc.commons.tools.constant.FieldConstant;
-import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.dao.PointsRuleDao;
 import com.elink.esua.epdc.dto.PointsRuleDTO;
-import com.elink.esua.epdc.dto.form.PointsLogsFormDTO;
-import com.elink.esua.epdc.dto.result.BehaviorResultDto;
-import com.elink.esua.epdc.dto.result.PointsLogsResultDTO;
 import com.elink.esua.epdc.dto.result.PointsRuleResultDTO;
 import com.elink.esua.epdc.entity.PointsRuleEntity;
 import com.elink.esua.epdc.redis.PointsRuleRedis;
@@ -171,9 +166,7 @@ public class PointsRuleServiceImpl extends BaseServiceImpl<PointsRuleDao, Points
 
     @Override
     public PointsRuleResultDTO getPointsRuleByBehaviorCode(String behaviorCode) {
-        PointsRuleEntity pointsRuleEntity = baseDao.selecOnePointsRuleByBehaviorCode(behaviorCode);
-        PointsRuleResultDTO pointsRuleResultDTO = ConvertUtils.sourceToTarget(pointsRuleEntity, PointsRuleResultDTO.class);
-        return pointsRuleResultDTO;
+        return baseDao.selecOnePointsRuleByBehaviorCode(behaviorCode);
     }
 
     /**

esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/resources/mapper/PointsRuleDao.xml

@@ -24,10 +24,15 @@
         <result property="updatedTime" column="UPDATED_TIME"/>
     </resultMap>
 
-    <select id="selecOnePointsRuleByBehaviorCode" resultMap="pointsRuleMap">
-        select ID,RULE_CODE,BEHAVIOR_CODE,RULE_DESC,OPERATION_TYPE,POINTS,LIMIT_TYPE,UPPER_LIMIT_VAL
-        ,ENABLE_FLAG,ADDED_VAL,REMARK,REVISION,DEL_FLAG,CREATED_BY,CREATED_TIME,UPDATED_BY,UPDATED_TIME,LIMIT_NUM
-        from epdc_points_rule where BEHAVIOR_CODE = #{behaviorCode} and ENABLE_FLAG = '1' limit 1
+    <select id="selecOnePointsRuleByBehaviorCode" resultType="com.elink.esua.epdc.dto.result.PointsRuleResultDTO">
+        select epr.RULE_CODE,epb.BEHAVIOR_CODE,epr.RULE_DESC,epr.OPERATION_TYPE,epr.POINTS,epr.LIMIT_TYPE,epr.UPPER_LIMIT_VAL
+        ,epr.ENABLE_FLAG,epr.ADDED_VAL,epr.LIMIT_NUM,epb.BEHAVIOR_DESC
+        from epdc_points_behavior_rule epbr
+    left join epdc_points_behavior epb on  epb.ID = epbr.BEHAVIOR_ID
+    left join epdc_points_rule epr on epr.ID = epbr.RULE_ID
+    where epbr.DEL_FLAG='0' and epb.DEL_FLAG='0' and epr.DEL_FLAG='0' and epr.ENABLE_FLAG = '1' and epb.BEHAVIOR_CODE = #{behaviorCode}
+    order by epbr.CREATED_TIME desc
+    limit 1;
     </select>
 
     <select id="selectListPointsRule" resultType="com.elink.esua.epdc.dto.PointsRuleDTO">