Merge branches 'dev' and 'dev_heart' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_heart

epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/work/AactUserDetailFormDTO.java

@@ -24,4 +24,6 @@ public class AactUserDetailFormDTO implements Serializable {
     @NotBlank(message = "主键不能为空", groups = {AddUserInternalGroup.class})
     private String actUserRelationId;
 
+    @NotBlank(message = "当前活动id不能为空", groups = {UserHistoricalActFormDTO.AddUserInternalGroup.class})
+    private String currentActId;
 }

epmet-module/epmet-heart/epmet-heart-server/deploy/docker-compose-dev.yml

@@ -2,7 +2,7 @@ version: "3.7"
 services:
   epmet-heart-server:
     container_name: epmet-heart-server-dev
-    image: 192.168.1.130:10080/epmet-cloud-dev/epmet-heart-server:0.0.24
+    image: 192.168.1.130:10080/epmet-cloud-dev/epmet-heart-server:0.0.26
     ports:
       - "8111:8111"
     network_mode: host # 使用现有网络

epmet-module/epmet-heart/epmet-heart-server/pom.xml

@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <version>0.0.24</version>
+    <version>0.0.26</version>
     <parent>
         <groupId>com.epmet</groupId>
         <artifactId>epmet-heart</artifactId>

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/ActUserRelationDao.java

@@ -97,11 +97,12 @@ public interface ActUserRelationDao extends BaseDao<ActUserRelationEntity> {
     /**
      * @return java.lang.Integer
      * @param userId
+     * @param currentActId
      * @author yinzuomei
      * @description 报名活动个数（act_user_realation）
      * @Date 2020/7/23 15:57
      **/
-    Integer countSignUpActNum(String userId);
+    Integer countSignUpActNum(@Param("userId")String userId,@Param("currentActId") String currentActId);
 
     /**
      * @return java.lang.Integer

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/WorkActUserServiceImpl.java

@@ -348,7 +348,7 @@ public class WorkActUserServiceImpl implements WorkActUserService {
          ）
          */
         resultDTO.setStatus(actUserRelationDTO.getStatus());
-        HistoricalActInfo historicalActInfo=this.getHistoricalActInfo(actUserRelationDTO.getUserId());
+        HistoricalActInfo historicalActInfo=this.getHistoricalActInfo(actUserRelationDTO.getUserId(),formDTO.getCurrentActId());
         resultDTO.setHistoricalActInfo(historicalActInfo);
         if(ActConstant.ACT_USER_STATUS_AUDITING.equals(resultDTO.getStatus())){
             //被拒绝过，才赋值
@@ -399,7 +399,7 @@ public class WorkActUserServiceImpl implements WorkActUserService {
             resultDTO.setRealName(userBaseInfoResultDTO.getRealName());
         }
         //参与活动统计值
-        HistoricalActInfo historicalActInfo=getHistoricalActInfo(formDTO.getUserId());
+        HistoricalActInfo historicalActInfo=getHistoricalActInfo(formDTO.getUserId(),formDTO.getCurrentActId());
         resultDTO.setSignInActNum(historicalActInfo.getSignInActNum());
         //减去当前的
         resultDTO.setSignUpActNum(historicalActInfo.getSignUpActNum());
@@ -639,11 +639,12 @@ public class WorkActUserServiceImpl implements WorkActUserService {
     /**
      * @return com.epmet.dto.result.work.HistoricalActInfo
      * @param userId
+     * @param currentActId
      * @author yinzuomei
      * @description 用户历史活动情况
      * @Date 2020/7/23 15:56
      **/
-    private HistoricalActInfo getHistoricalActInfo(String userId) {
+    private HistoricalActInfo getHistoricalActInfo(String userId,String currentActId) {
         HistoricalActInfo historicalActInfo=new HistoricalActInfo();
         /**
          * 实际参加活动个数(已经签到的)
@@ -653,7 +654,7 @@ public class WorkActUserServiceImpl implements WorkActUserService {
         /**
          * 报名活动个数（act_user_realation）
          */
-         Integer signUpActNum=actUserRelationDao.countSignUpActNum(userId);
+         Integer signUpActNum=actUserRelationDao.countSignUpActNum(userId,currentActId);
         historicalActInfo.setSignUpActNum(signUpActNum);
         /**
          * 获得积分活动个数

epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/ActUserRelationDao.xml

@@ -114,7 +114,7 @@
     </select>
 
     <!--  报名活动个数（act_user_realation）  -->
-    <select id="countSignUpActNum" resultType="java.lang.Integer" parameterType="java.lang.String">
+    <select id="countSignUpActNum" resultType="java.lang.Integer" parameterType="map">
         SELECT
             count( 1 ) as total
         FROM
@@ -123,6 +123,9 @@
             DEL_FLAG = '0'
             and acu.STATUS !='auditing'
             AND acu.USER_ID = #{userId}
+            <if test="currentActId != null and currentActId != ''">
+                and acu.ACT_ID != #{currentActId}
+            </if>
     </select>
 
     <!--  获得积分活动个数  -->

epmet-module/epmet-point/epmet-point-server/deploy/docker-compose-dev.yml

@@ -2,7 +2,7 @@ version: "3.7"
 services:
   epmet-point-server:
     container_name: epmet-point-server-dev
-    image: 192.168.1.130:10080/epmet-cloud-dev/epmet-point-server:0.0.17
+    image: 192.168.1.130:10080/epmet-cloud-dev/epmet-point-server:0.0.18
     ports:
       - "8112:8112"
     network_mode: host # 使用现有网络

epmet-module/epmet-point/epmet-point-server/pom.xml

@@ -3,7 +3,7 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <version>0.0.17</version>
+    <version>0.0.18</version>
     <parent>
         <artifactId>epmet-point</artifactId>
         <groupId>com.epmet</groupId>

epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/dao/UserPointActionLogDao.java

@@ -23,6 +23,7 @@ import com.epmet.entity.UserPointActionLogEntity;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -50,5 +51,5 @@ public interface UserPointActionLogDao extends BaseDao<UserPointActionLogEntity>
      * @author wangc
      * @date 2020.07.31 15:11
     **/
-    Integer selectSumByEvent(@Param("userId") String userId,@Param("eventId") String eventId, @Param("sourceId") String sourceId,@Param("customerId") String customerId);
+    Integer selectSumByEvent(@Param("userId") String userId, @Param("eventId") String eventId, @Param("sourceId") String sourceId, @Param("customerId") String customerId, @Param("dateCheck") Date dateCheck);
 }

epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointVerificationLogServiceImpl.java

@@ -156,7 +156,7 @@ public class PointVerificationLogServiceImpl extends BaseServiceImpl<PointVerifi
             Map<String, List<ResiPointLogPeriodResultDTO>> sortedMap = Maps.newLinkedHashMap();
             map.entrySet().stream().sorted(Map.Entry.<String, List<ResiPointLogPeriodResultDTO>>comparingByKey().reversed())
                     .forEachOrdered(e -> sortedMap.put(e.getKey(), e.getValue()));
-            map.entrySet().forEach(e -> {
+            sortedMap.entrySet().forEach(e -> {
                 ResiPointLogListResultDTO o = new ResiPointLogListResultDTO();
                 o.setDate(e.getKey());
                 o.setDailyList(e.getValue());
@@ -243,9 +243,10 @@ public class PointVerificationLogServiceImpl extends BaseServiceImpl<PointVerifi
         if(StringUtils.isNotBlank(decodedUserId)){
             verificationParam.setUserId(decodedUserId);
         }else{
-            logger.error(String.format("用户二维码失效，参数详情 -> 【】", JSON.toJSON(verificationParam)));
+            logger.error(String.format("用户二维码失效，参数详情 -> 【%s】", JSON.toJSON(verificationParam)));
             result.setSuccessFlag(false);
             result.setFailureReason(ModuleConstant.INVALID_USER_QRCDDE);
+            return result;
         }
 
         DimIdGenerator.DimIdBean dim = DimIdGenerator.getDimIdBean(new Date());

epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/UserPointActionLogServiceImpl.java

@@ -196,11 +196,27 @@ public class UserPointActionLogServiceImpl extends BaseServiceImpl<UserPointActi
 
         PointRuleEntity ruleInfo = pointRuleService.getByEventCodeAndCustomerId(event.getCustomerId(),eventCode);
         if(null != ruleInfo && StringUtils.equals(NumConstant.ONE_STR,ruleInfo.getEnabledFlag())){
+            Date dateCheck = null;
             //判断积分规则的积分单位 次、天、分钟、小时
-
+            if(StringUtils.equals(ModuleConstant.POINT_UNIT_TIME,ruleInfo.getPointUnit())){
+                //次
+            }else if(StringUtils.equals(ModuleConstant.POINT_UNIT_DAY,ruleInfo.getPointUnit())){
+                //天
+                //在selectSumByEvent时要校验时间区间
+                Calendar calendar = Calendar.getInstance();
+                calendar.setTime(new Date());
+                calendar.set(Calendar.HOUR_OF_DAY, NumConstant.ZERO);
+                calendar.set(Calendar.MINUTE, NumConstant.ZERO);
+                calendar.set(Calendar.SECOND, NumConstant.ZERO);
+                dateCheck = calendar.getTime();
+            }else{
+                //其余积分单位
+                //TODO..
+                logger.warn(String.format("当前规则属于按%s计分，系统尚不支持响应此类积分规则的事件"),ruleInfo.getPointUnit());
+            }
             //校验是否达到上限
             if(ruleInfo.getUpLimit() > NumConstant.ZERO){
-                Integer sum = baseDao.selectSumByEvent(event.getUserId(),eventCode,event.getSourceId(),event.getCustomerId());
+                Integer sum = baseDao.selectSumByEvent(event.getUserId(),eventCode,event.getSourceId(),event.getCustomerId(),dateCheck);
                 if(null == sum) sum = NumConstant.ZERO;
                 if(StringUtils.equals(ModuleConstant.OPERATION_TYPE_PLUS,ruleInfo.getOperateType())){
                    sum += ruleInfo.getPoint();

epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/utils/ModuleConstant.java

@@ -94,4 +94,24 @@ public interface ModuleConstant extends Constant {
     String CREATED_BY_SYSTEM = "SYSTEM";
 
     String INVALID_USER_QRCDDE = "用户二维码失效";
+
+    /**
+     * 积分单位：次
+     * */
+    String POINT_UNIT_TIME = "time";
+
+    /**
+     * 积分单位：天
+     * */
+    String POINT_UNIT_DAY = "day";
+
+    /**
+     * 积分单位：分钟
+     * */
+    String POINT_UNIT_MINUTE = "minute";
+
+    /**
+     * 积分单位：小时
+     * */
+    String POINT_UNIT_HOUR = "hour";
 }

epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/UserPointActionLogDao.xml

@@ -56,6 +56,9 @@
             <if test='null != sourceId and "" != sourceId'>
                 AND SOURCE_ID = #{sourceId}
             </if>
+            <if test="null != dateCheck">
+                AND CREATED_TIME <![CDATA[ >= ]]> #{dateCheck}
+            </if>
 
     </select>
 </mapper>