Merge remote-tracking branch 'origin/dev'

epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/DingdingMsgSender.java

@@ -38,7 +38,7 @@ public class DingdingMsgSender {
 	/**
 	 * 默认10
 	 */
-	private static Integer maxQueueSize = 10;
+	private static Integer maxQueueSize = 8;
 
 	/**
 	 * 有序队列

epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/resi/ResiActDetailResultDTO.java

@@ -139,9 +139,13 @@ public class ResiActDetailResultDTO implements Serializable {
     private Boolean isSignUp;
 
     /**
-     * 用户是否已报名该活动  true用户已报名；false用户未报名
+     * 用户报名活动后，当前状态
+     * --（已报名/待审核auditing，
+     * -- 审核通过passed，
+     * -- 未报名(审核不通过 或 取消报名)canceled，
+     * -- ）
      */
-    private Boolean isRegistration;
+    private String isRegistration;
 
     /**
      * 打卡开始时间（yyyy-MM-dd HH:mm）

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

@@ -221,12 +221,18 @@ public class ActInfoServiceImpl extends BaseServiceImpl<ActInfoDao, ActInfoEntit
 
         // 查询用户是否已报名活动
         String status = actUserRelationDao.selectUserStatusByActIdAndUserId(formDto.getActId(), formDto.getUserId());
-        detailResultDTO.setIsRegistration(false);
+        // 默认用户 未报名活动
+        detailResultDTO.setIsRegistration(ActConstant.ACT_USER_LOG_OPER_CANCELD);
         if (null != status){
-            if (ActConstant.ACT_USER_STATUS_PASSED.equals(status) || ActConstant.ACT_USER_STATUS_AUDITING.equals(status)){
-                detailResultDTO.setIsRegistration(true);
+            if (ActConstant.ACT_USER_STATUS_PASSED.equals(status)){
+                // 用户报名活动审核通过，赋值 审核通过
+                detailResultDTO.setIsRegistration(status);
+            } else if ( ActConstant.ACT_USER_STATUS_AUDITING.equals(status)){
+                // 用户报名活动未审核，赋值 已报名/待审核
+                detailResultDTO.setIsRegistration(status);
             }
         }
+
         // 获取用户报名状态
         String currentUserStatus = getCurrentUserStatus(formDto.getActId(), formDto.getUserId());
         detailResultDTO.setCurrentUserStatus(currentUserStatus);

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

@@ -260,7 +260,7 @@ public class UserPointTotalServiceImpl extends BaseServiceImpl<UserPointTotalDao
      **/
     @Override
     public ResiPointDetailResultDTO getMyPointGroupByCustomer(CommonUserFormDTO customerUserParam) {
-        ResiPointDetailResultDTO result = baseDao.selectPointByUserId(customerUserParam.getUserId());
+        ResiPointDetailResultDTO result = baseDao.selectPointByCustomerUserId(customerUserParam.getUserId(),customerUserParam.getCustomerId());
         if(null == result) return new ResiPointDetailResultDTO();
         if(null == result.getUsablePoint() || null == result.getAccumulatedPoint()) return new ResiPointDetailResultDTO();
         return result;