From e0078374912f9e7a1788cd85e43c32a5f83fc4a4 Mon Sep 17 00:00:00 2001
From: zhangyongzhangyong <2012005003@qq.coom>
Date: Fri, 31 Jul 2020 11:09:24 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BF=97=E6=84=BF=E8=80=85=E8=AE=A4=E8=AF=81?=
 =?UTF-8?q?=EF=BC=8C=E6=8E=A5=E5=8F=A3=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/VolunteerInfoServiceImpl.java        | 25 +++----------------
 .../src/main/resources/mapper/ActInfoDao.xml  |  3 +++
 .../main/resources/mapper/ActLiveRecDao.xml   |  1 +
 3 files changed, 8 insertions(+), 21 deletions(-)

diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/VolunteerInfoServiceImpl.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/VolunteerInfoServiceImpl.java
index 06cd0afafd..8ac75314f7 100644
--- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/VolunteerInfoServiceImpl.java
+++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/VolunteerInfoServiceImpl.java
@@ -33,7 +33,7 @@ import com.epmet.constant.ActMessageConstant;
 import com.epmet.dao.VolunteerInfoDao;
 import com.epmet.dto.HeartUserInfoDTO;
 import com.epmet.dto.VolunteerInfoDTO;
-import com.epmet.dto.form.WxUserInfoFormDTO;
+import com.epmet.dto.form.PasswordLoginUserInfoFormDTO;
 import com.epmet.dto.form.resi.ResiVolunteerAuthenticateFormDTO;
 import com.epmet.dto.result.ResiUserBaseInfoResultDTO;
 import com.epmet.dto.result.resi.ResiVolunteerInfoResultDTO;
@@ -93,9 +93,9 @@ public class VolunteerInfoServiceImpl extends BaseServiceImpl<VolunteerInfoDao,
             // 发送消息 由积分系统消费消息（需要使用规则）
             this.grantActPoints(formDTO);
         }
-        // 更新用户基础信息表 并 更新用户微信表
-        WxUserInfoFormDTO wxUserInfoFormDTO = this.packageWxUserInfo(formDTO);
-        return epmetUserOpenFeignClient.updateUserBaseAndWxUserInfo(wxUserInfoFormDTO);
+        // 志愿者认证，更新用户基础信息
+        com.epmet.dto.form.ResiVolunteerAuthenticateFormDTO param = ConvertUtils.sourceToTarget(formDTO, com.epmet.dto.form.ResiVolunteerAuthenticateFormDTO.class);
+        return epmetUserOpenFeignClient.volunteerBaseInfo(param);
     }
 
     private void grantActPoints(ResiVolunteerAuthenticateFormDTO formDTO){
@@ -122,23 +122,6 @@ public class VolunteerInfoServiceImpl extends BaseServiceImpl<VolunteerInfoDao,
         }
     }
 
-    /**
-     * 根据志愿者认证参数，组装微信基本信息
-     *
-     * @param formDTO
-     * @return com.epmet.dto.form.WxUserInfoFormDTO
-     * @Author zhangyong
-     * @Date 13:54 2020-07-28
-     **/
-    private WxUserInfoFormDTO packageWxUserInfo(ResiVolunteerAuthenticateFormDTO formDTO){
-        WxUserInfoFormDTO wxUserInfoFormDTO = new WxUserInfoFormDTO();
-        wxUserInfoFormDTO.setUserId(formDTO.getUserId());
-        wxUserInfoFormDTO.setNickName(formDTO.getNickname());
-        wxUserInfoFormDTO.setAvatarUrl(formDTO.getAvatarUrl());
-        wxUserInfoFormDTO.setGender(formDTO.getGender());
-        return wxUserInfoFormDTO;
-    }
-
     @Override
     public Result<ResiVolunteerInfoResultDTO> selectVolunteerInfoByUserId(TokenDto tokenDto) {
         ResiVolunteerInfoResultDTO resultDTO = new ResiVolunteerInfoResultDTO();
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 a2b4d9ad62..caacebc94b 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
@@ -205,6 +205,7 @@
         AND u.DEL_FLAG = '0'
         AND u.USER_ID = #{userId}
         AND u.`STATUS` = 'auditing'
+        AND <![CDATA[ DATE_FORMAT(i.ACT_END_TIME,'%Y-%m-%d %H:%i:%s') > ]]> NOW() -- 活动结束时间 > 当前时间, 活动未结束
         ORDER BY i.CREATED_TIME DESC
         LIMIT #{pageNo}, #{pageSize}
     </select>
@@ -229,6 +230,7 @@
         AND u.DEL_FLAG = '0'
         AND u.USER_ID = #{userId}
         AND u.`STATUS` = 'passed'
+        AND <![CDATA[ DATE_FORMAT(i.ACT_END_TIME,'%Y-%m-%d %H:%i:%s') > ]]> NOW() -- 活动结束时间 > 当前时间, 活动未结束
         ORDER BY i.CREATED_TIME DESC
         LIMIT #{pageNo}, #{pageSize}
     </select>
@@ -253,6 +255,7 @@
         AND u.DEL_FLAG = '0'
         AND u.USER_ID = #{userId}
         AND u.`STATUS` = 'refused'
+        AND <![CDATA[ DATE_FORMAT(i.ACT_END_TIME,'%Y-%m-%d %H:%i:%s') > ]]> NOW() -- 活动结束时间 > 当前时间, 活动未结束
         ORDER BY i.CREATED_TIME DESC
         LIMIT  #{pageNo}, #{pageSize}
     </select>
diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/ActLiveRecDao.xml b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/ActLiveRecDao.xml
index 6b3c8d92ea..f5ce7e4f29 100644
--- a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/ActLiveRecDao.xml
+++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/ActLiveRecDao.xml
@@ -32,6 +32,7 @@
         FROM act_live_rec r
         WHERE r.DEL_FLAG = '0'
         AND r.ACT_ID = #{actId}
+        ORDER BY CREATED_TIME DESC
     </select>
 
     <!--根据实况id，查询每条实况对应的多张图片-->