Merge branch 'dev_heart' into dev

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/ResiActListController.java

@@ -304,4 +304,17 @@ public class ResiActListController {
         return actUserRelationService.registration(tokenDto, formDTO);
     }
 
+    /**
+     * 首页组件 - 活动回顾列表(包含状态：已结束：finished；)
+     *
+     * @param formDto
+     * @return com.epmet.commons.tools.utils.Result<java.util.List<com.epmet.dto.result.resi.ResiLookBackActResultDTO>>
+     * @Author zhangyong
+     * @Date 13:39 2020-07-21
+     **/
+    @PostMapping("actlookbackassembly")
+    public Result<List<ResiLookBackActResultDTO>> actLookBackAssembly(@RequestBody ResiLatestActFormDTO formDto) {
+        ValidatorUtils.validateEntity(formDto, ResiActBaseFormDTO.AddUserInternalGroup.class);
+        return actInfoService.actLookBackAssembly(formDto);
+    }
 }

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/ActInfoDao.java

@@ -297,4 +297,16 @@ public interface ActInfoDao extends BaseDao<ActInfoEntity> {
      * @Date 2020/7/26 21:35
      **/
     InProgressActDetailResultDTO selectInProgressDetail(String actId);
+
+    /**
+     * 首页组件 - 活动回顾列表(包含状态：已结束：finished；)
+     * 已结束的活动，并且有实况或有回顾
+     * 按照时间顺序排序
+     *
+     * @param formDTO
+     * @return java.util.List<com.epmet.dto.result.resi.ResiLookBackActResultDTO>
+     * @Author zhangyong
+     * @Date 11:00 2020-07-20
+     **/
+    List<ResiLookBackActResultDTO> selectListLookBackActAssembly(ResiLatestActFormDTO formDTO);
 }

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

@@ -225,4 +225,14 @@ public interface ActInfoService extends BaseService<ActInfoEntity> {
      * @Date 17:17 2020-07-23
      **/
     Integer checkActTime(ActInfoDTO actInfoDTO);
+
+    /**
+     * 首页组件 - 活动回顾列表(包含状态：已结束：finished；)
+     *
+     * @param formDTO
+     * @return com.epmet.commons.tools.utils.Result<java.util.List<com.epmet.dto.result.resi.ResiLookBackActResultDTO>>
+     * @Author zhangyong
+     * @Date 13:39 2020-07-21
+     **/
+    Result<List<ResiLookBackActResultDTO>> actLookBackAssembly(ResiLatestActFormDTO formDTO);
 }

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

@@ -379,4 +379,10 @@ public class ActInfoServiceImpl extends BaseServiceImpl<ActInfoDao, ActInfoEntit
     public Integer checkActTime(ActInfoDTO actInfoDTO) {
         return baseDao.checkActTime(actInfoDTO);
     }
+
+    @Override
+    public Result<List<ResiLookBackActResultDTO>> actLookBackAssembly(ResiLatestActFormDTO formDTO) {
+        List<ResiLookBackActResultDTO> lookBackAct = baseDao.selectListLookBackActAssembly(formDTO);
+        return new Result<List<ResiLookBackActResultDTO>>().ok(lookBackAct);
+    }
 }

epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/ActInfoDao.xml

@@ -330,7 +330,7 @@
     <select id="selectListLookBackAct" parameterType="com.epmet.dto.form.resi.ResiActBaseFormDTO"
             resultType="com.epmet.dto.result.resi.ResiLookBackActResultDTO">
         SELECT
-            i.ID id,
+            i.ID actId,
             i.TITLE title,
             i.COVER_PIC coverPic,
             DATE_FORMAT(i.ACT_START_TIME,'%Y-%m-%d %H:%i') actStartTime,
@@ -666,4 +666,24 @@
             ai.DEL_FLAG = '0'
             AND ai.ID = #{actId}
     </select>
+
+    <!--首页组件-活动回顾列表-->
+    <select id="selectListLookBackActAssembly" parameterType="com.epmet.dto.form.resi.ResiLatestActFormDTO"
+            resultType="com.epmet.dto.result.resi.ResiLookBackActResultDTO">
+        SELECT
+            i.ID actId,
+            i.TITLE title,
+            i.COVER_PIC coverPic,
+            DATE_FORMAT(i.ACT_START_TIME,'%Y-%m-%d %H:%i') actStartTime,
+            DATE_FORMAT(i.ACT_END_TIME,'%Y-%m-%d %H:%i') actEndTime,
+            i.ACT_ADDRESS actAddress,
+            'finished' actCurrentState
+        FROM act_info i
+        WHERE i.DEL_FLAG = '0'
+        AND i.SUMMARY_FLAG = 1 OR (SELECT r.ACT_ID FROM act_live_rec r WHERE r.DEL_FLAG = '0' AND r.ACT_ID = i.ID GROUP BY r.ACT_ID)
+        AND i.CUSTOMER_ID = #{customerId}
+        AND i.ACT_STATUS = 'finished'
+        ORDER BY i.CREATED_TIME DESC
+        LIMIT 0, #{num}
+    </select>
 </mapper>

epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/result/ResiPointDetailResultDTO.java

@@ -17,11 +17,11 @@ public class ResiPointDetailResultDTO  implements Serializable {
     /**
      * 累计积分
      * */
-    private Integer accumulatedPoint;
+    private Integer accumulatedPoint = 0;
 
     /**
      * 可用积分
      * */
-    private Integer usablePoint;
+    private Integer usablePoint = 0;
 
 }

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

@@ -118,7 +118,10 @@ public class UserPointTotalServiceImpl extends BaseServiceImpl<UserPointTotalDao
      **/
     @Override
     public ResiPointDetailResultDTO getMyPoint(ResiCommonUserIdFormDTO userId) {
-        return baseDao.selectPointByUserId(userId.getUserId());
+        ResiPointDetailResultDTO result = baseDao.selectPointByUserId(userId.getUserId());
+        if(null == result) return new ResiPointDetailResultDTO();
+        if(null == result.getUsablePoint() || null == result.getAccumulatedPoint()) return new ResiPointDetailResultDTO();
+        return result;
     }
 
     /**