From 8fa043ff0d6d4d10b54bcda6af6fa2cf4d5841f1 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Mon, 3 Aug 2020 13:06:59 +0800 Subject: [PATCH 1/5] heart+1=>25 --- .../epmet-heart-server/deploy/docker-compose-dev.yml | 2 +- epmet-module/epmet-heart/epmet-heart-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-module/epmet-heart/epmet-heart-server/deploy/docker-compose-dev.yml b/epmet-module/epmet-heart/epmet-heart-server/deploy/docker-compose-dev.yml index 0179d90cbb..0387c203c3 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/deploy/docker-compose-dev.yml +++ b/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.25 ports: - "8111:8111" network_mode: host # 使用现有网络 diff --git a/epmet-module/epmet-heart/epmet-heart-server/pom.xml b/epmet-module/epmet-heart/epmet-heart-server/pom.xml index df604298c2..c0ec2bd194 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/pom.xml +++ b/epmet-module/epmet-heart/epmet-heart-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.0.24 + 0.0.25 com.epmet epmet-heart From ade7ae96b29ce72c8360aab97316aadc01fc688e Mon Sep 17 00:00:00 2001 From: wangchao Date: Mon, 3 Aug 2020 13:55:39 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E7=A7=AF=E5=88=86=E5=85=91=E6=8D=A2?= =?UTF-8?q?=E8=AE=B0=E5=BD=95=E9=A1=BA=E5=BA=8F=E3=80=81=E7=A7=AF=E5=88=86?= =?UTF-8?q?=E4=BA=8B=E4=BB=B6=E5=A2=9E=E5=8A=A0=E7=A7=AF=E5=88=86=E5=8D=95?= =?UTF-8?q?=E4=BD=8D=E5=88=A4=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/dao/UserPointActionLogDao.java | 3 ++- .../impl/PointVerificationLogServiceImpl.java | 5 +++-- .../impl/UserPointActionLogServiceImpl.java | 20 +++++++++++++++++-- .../java/com/epmet/utils/ModuleConstant.java | 20 +++++++++++++++++++ .../mapper/UserPointActionLogDao.xml | 3 +++ 5 files changed, 46 insertions(+), 5 deletions(-) diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/dao/UserPointActionLogDao.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/dao/UserPointActionLogDao.java index 821bb2e443..a16ce26c67 100644 --- a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/dao/UserPointActionLogDao.java +++ b/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 * @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); } \ No newline at end of file diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointVerificationLogServiceImpl.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointVerificationLogServiceImpl.java index d7f0d379b6..f4f0a88b7b 100644 --- a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointVerificationLogServiceImpl.java +++ b/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> sortedMap = Maps.newLinkedHashMap(); map.entrySet().stream().sorted(Map.Entry.>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 【】", 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()); diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/UserPointActionLogServiceImpl.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/UserPointActionLogServiceImpl.java index 1d813760ca..87466df5d7 100644 --- a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/UserPointActionLogServiceImpl.java +++ b/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 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(); diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/utils/ModuleConstant.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/utils/ModuleConstant.java index d607a11b21..468373e0dc 100644 --- a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/utils/ModuleConstant.java +++ b/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"; } diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/UserPointActionLogDao.xml b/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/UserPointActionLogDao.xml index 3ba551805c..827287d941 100644 --- a/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/UserPointActionLogDao.xml +++ b/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/UserPointActionLogDao.xml @@ -56,6 +56,9 @@ AND SOURCE_ID = #{sourceId} + + AND CREATED_TIME = ]]> #{dateCheck} + \ No newline at end of file From 34289fa3200457da46a6bcc801c197ed30855f90 Mon Sep 17 00:00:00 2001 From: wangchao Date: Mon, 3 Aug 2020 14:00:26 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E7=A7=AF=E5=88=86=20=20=2017=20->=2018?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet-point-server/deploy/docker-compose-dev.yml | 2 +- epmet-module/epmet-point/epmet-point-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-module/epmet-point/epmet-point-server/deploy/docker-compose-dev.yml b/epmet-module/epmet-point/epmet-point-server/deploy/docker-compose-dev.yml index b06be7e182..d0fc88fc97 100644 --- a/epmet-module/epmet-point/epmet-point-server/deploy/docker-compose-dev.yml +++ b/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 # 使用现有网络 diff --git a/epmet-module/epmet-point/epmet-point-server/pom.xml b/epmet-module/epmet-point/epmet-point-server/pom.xml index 526f37eaa0..6388663f7d 100644 --- a/epmet-module/epmet-point/epmet-point-server/pom.xml +++ b/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"> 4.0.0 - 0.0.17 + 0.0.18 epmet-point com.epmet From 8765258142b1f485f0984836a0357c3ca1fb0fd3 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Mon, 3 Aug 2020 14:22:45 +0800 Subject: [PATCH 4/5] =?UTF-8?q?userdetail=E6=8E=A5=E5=8F=A3=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/dto/form/work/AactUserDetailFormDTO.java | 2 ++ .../src/main/java/com/epmet/dao/ActUserRelationDao.java | 3 ++- .../com/epmet/service/impl/WorkActUserServiceImpl.java | 9 +++++---- .../src/main/resources/mapper/ActUserRelationDao.xml | 5 ++++- 4 files changed, 13 insertions(+), 6 deletions(-) diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/work/AactUserDetailFormDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/work/AactUserDetailFormDTO.java index 3e653e76c1..07e481fb99 100644 --- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/work/AactUserDetailFormDTO.java +++ b/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; } diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/ActUserRelationDao.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/ActUserRelationDao.java index 7b97d6cf80..1322db3c83 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/ActUserRelationDao.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/ActUserRelationDao.java @@ -97,11 +97,12 @@ public interface ActUserRelationDao extends BaseDao { /** * @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 diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/WorkActUserServiceImpl.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/WorkActUserServiceImpl.java index a0aa461f52..1fa1472042 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/WorkActUserServiceImpl.java +++ b/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); /** * 获得积分活动个数 diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/ActUserRelationDao.xml b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/ActUserRelationDao.xml index 9d7e256b9e..618cfb76fb 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/ActUserRelationDao.xml +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/ActUserRelationDao.xml @@ -114,7 +114,7 @@ - SELECT count( 1 ) as total FROM @@ -123,6 +123,9 @@ DEL_FLAG = '0' and acu.STATUS !='auditing' AND acu.USER_ID = #{userId} + + and acu.ACT_ID != #{currentActId} + From ceec9c1abe0019532fed6fc92b523e2f2478d30a Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Mon, 3 Aug 2020 14:23:21 +0800 Subject: [PATCH 5/5] heart+1=>26 --- .../epmet-heart-server/deploy/docker-compose-dev.yml | 2 +- epmet-module/epmet-heart/epmet-heart-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-module/epmet-heart/epmet-heart-server/deploy/docker-compose-dev.yml b/epmet-module/epmet-heart/epmet-heart-server/deploy/docker-compose-dev.yml index 0387c203c3..9379505508 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/deploy/docker-compose-dev.yml +++ b/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.25 + image: 192.168.1.130:10080/epmet-cloud-dev/epmet-heart-server:0.0.26 ports: - "8111:8111" network_mode: host # 使用现有网络 diff --git a/epmet-module/epmet-heart/epmet-heart-server/pom.xml b/epmet-module/epmet-heart/epmet-heart-server/pom.xml index c0ec2bd194..c44bc98d5b 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/pom.xml +++ b/epmet-module/epmet-heart/epmet-heart-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.0.25 + 0.0.26 com.epmet epmet-heart