From 6fc76f98840d440b9b32a4db506a71e4ad2bb48c Mon Sep 17 00:00:00 2001
From: wangchao <crystal_jupiter@163.com>
Date: Thu, 10 Sep 2020 13:24:52 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E7=A7=AF=E5=88=86=E6=A0=B8=E9=94=80?=
 =?UTF-8?q?=E5=8A=A0=E5=85=A5customerId=E6=A0=A1=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/epmet/service/impl/UserPointTotalServiceImpl.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/UserPointTotalServiceImpl.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/UserPointTotalServiceImpl.java
index 2560755667..6bace14ee9 100644
--- a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/UserPointTotalServiceImpl.java
+++ b/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;

From 2444e10d078fb37ceb0cf666550d060f5f26f406 Mon Sep 17 00:00:00 2001
From: zhangyongzhangyong <2012005003@qq.coom>
Date: Fri, 11 Sep 2020 09:57:18 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E7=AD=BE=E5=88=B0=E6=89=93=E5=8D=A1?=
 =?UTF-8?q?=E6=8C=89=E9=92=AE=EF=BC=8C=E6=8E=A7=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dto/result/resi/ResiActDetailResultDTO.java      |  8 ++++++--
 .../com/epmet/service/impl/ActInfoServiceImpl.java   | 12 +++++++++---
 2 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/resi/ResiActDetailResultDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/resi/ResiActDetailResultDTO.java
index 312d36843e..0f5033e02a 100644
--- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/resi/ResiActDetailResultDTO.java
+++ b/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）
diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/ActInfoServiceImpl.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/ActInfoServiceImpl.java
index 9f3649d421..4f539675fb 100644
--- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/ActInfoServiceImpl.java
+++ b/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);

From a600e8919ee6869109dc4a529ae0c40a36faa227 Mon Sep 17 00:00:00 2001
From: jianjun <liujianjun@git.elinkit.com.cn>
Date: Fri, 11 Sep 2020 10:54:35 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=A4=A7=E5=B0=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/epmet/commons/tools/utils/DingdingMsgSender.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/DingdingMsgSender.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/DingdingMsgSender.java
index 59016ccc88..d37ef464bd 100644
--- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/DingdingMsgSender.java
+++ b/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;
 
 	/**
 	 * 有序队列