From 94bdb7ea334723b1f6e9ddcb0196ef2c89c4340e Mon Sep 17 00:00:00 2001 From: zhangyongzhangyong <2012005003@qq.coom> Date: Wed, 29 Jul 2020 17:16:58 +0800 Subject: [PATCH 1/9] =?UTF-8?q?=E6=9C=80=E6=96=B0=E6=B4=BB=E5=8A=A8?= =?UTF-8?q?=E5=88=97=E8=A1=A8sql=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/ActInfoDao.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/ActInfoDao.xml b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/ActInfoDao.xml index 891cde8f20..2ff55fffcc 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/ActInfoDao.xml +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/ActInfoDao.xml @@ -286,7 +286,7 @@ i.ACT_QUOTA actQuota, IFNULL(c.signupNum, 0) signupNum, -- 已报名人数 case - when i.ACT_STATUS = 'published' + when = ]]> NOW() then case when = ACT_QUOTA ]]> and i.ACT_QUOTA_CATEGORY = 1 @@ -304,6 +304,7 @@ WHERE i.DEL_FLAG = '0' AND i.CUSTOMER_ID = #{customerId} AND i.ACT_STATUS != 'finished' AND i.ACT_STATUS != 'canceled' + AND ]]> NOW() ORDER BY i.CREATED_TIME DESC LIMIT 0, #{num} From b627bb3712a7bec5826e997cebfc3e2438a29b82 Mon Sep 17 00:00:00 2001 From: jianjun Date: Wed, 29 Jul 2020 17:32:41 +0800 Subject: [PATCH 2/9] =?UTF-8?q?user=5Fcustomer=E6=B7=BB=E5=8A=A0=E6=98=AF?= =?UTF-8?q?=E5=90=A6=E6=B3=A8=E5=86=8C=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/epmet/dao/UserCustomerDao.java | 11 ++++++++++- .../service/impl/UserResiInfoServiceImpl.java | 8 +++++++- .../db/migration/V0.0.5__add_isRegister.sql | 8 ++++++++ .../main/resources/mapper/UserCustomerDao.xml | 16 +++------------- .../main/resources/mapper/UserResiInfoDao.xml | 1 + 5 files changed, 29 insertions(+), 15 deletions(-) create mode 100644 epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.5__add_isRegister.sql diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/UserCustomerDao.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/UserCustomerDao.java index 4dc226e8a7..04473a7b88 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/UserCustomerDao.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/UserCustomerDao.java @@ -3,6 +3,7 @@ package com.epmet.dao; import com.epmet.commons.mybatis.dao.BaseDao; import com.epmet.entity.UserCustomerEntity; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; /** * @Description 客户用户关系表 @@ -11,6 +12,14 @@ import org.apache.ibatis.annotations.Mapper; * @date 2020.03.31 13:53 */ @Mapper -public interface UserCustomerDao extends BaseDao{ +public interface UserCustomerDao extends BaseDao { + /** + * desc:修改客户的用户的注册状态为已注册 + * + * @param customerId + * @param userId + * @return + */ + int updateRegistered(@Param("customerId") String customerId, @Param("userId") String userId); } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserResiInfoServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserResiInfoServiceImpl.java index 0ccd75bf6a..c2e90bfcf4 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserResiInfoServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserResiInfoServiceImpl.java @@ -30,6 +30,7 @@ import com.epmet.commons.tools.utils.Result; import com.epmet.constant.SmsTemplateConstant; import com.epmet.constant.UserConstant; import com.epmet.constant.UserRoleConstant; +import com.epmet.dao.UserCustomerDao; import com.epmet.dao.UserResiInfoDao; import com.epmet.dto.UserResiInfoDTO; import com.epmet.dto.UserResiRegisterVisitDTO; @@ -79,6 +80,8 @@ public class UserResiInfoServiceImpl extends BaseServiceImpl page(Map params) { @@ -208,7 +211,7 @@ public class UserResiInfoServiceImpl extends BaseServiceImpl - - - - - - - - - - - - - + + update set IS_REGISTER = 1 where CUSTOMER_ID = #{customerId,jdbcType=VARCHAR} and USER_ID = #{userId,jdbcType=VARCHAR} + \ No newline at end of file diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/UserResiInfoDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/UserResiInfoDao.xml index 067c49a86a..9221d0c011 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/UserResiInfoDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/UserResiInfoDao.xml @@ -103,6 +103,7 @@ uri.DEL_FLAG = '0' AND uri.REG_MOBILE = #{regMobile,jdbcType=VARCHAR} AND uc.CUSTOMER_ID = #{customerId,jdbcType=VARCHAR} + AND uc.IS_REGISTER = 1 From 675cd406f30dea029885659d2730e488af68ecba Mon Sep 17 00:00:00 2001 From: jianjun Date: Wed, 29 Jul 2020 17:37:08 +0800 Subject: [PATCH 3/9] =?UTF-8?q?=E9=83=A8=E7=BD=B2user?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- epmet-user/epmet-user-server/deploy/docker-compose-dev.yml | 2 +- epmet-user/epmet-user-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-user/epmet-user-server/deploy/docker-compose-dev.yml b/epmet-user/epmet-user-server/deploy/docker-compose-dev.yml index b405c1d094..971640a11c 100644 --- a/epmet-user/epmet-user-server/deploy/docker-compose-dev.yml +++ b/epmet-user/epmet-user-server/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-user-server: container_name: epmet-user-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/epmet-user-server:0.3.87 + image: 192.168.1.130:10080/epmet-cloud-dev/epmet-user-server:0.3.88 ports: - "8087:8087" network_mode: host # 不会创建新的网络 diff --git a/epmet-user/epmet-user-server/pom.xml b/epmet-user/epmet-user-server/pom.xml index 43bcda2035..acc3a938b8 100644 --- a/epmet-user/epmet-user-server/pom.xml +++ b/epmet-user/epmet-user-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.87 + 0.3.88 com.epmet epmet-user From 78972ac06d8e158f807a7a76bde96e6766cee3bb Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Wed, 29 Jul 2020 17:40:56 +0800 Subject: [PATCH 4/9] =?UTF-8?q?=E8=81=94=E8=B0=83bug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../commons/tools/constant/NumConstant.java | 1 + .../epmet/commons/tools/utils/DateUtils.java | 47 +++++++++++ .../dto/form/work/SummaryActFormDTO.java | 2 +- .../work/CanceledActDetailResultDTO.java | 23 +++++ .../work/FinishedActDetailResultDTO.java | 23 +++++ .../work/InProgressActDetailResultDTO.java | 33 ++++++++ .../epmet/controller/WorkActController.java | 4 +- .../service/impl/WorkActServiceImpl.java | 83 +++++++++++++++---- .../service/impl/WorkActUserServiceImpl.java | 9 +- .../src/main/resources/mapper/ActInfoDao.xml | 28 ++++++- 10 files changed, 230 insertions(+), 23 deletions(-) diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/constant/NumConstant.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/constant/NumConstant.java index 1c0247c8b1..92af86d3a9 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/constant/NumConstant.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/constant/NumConstant.java @@ -51,4 +51,5 @@ public interface NumConstant { String FIVE_STR = "5"; String POSITIVE_EIGHT_STR = "+8"; String EMPTY_STR = ""; + String ONE_NEG_STR = "-1"; } diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/DateUtils.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/DateUtils.java index d7c2098221..0a45a6b290 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/DateUtils.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/DateUtils.java @@ -8,6 +8,7 @@ package com.epmet.commons.tools.utils; +import com.epmet.commons.tools.constant.NumConstant; import org.apache.commons.lang3.StringUtils; import org.joda.time.DateTime; import org.joda.time.LocalDate; @@ -488,6 +489,13 @@ public class DateUtils { return format.format(timestamp * 1000); } + /** + * @return java.util.Date + * @param minStr yyyy-MM-dd HH:mm字符串 + * @author yinzuomei + * @description 改为yyyy-MM-dd HH:mm:00 时间点 + * @Date 2020/7/29 13:38 + **/ public static Date minStrToSecondDate(String minStr){ if(StringUtils.isNotBlank(minStr)&&minStr.length()==16){ String date=minStr.concat(":00"); @@ -502,6 +510,14 @@ public class DateUtils { return null; } + /** + * @return java.lang.Integer + * @param startDate + * @param endDate + * @author yinzuomei + * @description 计算两个时间点之间相隔分钟数 + * @Date 2020/7/29 13:38 + **/ public static Integer calculateMin(Date startDate,Date endDate){ long start=startDate.getTime(); long end=endDate.getTime(); @@ -510,4 +526,35 @@ public class DateUtils { System.out.println("两个时间之间的分钟差为：" + minutes); return minutes; } + + /** + * @return java.lang.String + * @param dateOne + * @param dateTwo + * @author yinzuomei + * @description 相等0 -1: dateOne早于dateTwo; 1: dateOne晚于dateTwo + * @Date 2020/7/29 15:31 + **/ + public static String comparteDate(Date dateOne,Date dateTwo){ + long dateOneTime =dateOne.getTime(); + long dateTwoTime= dateTwo.getTime(); + String result=""; + if(dateOneTime==dateTwoTime){ + result= NumConstant.ZERO_STR; + }else if(dateOneTimedateTwoTime){ + result=NumConstant.ONE_STR; + } + return result; + } + + public static void main(String[] args) { + Date today=new Date(); + Date yesterDay=DateUtils.parse("2020-07-28 15:33:00","yyyy-MM-dd HH:mm:ss"); + Date tomorrow=DateUtils.parse("2020-07-30 15:33:00","yyyy-MM-dd HH:mm:ss"); + System.out.println(comparteDate(today,today)); + System.out.println(comparteDate(yesterDay,today)); + System.out.println(comparteDate(tomorrow,today)); + } } diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/work/SummaryActFormDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/work/SummaryActFormDTO.java index bd5f3a2655..69537fc848 100644 --- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/work/SummaryActFormDTO.java +++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/work/SummaryActFormDTO.java @@ -29,5 +29,5 @@ public class SummaryActFormDTO implements Serializable { @Valid @Size(min=1,message = "活动详情不能为空",groups = {AddUserShowGroup.class}) - private List actContent; + private List actSummary; } diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/work/CanceledActDetailResultDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/work/CanceledActDetailResultDTO.java index 3239a78ced..3a19c7d4d4 100644 --- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/work/CanceledActDetailResultDTO.java +++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/work/CanceledActDetailResultDTO.java @@ -124,4 +124,27 @@ public class CanceledActDetailResultDTO implements Serializable { ", actContent=" + actContent + '}'; } + + //新增签到相关信息 + /** + * 签到开始时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8") + private Date signInStartTime; + + /** + * 签到截止时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8") + private Date signInEndTime; + + /** + * 活动签到打卡地点 + */ + private String signInAddress; + + /** + * 活动签到打卡半径(单位：米) + */ + private Integer signInRadius; } diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/work/FinishedActDetailResultDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/work/FinishedActDetailResultDTO.java index 5e9d4a991d..e96026f842 100644 --- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/work/FinishedActDetailResultDTO.java +++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/work/FinishedActDetailResultDTO.java @@ -113,4 +113,27 @@ public class FinishedActDetailResultDTO implements Serializable { @JsonIgnore private String createdBy; + + //新增签到相关信息 + /** + * 签到开始时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8") + private Date signInStartTime; + + /** + * 签到截止时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8") + private Date signInEndTime; + + /** + * 活动签到打卡地点 + */ + private String signInAddress; + + /** + * 活动签到打卡半径(单位：米) + */ + private Integer signInRadius; } diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/work/InProgressActDetailResultDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/work/InProgressActDetailResultDTO.java index cc9e66a9bf..cd2518f840 100644 --- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/work/InProgressActDetailResultDTO.java +++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/work/InProgressActDetailResultDTO.java @@ -98,4 +98,37 @@ public class InProgressActDetailResultDTO implements Serializable { @JsonIgnore private String createdBy; + + /** + * 活动状态：报名中：signing_up；截止报名: end_sign_up; 已开始： in_progress; 已报满： enough + */ + private String status=""; + /** + * 已报名人数 + */ + private Integer signedUp; + + + //新增签到相关信息 + /** + * 签到开始时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8") + private Date signInStartTime; + + /** + * 签到截止时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8") + private Date signInEndTime; + + /** + * 活动签到打卡地点 + */ + private String signInAddress; + + /** + * 活动签到打卡半径(单位：米) + */ + private Integer signInRadius; } diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/WorkActController.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/WorkActController.java index 81fd46ce1e..67eb62f18d 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/WorkActController.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/WorkActController.java @@ -200,8 +200,8 @@ public class WorkActController { @PostMapping("summaryact") public Result summaryAct(@RequestBody SummaryActFormDTO formDTO){ ValidatorUtils.validateEntity(formDTO, SummaryActFormDTO.AddUserInternalGroup.class); - if(null!=formDTO.getActContent()&&formDTO.getActContent().size()>0){ - ValidatorUtils.validateEntity(formDTO.getActContent(), SummaryActFormDTO.AddUserShowGroup.class); + if(null!=formDTO.getActSummary()&&formDTO.getActSummary().size()>0){ + ValidatorUtils.validateEntity(formDTO.getActSummary(), SummaryActFormDTO.AddUserShowGroup.class); } workActService.summaryAct(formDTO); return new Result(); diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/WorkActServiceImpl.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/WorkActServiceImpl.java index b435c6088a..e93d288699 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/WorkActServiceImpl.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/WorkActServiceImpl.java @@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.epmet.commons.tools.constant.AppClientConstant; import com.epmet.commons.tools.constant.MqConstant; +import com.epmet.commons.tools.constant.NumConstant; import com.epmet.commons.tools.constant.StrConstant; import com.epmet.commons.tools.dto.form.mq.MqBaseMsgDTO; import com.epmet.commons.tools.dto.form.mq.eventmsg.BasePointEventMsg; @@ -532,11 +533,12 @@ public class WorkActServiceImpl implements WorkActService { Date nowDate = new Date(); for (InProgressActResultDTO inProgressActResultDTO : list) { // 活动状态：报名中：signing_up；截止报名: end_sign_up; 已开始： in_progress; 已报满： enough - if (nowDate.compareTo(inProgressActResultDTO.getSignUpEndTime()) == -1 - || nowDate.compareTo(inProgressActResultDTO.getSignUpEndTime()) == 0) { + /*if (nowDate.compareTo(inProgressActResultDTO.getSignUpEndTime()) == -1 + || nowDate.compareTo(inProgressActResultDTO.getSignUpEndTime()) == 0) {*/ + if (!NumConstant.ONE_STR.equals(DateUtils.comparteDate(nowDate, inProgressActResultDTO.getSignUpEndTime()))) { logger.info(String.format("当前时间%s报名截止时间%s处于报名中", - DateUtils.format(nowDate,DateUtils.DATE_TIME_PATTERN), - DateUtils.format(inProgressActResultDTO.getSignUpEndTime(),DateUtils.DATE_TIME_PATTERN))); + DateUtils.format(nowDate, DateUtils.DATE_TIME_PATTERN), + DateUtils.format(inProgressActResultDTO.getSignUpEndTime(), DateUtils.DATE_TIME_PATTERN))); //截止报名时间之前(包含报名时间截止时间点) if (!inProgressActResultDTO.getActQuotaCategory()) { //如果是不限制名额，则显示报名中 @@ -555,20 +557,25 @@ public class WorkActServiceImpl implements WorkActService { continue; } } - } else if (nowDate.compareTo(inProgressActResultDTO.getSignUpEndTime()) == 1 - &&nowDate.compareTo(inProgressActResultDTO.getActStartTime()) == -1) { + } + /*else if (nowDate.compareTo(inProgressActResultDTO.getSignUpEndTime()) == 1 + &&nowDate.compareTo(inProgressActResultDTO.getActStartTime()) == -1) {*/ + else if (NumConstant.ONE_STR.equals(DateUtils.comparteDate(nowDate, inProgressActResultDTO.getSignUpEndTime())) + && NumConstant.ONE_NEG_STR.equals(DateUtils.comparteDate(nowDate, inProgressActResultDTO.getActStartTime()))) { logger.info(String.format("当前时间%s报名截止时间%s活动预计开始时间%s界面显示截止报名", - DateUtils.format(nowDate,DateUtils.DATE_TIME_PATTERN), - DateUtils.format(inProgressActResultDTO.getSignUpEndTime(),DateUtils.DATE_TIME_PATTERN), - DateUtils.format(inProgressActResultDTO.getActStartTime(),DateUtils.DATE_TIME_PATTERN))); + DateUtils.format(nowDate, DateUtils.DATE_TIME_PATTERN), + DateUtils.format(inProgressActResultDTO.getSignUpEndTime(), DateUtils.DATE_TIME_PATTERN), + DateUtils.format(inProgressActResultDTO.getActStartTime(), DateUtils.DATE_TIME_PATTERN))); //活动报名截止-活动预计开始之间显示截止报名 inProgressActResultDTO.setStatus("end_sign_up"); continue; - } else if (nowDate.compareTo(inProgressActResultDTO.getActStartTime()) == 1 - || nowDate.compareTo(inProgressActResultDTO.getActStartTime()) == 0) { + } + /*else if (nowDate.compareTo(inProgressActResultDTO.getActStartTime()) == 1 + || nowDate.compareTo(inProgressActResultDTO.getActStartTime()) == 0) {*/ + else if (!NumConstant.ONE_NEG_STR.equals(DateUtils.comparteDate(nowDate, inProgressActResultDTO.getActStartTime()))) { logger.info(String.format("当前时间%s活动预计开始时间%s界面显示已开始", - DateUtils.format(nowDate,DateUtils.DATE_TIME_PATTERN), - DateUtils.format(inProgressActResultDTO.getActStartTime(),DateUtils.DATE_TIME_PATTERN))); + DateUtils.format(nowDate, DateUtils.DATE_TIME_PATTERN), + DateUtils.format(inProgressActResultDTO.getActStartTime(), DateUtils.DATE_TIME_PATTERN))); //活动预计开始时间点之后，包含活动预计开始时间点，显示 已开始 inProgressActResultDTO.setStatus("in_progress"); continue; @@ -732,8 +739,54 @@ public class WorkActServiceImpl implements WorkActService { public InProgressActDetailResultDTO inProgressDetail(String actId) { InProgressActDetailResultDTO resultDTO = actInfoDao.selectInProgressDetail(actId); if (null != resultDTO) { + Date nowDate=new Date(); + // 活动状态：报名中：signing_up；截止报名: end_sign_up; 已开始： in_progress; 已报满： enough + /*if (nowDate.compareTo(inProgressActResultDTO.getSignUpEndTime()) == -1 + || nowDate.compareTo(inProgressActResultDTO.getSignUpEndTime()) == 0) {*/ + if (!NumConstant.ONE_STR.equals(DateUtils.comparteDate(nowDate, resultDTO.getSignUpEndTime()))) { + logger.info(String.format("当前时间%s报名截止时间%s处于报名中", + DateUtils.format(nowDate, DateUtils.DATE_TIME_PATTERN), + DateUtils.format(resultDTO.getSignUpEndTime(), DateUtils.DATE_TIME_PATTERN))); + //截止报名时间之前(包含报名时间截止时间点) + if (!resultDTO.getActQuotaCategory()) { + //如果是不限制名额，则显示报名中 + resultDTO.setStatus("signing_up"); + logger.info("活动不限制名额,界面显示 报名中"); + } else { + //固定名额，且已报名人数<活动需要人数显示报名中 + if (resultDTO.getActQuota() > resultDTO.getSignedUp()) { + logger.info("活动限制名额,未报满,界面显示报名中"); + resultDTO.setStatus("signing_up"); + } else if (resultDTO.getActQuota().equals(resultDTO.getSignedUp())) { + resultDTO.setStatus("enough"); + logger.info("活动限制名额,且已报满,界面显示已报满"); + } + } + } + /*else if (nowDate.compareTo(inProgressActResultDTO.getSignUpEndTime()) == 1 + &&nowDate.compareTo(inProgressActResultDTO.getActStartTime()) == -1) {*/ + else if (NumConstant.ONE_STR.equals(DateUtils.comparteDate(nowDate, resultDTO.getSignUpEndTime())) + && NumConstant.ONE_NEG_STR.equals(DateUtils.comparteDate(nowDate, resultDTO.getActStartTime()))) { + logger.info(String.format("当前时间%s报名截止时间%s活动预计开始时间%s界面显示截止报名", + DateUtils.format(nowDate, DateUtils.DATE_TIME_PATTERN), + DateUtils.format(resultDTO.getSignUpEndTime(), DateUtils.DATE_TIME_PATTERN), + DateUtils.format(resultDTO.getActStartTime(), DateUtils.DATE_TIME_PATTERN))); + //活动报名截止-活动预计开始之间显示截止报名 + resultDTO.setStatus("end_sign_up"); + } + /*else if (nowDate.compareTo(inProgressActResultDTO.getActStartTime()) == 1 + || nowDate.compareTo(inProgressActResultDTO.getActStartTime()) == 0) {*/ + else if (!NumConstant.ONE_NEG_STR.equals(DateUtils.comparteDate(nowDate, resultDTO.getActStartTime()))) { + logger.info(String.format("当前时间%s活动预计开始时间%s界面显示已开始", + DateUtils.format(nowDate, DateUtils.DATE_TIME_PATTERN), + DateUtils.format(resultDTO.getActStartTime(), DateUtils.DATE_TIME_PATTERN))); + //活动预计开始时间点之后，包含活动预计开始时间点，显示 已开始 + resultDTO.setStatus("in_progress"); + } + //查询活动详情 List list = actContentDao.selectByActId(actId); resultDTO.setActContent(list); + //当前活动是否是我发布的 if(resultDTO.getCreatedBy().equals(loginUserUtil.getLoginUserId())){ resultDTO.setIsMyPublish(true); }else{ @@ -921,7 +974,7 @@ public class WorkActServiceImpl implements WorkActService { //审核 List textList=new ArrayList<>(); List imgList=new ArrayList<>(); - for(PublishActContentFormDTO actContent:formDTO.getActContent()){ + for(PublishActContentFormDTO actContent:formDTO.getActSummary()){ if(ActConstant.ACT_CONTENT_TYPE_TEXT.equals(actContent.getContentType())){ textList.add(actContent.getContent()); }else if(ActConstant.ACT_CONTENT_TYPE_IMG.equals(actContent.getContentType())){ @@ -931,7 +984,7 @@ public class WorkActServiceImpl implements WorkActService { this.auditActContent(textList,imgList); //插入act_summary记录 int orderNum=1; - for(PublishActContentFormDTO actContentFormDTO:formDTO.getActContent()){ + for(PublishActContentFormDTO actContentFormDTO:formDTO.getActSummary()){ ActSummaryEntity actSummaryEntity=new ActSummaryEntity(); actSummaryEntity.setActId(formDTO.getActId()); actSummaryEntity.setContent(actContentFormDTO.getContent()); 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 87d8575e03..c31ad005a6 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 @@ -2,6 +2,7 @@ package com.epmet.service.impl; import com.alibaba.fastjson.JSON; import com.epmet.commons.tools.constant.AppClientConstant; +import com.epmet.commons.tools.constant.NumConstant; import com.epmet.commons.tools.constant.StrConstant; import com.epmet.commons.tools.exception.EpmetErrorCode; import com.epmet.commons.tools.exception.RenException; @@ -262,13 +263,17 @@ public class WorkActUserServiceImpl implements WorkActUserService { actInfo.setRefusedNum(actUserRelationService.selectCountUser(actId,ActConstant.ACT_USER_STATUS_REFUSED)); //已取消总人数 actInfo.setCanceledNum(actUserRelationService.selectCountUser(actId,ActConstant.ACT_USER_STATUS_CANCELD)); + //固定名额 + Integer totalSignUp=actInfo.getAuditingNum()+actInfo.getPassedNum(); + actInfo.setTotalSignUp(totalSignUp); //true:固定名额 false： 不限制名额 if(actInfo.getActQuotaCategory()){ - Integer totalSignUp=actInfo.getAuditingNum()+actInfo.getPassedNum(); - actInfo.setTotalSignUp(totalSignUp); //剩余报名名额 Integer residueNum=actInfo.getActQuota()-totalSignUp; actInfo.setResidueNum(residueNum); + }else{ + //不信名额 + actInfo.setResidueNum(NumConstant.ZERO); } } return actInfo; diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/ActInfoDao.xml b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/ActInfoDao.xml index 891cde8f20..9a5febfbdd 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/ActInfoDao.xml +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/ActInfoDao.xml @@ -605,7 +605,11 @@ ai.REQUIREMENT AS requirement, ai.CANCEL_TIME AS cancelTime, ai.CANCEL_REASON AS cancelReason, - ai.CREATED_BY as createdBy + ai.CREATED_BY as createdBy, + ai.SIGN_IN_START_TIME as signInStartTime, + ai.SIGN_IN_END_TIME as signInEndTime, + ai.SIGN_IN_ADDRESS as signInAddress, + ai.SIGN_IN_RADIUS as signInRadius FROM act_info ai WHERE @@ -634,7 +638,11 @@ AI.SUMMARY_FLAG AS summaryFlag, AI.ACTUAL_START_TIME AS actualStartTime, AI.ACTUAL_END_TIME AS actualEndTime, - ai.CREATED_BY as createdBy + ai.CREATED_BY as createdBy, + ai.SIGN_IN_START_TIME as signInStartTime, + ai.SIGN_IN_END_TIME as signInEndTime, + ai.SIGN_IN_ADDRESS as signInAddress, + ai.SIGN_IN_RADIUS as signInRadius FROM act_info ai WHERE @@ -659,7 +667,21 @@ ai.REWARD AS reward, ai.SPONSOR_NAME AS sponsorName, ai.REQUIREMENT AS requirement, - ai.CREATED_BY as createdBy + ai.CREATED_BY as createdBy, + ( + SELECT + count( aur.id ) + FROM + act_user_relation aur + WHERE + aur.ACT_ID = ai.ID + AND aur.DEL_FLAG = '0' + AND ( aur.`STATUS` = 'auditing' OR aur.`STATUS` = 'passed' ) + ) AS signedUp, + ai.SIGN_IN_START_TIME as signInStartTime, + ai.SIGN_IN_END_TIME as signInEndTime, + ai.SIGN_IN_ADDRESS as signInAddress, + ai.SIGN_IN_RADIUS as signInRadius FROM act_info ai WHERE From b5bddfcaf171e65d7212cf8aa0d25597137c37d4 Mon Sep 17 00:00:00 2001 From: jianjun Date: Wed, 29 Jul 2020 17:42:36 +0800 Subject: [PATCH 5/9] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/epmet/entity/UserCustomerEntity.java | 10 ++++++++-- .../epmet/service/impl/UserResiInfoServiceImpl.java | 2 +- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/UserCustomerEntity.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/UserCustomerEntity.java index 0b92baede7..d7d5312df9 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/UserCustomerEntity.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/UserCustomerEntity.java @@ -20,12 +20,18 @@ public class UserCustomerEntity extends BaseEpmetEntity { /** * 客户Id - * */ + */ private String customerId; /** * 用户Id - * */ + */ private String userId; + /** + * 是否注册 1已注册 0未注册 + */ + private String isRegister; + + } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserResiInfoServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserResiInfoServiceImpl.java index c2e90bfcf4..37c52c4583 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserResiInfoServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserResiInfoServiceImpl.java @@ -211,7 +211,7 @@ public class UserResiInfoServiceImpl extends BaseServiceImpl Date: Wed, 29 Jul 2020 17:43:03 +0800 Subject: [PATCH 6/9] heart+1 --- .../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 1ae781d21c..d31b6fd06d 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.8 + image: 192.168.1.130:10080/epmet-cloud-dev/epmet-heart-server:0.0.9 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 20462901b2..ffb2ec42ff 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.8 + 0.0.9 com.epmet epmet-heart From 4e4a764fb847a1bf3ae687039c450c716fed5a9d Mon Sep 17 00:00:00 2001 From: jianjun Date: Wed, 29 Jul 2020 18:03:39 +0800 Subject: [PATCH 7/9] =?UTF-8?q?=E5=8D=87=E7=BA=A7user?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- epmet-user/epmet-user-server/deploy/docker-compose-dev.yml | 2 +- epmet-user/epmet-user-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-user/epmet-user-server/deploy/docker-compose-dev.yml b/epmet-user/epmet-user-server/deploy/docker-compose-dev.yml index 971640a11c..8ceaccca60 100644 --- a/epmet-user/epmet-user-server/deploy/docker-compose-dev.yml +++ b/epmet-user/epmet-user-server/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-user-server: container_name: epmet-user-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/epmet-user-server:0.3.88 + image: 192.168.1.130:10080/epmet-cloud-dev/epmet-user-server:0.3.89 ports: - "8087:8087" network_mode: host # 不会创建新的网络 diff --git a/epmet-user/epmet-user-server/pom.xml b/epmet-user/epmet-user-server/pom.xml index acc3a938b8..67c234057c 100644 --- a/epmet-user/epmet-user-server/pom.xml +++ b/epmet-user/epmet-user-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.88 + 0.3.89 com.epmet epmet-user From 530c640a932230084bbe0e18f2166d5a1b181bc5 Mon Sep 17 00:00:00 2001 From: jianjun Date: Wed, 29 Jul 2020 18:04:10 +0800 Subject: [PATCH 8/9] =?UTF-8?q?=E5=8D=87=E7=BA=A7user?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...5__create_userbaseinfo.sql => V0.0.6__create_userbaseinfo.sql} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename epmet-user/epmet-user-server/src/main/resources/db/migration/{V0.0.5__create_userbaseinfo.sql => V0.0.6__create_userbaseinfo.sql} (100%) diff --git a/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.5__create_userbaseinfo.sql b/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.6__create_userbaseinfo.sql similarity index 100% rename from epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.5__create_userbaseinfo.sql rename to epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.6__create_userbaseinfo.sql From d530bef8c9b273783f3a90ff9b04d60809d631a0 Mon Sep 17 00:00:00 2001 From: jianjun Date: Wed, 29 Jul 2020 18:06:57 +0800 Subject: [PATCH 9/9] =?UTF-8?q?=E5=8D=87=E7=BA=A7user?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- epmet-user/epmet-user-server/deploy/docker-compose-dev.yml | 2 +- epmet-user/epmet-user-server/pom.xml | 2 +- ..._create_userbaseinfo.sql => V0.0.5__create_userbaseinfo.sql} | 0 .../{V0.0.5__add_isRegister.sql => V0.0.6__add_isRegister.sql} | 0 4 files changed, 2 insertions(+), 2 deletions(-) rename epmet-user/epmet-user-server/src/main/resources/db/migration/{V0.0.6__create_userbaseinfo.sql => V0.0.5__create_userbaseinfo.sql} (100%) rename epmet-user/epmet-user-server/src/main/resources/db/migration/{V0.0.5__add_isRegister.sql => V0.0.6__add_isRegister.sql} (100%) diff --git a/epmet-user/epmet-user-server/deploy/docker-compose-dev.yml b/epmet-user/epmet-user-server/deploy/docker-compose-dev.yml index 8ceaccca60..615c149f21 100644 --- a/epmet-user/epmet-user-server/deploy/docker-compose-dev.yml +++ b/epmet-user/epmet-user-server/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-user-server: container_name: epmet-user-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/epmet-user-server:0.3.89 + image: 192.168.1.130:10080/epmet-cloud-dev/epmet-user-server:0.3.90 ports: - "8087:8087" network_mode: host # 不会创建新的网络 diff --git a/epmet-user/epmet-user-server/pom.xml b/epmet-user/epmet-user-server/pom.xml index 67c234057c..6351062f8e 100644 --- a/epmet-user/epmet-user-server/pom.xml +++ b/epmet-user/epmet-user-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.89 + 0.3.90 com.epmet epmet-user diff --git a/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.6__create_userbaseinfo.sql b/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.5__create_userbaseinfo.sql similarity index 100% rename from epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.6__create_userbaseinfo.sql rename to epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.5__create_userbaseinfo.sql diff --git a/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.5__add_isRegister.sql b/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.6__add_isRegister.sql similarity index 100% rename from epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.5__add_isRegister.sql rename to epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.6__add_isRegister.sql