Merge remote-tracking branch 'origin/dev_heart' into dev_heart

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  <![CDATA[ DATE_FORMAT(i.SIGN_UP_END_TIME,'%Y-%m-%d %H:%i:%s') >= ]]> NOW()
             then
                 case
                 when <![CDATA[c.signupNum >= 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 <![CDATA[ DATE_FORMAT(i.ACT_END_TIME,'%Y-%m-%d %H:%i:%s') > ]]> NOW()
         ORDER BY i.CREATED_TIME DESC
         LIMIT 0, #{num}
     </select>

epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/feign/EpmetPointOpenFeignClient.java

@@ -25,6 +25,6 @@ public interface EpmetPointOpenFeignClient {
      * @author wangc
      * @date 2020.07.22 15:58
      **/
-    @GetMapping("mypoint")
+    @GetMapping("/point/resi/point/mypoint")
     Result<ResiPointDetailResultDTO> myPoint(TokenDto dto);
 }